Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

CHANGELOG

@@ -299,6 +299,8 @@
 - do not list document/folders in sequence selector if its number exceeds 50
 - typeahead menu works with arrow keys again, wait 1 sec. before searching
 - fix sending notification mails when document/folder was moved
+- tasks and clipboard can be shown in main menu, even if there are no tasks
+  due or the clipboard is empty
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.33

inc/inc.ClassSettings.php

@@ -289,10 +289,14 @@ class Settings { /* {{{ */
 	var $_enableExtensionImportFromRepository = true;
 	// enable/disable display of the clipboard
 	var $_enableClipboard = true;
+	// show always clipboard in main menu, even if empty
+	var $_alwaysShowClipboard = false;
 	// enable/disable list of tasks in main menu
 	var $_enableMenuTasks = true;
 	// select which tasks show up in main menu
 	var $_tasksInMenu = array();
+	// show always tasks in main menu, even if none are due
+	var $_alwaysShowMenuTasks = true;
 	// enable/disable list of files in drop folder
 	var $_enableDropFolderList = false;
 	// enable/disable display of the session list
@@ -596,7 +600,9 @@ class Settings { /* {{{ */
 		$this->_enableUsersView = Settings::boolVal($tab["enableUsersView"]);
 		$this->_enableSessionList = Settings::boolVal($tab["enableSessionList"]);
 		$this->_enableClipboard = Settings::boolVal($tab["enableClipboard"]);
+		$this->_alwaysShowClipboard = Settings::boolVal($tab["alwaysShowClipboard"]);
 		$this->_enableMenuTasks = Settings::boolVal($tab["enableMenuTasks"]);
+		$this->_alwaysShowMenuTasks = Settings::boolVal($tab["alwaysShowMenuTasks"]);
 		$this->_tasksInMenu = Settings::arrayVal($tab["tasksInMenu"]);
 		$this->_enableDropFolderList = Settings::boolVal($tab["enableDropFolderList"]);
 		$this->_enableDropUpload = Settings::boolVal($tab["enableDropUpload"]);
@@ -1015,7 +1021,9 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableUsersView", $this->_enableUsersView);
 		$this->setXMLAttributValue($node, "enableSessionList", $this->_enableSessionList);
 		$this->setXMLAttributValue($node, "enableClipboard", $this->_enableClipboard);
+		$this->setXMLAttributValue($node, "alwaysShowClipboard", $this->_alwaysShowClipboard);
 		$this->setXMLAttributValue($node, "enableMenuTasks", $this->_enableMenuTasks);
+		$this->setXMLAttributValue($node, "alwaysShowMenuTasks", $this->_alwaysShowMenuTasks);
 		$this->setXMLAttributValue($node, "tasksInMenu", $this->_tasksInMenu);
 		$this->setXMLAttributValue($node, "enableDropFolderList", $this->_enableDropFolderList);
 		$this->setXMLAttributValue($node, "enableDropUpload", $this->_enableDropUpload);

languages/ar_EG/lang.inc

@@ -1501,6 +1501,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => 'السماح بتغيير التطبيق في العملية',
 'settings_allowReviewerOnly' => 'السماح بالمراجع فقط',
 'settings_allowReviewerOnly_desc' => 'السماح بالمراجع فقط',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/bg_BG/lang.inc

@@ -1343,6 +1343,10 @@ $text = array(
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => '',
 'settings_allowReviewerOnly_desc' => '',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/ca_ES/lang.inc

@@ -1348,6 +1348,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => '',
 'settings_allowReviewerOnly_desc' => '',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/cs_CZ/lang.inc

@@ -1573,6 +1573,10 @@ Jméno: [username]
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => 'Nastavit pouze recenzenta',
 'settings_allowReviewerOnly_desc' => 'Aktivujte, pokud má být nastaven pouze recenzent, ale žádný schvalovatel v tradičním režimu workflow.',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/de_DE/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3356), dgrutsch (22)
+//    Translators: Admin (3364), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -141,7 +141,7 @@ URL: [url]</p>',
 'approval_request_email_subject' => '[sitename]: [name] - Aufforderung zur Freigabe',
 'approval_status' => 'Freigabestatus',
 'approval_submit_email' => '',
-'approval_submit_email_body' => 'Freigabe erteilt
+'approval_submit_email_body' => 'Freigabe ausgeführt
 
 Dokument: [name]
 Version: [version]
@@ -150,7 +150,7 @@ Status: [status]
 Kommentar: [comment]
 Benutzer: [username]
 URL: [url]',
-'approval_submit_email_body_html' => '<p>Freigabe erteilt</p>
+'approval_submit_email_body_html' => '<p>Freigabe ausgeführt</p>
 
 <p>Dokument: [name]<br />
 Version: [version]<br />
@@ -1774,7 +1774,7 @@ Status: [status]
 Kommentar: [comment]
 Benutzer: [username]
 URL: [url]',
-'revision_submit_email_body_html' => '<p>Erneute Freigabe erteilt</p>
+'revision_submit_email_body_html' => '<p>Erneute Freigabe ausgeführt</p>
 
 <p>Dokument: [name]<br />
 Version: [version]<br />
@@ -1783,7 +1783,7 @@ Status: [status]<br />
 Kommentar: [comment]<br />
 Benutzer: [username]<br />
 URL: [url]</p>',
-'revision_submit_email_subject' => '[sitename]: [name] - Erneute Freigabe erteilt',
+'revision_submit_email_subject' => '[sitename]: [name] - Erneute Freigabe ausgeführt',
 'revision_summary' => 'Übersicht Wiederholungsprüfungen',
 'revisors' => 'Wiederholungsprüfer',
 'revisor_already_assigned' => 'Benutzer bereits als Wiederholungsprüfer eingetragen.',
@@ -1964,6 +1964,10 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'settings_allowChangeRevAppInProcess_desc' => 'Voreingestellt können Prüfer und Freigeber nicht mehr verändert werden, wenn eine Freigabe oder Prüfung ausgeführt wurde. Diese Option erlaubt es Administratoren auch nach der ersten Prüfung oder Freigabe die Prüfer und Freigeber zu verändern, bis das Dokument endgültig freigegeben oder abgelehnt ist.',
 'settings_allowReviewerOnly' => 'Erlaube nur Prüfer zu setzen',
 'settings_allowReviewerOnly_desc' => 'Anwählen, um zu erlauben, dass nur ein Prüfer aber kein Freigeber beim traditionellen Workflow gesetzt werden darf.',
+'settings_alwaysShowClipboard' => 'Zwischenablage im Hauptmenü immer anzeigen',
+'settings_alwaysShowClipboard_desc' => 'Zeigt den Eintrag für die Zwischenablage im Hauptmenü auch dann an, wenn die Zwischenablage leer ist',
+'settings_alwaysShowMenuTasks' => 'Aufgaben im Hauptmenü immer anzeigen',
+'settings_alwaysShowMenuTasks_desc' => 'Zeigt den Eintrag im Hauptmenü für die Aufgaben auch dann an, wenn keine Aufgaben anstehen.',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => 'Authentifizierungsschḻüssel für REST API',
 'settings_apiKey_desc' => 'Dieser Schlüssel wird zur alternativen Authentifizierung in der REST API verwendet. Wählen Sie eine 32 Zeichen lange Zeichenkette.',

languages/el_GR/lang.inc

@@ -1354,6 +1354,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => '',
 'settings_allowReviewerOnly_desc' => '',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => '',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/en_GB/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2460), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2464), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1966,6 +1966,10 @@ If you did not receive a password, please use the password forgotten function on
 'settings_allowChangeRevAppInProcess_desc' => 'By default the reviewers and approvers cannot be changed anymore once a review or approval has been submitted. This option will allow administrators to do this as long as the document is not released or rejected.',
 'settings_allowReviewerOnly' => 'Allow to set reviewer only',
 'settings_allowReviewerOnly_desc' => 'Enable this, if it shall be allow to set just a reviewer but no approver in traditional workflow mode.',
+'settings_alwaysShowClipboard' => 'Always show clipboard in main menu',
+'settings_alwaysShowClipboard_desc' => 'Show the entry for the clipboard in the main menu, even if the clipboard is empty.',
+'settings_alwaysShowMenuTasks' => 'Always show tasks in main menu',
+'settings_alwaysShowMenuTasks_desc' => 'Shows the menu item in the main menu for the tasks, even if there are no tasks due.',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => 'Authentification key for REST api',
 'settings_apiKey_desc' => 'This key is used a alternative authentication for the REST api. Choose a 32 char long string.',

languages/es_ES/lang.inc

@@ -1524,6 +1524,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => 'Por defecto, los revisores y aprobadores no se pueden cambiar una vez que se ha enviado una revisión o aprobación esta opción permitirá al administrador hacer esto mientras el documento no sea liberado o rechazado.',
 'settings_allowReviewerOnly' => 'Permitir habilitar la función de Revisor para un usuario',
 'settings_allowReviewerOnly_desc' => 'Habilite esto si se requiere permitir que un usuario sea lector o revisor sin capacidad de aprobar un documento en un proceso de workflow tradicional',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Módulo Reescritura',
 'settings_apiKey' => 'Clave de autenticación para la API de descanso.',
 'settings_apiKey_desc' => 'Esta clave se utiliza como autenticación alternativa para la API de descanso. Selecciona una cadena de 32 caracteres.',

languages/fr_FR/lang.inc

@@ -1911,6 +1911,10 @@ Nom : [username]
 'settings_allowChangeRevAppInProcess_desc' => 'Par défaut, les réviseurs et les approbateurs ne peuvent plus être modifiés une fois la soumission d’un examen ou d’une approbation. Cette option permettra aux administrateurs de le faire tant que le document n’est pas publié ou rejeté.',
 'settings_allowReviewerOnly' => 'Permettre d’affecter l’examinateur uniquement',
 'settings_allowReviewerOnly_desc' => 'Activer cette option pour permettre d’affecter un examinateur mais pas d’approbateur dans le mode de Workflow traditionnel.',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => 'Clé d’authentification pour l’API REST',
 'settings_apiKey_desc' => 'Cette clé est utilisée pour l’authentification alternative via l\'API REST. Utilisez une chaîne de 32 caractères.',

languages/hr_HR/lang.inc

@@ -1537,6 +1537,10 @@ Internet poveznica: [url]',
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => '',
 'settings_allowReviewerOnly_desc' => '',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Modul prepisa',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/hu_HU/lang.inc

@@ -1514,6 +1514,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => 'Engedélyezi, hogy csak az ellenört állítsa be',
 'settings_allowReviewerOnly_desc' => 'Ha ezt engedélyez, akkor lehetővé válik, hogy a hagyományos munkafolyamat módban csak ellenört állítson be, ne jóváhagyót.',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Rewrite modul',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/id_ID/lang.inc

@@ -1604,6 +1604,10 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'settings_allowChangeRevAppInProcess_desc' => 'Secara default, peninjau dan pemberi persetujuan tidak dapat diubah lagi setelah tinjauan atau persetujuan telah dikirimkan. Opsi ini akan memungkinkan administrator untuk melakukan ini selama dokumen tidak dirilis atau ditolak.',
 'settings_allowReviewerOnly' => 'Izinkan untuk menyetel pengulas saja',
 'settings_allowReviewerOnly_desc' => 'Aktifkan ini, jika diizinkan untuk menetapkan hanya peninjau tetapi tidak ada pemberi persetujuan dalam mode alur kerja tradisional.',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Modul Rewrite',
 'settings_apiKey' => 'Kunci otentikasi untuk rest api',
 'settings_apiKey_desc' => 'Kunci ini digunakan sebagai otentikasi alternatif untuk rest api. Pilih panjang string 32 karakter.',

languages/it_IT/lang.inc

@@ -1560,6 +1560,10 @@ Name: [username]
 'settings_allowChangeRevAppInProcess_desc' => 'Per impostazione predefinita, i revisori e gli approvatori non possono più essere modificati dopo l\'invio di una revisione o di un\'approvazione. Questa opzione consentirà agli amministratori di farlo purché il documento non venga rilasciato o rifiutato.',
 'settings_allowReviewerOnly' => 'Abilita l\'impostazione del solo revisore',
 'settings_allowReviewerOnly_desc' => 'Abilita se si vuole concedere di impostare solo un revisore ma non un apporvatore nel flusso di lavoro tradizionale',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Mod Rewrite',
 'settings_apiKey' => 'Chiave di autenticazione per api',
 'settings_apiKey_desc' => 'Questa chiave viene utilizzata come autenticazione alternativa per api. Scegli una stringa lunga 32 caratteri.',

languages/ko_KR/lang.inc

@@ -1531,6 +1531,10 @@ URL : [url]',
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => '',
 'settings_allowReviewerOnly_desc' => '',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => '아파치 - 모듈 다시 쓰기',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/lo_LA/lang.inc

@@ -1557,6 +1557,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => '',
 'settings_allowReviewerOnly_desc' => '',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'ອາປາເຊ -ຂຽນໄຫມ່',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/nb_NO/lang.inc

@@ -1570,6 +1570,10 @@ Bruker: [username]
 'settings_allowChangeRevAppInProcess_desc' => 'Som standard kan ikke anmelderne og godkjennerne endres lenger når en gjennomgang eller godkjenning er sendt. Dette alternativet lar administratorer gjøre dette så lenge dokumentet ikke er utgitt eller avvist.',
 'settings_allowReviewerOnly' => 'Tilat til å kun sette korrektur',
 'settings_allowReviewerOnly_desc' => 'Aktiver dette hvis det skal være tillatt å stille en korrekturleser, men ingen godkjenner i tradisjonell arbeidsflytmodus.',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Omskriving av moduler',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/nl_NL/lang.inc

@@ -1569,6 +1569,10 @@ Name: [username]
 'settings_allowChangeRevAppInProcess_desc' => 'De default is dat beoordelaars en goedkeurders niet meer veranderen nadat er al een beoordeling of goedkeuring is verzonden. Deze optie stelt administrators in staat veranderingen aan te brengen zolang het document niet is afgewezen of vrijgegeven.',
 'settings_allowReviewerOnly' => 'Alleen reviewer toestaan',
 'settings_allowReviewerOnly_desc' => 'Aanzetten als wel de reviewer, maar niet de goedkeurder toegewezen kan worden.',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => 'Authentification key voor REST api',
 'settings_apiKey_desc' => 'Deze sleutel wordt gebruikt als alternatieve authenticatie voor de REST api. Kies een tekst-string van 32 tekens.',

languages/pl_PL/lang.inc

@@ -1500,6 +1500,10 @@ Name: [username]
 'settings_allowChangeRevAppInProcess_desc' => 'Domyślnie recenzenci i osoby zatwierdzające nie mogą być już zmieniane po przesłaniu recenzji lub zatwierdzenia. Ta opcja umożliwia administratorom to zrobić tak długo, jak długo dokument nie zostanie wydany lub odrzucony.',
 'settings_allowReviewerOnly' => 'Zezwalaj tylko na ustawianie recenzenta',
 'settings_allowReviewerOnly_desc' => 'Włącz to, jeśli będzie można zezwolić na ustawienie tylko recenzenta, ale bez osoby zatwierdzającej w tradycyjnym trybie przepływu pracy.',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Moduł Rewrite',
 'settings_apiKey' => 'Klucz autentyfikacyjny dla REST API',
 'settings_apiKey_desc' => 'Ten klucz jest używany jako alternatywna autentyfikacja dla REST API. Wybierz 32-znakowy łańcuch.',

languages/pt_BR/lang.inc

@@ -1576,6 +1576,10 @@ Nome: [username]
 'settings_allowChangeRevAppInProcess_desc' => 'Por padrão, os revisores e aprovadores não podem mais ser alterados depois que uma revisão ou aprovação for enviada. Essa opção permitirá que os administradores façam isso, desde que o documento não seja liberado ou rejeitado.',
 'settings_allowReviewerOnly' => 'Permitir definir apenas o revisor',
 'settings_allowReviewerOnly_desc' => 'Habilitar se for permitido definir apenas um revisor, mas nenhum aprovador no modo de fluxo de trabalho tradicional.',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Módulo Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/ro_RO/lang.inc

@@ -1538,6 +1538,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => '',
 'settings_allowReviewerOnly_desc' => '',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/ru_RU/lang.inc

@@ -1545,6 +1545,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => '',
 'settings_allowReviewerOnly_desc' => '',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache — модуль Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/sk_SK/lang.inc

@@ -1578,6 +1578,10 @@ Meno: [username]
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => 'Allow to set reviewer only',
 'settings_allowReviewerOnly_desc' => 'Enable this, if it shall be allow to set just a reviewer but no approver in traditional workflow mode.',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Modul Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/sv_SE/lang.inc

@@ -1551,6 +1551,10 @@ Kommentar: [comment]',
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => '',
 'settings_allowReviewerOnly_desc' => '',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/tr_TR/lang.inc

@@ -1515,6 +1515,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => '',
 'settings_allowReviewerOnly_desc' => '',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/uk_UA/lang.inc

@@ -1537,6 +1537,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => '',
 'settings_allowReviewerOnly' => '',
 'settings_allowReviewerOnly_desc' => '',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache — модуль Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/zh_CN/lang.inc

@@ -1525,6 +1525,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => '默认情况下，已提交审核或审核人员和审批人有批准就不能再更改。',
 'settings_allowReviewerOnly' => '允许只设置审阅者',
 'settings_allowReviewerOnly_desc' => '在传统的工作流程模式中，只允许设置审批人而不允许设置审批人则启用此功能。',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache -模块重写',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

languages/zh_TW/lang.inc

@@ -1576,6 +1576,10 @@ URL: [url]',
 'settings_allowChangeRevAppInProcess_desc' => '默認情況下，一旦提交了審核或批准，就不能再更改審核者和批准者。只要未發布或拒絕文檔，此選項將允許管理員執行此操作。',
 'settings_allowReviewerOnly' => '只允許設置審閱者',
 'settings_allowReviewerOnly_desc' => '如果允許在傳統的工作流程模式下僅設置審閱者而不設置批准者，則啟用此功能。',
+'settings_alwaysShowClipboard' => '',
+'settings_alwaysShowClipboard_desc' => '',
+'settings_alwaysShowMenuTasks' => '',
+'settings_alwaysShowMenuTasks_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',

op/op.Settings.php

@@ -137,7 +137,9 @@ if ($action == "saveSettings")
   setBoolValue("showSingleSearchHit");
   setBoolValue("enableSessionList");
   setBoolValue("enableClipboard");
+  setBoolValue("alwaysShowClipboard");
   setBoolValue("enableMenuTasks");
+  setBoolValue("alwaysShowMenuTasks");
   $settings->_tasksInMenu = isset($_POST["tasksInMenu"]) ? $_POST["tasksInMenu"] : array();
   setBoolValue("enableDropFolderList");
   setBoolValue("enableDropUpload");

views/bootstrap/class.Clipboard.php

@@ -41,8 +41,9 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
 	 * @return string html code
 	 */
 	public function menuClipboard() { /* {{{ */
+		$settings = $this->params['settings'];
 		$clipboard = $this->params['session']->getClipboard();
-		if (/*$this->params['user']->isGuest() ||*/ (count($clipboard['docs']) + count($clipboard['folders'])) == 0) {
+		if (empty($settings->_alwaysShowClipboard) && (count($clipboard['docs']) + count($clipboard['folders'])) == 0) {
 			return '';
 		}
 
@@ -58,13 +59,15 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
 			if($document = $this->params['dms']->getDocument($docid))
 				$subitems[] = array('label'=>'<i class="fa fa-file"></i> '.$document->getName(), 'link'=>$this->params['settings']->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(), 'class'=>"table-row-document droptarget", 'attributes'=>array(array('data-droptarget', "document_".$document->getID()), array('rel', "document_".$document->getID()), array('formtoken', createFormKey('')), array('data-name', htmlspecialchars($document->getName(), ENT_QUOTES))));
 		}
-		$subitems[] = array('divider'=>true);
+		if((count($clipboard['docs']) + count($clipboard['folders'])) > 0) {
-		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
+			$subitems[] = array('divider'=>true);
-			$subitems[] = array('label'=>getMLText("move_clipboard"), 'link'=>$this->params['settings']->_httpRoot."op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['settings']->_httpRoot.'out/out.ViewFolder.php?folderid='.$this->params['folder']->getID()));
+			if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
+				$subitems[] = array('label'=>getMLText("move_clipboard"), 'link'=>$this->params['settings']->_httpRoot."op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['settings']->_httpRoot.'out/out.ViewFolder.php?folderid='.$this->params['folder']->getID()));
+			}
+			$subitems[] = array('label'=>getMLText('clear_clipboard'), 'class'=>'ajax-click', 'attributes'=>array(array('data-href', $this->params['settings']->_httpRoot.'op/op.Ajax.php'), array('data-param1', 'command=clearclipboard')));
+			if($this->hasHook('clipboardMenuItems'))
+				$subitems = $this->callHook('clipboardMenuItems', $clipboard, $subitems);
 		}
-		$subitems[] = array('label'=>getMLText('clear_clipboard'), 'class'=>'ajax-click', 'attributes'=>array(array('data-href', $this->params['settings']->_httpRoot.'op/op.Ajax.php'), array('data-param1', 'command=clearclipboard')));
-		if($this->hasHook('clipboardMenuItems'))
-			$subitems = $this->callHook('clipboardMenuItems', $clipboard, $subitems);
 		$menuitems['clipboard'] = array('label'=>getMLText('clipboard')." (".count($clipboard['folders'])."/". count($clipboard['docs']).")", 'children'=>$subitems);
 		self::showNavigationBar($menuitems, array('right'=>true));
 	} /* }}} */

views/bootstrap/class.Settings.php

@@ -421,7 +421,9 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 <?php $this->showConfigOption('settings_suggestTerms', 'suggestTerms', array('title','comment', 'keywords', 'content'), true, true); ?>
 <?php $this->showConfigText('settings_stopWordsFile', 'stopWordsFile'); ?>
 <?php $this->showConfigCheckbox('settings_enableClipboard', 'enableClipboard'); ?>
+<?php $this->showConfigCheckbox('settings_alwaysShowClipboard', 'alwaysShowClipboard'); ?>
 <?php $this->showConfigCheckbox('settings_enableMenuTasks', 'enableMenuTasks'); ?>
+<?php $this->showConfigCheckbox('settings_alwaysShowMenuTasks', 'alwaysShowMenuTasks'); ?>
 <?php $this->showConfigOption('settings_tasksInMenu', 'tasksInMenu', array('review'=>'settings_tasksInMenu_review', 'approval'=>'settings_tasksInMenu_approval', 'workflow'=>'settings_tasksInMenu_workflow', 'receipt'=>'settings_tasksInMenu_receipt', 'revision'=>'settings_tasksInMenu_revision', 'needscorrection'=>'settings_tasksInMenu_needscorrection', 'rejected'=>'settings_tasksInMenu_rejected', 'checkedout'=>'settings_tasksInMenu_checkedout'), true, true); ?>
 <?php $this->showConfigCheckbox('settings_enableDropFolderList', 'enableDropFolderList'); ?>
 <?php $this->showConfigCheckbox('settings_enableSessionList', 'enableSessionList'); ?>

views/bootstrap/class.Tasks.php

@@ -268,6 +268,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$accessobject = $this->params['accessobject'];
+		$settings = $this->params['settings'];
 
 		if(!$tasks = $this->__myTasks()) {
 			echo '';
@@ -297,7 +298,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 		$menuitems['tasks'] = array('label'=>getMLText('tasks')." (".implode('/', $ct).")");
 		$menuitems['tasks']['children'] = [];
 
-		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow']) || !empty($tasks['rejected']) || !empty($tasks['rejected']) || !empty($tasks['checkedout'])) {
+		if(!empty($settings->_alwaysShowMenuTasks) || !empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow']) || !empty($tasks['rejected']) || !empty($tasks['rejected']) || !empty($tasks['checkedout'])) {
 		if(!empty($tasks['review'])) {
 		$subitems = [];
 		foreach($tasks['review'] as $t) {
@@ -367,8 +368,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 		$menuitems['tasks']['children']['divider'] = array('divider'=>true);
 		$menuitems['tasks']['children']['mydocuments'] = array('label'=>getMLText('my_documents'), 'link'=>$this->params['settings']->_httpRoot.'out/out.MyDocuments.php');
 		}
-		}
 		self::showNavigationBar($menuitems, array('right'=>true));
+		}
 	} /* }}} */
 
 	/**