Merge branch 'Alinto:master' into master

UI/Templates/ContactsUI/UIxContactFolderProperties.wox

@@ -20,15 +20,17 @@
       </div>
     </md-toolbar>
 
-    <md-dialog-content class="md-dialog-content" layout="column">
-      <md-checkbox
-          ng-model="properties.addressbook.synchronize"
-          ng-disabled="properties.addressbook.id == 'personal'"
-          ng-true-value="1"
-          ng-false-value="0">
-        <var:string label:value="Synchronize"/> (Microsoft Enterprise ActiveSync)
-      </md-checkbox>
-    </md-dialog-content>
+    <var:if condition="isEasUIEnabled">
+      <md-dialog-content class="md-dialog-content" layout="column">
+        <md-checkbox
+            ng-model="properties.addressbook.synchronize"
+            ng-disabled="properties.addressbook.id == 'personal'"
+            ng-true-value="1"
+            ng-false-value="0">
+          <var:string label:value="Synchronize"/> (Microsoft Enterprise ActiveSync)
+        </md-checkbox>
+      </md-dialog-content>
+    </var:if>
 
     <md-dialog-actions>
       <md-button type="button" ng-click="properties.close()"><var:string label:value="Cancel"/></md-button>

UI/Templates/MailerUI/UIxMailMainFrame.wox

@@ -8,7 +8,7 @@
     xmlns:label="OGo:label"
     className="UIxPageFrame"
     title="moduleName"
-    const:jsFiles="vendor/ckeditor/ckeditor.js, Common/sgCkeditor.component.js, Common.js, Preferences.services.js, Contacts.services.js, Scheduler.services.js, Mailer.js, Mailer.services.js, vendor/angular-file-upload.min.js, vendor/FileSaver.min.js">
+    const:jsFiles="vendor/ckeditor/ckeditor.js, Common/sgCkeditor.component.js, Common.js, Preferences.services.js, Contacts.services.js, Scheduler.services.js, Mailer.js, Mailer.services.js, vendor/angular-file-upload.min.js, vendor/FileSaver.min.js, vendor/punycode.js">
   <script type="text/javascript">
     var mailAccounts = <var:string value="mailAccounts" const:escapeHTML="NO" />;
     var userNames = <var:string value="userNames" const:escapeHTML="NO" />;

UI/Templates/MailerUI/UIxMailPopupView.wox

@@ -9,7 +9,7 @@
     className="UIxPageFrame"
     title="title"
     const:popup="YES"
-    const:jsFiles="Common.js, Preferences.services.js, Contacts.services.js, Scheduler.services.js, Mailer.app.popup.js, Mailer.services.js, vendor/ckeditor/ckeditor.js, Common/sgCkeditor.component.js, vendor/angular-file-upload.min.js, vendor/FileSaver.min.js">
+    const:jsFiles="Common.js, Preferences.services.js, Contacts.services.js, Scheduler.services.js, Mailer.app.popup.js, Mailer.services.js, vendor/ckeditor/ckeditor.js, Common/sgCkeditor.component.js, vendor/angular-file-upload.min.js, vendor/FileSaver.min.js, vendor/punycode.js">
 
   <main class="layout-fill" ng-controller="navController">
     <div id="detailView" class="view-detail md-default-theme md-background md-bg md-hue-2"

UI/Templates/MainUI/SOGoRootPage.wox

@@ -43,24 +43,24 @@
             </var:if>
             <div ng-if="!app.loginState">
               <md-input-container class="md-block">
-                <label><var:string label:value="Username"/></label>
-                <md-icon>person</md-icon>
-                <input autocorrect="off" autocapitalize="off" type="text" ng-model="app.creds.username" ng-required="true" ng-change="app.usernameChanged()" ng-blur="app.retrievePasswordRecoveryEnabled()" />
+                <label class="md-default-theme md-accent md-bg"><var:string label:value="Username"/></label>
+                <md-icon class="material-icons md-default-theme md-accent md-bg">person</md-icon>
+                <input class="md-default-theme md-accent md-bg" autocorrect="off" autocapitalize="off" type="text" ng-model="app.creds.username" ng-required="true" ng-change="app.usernameChanged()" ng-blur="app.retrievePasswordRecoveryEnabled()" />
               </md-input-container>
               <md-input-container class="md-block">
-                <label><var:string label:value="Password"/></label>
-                <md-icon>email</md-icon>
-                <input id="passwordField" type="password" ng-model="app.creds.password" ng-required="true"/>
-                <md-icon id="password-visibility-icon" ng-click="app.changePasswordVisibility()">visibility</md-icon>
+                <label class="md-default-theme md-accent md-bg"><var:string label:value="Password"/></label>
+                <md-icon class="material-icons md-default-theme md-accent md-bg">email</md-icon>
+                <input class="md-default-theme md-accent md-bg" id="passwordField" type="password" ng-model="app.creds.password" ng-required="true"/>
+                <md-icon class="material-icons md-default-theme md-accent md-bg" id="password-visibility-icon" ng-click="app.changePasswordVisibility()">visibility</md-icon>
               </md-input-container>
               
 
               <!-- LANGUAGES SELECT -->
               <div layout="row" layout-align="start end">
-                <md-icon>language</md-icon>
-                <md-input-container class="md-flex">
-                  <label><var:string label:value="choose"/></label>
-                  <md-select ng-model="app.creds.language"
+                <md-icon class="material-icons md-default-theme md-accent md-bg">language</md-icon>
+                <md-input-container class="md-default-theme md-accent md-bg md-flex">
+                  <label class="md-default-theme md-accent md-bg"><var:string label:value="choose"/></label>
+                  <md-select md-container-class="md-default-theme md-accent md-bg" ng-model="app.creds.language"
                             var:placeholder="localizedLanguage"
                             ng-change="app.changeLanguage($event)">
                     <var:foreach list="languages" item="item">
@@ -75,7 +75,7 @@
               <!-- DOMAINS SELECT -->
               <var:if condition="hasLoginDomains">
                 <div layout="row" layout-align="start end">
-                  <md-icon>domain</md-icon>
+                  <md-icon class="material-icons md-default-theme md-accent md-bg">domain</md-icon>
                         <md-input-container class="md-flex">
                           <md-select class="md-flex" ng-model="app.creds.domain" label:placeholder="choose" ng-change="app.retrievePasswordRecoveryEnabled()">
                             <var:foreach list="loginDomains" item="item">
@@ -109,7 +109,7 @@
               <md-button class="md-icon-button"
                          label:aria-label="About"
                          ng-click="app.showAbout()">
-                <md-icon>info</md-icon>
+                <md-icon class="material-icons md-default-theme md-accent md-bg">info</md-icon>
               </md-button>
               <div>
                 <md-button class="md-fab md-accent md-hue-2" type="submit"
@@ -146,7 +146,7 @@
               <div flex="80" flex-sm="50" flex-gt-sm="40">
                 <md-input-container class="md-block">
                   <label><var:string label:value="Verification Code"/></label>
-                  <md-icon>lock</md-icon>
+                  <md-icon class="material-icons md-default-theme md-accent md-bg">lock</md-icon>
                   <input type="text"
                          ng-pattern="app.verificationCodePattern"
                          ng-model="app.creds.verificationCode"
@@ -159,14 +159,14 @@
                              label:aria-label="Cancel"
                              ng-click="app.restoreLogin()"
                              sg-ripple-click="loginContent">
-                    <md-icon>arrow_backward</md-icon>
+                    <md-icon class="material-icons md-default-theme md-accent md-bg">arrow_backward</md-icon>
                   </md-button>
                   <md-button class="md-fab md-accent md-hue-2" type="submit"
                              label:aria-label="Connect"
                              ng-if="app.loginState == 'totpcode'"
                              ng-disabled="loginForm.$invalid"
                              ng-click="app.login()">
-                    <md-icon>arrow_forward</md-icon>
+                    <md-icon class="material-icons md-default-theme md-accent md-bg">arrow_forward</md-icon>
                   </md-button>
                 </div>
               </div>
@@ -180,7 +180,7 @@
                   <var:string label:value="Welcome"/> {{app.cn}}
                 </div>
                 <div class="md-padding" layout="row" layout-align="start center">
-                  <md-icon>priority_high</md-icon>
+                  <md-icon class="material-icons md-default-theme md-accent md-bg">priority_high</md-icon>
                   <div class="md-padding">
                     <var:string label:value="Two-factor authentication has been disabled. Visit the Preferences module to restore two-factor authentication and reconfigure your TOTP application."/>
                   </div>

UI/Templates/PreferencesUI/UIxPreferences.wox

@@ -258,7 +258,15 @@
                 </div>
                 <div flex="100" flex-sm="60" flex-gt-sm="50">
                   <var:string label:value="You must enter this key into your TOTP application."/> <b><var:string label:value="If you do not and you log out you will not be able to login again."/></b>
+                  <md-input-container class="md-block md-input-has-value md-auto-horizontal-margin">
+                    <label><var:string label:value="Enter TOTP verification code :"/></label>
+                    <input type="text" ng-model="app.preferences.defaults.totpVerificationCode" name="totpVerificationCode" autocomplete="one-time-code" id="totpVerificationCode" sg-no-dirty-check="true" ng-change="app.resetTotpVerificationCode(preferencesForm)"/>
+                    <div ng-messages="preferencesForm.totpVerificationCode.$error">
+                      <div ng-message="invalidTotpCode"><var:string label:value="Invalid TOTP verification code"/></div>
+                    </div>
+                  </md-input-container>
                 </div>
+                
               </div>
             </var:if>
 
@@ -654,15 +662,17 @@
               </md-checkbox>
             </div>
 
-            <div>
-              <md-checkbox
-                  ng-model="app.preferences.defaults.SOGoMailSynchronizeOnlyDefaultFolders"
-                  ng-true-value="1"
-                  ng-false-value="0"
-                  label:aria-label="Synchronize only default mail folders (EAS)">
-                <var:string label:value="Synchronize only default mail folders (EAS)"/>
-              </md-checkbox>
-            </div>
+            <var:if condition="isEasUIEnabled">
+              <div>
+                <md-checkbox
+                    ng-model="app.preferences.defaults.SOGoMailSynchronizeOnlyDefaultFolders"
+                    ng-true-value="1"
+                    ng-false-value="0"
+                    label:aria-label="Synchronize only default mail folders (EAS)">
+                  <var:string label:value="Synchronize only default mail folders (EAS)"/>
+                </md-checkbox>
+              </div>
+            </var:if>
 
             <div>
               <md-checkbox

UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox

@@ -4,12 +4,22 @@
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label">
-  <md-dialog flex="60" flex-sm="80" flex-xs="100">
+  <md-dialog 
+  flex="{{ editor.isFullscreen?    100 : 60 }}"
+  flex-sm="{{ editor.isFullscreen? 100 : 80 }}">
     <form name="eventForm" class="md-inline-form" ng-submit="editor.save(eventForm)">
       <md-toolbar>
         <div class="md-toolbar-tools sg-no-transition">
           <md-icon class="material-icons sg-icon-toolbar-bg">event</md-icon>
           <!-- summary -->
+          <md-button ng-click="editor.toggleFullscreen($event)"
+                     class="md-icon-button hide show-gt-xs"
+                     aria-hidden="true"
+                     ng-if="!isPopup">
+            <md-tooltip ng-if="centerIsClose" md-direction="bottom">{{ ::'Reduce' | loc }}</md-tooltip>
+            <md-tooltip ng-else="centerIsClose" md-direction="bottom">{{ ::'Expand' | loc }}</md-tooltip>
+            <md-icon>{{ editor.isFullscreen ? 'fullscreen_exit' : 'fullscreen' }}</md-icon>
+          </md-button>
           <md-icon ng-if="editor.component.classification == 'confidential'">visibility_off</md-icon>
           <md-icon ng-if="editor.component.classification == 'private'">vpn_key</md-icon>
           <md-input-container class="md-flex">

UI/Templates/SchedulerUI/UIxCalendarProperties.wox

@@ -43,14 +43,16 @@
               ng-false-value="0">
             <var:string label:value="Show tasks"/>
           </md-checkbox>
-          <md-checkbox
-              ng-model="properties.calendar.synchronize"
-              ng-show="!properties.calendar.isWebCalendar"
-              ng-disabled="properties.calendar.id == 'personal'"
-              ng-true-value="1"
-              ng-false-value="0">
-            <var:string label:value="Synchronize"/> (Microsoft Enterprise ActiveSync)
-          </md-checkbox>
+          <var:if condition="isEasUIEnabled">
+            <md-checkbox
+                ng-model="properties.calendar.synchronize"
+                ng-show="!properties.calendar.isWebCalendar"
+                ng-disabled="properties.calendar.id == 'personal'"
+                ng-true-value="1"
+                ng-false-value="0">
+              <var:string label:value="Synchronize"/> (Microsoft Enterprise ActiveSync)
+            </md-checkbox>
+          </var:if>
           <md-checkbox
               ng-model="properties.calendar.reloadOnLogin"
               ng-show="properties.calendar.isWebCalendar"