From b3955cd53a08130f9799ee23093b202aad95fbb6 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Wed, 11 Dec 2013 00:14:59 +0400 Subject: [PATCH] Allow interface selection in admin panel + small fixes --- dev/Styles/MessageList.less | 9 ++-- dev/ViewModels/MailBoxMessageViewViewModel.js | 5 +++ .../0.0.0/app/templates/Views/AdminPane.html | 44 +++++++++---------- .../templates/Views/AdminSettingsDomains.html | 2 +- .../Views/AdminSettingsSecurity.html | 2 +- .../templates/Views/AdminSettingsSocial.html | 2 +- .../app/templates/Views/MailMessageView.html | 7 +++ .../app/templates/Views/PopupsLanguages.html | 2 +- rainloop/v/0.0.0/static/css/app.css | 9 ++-- rainloop/v/0.0.0/static/css/app.min.css | 2 +- rainloop/v/0.0.0/static/css/less.css | 9 ++-- rainloop/v/0.0.0/static/js/app.js | 5 +++ rainloop/v/0.0.0/static/js/app.min.js | 2 +- 13 files changed, 60 insertions(+), 40 deletions(-) diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less index a3ab09df9..f7b3c495f 100644 --- a/dev/Styles/MessageList.less +++ b/dev/Styles/MessageList.less @@ -23,8 +23,8 @@ html.rl-no-preview-pane { bottom: 0; right: 0; left: 0; - height: 29px; - padding: 10px; + height: 30px; + padding: 7px; min-width: 300px; z-index: 101; @@ -37,6 +37,7 @@ html.rl-no-preview-pane { .e-quota { display: inline-block; margin-top: 5px; + margin-left: 5px; font-size: 18px; cursor: help; } @@ -103,13 +104,13 @@ html.rl-no-preview-pane { } .footerDelimiter { - bottom: 49px; + bottom: 44px; } .b-content { position: absolute; top: 50px; - bottom: 50px; + bottom: 45px; left: 0; right: 0; padding: 0; diff --git a/dev/ViewModels/MailBoxMessageViewViewModel.js b/dev/ViewModels/MailBoxMessageViewViewModel.js index c71dc81c1..17a3d605d 100644 --- a/dev/ViewModels/MailBoxMessageViewViewModel.js +++ b/dev/ViewModels/MailBoxMessageViewViewModel.js @@ -58,6 +58,11 @@ function MailBoxMessageViewViewModel() this.editMessage(); }, this.messageVisibility); + this.deleteCommand = Utils.createCommand(this, function () { + // TODO + window.console.log(arguments); + }, this.messageVisibility); + // viewer this.viewSubject = ko.observable(''); this.viewFromShort = ko.observable(''); 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 1aa974252..21e925590 100644 --- a/rainloop/v/0.0.0/app/templates/Views/AdminPane.html +++ b/rainloop/v/0.0.0/app/templates/Views/AdminPane.html @@ -1,23 +1,23 @@ -
-
-
-

- Admin Panel -    - ( – ) -

-
- - - -
-
-
-
-
-
-
-
-
-
+
+
+
+

+ Admin Panel +    + ( – ) +

+
+ + + +
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/AdminSettingsDomains.html b/rainloop/v/0.0.0/app/templates/Views/AdminSettingsDomains.html index 32fd3b016..a65042b64 100644 --- a/rainloop/v/0.0.0/app/templates/Views/AdminSettingsDomains.html +++ b/rainloop/v/0.0.0/app/templates/Views/AdminSettingsDomains.html @@ -18,7 +18,7 @@    loading...
- +
diff --git a/rainloop/v/0.0.0/app/templates/Views/AdminSettingsSecurity.html b/rainloop/v/0.0.0/app/templates/Views/AdminSettingsSecurity.html index 1aff0d4ce..7edbe1372 100644 --- a/rainloop/v/0.0.0/app/templates/Views/AdminSettingsSecurity.html +++ b/rainloop/v/0.0.0/app/templates/Views/AdminSettingsSecurity.html @@ -1,4 +1,4 @@ -
+
Security diff --git a/rainloop/v/0.0.0/app/templates/Views/AdminSettingsSocial.html b/rainloop/v/0.0.0/app/templates/Views/AdminSettingsSocial.html index 9cfe480f6..a05753561 100644 --- a/rainloop/v/0.0.0/app/templates/Views/AdminSettingsSocial.html +++ b/rainloop/v/0.0.0/app/templates/Views/AdminSettingsSocial.html @@ -5,7 +5,7 @@ http://rainloop.net/docs/social/
-
+
Google
diff --git a/rainloop/v/0.0.0/app/templates/Views/MailMessageView.html b/rainloop/v/0.0.0/app/templates/Views/MailMessageView.html index 06e792b50..0bc24aceb 100644 --- a/rainloop/v/0.0.0/app/templates/Views/MailMessageView.html +++ b/rainloop/v/0.0.0/app/templates/Views/MailMessageView.html @@ -23,6 +23,13 @@
+
diff --git a/rainloop/v/0.0.0/app/templates/Views/PopupsLanguages.html b/rainloop/v/0.0.0/app/templates/Views/PopupsLanguages.html index 9ad163660..4ab1764dd 100644 --- a/rainloop/v/0.0.0/app/templates/Views/PopupsLanguages.html +++ b/rainloop/v/0.0.0/app/templates/Views/PopupsLanguages.html @@ -1,5 +1,5 @@
-