From 3215c5f8d3553ed03b86a7ca8d41bdc97b2e54bd Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Fri, 29 Apr 2016 23:28:02 +0300 Subject: [PATCH] Small GUI fixes (#1014) --- dev/Styles/FolderList.less | 30 ++++++++++++++----- dev/Styles/_BootstrapFix.less | 29 ++++++++++++++++++ dev/View/User/MailBox/FolderList.js | 10 +------ package.json | 4 +-- .../v/0.0.0/app/localization/admin/it_IT.yml | 2 ++ .../app/localization/webmail/_source.en.yml | 1 - .../0.0.0/app/localization/webmail/en_GB.yml | 1 - .../0.0.0/app/localization/webmail/en_US.yml | 1 - .../0.0.0/app/localization/webmail/hu_HU.yml | 3 ++ .../0.0.0/app/localization/webmail/it_IT.yml | 2 ++ .../0.0.0/app/localization/webmail/ru_RU.yml | 3 +- .../templates/Views/User/MailFolderList.html | 9 ++---- .../templates/Views/User/MailMessageView.html | 26 +++++----------- 13 files changed, 73 insertions(+), 48 deletions(-) diff --git a/dev/Styles/FolderList.less b/dev/Styles/FolderList.less index 496c7f90e..7aa602d8f 100644 --- a/dev/Styles/FolderList.less +++ b/dev/Styles/FolderList.less @@ -19,14 +19,9 @@ right: 0; left: 0; height: 30px; - padding: 10px 10px 0 @rlLowMargin; + padding: 10px 0 0 @rlLowMargin; color: #fff; z-index: 101; - - html.rl-left-panel-enabled &{ - overflow: hidden; - white-space: nowrap; - } } .b-footer { @@ -137,7 +132,6 @@ } } - &.system { cursor: default; color: grey; @@ -237,7 +231,29 @@ /**/ } +.btn { + .btn-text-wrp { + padding-left: 7px; + white-space: normal; + } + + &.buttonCompose { + width: calc(~'100% - 85px'); + max-width: fit-content; + white-space: nowrap; + overflow: hidden; + height: 20px; + display: inline-block; + } +} + html.rl-left-panel-disabled, html.rl-left-panel-short { + .buttonComposeText{ + display: none; + } + .btn.buttonCompose { + width: auto; + } .btn.buttonContacts { margin-top: 10px !important; margin-left: 0 !important; diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index 68b83a384..d38b7bd28 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -91,6 +91,35 @@ select { white-space: nowrap; } +.btn.btn-transparent { + background: none !important; + border-color: transparent !important; + text-shadow: none !important; + box-shadow: none !important; + opacity: .6; + + [class^="icon-"] { + width: 19px; + height: 19px; + line-height: 20px; + font-size: 19px; + } + + &:hover { + opacity: 1; + } +} + +.btn-group.open .btn.btn-transparent.dropdown-toggle { + color: #BD362F; + .caret { + border-top-color: #BD362F; + } + [class^="icon-"]:before { + color: #BD362F; + } +} + .btn.btn-narrow { padding-left: 12px; padding-right: 12px; diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js index a9cbb7e99..585c469c4 100644 --- a/dev/View/User/MailBox/FolderList.js +++ b/dev/View/User/MailBox/FolderList.js @@ -63,18 +63,10 @@ this.isInboxStarred = ko.computed(function () { return FolderStore.currentFolder() && FolderStore.currentFolder().isInbox() && - 'is:flagged' === MessageStore.messageListSearch() + -1 < Utils.trim(MessageStore.messageListSearch()).indexOf('is:flagged') ; }); - this.displayNewText = ko.observable(false); - this.displayNewMessageText = ko.observable(false); - - Globals.leftPanelWidth.subscribe(function(v){ - this.displayNewText(170 < v && 230 >= v); - this.displayNewMessageText(230 < v); - }, this); - kn.constructorEnd(this); } diff --git a/package.json b/package.json index a11d2e0a1..953cfe186 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.9.4", - "release": "415", + "release": "417", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", "main": "gulpfile.js", @@ -40,7 +40,7 @@ "plugins" ], "readmeFilename": "README.md", - "ownCloudPackageVersion": "4.14", + "ownCloudPackageVersion": "4.15", "engines": { "node": ">= 0.10.0" }, diff --git a/rainloop/v/0.0.0/app/localization/admin/it_IT.yml b/rainloop/v/0.0.0/app/localization/admin/it_IT.yml index e973a6baa..0da95b533 100644 --- a/rainloop/v/0.0.0/app/localization/admin/it_IT.yml +++ b/rainloop/v/0.0.0/app/localization/admin/it_IT.yml @@ -215,6 +215,7 @@ it_IT: BUTTON_CLOSE: "Chiudi" BUTTON_ADD: "Aggiungi" BUTTON_UPDATE: "Aggiorna" + NEW_DOMAIN_DESC: "La configurazione di questo dominio ti permette di lavorare
con %NAME% indirizzi email." WHITE_LIST_ALERT: | Lista di domini a cui gli utenti sono autorizzati ad accedere. Utilizzare uno spazio come separatore. @@ -291,6 +292,7 @@ it_IT: DEMO_SEND_MESSAGE_ERROR: "Per ragioni di sicurezza, questo account non è abilitato ad inviare email all'esterno." DEMO_ACCOUNT_ERROR: "Per ragioni di sicurezza, questa funzionalità è bloccata." ACCOUNT_ALREADY_EXISTS: "Questo account esiste già" + ACCOUNT_DOES_NOT_EXIST: "L'account non esiste" MAIL_SERVER_ERROR: "Errore durante la connessione con il server mail" INVALID_INPUT_ARGUMENT: "Argomento non valido" UNKNOWN_ERROR: "Errore sconosciuto" diff --git a/rainloop/v/0.0.0/app/localization/webmail/_source.en.yml b/rainloop/v/0.0.0/app/localization/webmail/_source.en.yml index 0b192713c..ee94c455c 100644 --- a/rainloop/v/0.0.0/app/localization/webmail/_source.en.yml +++ b/rainloop/v/0.0.0/app/localization/webmail/_source.en.yml @@ -50,7 +50,6 @@ en: FOLDER_LIST: BUTTON_COMPOSE: "Compose" BUTTON_CONTACTS: "Contacts" - BUTTON_NEW: "New" BUTTON_NEW_MESSAGE: "New message" INBOX_NAME: "Inbox" STARRED_NAME: "Starred" diff --git a/rainloop/v/0.0.0/app/localization/webmail/en_GB.yml b/rainloop/v/0.0.0/app/localization/webmail/en_GB.yml index ac1666489..b75a29e1c 100644 --- a/rainloop/v/0.0.0/app/localization/webmail/en_GB.yml +++ b/rainloop/v/0.0.0/app/localization/webmail/en_GB.yml @@ -50,7 +50,6 @@ en_GB: FOLDER_LIST: BUTTON_COMPOSE: "Compose" BUTTON_CONTACTS: "Contacts" - BUTTON_NEW: "New" BUTTON_NEW_MESSAGE: "New message" INBOX_NAME: "Inbox" STARRED_NAME: "Starred" diff --git a/rainloop/v/0.0.0/app/localization/webmail/en_US.yml b/rainloop/v/0.0.0/app/localization/webmail/en_US.yml index 3ae7f9ad8..bc926b645 100644 --- a/rainloop/v/0.0.0/app/localization/webmail/en_US.yml +++ b/rainloop/v/0.0.0/app/localization/webmail/en_US.yml @@ -50,7 +50,6 @@ en_US: FOLDER_LIST: BUTTON_COMPOSE: "Compose" BUTTON_CONTACTS: "Contacts" - BUTTON_NEW: "New" BUTTON_NEW_MESSAGE: "New message" INBOX_NAME: "Inbox" STARRED_NAME: "Starred" diff --git a/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml b/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml index 58fd4925c..3cdcc8f4c 100644 --- a/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml +++ b/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml @@ -50,7 +50,9 @@ hu_HU: FOLDER_LIST: BUTTON_COMPOSE: "Levélírás" BUTTON_CONTACTS: "Névjegyek" + BUTTON_NEW_MESSAGE: "Új üzenet" INBOX_NAME: "Beérkező levelek" + STARRED_NAME: "Csillagozott" SENT_NAME: "Elküldött levelek" DRAFTS_NAME: "Piszkozatok" SPAM_NAME: "Levélszemét" @@ -621,6 +623,7 @@ hu_HU: NO_PRIVATE_KEY_FOUND: "Nem találtam privát kulcsot" NO_PRIVATE_KEY_FOUND_FOR: "Nem találtam privát kulcsot ehhez az e-mailhez: \"%EMAIL%\"" ADD_A_PUBLICK_KEY: "Publikus kulcs hozzáadás" + SELECT_A_PRIVATE_KEY: "Privát kulcs választás" UNVERIFIRED_SIGNATURE: "Nem ellenőrzött aláírás" DECRYPTION_ERROR: "OpenPGP visszafejtési hiba" GOOD_SIGNATURE: "Jó aláírás tőle: %USER%" diff --git a/rainloop/v/0.0.0/app/localization/webmail/it_IT.yml b/rainloop/v/0.0.0/app/localization/webmail/it_IT.yml index 7c33d1c25..d9a197d9f 100644 --- a/rainloop/v/0.0.0/app/localization/webmail/it_IT.yml +++ b/rainloop/v/0.0.0/app/localization/webmail/it_IT.yml @@ -51,6 +51,7 @@ it_IT: BUTTON_COMPOSE: "Scrivi messaggio" BUTTON_CONTACTS: "Contatti" INBOX_NAME: "Posta in arrivo" + STARRED_NAME: "Preferiti" SENT_NAME: "Posta inviata" DRAFTS_NAME: "Bozze" SPAM_NAME: "Spam" @@ -620,6 +621,7 @@ it_IT: NO_PRIVATE_KEY_FOUND: "Nessuna chiave privata trovata" NO_PRIVATE_KEY_FOUND_FOR: "Nessuna chiave privata trovata per l'indirizzo email \"%EMAIL%\"\n" ADD_A_PUBLICK_KEY: "Add a public key" + SELECT_A_PRIVATE_KEY: "Seleziona una chiave privata" UNVERIFIRED_SIGNATURE: "Firma non verificata" DECRYPTION_ERROR: "Decriptazione con OpenPGP fallita" GOOD_SIGNATURE: "Firma valida da %USER%" diff --git a/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml b/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml index 913815020..1ed3aafee 100644 --- a/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml +++ b/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml @@ -50,8 +50,7 @@ ru_RU: FOLDER_LIST: BUTTON_COMPOSE: "Написать" BUTTON_CONTACTS: "Контакты" - BUTTON_NEW: "Новое" - BUTTON_NEW_MESSAGE: "Написать" + BUTTON_NEW_MESSAGE: "Новое сообщение" INBOX_NAME: "Входящие" STARRED_NAME: "Отмеченные" SENT_NAME: "Отправленные" diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailFolderList.html b/rainloop/v/0.0.0/app/templates/Views/User/MailFolderList.html index ed45a883d..bf6344474 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailFolderList.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailFolderList.html @@ -1,13 +1,8 @@
- + - -    - - - -    + diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html index cf40951b2..a3534d236 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html @@ -72,32 +72,22 @@
-
-
- - - +
+
+
- - -