gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 00:45:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2018-07-11 20:41:22 +02:00
commit 5df058415d
28 changed files with 1897 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
languages/ar_EG/lang.inc
View File

@ -619,7 +619,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => '',
'individuals' => 'افراد',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => 'موروث',
'inherits_access_copy_msg' => 'نسخ قائمة صلاحيات موروثة.',

2
languages/bg_BG/lang.inc
View File

@ -548,7 +548,7 @@ $text = array(
'index_pending' => '',
'index_waiting' => '',
'individuals' => 'Личности',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => 'наследен',
'inherits_access_copy_msg' => 'Изкопирай наследения список',

2
languages/ca_ES/lang.inc
View File

@ -553,7 +553,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => '',
'individuals' => 'Individuals',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => 'Heredat',
'inherits_access_copy_msg' => 'Copiar llista d\'accés heretat',

2
languages/cs_CZ/lang.inc
View File

@ -626,7 +626,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => '',
'individuals' => 'Jednotlivci',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => 'Zděděno',
'inherits_access_copy_msg' => 'Zkopírovat zděděný seznam řízení přístupu',

2
languages/de_DE/lang.inc
View File

@ -656,7 +656,7 @@ URL: [url]',
'index_pending' => 'Vorgemerkt',
'index_waiting' => 'Warte',
'individuals' => 'Einzelpersonen',
'indivіduals_in_groups' => 'Mitglieder einer Gruppe',
'individuals_in_groups' => 'Mitglieder einer Gruppe',
'info_recipients_tab_not_released' => 'Die Bestätigung des Empfangs für diese Dokumentenversion ist nicht möglich, weil die Version nicht freigegeben ist.',
'inherited' => 'geerbt',
'inherits_access_copy_msg' => 'Berechtigungen kopieren',

38
languages/el_GR/lang.inc
View File

@ -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 (255)
// Translators: Admin (272)
$text = array(
'2_factor_auth' => '',
@ -210,9 +210,9 @@ $text = array(
'chart_docspercategory_title' => 'Έγγραφα κατά κατηγορία',
'chart_docspermimetype_title' => '',
'chart_docspermonth_title' => 'Νέα έγγραφα κατά μήνα',
'chart_docsperstatus_title' => '',
'chart_docsperstatus_title' => 'Κατάσταση εγγράφων',
'chart_docsperuser_title' => 'Έγγραφα κατά χρήστη',
'chart_selection' => '',
'chart_selection' => 'Επιλογή γραφήματος',
'chart_sizeperuser_title' => 'Χώρος κατά χρήστη',
'checkedout_file_has_different_version' => '',
'checkedout_file_has_disappeared' => '',
@ -302,7 +302,7 @@ $text = array(
'documentcontent' => '',
'documents' => 'Έγγραφα',
'documents_checked_out_by_you' => '',
'documents_expired' => '',
'documents_expired' => 'Ληγμένα έγγραφα',
'documents_in_process' => '',
'documents_locked' => '',
'documents_locked_by_you' => '',
@ -457,7 +457,7 @@ $text = array(
'extension_archive' => '',
'extension_changelog' => '',
'extension_loading' => '',
'extension_manager' => '',
'extension_manager' => 'Διαχείριση πρόσθετων',
'extension_mgr_installed' => '',
'extension_mgr_no_upload' => '',
'extension_mgr_repository' => '',
@ -534,7 +534,7 @@ $text = array(
'import' => '',
'importfs' => '',
'import_extension' => '',
'import_fs' => '',
'import_fs' => 'Εισαγωγή από το σύστημα',
'import_fs_warning' => '',
'include_content' => '',
'include_documents' => '',
@ -548,7 +548,7 @@ $text = array(
'index_pending' => '',
'index_waiting' => '',
'individuals' => 'Άτομα',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => '',
'inherits_access_copy_msg' => '',
@ -616,7 +616,7 @@ $text = array(
'language' => 'Γλώσσα',
'lastaccess' => '',
'last_update' => 'Τελευταία Αναναίωση',
'legend' => '',
'legend' => 'Ιστορικό',
'librarydoc' => '',
'linked_documents' => '',
'linked_files' => '',
@ -643,7 +643,7 @@ $text = array(
'login_ok' => 'Επιτυχημένη σύνδεση',
'logout' => 'Εποσύνδεση',
'log_management' => 'Διαχείριση αρχείων καταγραφής',
'lo_LA' => '',
'lo_LA' => 'Τοποθεσία',
'manager' => 'Διαχειριστής',
'manager_of_group' => 'Είστε διαχειριστής της ομάδας',
'mandatory_approvergroups' => '',
@ -978,7 +978,7 @@ URL: [url]',
'select_ind_recipients' => '',
'select_ind_reviewers' => '',
'select_ind_revisors' => '',
'select_one' => '',
'select_one' => 'Επιλογή',
'select_user' => '',
'select_users' => '',
'select_value' => '',
@ -1480,7 +1480,7 @@ URL: [url]',
'theme' => '',
'thursday' => 'Πέμπτη',
'thursday_abbr' => 'Πε',
'timeline' => '',
'timeline' => 'Ιστορικό',
'timeline_add_file' => '',
'timeline_add_version' => '',
'timeline_full_add_file' => '',
@ -1489,14 +1489,14 @@ URL: [url]',
'timeline_full_status_change' => '',
'timeline_scheduled_revision' => '',
'timeline_selected_item' => '',
'timeline_skip_add_file' => '',
'timeline_skip_add_file' => 'Η προσθήκη ολοκληρώθηκε',
'timeline_skip_scheduled_revision' => '',
'timeline_skip_status_change_-1' => '',
'timeline_skip_status_change_-3' => '',
'timeline_skip_status_change_0' => '',
'timeline_skip_status_change_1' => '',
'timeline_skip_status_change_2' => '',
'timeline_skip_status_change_3' => '',
'timeline_skip_status_change_-1' => 'Απορριφθέντα',
'timeline_skip_status_change_-3' => 'Ληγμένα',
'timeline_skip_status_change_0' => 'Προς ενημέρωση',
'timeline_skip_status_change_1' => 'Προς έγκριση',
'timeline_skip_status_change_2' => 'Εκδοθέντα',
'timeline_skip_status_change_3' => 'Σε ροή εργασιών',
'timeline_skip_status_change_4' => '',
'timeline_skip_status_change_5' => '',
'timeline_status_change' => '',
@ -1543,7 +1543,7 @@ URL: [url]',
'unlock_cause_access_mode_all' => '',
'unlock_cause_locking_user' => '',
'unlock_document' => '',
'update' => '',
'update' => 'Ενημέρωση',
'update_approvers' => '',
'update_document' => '',
'update_fulltext_index' => '',

2
languages/en_GB/lang.inc
View File

@ -657,7 +657,7 @@ URL: [url]',
'index_pending' => 'Pending',
'index_waiting' => 'Waiting',
'individuals' => 'Individuals',
'indivіduals_in_groups' => 'Members of a group',
'individuals_in_groups' => 'Members of a group',
'info_recipients_tab_not_released' => 'Acknowledgement of reception for this document version is not possible, because the version is not released.',
'inherited' => 'inherited',
'inherits_access_copy_msg' => 'Copy inherited access list',

10
languages/es_ES/lang.inc
View File

@ -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: acabello (20), Admin (1088), angel (123), francisco (2), jaimem (14)
// Translators: acabello (20), Admin (1091), angel (123), francisco (2), jaimem (14)
$text = array(
'2_factor_auth' => '',
@ -626,7 +626,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => 'Esperando',
'individuals' => 'Individuales',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => 'heredado',
'inherits_access_copy_msg' => 'Copiar lista de acceso heredado',
@ -699,7 +699,7 @@ URL: [url]',
'linked_documents' => 'Documentos relacionados',
'linked_files' => 'Adjuntos',
'linked_to_current_version' => '',
'linked_to_document' => '',
'linked_to_document' => 'Enlazado al documento',
'linked_to_this_version' => '',
'link_alt_updatedocument' => 'Si desea subir archivos mayores que el tamaño máximo actualmente permitido, por favor, utilice la <a href="%s">página de subida</a> alternativa.',
'link_to_version' => '',
@ -1102,7 +1102,7 @@ URL: [url]',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Haga Click para seleccionar categoría',
'select_group' => '',
'select_group' => 'Seleccionar Grupo',
'select_groups' => 'Haga Click para seleccionar grupos',
'select_grp_approvers' => 'Haga Click para seleccionar grupo de aprobadores',
'select_grp_ind_approvers' => '',
@ -1120,7 +1120,7 @@ URL: [url]',
'select_ind_reviewers' => 'Haga Click para seleccionar revisor individual',
'select_ind_revisors' => '',
'select_one' => 'Seleccionar uno',
'select_user' => '',
'select_user' => 'Seleccionar Usuario',
'select_users' => 'Haga Click para seleccionar usuarios',
'select_value' => 'Selecciona valor',
'select_workflow' => 'Selecionar Flujo de Trabajo',

2
languages/fr_FR/lang.inc
View File

@ -657,7 +657,7 @@ URL: [url]',
'index_pending' => 'En attente',
'index_waiting' => 'Chargement…',
'individuals' => 'Individuels',
'indivіduals_in_groups' => 'Membres d’un groupe',
'individuals_in_groups' => 'Membres d’un groupe',
'info_recipients_tab_not_released' => 'L’accusé de réception pour cette version du document n’est pas possible car la version n’est pas en état « publié ».',
'inherited' => 'hérité',
'inherits_access_copy_msg' => 'Recopier la liste des accès hérités',

2
languages/hr_HR/lang.inc
View File

@ -631,7 +631,7 @@ Internet poveznica: [url]',
'index_pending' => '',
'index_waiting' => '',
'individuals' => 'Pojedinci',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => 'naslijeđeno',
'inherits_access_copy_msg' => 'Kopiraj listu naslijeđenih prava pristupa',

2
languages/hu_HU/lang.inc
View File

@ -626,7 +626,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => '',
'individuals' => 'Egyedek',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => 'örökölt',
'inherits_access_copy_msg' => 'Örökített hozzáférési lista másolása',

2
languages/it_IT/lang.inc
View File

@ -632,7 +632,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => 'Attendi',
'individuals' => 'Singoli',
'indivіduals_in_groups' => 'I membri de la gruppo',
'individuals_in_groups' => 'I membri de la gruppo',
'info_recipients_tab_not_released' => '',
'inherited' => 'ereditato',
'inherits_access_copy_msg' => 'Copia la lista degli accessi ereditati',

2
languages/ko_KR/lang.inc
View File

@ -632,7 +632,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => '기다리는 중',
'individuals' => '개인',
'indivіduals_in_groups' => '개별 그룹',
'individuals_in_groups' => '개별 그룹',
'info_recipients_tab_not_released' => '',
'inherited' => '상속',
'inherits_access_copy_msg' => '상속 액세스 목록 복사',

1830
languages/lo_LA/lang.inc Normal file
View File

File diff suppressed because it is too large Load Diff

2
languages/nl_NL/lang.inc
View File

@ -631,7 +631,7 @@ URL: [url]',
'index_pending' => 'Indexering moet nog gebeuren',
'index_waiting' => 'Indexering wacht',
'individuals' => 'Individuen',
'indivіduals_in_groups' => 'Individuen in groepen',
'individuals_in_groups' => 'Individuen in groepen',
'info_recipients_tab_not_released' => '',
'inherited' => 'overgeerfd',
'inherits_access_copy_msg' => 'Kopie lijst overerfde toegang',

2
languages/pl_PL/lang.inc
View File

@ -619,7 +619,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => 'Oczekiwanie',
'individuals' => 'Indywidualni',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => 'dziedziczony',
'inherits_access_copy_msg' => 'Kopiuj odziedziczoną listę dostępu',

2
languages/pt_BR/lang.inc
View File

@ -625,7 +625,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => 'Aguarde...',
'individuals' => 'Individuals',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => 'herdado',
'inherits_access_copy_msg' => 'Copy inherited access list',

2
languages/ro_RO/lang.inc
View File

@ -631,7 +631,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => '',
'individuals' => 'Individuals',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => 'moștenit',
'inherits_access_copy_msg' => 'Copie lista de acces moștenită',

2
languages/ru_RU/lang.inc
View File

@ -631,7 +631,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => 'Ожидание',
'individuals' => 'Пользователи',
'indivіduals_in_groups' => 'Пользователи группы',
'individuals_in_groups' => 'Пользователи группы',
'info_recipients_tab_not_released' => '',
'inherited' => 'унаследованный',
'inherits_access_copy_msg' => 'Скопировать наследованный список',

2
languages/sk_SK/lang.inc
View File

@ -560,7 +560,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => 'Čakajte',
'individuals' => 'Jednotlivci',
'indivіduals_in_groups' => 'Členovia skupiny',
'individuals_in_groups' => 'Členovia skupiny',
'info_recipients_tab_not_released' => '',
'inherited' => 'zdedené',
'inherits_access_copy_msg' => 'Skopírovať zdedený zoznam riadenia prístupu',

2
languages/sv_SE/lang.inc
View File

@ -644,7 +644,7 @@ URL: [url]',
'index_pending' => 'Förestående',
'index_waiting' => 'Väntar',
'individuals' => 'Personer',
'indivіduals_in_groups' => 'Medlemmar i en grupp',
'individuals_in_groups' => 'Medlemmar i en grupp',
'info_recipients_tab_not_released' => '',
'inherited' => 'ärvd',
'inherits_access_copy_msg' => 'Kopiera lista för behörighetsarv',

2
languages/tr_TR/lang.inc
View File

@ -625,7 +625,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => 'Bekliyor',
'individuals' => 'Bireysel',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => 'devralındı',
'inherits_access_copy_msg' => 'Devralınan erişim listesini kopyala',

2
languages/uk_UA/lang.inc
View File

@ -631,7 +631,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => '',
'individuals' => 'Користувачі',
'indivіduals_in_groups' => 'Користувачі групи',
'individuals_in_groups' => 'Користувачі групи',
'info_recipients_tab_not_released' => '',
'inherited' => 'успадкований',
'inherits_access_copy_msg' => 'Скопіювати успадкований список',

2
languages/zh_CN/lang.inc
View File

@ -627,7 +627,7 @@ URL: [url]',
'index_pending' => '待处理',
'index_waiting' => '',
'individuals' => '个人',
'indivіduals_in_groups' => '组成员',
'individuals_in_groups' => '组成员',
'info_recipients_tab_not_released' => '',
'inherited' => '继承',
'inherits_access_copy_msg' => '复制继承访问权限列表',

2
languages/zh_TW/lang.inc
View File

@ -552,7 +552,7 @@ URL: [url]',
'index_pending' => '',
'index_waiting' => '請稍後',
'individuals' => '個人',
'indivіduals_in_groups' => '',
'individuals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => '繼承',
'inherits_access_copy_msg' => '複製繼承存取權限列表',

17
views/bootstrap/class.Clipboard.php
View File

@ -68,7 +68,22 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
$content .= " <li><a href=\"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['refferer'])."\">".getMLText("move_clipboard")."</a></li>\n";
}
// $content .= " <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n";
$content .= " <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";
// $content .= " <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";
$menuitems = array();
$menuitems['clear_clipboard'] = array('label'=>'clear_clipboard', 'attributes'=>array(array('class', 'ajax-click'), array('data-href', '../op/op.Ajax.php'), array('data-param1', 'command=clearclipboard')));
if($this->hasHook('clipboardMenuItems'))
$menuitems = $this->callHook('clipboardMenuItems', $clipboard, $menuitems);
foreach($menuitems as $menuitem) {
$content .= "<li>";
$content .= "<a";
if($menuitem['link'])
$content .= ' href="'.$menuitem['link'].'"';
foreach($menuitem['attributes'] as $attr)
$content .= ' '.$attr[0].'="'.$attr[1].'"';
$content .= ">";
$content .= getMLText($menuitem['label']);
$content .= "</a></li>";
}
$content .= " </ul>\n";
$content .= " </li>\n";
$content .= " </ul>\n";

2
views/bootstrap/class.ExtensionMgr.php
View File

@ -239,6 +239,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
print "</tr></thead><tbody>\n";
$list = $extmgr->getExtensionList();
foreach($list as $re) {
if(!$re)
continue;
$extmgr->checkExtension($re);
$checkmsgs = $extmgr->getErrorMsgs();
$needsupdate = !isset($GLOBALS['EXT_CONF'][$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $GLOBALS['EXT_CONF'][$re['name']]['version']) > 0;

3
views/bootstrap/class.ViewFolder.php
View File

@ -89,6 +89,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
$orderby = $this->params['orderby'];
$expandFolderTree = $this->params['expandFolderTree'];
$enableDropUpload = $this->params['enableDropUpload'];
$maxItemsPerPage = $this->params['maxItemsPerPage'];
header('Content-Type: application/javascript; charset=UTF-8');
parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
@ -96,6 +97,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
function folderSelected(id, name) {
window.location = '../out/out.ViewFolder.php?folderid=' + id;
}
<?php if($maxItemsPerPage) { ?>
function loadMoreObjects(element, limit) {
if(!$(element).is(":visible"))
return;
@ -130,6 +132,7 @@ $(window).scroll(function() {
$('#loadmore').click(function(e) {
loadMoreObjects($(this), $(this).data('all'));
});
<?php } ?>
<?php
$this->printNewTreeNavigationJs($folder->getID(), M_READ, 0, '', $expandFolderTree == 2, $orderby);