gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-01 06:27:15 +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 2020-04-16 17:21:10 +02:00
commit 00cd7fc700
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -146,6 +146,7 @@
- allow multiple dependencies on seeddms of extension - allow multiple dependencies on seeddms of extension
- add table with chart data below chart - add table with chart data below chart
- do now show tasks in menu if workflow is turned off completely - do now show tasks in menu if workflow is turned off completely
- do not show hidden users in session list
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.15 Changes in version 5.1.15

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

@ -1117,7 +1117,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
function formSubmit($value, $name='') { /* {{{ */ function formSubmit($value, $name='') { /* {{{ */
echo "<div class=\"controls\">\n"; echo "<div class=\"controls\">\n";
echo "<button type=\"submit\" class=\"btn\"".($name ? ' name="'.$name.'" id="'.$name.'"' : '').">".$value."</button>\n"; echo "<button type=\"submit\" class=\"btn btn-primary\"".($name ? ' name="'.$name.'" id="'.$name.'"' : '').">".$value."</button>\n";
echo "</div>\n"; echo "</div>\n";
} /* }}} */ } /* }}} */

36
views/bootstrap/class.Session.php
View File

@ -53,20 +53,34 @@ class SeedDMS_View_Session extends SeedDMS_Bootstrap_Style {
if ($user->isGuest() || count($sessions) == 0) { if ($user->isGuest() || count($sessions) == 0) {
return ''; return '';
} }
$content = '';
$content .= " <ul id=\"main-menu-session\" class=\"nav pull-right\">\n"; /* $hasuser will be set to true when at least one of the logged in users
$content .= " <li class=\"dropdown add-session-area\">\n"; * is visible and not hidden in user lists.
$content .= " <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".count($sessions).") <i class=\"icon-caret-down\"></i></a>\n"; */
$content .= " <ul class=\"dropdown-menu\" role=\"menu\">\n"; $c = 0;
$ucontent = '';
foreach($sessions as $session) { foreach($sessions as $session) {
if($sesuser = $dms->getUser($session->getUser())) if($sesuser = $dms->getUser($session->getUser()))
if(!$sesuser->isHidden()) if(!$sesuser->isHidden()) {
$content .= " <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName()).($user->isAdmin() ? " (".getReadableDuration(time()-$session->getLastAccess()).")" : "")."</a></li>\n"; $c++;
$hasuser = true;
$ucontent .= " <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName()).($user->isAdmin() ? " (".getReadableDuration(time()-$session->getLastAccess()).")" : "")."</a></li>\n";
}
}
if($c) {
$content = '';
$content .= " <ul id=\"main-menu-session\" class=\"nav pull-right\">\n";
$content .= " <li class=\"dropdown add-session-area\">\n";
$content .= " <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".$c.") <i class=\"icon-caret-down\"></i></a>\n";
$content .= " <ul class=\"dropdown-menu\" role=\"menu\">\n";
$content .= $ucontent;
$content .= " </ul>\n";
$content .= " </li>\n";
$content .= " </ul>\n";
echo $content;
} else {
return '';
} }
$content .= " </ul>\n";
$content .= " </li>\n";
$content .= " </ul>\n";
echo $content;
} /* }}} */ } /* }}} */
} }

8
views/bootstrap/class.ViewDocument.php
View File

@ -1570,8 +1570,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
<div class="tab-pane <?php if($currenttab == 'attachments') echo 'active'; ?>" id="attachments"> <div class="tab-pane <?php if($currenttab == 'attachments') echo 'active'; ?>" id="attachments">
<?php <?php
$this->contentContainerStart();
if (count($files) > 0) { if (count($files) > 0) {
print "<table class=\"table\">"; print "<table class=\"table\">";
@ -1653,11 +1651,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "</tbody>\n</table>\n"; print "</tbody>\n</table>\n";
} }
else printMLText("no_attached_files"); else $this->infoMsg(getMLText("no_attached_files"));
$this->contentContainerStart();
if($accessobject->check_controller_access('AddFile')) { if($accessobject->check_controller_access('AddFile')) {
if ($document->getAccessMode($user) >= M_READWRITE){ if ($document->getAccessMode($user) >= M_READWRITE){
print "<ul class=\"unstyled\"><li>".$this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn'), getMLText("add"), false, true)."</li></ul>\n"; print $this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn btn-primary'), getMLText("add"), false, true)."\n";
} }
} }
$this->contentContainerEnd(); $this->contentContainerEnd();