diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js index 3ce98157a..373ca4ddd 100644 --- a/dev/Common/Utils.js +++ b/dev/Common/Utils.js @@ -1075,6 +1075,7 @@ Utils.setExpandedFolder = function (sFullNameHash, bExpanded) Utils.initLayoutResizer = function (sLeft, sRight, sClientSideKeyName) { var + iDisabledWidth = 65, iMinWidth = 155, oLeft = $(sLeft), oRight = $(sRight), @@ -1095,16 +1096,15 @@ Utils.initLayoutResizer = function (sLeft, sRight, sClientSideKeyName) }, fDisable = function (bDisable) { - var iWidth = 5; if (bDisable) { oLeft.resizable('disable'); - fSetWidth(iWidth); + fSetWidth(iDisabledWidth); } else { oLeft.resizable('enable'); - iWidth = Utils.pInt(RL.local().get(sClientSideKeyName)) || iMinWidth; + var iWidth = Utils.pInt(RL.local().get(sClientSideKeyName)) || iMinWidth; fSetWidth(iWidth > iMinWidth ? iWidth : iMinWidth); } }, @@ -1123,7 +1123,7 @@ Utils.initLayoutResizer = function (sLeft, sRight, sClientSideKeyName) if (null !== mLeftWidth) { - fSetWidth(mLeftWidth); + fSetWidth(mLeftWidth > iMinWidth ? mLeftWidth : iMinWidth); } oLeft.resizable({ diff --git a/dev/Styles/Animations.less b/dev/Styles/Animations.less index 37a5374d1..52875eb9c 100644 --- a/dev/Styles/Animations.less +++ b/dev/Styles/Animations.less @@ -154,6 +154,14 @@ html.rl-started-trigger.no-mobile #rl-content { animation: highlight-folder-row 0.5s linear; } + &.csstransitions .b-folders .btn.buttonContacts { + .transition(margin 0.3s linear); + } + + &.csstransitions .b-folders .b-content.opacity-on-panel-disabled { + .transition(opacity 0.3s linear); + } + &.csstransitions .messageList { .messageListItem { .transition(max-height 400ms ease); diff --git a/dev/Styles/Contacts.less b/dev/Styles/Contacts.less index 98c83732d..8532e84f2 100644 --- a/dev/Styles/Contacts.less +++ b/dev/Styles/Contacts.less @@ -58,7 +58,7 @@ }*/ } - .b-list-toopbar { + .b-list-toolbar { padding: 0; height: 45px; text-align: center; @@ -71,7 +71,7 @@ } } - .b-list-footer-toopbar { + .b-list-footer-toolbar { position: absolute; left: 0; bottom: 0; diff --git a/dev/Styles/FolderList.less b/dev/Styles/FolderList.less index cc21fc672..83d263b12 100644 --- a/dev/Styles/FolderList.less +++ b/dev/Styles/FolderList.less @@ -15,22 +15,23 @@ height: 30px; padding: 10px 10px 0 @rlLowMargin; color: #fff; + z-index: 101; } .b-footer { position: absolute; - bottom: 18px; + bottom: 20px; right: 0; left: 0; height: 20px; - padding: 0 10px 0 0; + padding: 0 10px 0 5px; z-index: 101; } .b-content { position: absolute; top: 50px + @rlLowMargin; - bottom: 30px + @rlLowMargin + @rlBottomMargin; + bottom: 32px + @rlLowMargin + @rlBottomMargin; // left: @rlLowMargin; left: 0; right: 0; @@ -161,3 +162,10 @@ padding-left: @subPadding * 3 + @folderItemPadding; } } + +html.rl-left-panel-disabled { + .btn.buttonContacts { + margin-top: 10px !important; + margin-left: 0 !important; + } +} \ No newline at end of file diff --git a/dev/Styles/Layout.less b/dev/Styles/Layout.less index 2927b77f8..3b060b5d3 100644 --- a/dev/Styles/Layout.less +++ b/dev/Styles/Layout.less @@ -36,7 +36,7 @@ .g-ui-absolute-reset; width: @rlLeftWidth; - min-width: 120px; + min-width: 60px; } #rl-right { @@ -147,10 +147,10 @@ html.ssm-state-tablet, html.ssm-state-mobile { } .b-contacts-content.modal { - .b-list-toopbar, .b-list-content, .b-list-footer-toopbar { + .b-list-toolbar, .b-list-content, .b-list-footer-toolbar { width: 150px; } - .b-list-toopbar .e-search { + .b-list-toolbar .e-search { width: 125px; } .b-view-content { @@ -173,10 +173,10 @@ html.ssm-state-tablet { } .b-contacts-content.modal { - .b-list-toopbar, .b-list-content, .b-list-footer-toopbar { + .b-list-toolbar, .b-list-content, .b-list-footer-toolbar { width: 200px; } - .b-list-toopbar .e-search { + .b-list-toolbar .e-search { width: 175px; } .b-view-content { @@ -188,15 +188,38 @@ html.ssm-state-tablet { } } +.show-on-panel-disabled { + display: none; +} + html.rl-left-panel-disabled { #rl-left { - width: 5px !important; - display: none; + width: 65px !important; + + .show-on-panel-disabled { + display: block; + } + + .opacity-on-panel-disabled { + .opacity(30); + } + + .visibility-hidden-on-panel-disabled { + visibility: hidden; + } + + .hide-on-panel-disabled { + display: none; + } + + &.ui-state-disabled { + .opacity(100); + } } #rl-right { - left: 5px !important; + left: 65px !important; } } diff --git a/dev/ViewModels/AdminMenuViewModel.js b/dev/ViewModels/AdminMenuViewModel.js index b8ab2e283..ce97bcb1c 100644 --- a/dev/ViewModels/AdminMenuViewModel.js +++ b/dev/ViewModels/AdminMenuViewModel.js @@ -10,6 +10,8 @@ function AdminMenuViewModel(oScreen) { KnoinAbstractViewModel.call(this, 'Left', 'AdminMenu'); + this.leftPanelDisabled = RL.data().leftPanelDisabled; + this.menu = oScreen.menu; Knoin.constructorEnd(this); diff --git a/dev/ViewModels/AdminPaneViewModel.js b/dev/ViewModels/AdminPaneViewModel.js index 260fe20d0..86b749ee3 100644 --- a/dev/ViewModels/AdminPaneViewModel.js +++ b/dev/ViewModels/AdminPaneViewModel.js @@ -12,7 +12,6 @@ function AdminPaneViewModel() this.version = ko.observable(RL.settingsGet('Version')); this.adminManLoadingVisibility = RL.data().adminManLoadingVisibility; - this.leftPanelDisabled = RL.data().leftPanelDisabled; Knoin.constructorEnd(this); } diff --git a/dev/ViewModels/MailBoxMessageListViewModel.js b/dev/ViewModels/MailBoxMessageListViewModel.js index b94d86cff..bababcf21 100644 --- a/dev/ViewModels/MailBoxMessageListViewModel.js +++ b/dev/ViewModels/MailBoxMessageListViewModel.js @@ -26,7 +26,6 @@ function MailBoxMessageListViewModel() this.folderMenuForMove = oData.folderMenuForMove; this.useCheckboxesInList = oData.useCheckboxesInList; - this.leftPanelDisabled = oData.leftPanelDisabled; this.mainMessageListSearch = oData.mainMessageListSearch; this.messageListEndFolder = oData.messageListEndFolder; diff --git a/dev/ViewModels/SettingsMenuViewModel.js b/dev/ViewModels/SettingsMenuViewModel.js index c28f2ccb4..fc8c894e8 100644 --- a/dev/ViewModels/SettingsMenuViewModel.js +++ b/dev/ViewModels/SettingsMenuViewModel.js @@ -10,6 +10,8 @@ function SettingsMenuViewModel(oScreen) { KnoinAbstractViewModel.call(this, 'Left', 'SettingsMenu'); + this.leftPanelDisabled = RL.data().leftPanelDisabled; + this.menu = oScreen.menu; Knoin.constructorEnd(this); diff --git a/dev/ViewModels/SettingsPaneViewModel.js b/dev/ViewModels/SettingsPaneViewModel.js index ba71c6b60..b6d5ee08c 100644 --- a/dev/ViewModels/SettingsPaneViewModel.js +++ b/dev/ViewModels/SettingsPaneViewModel.js @@ -8,8 +8,6 @@ function SettingsPaneViewModel() { KnoinAbstractViewModel.call(this, 'Right', 'SettingsPane'); - this.leftPanelDisabled = RL.data().leftPanelDisabled; - Knoin.constructorEnd(this); } diff --git a/package.json b/package.json index 848173d92..e5aa4e9c6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.6.6", - "release": "921", + "release": "922", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", "main": "Gruntfile.js", diff --git a/rainloop/v/0.0.0/app/templates/Views/AdminMenu.html b/rainloop/v/0.0.0/app/templates/Views/AdminMenu.html index 6cec329de..d4cd5d1b2 100644 --- a/rainloop/v/0.0.0/app/templates/Views/AdminMenu.html +++ b/rainloop/v/0.0.0/app/templates/Views/AdminMenu.html @@ -1,6 +1,12 @@
-
-
+
+
+ + + +
+
+
@@ -14,4 +20,5 @@
+
\ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/AdminPane.html b/rainloop/v/0.0.0/app/templates/Views/AdminPane.html index 61e72c8f0..d315378b8 100644 --- a/rainloop/v/0.0.0/app/templates/Views/AdminPane.html +++ b/rainloop/v/0.0.0/app/templates/Views/AdminPane.html @@ -13,12 +13,6 @@
-
 
-
- - - -
diff --git a/rainloop/v/0.0.0/app/templates/Views/MailFolderList.html b/rainloop/v/0.0.0/app/templates/Views/MailFolderList.html index 2da067b74..f5d6ca00f 100644 --- a/rainloop/v/0.0.0/app/templates/Views/MailFolderList.html +++ b/rainloop/v/0.0.0/app/templates/Views/MailFolderList.html @@ -1,13 +1,13 @@
- -
+ +
@@ -16,20 +16,24 @@
- \ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/MailMessageList.html b/rainloop/v/0.0.0/app/templates/Views/MailMessageList.html index 211c2d453..82d30d79f 100644 --- a/rainloop/v/0.0.0/app/templates/Views/MailMessageList.html +++ b/rainloop/v/0.0.0/app/templates/Views/MailMessageList.html @@ -164,9 +164,6 @@
-