From 2651b6fd93fdf6f990a42b2c9fe2b5b866bd4220 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Thu, 29 Sep 2022 10:08:45 +0200 Subject: [PATCH] Remove the old "move to folder" behaviour option --- .../files/usr/local/include/application.ini | 1 - dev/Settings/Admin/General.js | 2 +- dev/Styles/User/Layout.less | 1 - dev/View/User/MailBox/MessageList.js | 28 ++++--------------- .../0.0.0/app/libraries/RainLoop/Actions.php | 1 - .../app/libraries/RainLoop/ActionsAdmin.php | 2 -- .../libraries/RainLoop/Config/Application.php | 3 +- .../v/0.0.0/app/localization/cs-CZ/admin.json | 1 - .../v/0.0.0/app/localization/da-DK/admin.json | 1 - .../v/0.0.0/app/localization/de-DE/admin.json | 1 - .../v/0.0.0/app/localization/en/admin.json | 1 - .../v/0.0.0/app/localization/es-ES/admin.json | 1 - .../v/0.0.0/app/localization/fa-IR/admin.json | 1 - .../v/0.0.0/app/localization/fi-FI/admin.json | 1 - .../v/0.0.0/app/localization/fr-FR/admin.json | 1 - .../v/0.0.0/app/localization/hu-HU/admin.json | 1 - .../v/0.0.0/app/localization/id-ID/admin.json | 1 - .../v/0.0.0/app/localization/it-IT/admin.json | 1 - .../v/0.0.0/app/localization/ja-JP/admin.json | 1 - .../v/0.0.0/app/localization/lt-LT/admin.json | 1 - .../v/0.0.0/app/localization/nb-NO/admin.json | 1 - .../v/0.0.0/app/localization/nl-NL/admin.json | 1 - .../v/0.0.0/app/localization/pl-PL/admin.json | 1 - .../v/0.0.0/app/localization/pt-BR/admin.json | 1 - .../v/0.0.0/app/localization/pt-PT/admin.json | 1 - .../v/0.0.0/app/localization/pt/admin.json | 1 - .../v/0.0.0/app/localization/ru-RU/admin.json | 1 - .../v/0.0.0/app/localization/sk-SK/admin.json | 1 - .../v/0.0.0/app/localization/sl-SI/admin.json | 1 - .../v/0.0.0/app/localization/sv-SE/admin.json | 1 - .../v/0.0.0/app/localization/vi-VN/admin.json | 1 - .../v/0.0.0/app/localization/zh-CN/admin.json | 1 - .../Views/Admin/AdminSettingsGeneral.html | 7 ----- .../templates/Views/User/MailMessageList.html | 17 +---------- 34 files changed, 8 insertions(+), 79 deletions(-) diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index 0345c10cb..dec5a06fc 100644 --- a/.docker/release/files/usr/local/include/application.ini +++ b/.docker/release/files/usr/local/include/application.ini @@ -39,7 +39,6 @@ attachment_size_limit = 2 [interface] show_attachment_thumbnail = On -new_move_to_folder_button = On [contacts] ; Enable contacts diff --git a/dev/Settings/Admin/General.js b/dev/Settings/Admin/General.js index 526277cc9..683fced6e 100644 --- a/dev/Settings/Admin/General.js +++ b/dev/Settings/Admin/General.js @@ -35,7 +35,7 @@ export class AdminSettingsGeneral extends AbstractViewSettings { this.theme = ThemeStore.theme; this.themes = ThemeStore.themes; - this.addSettings(['AllowLanguagesOnSettings','NewMoveToFolder']); + this.addSettings(['AllowLanguagesOnSettings']); addObservablesTo(this, { attachmentLimitTrigger: SaveSettingStatus.Idle, diff --git a/dev/Styles/User/Layout.less b/dev/Styles/User/Layout.less index 24d6ef584..a8a0bcf8f 100644 --- a/dev/Styles/User/Layout.less +++ b/dev/Styles/User/Layout.less @@ -143,7 +143,6 @@ html.rl-side-preview-pane { } #top-system-dropdown-id::after, -#move-dropdown-id.dropdown-toggle::after, #button-add-prop-dropdown-id::after { content: '▼'; font-size: 80%; diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 4c9bd6acc..4f75fd715 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -5,14 +5,14 @@ import { Scope } from 'Common/Enums'; import { ComposeType, FolderType, MessageSetAction } from 'Common/EnumsUser'; import { leftPanelDisabled, moveAction, - Settings, SettingsCapa, SettingsGet, + Settings, SettingsCapa, addEventsListeners, addShortcut, registerShortcut, formFieldFocused } from 'Common/Globals'; import { computedPaginatorHelper, showMessageComposer, populateMessageBody } from 'Common/UtilsUser'; import { FileInfo } from 'Common/File'; -import { folderListOptionsBuilder, moveMessagesToFolder } from 'Common/Folders'; +import { moveMessagesToFolder } from 'Common/Folders'; import { isFullscreen, toggleFullscreen } from 'Common/Fullscreen'; import { mailBox, serverRequest } from 'Common/Links'; @@ -70,8 +70,6 @@ export class MailMessageList extends AbstractViewRight { constructor() { super(); - this.newMoveToFolder = !!SettingsGet('NewMoveToFolder'); - this.allowDangerousActions = SettingsCapa('DangerousActions'); this.messageList = MessagelistUserStore; @@ -91,7 +89,6 @@ export class MailMessageList extends AbstractViewRight { this.userUsageProc = FolderUserStore.quotaPercentage; this.addObservables({ - moveDropdownTrigger: false, moreDropdownTrigger: false, sortDropdownTrigger: false, @@ -107,13 +104,6 @@ export class MailMessageList extends AbstractViewRight { sortSupported: () => FolderUserStore.hasCapability('SORT') | FolderUserStore.hasCapability('ESORT'), - folderMenuForMove: () => - folderListOptionsBuilder( - [FolderUserStore.currentFolderFullName()], - [], - item => item ? item.localName() : '' - ), - messageListSearchDesc: () => { const value = MessagelistUserStore().Search; return value ? i18n('MESSAGE_LIST/SEARCH_RESULT_FOR', { SEARCH: value }) : '' @@ -233,7 +223,6 @@ export class MailMessageList extends AbstractViewRight { spamCommand: canBeMovedHelper, notSpamCommand: canBeMovedHelper, moveCommand: canBeMovedHelper, - moveNewCommand: canBeMovedHelper, }); } @@ -283,10 +272,8 @@ export class MailMessageList extends AbstractViewRight { moveMessagesToFolderType(FolderType.NotSpam); } - moveCommand() {} - - moveNewCommand(vm, event) { - if (this.newMoveToFolder && this.mobileCheckedStateShow()) { + moveCommand(vm, event) { + if (this.mobileCheckedStateShow()) { if (vm && event?.preventDefault) { event.preventDefault(); event.stopPropagation(); @@ -669,12 +656,7 @@ export class MailMessageList extends AbstractViewRight { // move registerShortcut('insert', '', Scope.MessageList, () => { - if (this.newMoveToFolder) { - this.moveNewCommand(); - } else { - this.moveDropdownTrigger(true); - } - + this.moveCommand(); return false; }); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 65dcc90b9..469cb5ddf 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -711,7 +711,6 @@ class Actions 'Plugins' => array(), 'System' => $this->AppDataSystem($bAdmin), - 'NewMoveToFolder' => (bool) $oConfig->Get('interface', 'new_move_to_folder_button', true), 'AllowLanguagesOnSettings' => (bool) $oConfig->Get('webmail', 'allow_languages_on_settings', true), 'AllowLanguagesOnLogin' => (bool) $oConfig->Get('login', 'allow_languages_on_login', true), 'AttachmentLimit' => \min($upload_max_filesize, ((int) $oConfig->Get('webmail', 'attachment_size_limit', 10)) * 1024 * 1024), diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php index 28503d0c6..7f6302897 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php @@ -74,8 +74,6 @@ class ActionsAdmin extends Actions $this->setConfigFromParams($oConfig, 'UseLocalProxyForExternalImages', 'labs', 'use_local_proxy_for_external_images', 'bool'); - $this->setConfigFromParams($oConfig, 'NewMoveToFolder', 'interface', 'new_move_to_folder_button', 'bool'); - $this->setConfigFromParams($oConfig, 'AllowLanguagesOnSettings', 'webmail', 'allow_languages_on_settings', 'bool'); $this->setConfigFromParams($oConfig, 'AllowLanguagesOnLogin', 'login', 'allow_languages_on_login', 'bool'); $this->setConfigFromParams($oConfig, 'AttachmentLimit', 'webmail', 'attachment_size_limit', 'int'); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php index 656d16f9c..70f8afff6 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -149,8 +149,7 @@ class Application extends \RainLoop\Config\AbstractConfig ), 'interface' => array( - 'show_attachment_thumbnail' => array(true), - 'new_move_to_folder_button' => array(true) + 'show_attachment_thumbnail' => array(true) ), 'contacts' => array( diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json index 29b81856a..e992a8b82 100644 --- a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json +++ b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Povolit výběr jazyka na přihlašovací obrazovce", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Povolit výběr motivu na přihlašovací obrazovce", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Povolit výběr pozadí na přihlašovací obrazovce", - "LABEL_NEW_FOLDER_MOVE": "Nové tlačítko \"přesunout do adresáře\"", "LABEL_SHOW_THUMBNAILS": "Zobrazovat miniatury (přílohy)", "LEGEND_MAIN": "Hlavní", "LABEL_ATTACHMENT_SIZE_LIMIT": "Limit velikosti přílohy", diff --git a/snappymail/v/0.0.0/app/localization/da-DK/admin.json b/snappymail/v/0.0.0/app/localization/da-DK/admin.json index 0a0e800fd..618fa31e9 100644 --- a/snappymail/v/0.0.0/app/localization/da-DK/admin.json +++ b/snappymail/v/0.0.0/app/localization/da-DK/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Tillad sprogvalg i indstillinger", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Tillad temavalg i indstillinger", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Tillad baggrundsvalg i indstillinger", - "LABEL_NEW_FOLDER_MOVE": "Ny \"flyt til mappe\" knap", "LABEL_SHOW_THUMBNAILS": "Vis miniaturer (vedhæftede filer)", "LEGEND_MAIN": "Primære", "LABEL_ATTACHMENT_SIZE_LIMIT": "Vedhæftede filers størrelsesgrænse", diff --git a/snappymail/v/0.0.0/app/localization/de-DE/admin.json b/snappymail/v/0.0.0/app/localization/de-DE/admin.json index d4f152a62..1ebc7847a 100644 --- a/snappymail/v/0.0.0/app/localization/de-DE/admin.json +++ b/snappymail/v/0.0.0/app/localization/de-DE/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Sprachauswahl in den Einstellungen zulassen", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Themenauswahl in den Einstellungen zulassen", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Hintergrundauswahl in den Einstellungen zulassen", - "LABEL_NEW_FOLDER_MOVE": "Neue \"Verschieben nach\"-Schaltfläche", "LABEL_SHOW_THUMBNAILS": "Vorschaubilder anzeigen (Anhänge)", "LEGEND_MAIN": "Allgemein", "LABEL_ATTACHMENT_SIZE_LIMIT": "Größenlimit für Anhänge", diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json index 65c41458a..cf11138be 100644 --- a/snappymail/v/0.0.0/app/localization/en/admin.json +++ b/snappymail/v/0.0.0/app/localization/en/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Allow language selection on settings screen", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Allow theme selection on settings screen", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Allow background selection on settings screen", - "LABEL_NEW_FOLDER_MOVE": "New \"move to folder\" button", "LABEL_SHOW_THUMBNAILS": "Show thumbnails (attachments)", "LEGEND_MAIN": "Main", "LABEL_ATTACHMENT_SIZE_LIMIT": "Attachment size limit", diff --git a/snappymail/v/0.0.0/app/localization/es-ES/admin.json b/snappymail/v/0.0.0/app/localization/es-ES/admin.json index d7813cce3..c0289ad7a 100644 --- a/snappymail/v/0.0.0/app/localization/es-ES/admin.json +++ b/snappymail/v/0.0.0/app/localization/es-ES/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permitir selección del idioma", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Permitir personalización de la interfaz", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permitir cambiar el fondo de pantalla", - "LABEL_NEW_FOLDER_MOVE": "Nuevo botón \"mover a carpeta\"", "LABEL_SHOW_THUMBNAILS": "Mostrar previsualización (adjuntos)", "LEGEND_MAIN": "Principal", "LABEL_ATTACHMENT_SIZE_LIMIT": "Tamaño máximo para adjuntos", diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json index c9329d1d6..19a2179fb 100644 --- a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json +++ b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "زبان در صفحه تنظیمات قابل انتخاب باشد", "LABEL_ALLOW_THEMES_ON_SETTINGS": "پوسته در صفحه تنظیمات قابل انتخاب باشد", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "تصویر پشت زمینه در صفحه تنظیمات قابل انتخاب باشد", - "LABEL_NEW_FOLDER_MOVE": "دکمه جدید «انتقال به پوشه»", "LABEL_SHOW_THUMBNAILS": "اندازه کوچک را نشان بده (پیوست‌ها)", "LEGEND_MAIN": "اصلی", "LABEL_ATTACHMENT_SIZE_LIMIT": "محدودیت اندازه پیوست", diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json index 9a2edcbe3..34fe578c3 100644 --- a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json +++ b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Salli kielivalinta asetuksissa", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Salli teemavalinta asetuksissa", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Salli taustavalinta asetuksissa", - "LABEL_NEW_FOLDER_MOVE": "New \"move to folder\" button", "LABEL_SHOW_THUMBNAILS": "Näytä kuvakkeet (liitteet)", "LEGEND_MAIN": "Yleiset", "LABEL_ATTACHMENT_SIZE_LIMIT": "Liitetiedoston kokorajoitus", diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json index d5ba4406f..21e3e7aca 100644 --- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json +++ b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permettre la sélection de la langue dans les paramètres", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Permettre la sélection du thème dans les paramètres", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permettre la sélection de l'arrière-plan dans les paramètres", - "LABEL_NEW_FOLDER_MOVE": "Nouveau bouton \"déplacer vers le dossier\"", "LABEL_SHOW_THUMBNAILS": "Montrer les miniatures (pièces jointes)", "LEGEND_MAIN": "Principal", "LABEL_ATTACHMENT_SIZE_LIMIT": "Taille limite des pièces jointes", diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json index 0a6161033..23ad3f153 100644 --- a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json +++ b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Nyelv választás engedélyezés a beállításoknál", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Téma választás engedélyezés a beállításoknál", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Háttér választás engedélyezés a beállításoknál", - "LABEL_NEW_FOLDER_MOVE": "Új \"áthelyezés mappába\" gomb", "LABEL_SHOW_THUMBNAILS": "Előnézetek megjelenítése (mellékletek)", "LEGEND_MAIN": "Fontos", "LABEL_ATTACHMENT_SIZE_LIMIT": "Melléklet méret korlát", diff --git a/snappymail/v/0.0.0/app/localization/id-ID/admin.json b/snappymail/v/0.0.0/app/localization/id-ID/admin.json index b2d9f5ec4..78ff4b86e 100644 --- a/snappymail/v/0.0.0/app/localization/id-ID/admin.json +++ b/snappymail/v/0.0.0/app/localization/id-ID/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Izinkan pemilihan bahasa pada laman pengaturan", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Izinkan pemilihan tema di laman pengaturan", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Izinkan pemilihan gambar latar di laman pengaturan", - "LABEL_NEW_FOLDER_MOVE": "Tombol \"pindahkan ke folder\" baru", "LABEL_SHOW_THUMBNAILS": "Tampikankan gambar kecil (lampiran)", "LEGEND_MAIN": "Utama", "LABEL_ATTACHMENT_SIZE_LIMIT": "Batas ukuran lampiran", diff --git a/snappymail/v/0.0.0/app/localization/it-IT/admin.json b/snappymail/v/0.0.0/app/localization/it-IT/admin.json index 32269b8e3..19d598789 100644 --- a/snappymail/v/0.0.0/app/localization/it-IT/admin.json +++ b/snappymail/v/0.0.0/app/localization/it-IT/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Allow language selection on settings screen", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Allow theme selection on settings screen", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Allow background selection on settings screen", - "LABEL_NEW_FOLDER_MOVE": "New \"move to folder\" button", "LABEL_SHOW_THUMBNAILS": "Show thumbnails (attachments)", "LEGEND_MAIN": "Main", "LABEL_ATTACHMENT_SIZE_LIMIT": "Attachment size limit", diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json index f217e8ce5..053c12aa8 100644 --- a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json +++ b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "設定画面で言語選択を使用する", "LABEL_ALLOW_THEMES_ON_SETTINGS": "設定画面でテーマ選択を使用する", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "設定画面で背景選択を使用する", - "LABEL_NEW_FOLDER_MOVE": "新しい\"フォルダへ移動\"ボタン", "LABEL_SHOW_THUMBNAILS": "サムネイルを表示(添付ファイル)", "LEGEND_MAIN": "メイン", "LABEL_ATTACHMENT_SIZE_LIMIT": "添付サイズ制限", diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json index e8a9cd2c2..365ce8a1d 100644 --- a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json +++ b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Leisti kalbos keitimą nustatymuose", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Leisti temos keitimą nustatymuose", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Leisti keisti foną nustatymuose", - "LABEL_NEW_FOLDER_MOVE": "Naujas \"\"perkelti į katalogą\" mygtukas", "LABEL_SHOW_THUMBNAILS": "Rodyti miniatiūrą (prisegtuko)", "LEGEND_MAIN": "Pagrindinis", "LABEL_ATTACHMENT_SIZE_LIMIT": "Prisegtukų dydžio limitas", diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json index 4f92b2a07..54d6f5b6e 100644 --- a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json +++ b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "La brukere velge språk på oppsettsskjerm", "LABEL_ALLOW_THEMES_ON_SETTINGS": "La brukere velge tema på oppsettsskjerm", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "La brukere velge bakgrunn på oppsettsskjerm", - "LABEL_NEW_FOLDER_MOVE": "Ny «flytt til mappe»-knapp", "LABEL_SHOW_THUMBNAILS": "Vis miniatyrer (vedlegg)", "LEGEND_MAIN": "Hoved", "LABEL_ATTACHMENT_SIZE_LIMIT": "Maksimal størrelse på vedlegg", diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json index ae1e06d6a..6b3c37ab8 100644 --- a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json +++ b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Sta taalselectie toe in het instellingen scherm", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Sta thema selectie toe in het instellingen scherm", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Sta achtergrond selectie toe in het instellingen scherm", - "LABEL_NEW_FOLDER_MOVE": "Nieuwe \"verplaats naar map\" knop", "LABEL_SHOW_THUMBNAILS": "Toon miniaturen (bijlage)", "LEGEND_MAIN": "Diverse", "LABEL_ATTACHMENT_SIZE_LIMIT": "Maximale bijlage grootte", diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json index d35e2d19c..c8ff827a2 100644 --- a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json +++ b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Zezwól użytkownikowi na wybór języka", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Zezwól użytkownikowi na zmianę motywu", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Zezwól użytkownikowi na użycie własnego tła", - "LABEL_NEW_FOLDER_MOVE": "Nowy przycisk „przenieś do folderu”", "LABEL_SHOW_THUMBNAILS": "Pokaż miniatury (załączniki)", "LEGEND_MAIN": "Główne", "LABEL_ATTACHMENT_SIZE_LIMIT": "Maksymalny rozmiar załącznika", diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json index 7454c0025..6fc8db410 100644 --- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json +++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permitir escolha do idioma na tela de configurações", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Permitir escolha do tema na tela de configurações", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permitir escolha de Imagem de Fundo na tela de configurações", - "LABEL_NEW_FOLDER_MOVE": "Novo botão \"Mover para pasta\"", "LABEL_SHOW_THUMBNAILS": "Mostrar imagem miniatura (Anexos)", "LEGEND_MAIN": "Principal", "LABEL_ATTACHMENT_SIZE_LIMIT": "Tamanho limite de anexo", diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json index 4dbb99ba2..cef446e7f 100644 --- a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json +++ b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permitir escolha do idioma nas definições", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Permitir personalização da interface nas definições", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permitir alterar a imagem de fundo nas definições", - "LABEL_NEW_FOLDER_MOVE": "Novo botão \"mover para pasta\"", "LABEL_SHOW_THUMBNAILS": "Mostrar miniaturas (anexos)", "LEGEND_MAIN": "Prinicpal", "LABEL_ATTACHMENT_SIZE_LIMIT": "Tamanho limite dos anexos", diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json index 4dbb99ba2..cef446e7f 100644 --- a/snappymail/v/0.0.0/app/localization/pt/admin.json +++ b/snappymail/v/0.0.0/app/localization/pt/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permitir escolha do idioma nas definições", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Permitir personalização da interface nas definições", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permitir alterar a imagem de fundo nas definições", - "LABEL_NEW_FOLDER_MOVE": "Novo botão \"mover para pasta\"", "LABEL_SHOW_THUMBNAILS": "Mostrar miniaturas (anexos)", "LEGEND_MAIN": "Prinicpal", "LABEL_ATTACHMENT_SIZE_LIMIT": "Tamanho limite dos anexos", diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json index 33f18c98d..0c788d5ea 100644 --- a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json +++ b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Разрешить выбор языка на экране настроек", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Разрешить выбор темы на экране настроек", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Allow background selection on settings screen", - "LABEL_NEW_FOLDER_MOVE": "Новая кнопка \"переместить в папку\"", "LABEL_SHOW_THUMBNAILS": "Показывать миниатюры (для вложений)", "LEGEND_MAIN": "Основное", "LABEL_ATTACHMENT_SIZE_LIMIT": "Предельный размер вложений", diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json index 23dce3bb9..d473cea39 100644 --- a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json +++ b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Povoliť výber jazyka v nastaveniach", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Povoliť výber témy v nastaveniach", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Povoliť výber pozadia v nastaveniach", - "LABEL_NEW_FOLDER_MOVE": "New \"move to folder\" button", "LABEL_SHOW_THUMBNAILS": "Zobraziť náhľady (prílohy)", "LEGEND_MAIN": "Všeobecné", "LABEL_ATTACHMENT_SIZE_LIMIT": "Maximálna veľkosť prílohy", diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json index 889dfbfb8..4a257fbe3 100644 --- a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json +++ b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Dovoli izbor jezika v nastavitvah", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Dovoli izbor teme v nastavitvah", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Dovoli izbor ozadja v nastavitvah", - "LABEL_NEW_FOLDER_MOVE": "Novi gumb \"Premakni v mapo\"", "LABEL_SHOW_THUMBNAILS": "Pokaži predoglede (priloge)", "LEGEND_MAIN": "Glavno", "LABEL_ATTACHMENT_SIZE_LIMIT": "Omejitev velikosti prilog", diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json index 397d3e4eb..95682f0b7 100644 --- a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json +++ b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Tillåt språkändringar på konfigurationspanelen ", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Tillåt tema val på konfigurationspanelen", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Tillåt bakgrundsändringar på konfigurationspanelen", - "LABEL_NEW_FOLDER_MOVE": "Ny \"Flytta mapp\" knapp", "LABEL_SHOW_THUMBNAILS": "Visa miniatyrer (bilagor)", "LEGEND_MAIN": "Huvud", "LABEL_ATTACHMENT_SIZE_LIMIT": "Bilagor storlek", diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json index 45efac211..27c1906bd 100644 --- a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json +++ b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Cho phép lựa chọn ngôn ngữ trên màn hình cài đặt", "LABEL_ALLOW_THEMES_ON_SETTINGS": "Cho phép lựa chọn phông nền trên màn hình cài đặt", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Cho phép lựa chọn hình nền trên màn hình cài đặt ", - "LABEL_NEW_FOLDER_MOVE": "Nút \"chuyển đến thư mục\" mới", "LABEL_SHOW_THUMBNAILS": "Hiển thị ảnh thu gọn (trong phần đính kèm)", "LEGEND_MAIN": "Phần chính", "LABEL_ATTACHMENT_SIZE_LIMIT": "Giới hạn dung lượng đính kèm", diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json index 80d82b8f6..4d9db9a7f 100644 --- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json +++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json @@ -37,7 +37,6 @@ "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "允许在设置界面中选择语言", "LABEL_ALLOW_THEMES_ON_SETTINGS": "允许在设置界面中选择主题", "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "允许在设置界面中选择背景", - "LABEL_NEW_FOLDER_MOVE": "使用新的“移动”按钮样式", "LABEL_SHOW_THUMBNAILS": "显示缩略图(附件)", "LEGEND_MAIN": "主要设置", "LABEL_ATTACHMENT_SIZE_LIMIT": "附件大小限制", diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html index 9bc993922..e31f81108 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html @@ -66,13 +66,6 @@ value: capaUserBackground } }"> -
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html index 9f0683240..faf142a0c 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -8,27 +8,12 @@ - -
- - - 📁 - - -
  • - -
    • -     -
    - -
    - + 📁
    -
    🗄 ⚠