mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-02-06 15:14:58 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
f3fb09762f
|
@ -246,10 +246,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
global $MISSING_LANG, $LANG;
|
||||
if($MISSING_LANG) {
|
||||
echo '<div class="container-fluid">'."\n";
|
||||
echo '<div class="row-fluid">'."\n";
|
||||
echo '<div class="alert alert-error">'."\n";
|
||||
echo "<p><strong>This page contains missing translations in the selected language. Please help to improve SeedDMS and provide the translation.</strong></p>";
|
||||
echo "</div>";
|
||||
$this->rowStart();
|
||||
$this->columnStart(12);
|
||||
echo $this->errorMsg("This page contains missing translations in the selected language. Please help to improve SeedDMS and provide the translation.");
|
||||
echo "<table class=\"table table-condensed\">";
|
||||
echo "<tr><th>Key</th><th>engl. Text</th><th>Your translation</th></tr>\n";
|
||||
foreach($MISSING_LANG as $key=>$lang) {
|
||||
|
@ -258,7 +257,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
echo "</table>";
|
||||
echo "<div class=\"splash\" data-type=\"error\" data-timeout=\"5500\"><b>There are missing translations on this page!</b><br />Please check the bottom of the page.</div>\n";
|
||||
echo "</div>\n";
|
||||
echo "</div>\n";
|
||||
$this->columnEnd();
|
||||
$this->rowEnd();
|
||||
}
|
||||
} /* }}} */
|
||||
|
||||
|
@ -452,6 +452,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
echo " </li>\n";
|
||||
echo " </ul>\n";
|
||||
|
||||
/* menu tasks {{{ */
|
||||
if($this->params['enablemenutasks']) {
|
||||
if($accessobject->check_view_access('Tasks', array('action'=>'menuTasks'))) {
|
||||
echo " <div id=\"menu-tasks\">";
|
||||
|
@ -465,7 +466,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
//$this->addFooterJS('checkTasks();');
|
||||
}
|
||||
}
|
||||
/* }}} End of menu tasks */
|
||||
|
||||
/* drop folder dir {{{ */
|
||||
if($this->params['dropfolderdir'] && $this->params['enabledropfolderlist']) {
|
||||
echo " <div id=\"menu-dropfolder\">";
|
||||
echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"DropFolderChooser\" data-action=\"menuList\"";
|
||||
|
@ -474,16 +477,23 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
echo "></div>";
|
||||
echo " </div>";
|
||||
}
|
||||
/* }}} End of drop folder dir */
|
||||
|
||||
/* session list {{{ */
|
||||
if($this->params['enablesessionlist']) {
|
||||
echo " <div id=\"menu-session\">";
|
||||
echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Session\" data-action=\"menuSessions\"></div>";
|
||||
echo " </div>";
|
||||
}
|
||||
/* }}} End of session list */
|
||||
|
||||
/* clipboard {{{ */
|
||||
if($this->params['enableclipboard']) {
|
||||
echo " <div id=\"menu-clipboard\">";
|
||||
echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=".($folder != null ? $folder->getID() : 0)."\"></div>";
|
||||
echo " </div>";
|
||||
}
|
||||
/* }}} End of clipboard */
|
||||
|
||||
echo " <ul class=\"nav\">\n";
|
||||
$menuitems = array();
|
||||
|
@ -760,7 +770,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
self::showNavigationBar($menuitems);
|
||||
|
||||
echo "</div>\n";
|
||||
return;
|
||||
} /* }}} */
|
||||
|
||||
private function documentNavigationBar($document) { /* {{{ */
|
||||
|
@ -845,7 +854,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
self::showNavigationBar($menuitems);
|
||||
|
||||
echo "</div>\n";
|
||||
return;
|
||||
} /* }}} */
|
||||
|
||||
private function accountNavigationBar() { /* {{{ */
|
||||
|
@ -878,7 +886,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
self::showNavigationBar($menuitems);
|
||||
|
||||
echo "</div>\n";
|
||||
return;
|
||||
} /* }}} */
|
||||
|
||||
private function myDocumentsNavigationBar() { /* {{{ */
|
||||
|
@ -911,7 +918,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
self::showNavigationBar($menuitems);
|
||||
|
||||
echo "</div>\n";
|
||||
return;
|
||||
} /* }}} */
|
||||
|
||||
private function adminToolsNavigationBar() { /* {{{ */
|
||||
|
@ -1013,7 +1019,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
self::showNavigationBar($menuitems);
|
||||
|
||||
echo "</div>\n";
|
||||
return;
|
||||
} /* }}} */
|
||||
|
||||
private function calendarOldNavigationBar($d){ /* {{{ */
|
||||
|
@ -1050,8 +1055,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
self::showNavigationBar($menuitems);
|
||||
|
||||
echo "</div>\n";
|
||||
return;
|
||||
|
||||
} /* }}} */
|
||||
|
||||
function pageList($pageNumber, $totalPages, $baseURI, $params) { /* {{{ */
|
||||
|
@ -1215,26 +1218,32 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
echo '<textarea'.
|
||||
(!empty($value['id']) ? ' id="'.$value['id'].'"' : '').
|
||||
(!empty($value['name']) ? ' name="'.$value['name'].'"' : '').
|
||||
(!empty($value['class']) ? ' class="'.$value['class'].'"' : '').
|
||||
(!empty($value['rows']) ? ' rows="'.$value['rows'].'"' : '').
|
||||
(!empty($value['cols']) ? ' rows="'.$value['cols'].'"' : '').
|
||||
(!empty($value['required']) ? ' required' : '').">".(!empty($value['value']) ? $value['value'] : '')."</textarea>";
|
||||
break;
|
||||
case 'input':
|
||||
default:
|
||||
echo '<input'.
|
||||
(!empty($value['type']) ? ' type="'.$value['type'].'"' : '').
|
||||
(!empty($value['id']) ? ' id="'.$value['id'].'"' : '').
|
||||
(!empty($value['name']) ? ' name="'.$value['name'].'"' : '').
|
||||
((isset($value['value']) && is_string($value['value'])) || !empty($value['value']) ? ' value="'.$value['value'].'"' : '').
|
||||
(!empty($value['placeholder']) ? ' placeholder="'.$value['placeholder'].'"' : '').
|
||||
(!empty($value['autocomplete']) ? ' autocomplete="'.$value['autocomplete'].'"' : '').
|
||||
(isset($value['min']) ? ' min="'.$value['min'].'"' : '').
|
||||
(!empty($value['checked']) ? ' checked' : '').
|
||||
(!empty($value['required']) ? ' required' : '');
|
||||
if(!empty($value['attributes']) && is_array($value['attributes']))
|
||||
foreach($value['attributes'] as $a)
|
||||
echo ' '.$a[0].'="'.$a[1].'"';
|
||||
echo ">";
|
||||
switch($value['type']) {
|
||||
default:
|
||||
echo '<input'.
|
||||
(!empty($value['type']) ? ' type="'.$value['type'].'"' : '').
|
||||
(!empty($value['id']) ? ' id="'.$value['id'].'"' : '').
|
||||
(!empty($value['name']) ? ' name="'.$value['name'].'"' : '').
|
||||
(!empty($value['class']) ? ' class="'.$value['class'].'"' : '').
|
||||
((isset($value['value']) && is_string($value['value'])) || !empty($value['value']) ? ' value="'.$value['value'].'"' : '').
|
||||
(!empty($value['placeholder']) ? ' placeholder="'.$value['placeholder'].'"' : '').
|
||||
(!empty($value['autocomplete']) ? ' autocomplete="'.$value['autocomplete'].'"' : '').
|
||||
(isset($value['min']) ? ' min="'.$value['min'].'"' : '').
|
||||
(!empty($value['checked']) ? ' checked' : '').
|
||||
(!empty($value['required']) ? ' required' : '');
|
||||
if(!empty($value['attributes']) && is_array($value['attributes']))
|
||||
foreach($value['attributes'] as $a)
|
||||
echo ' '.$a[0].'="'.$a[1].'"';
|
||||
echo ">";
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user