gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-15 06:01:19 +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 2021-04-19 08:38:41 +02:00
commit d994232cc4
4 changed files with 105 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
views/bootstrap/class.AdminTools.php
View File

@ -35,16 +35,24 @@ class SeedDMS_View_AdminTools extends SeedDMS_Theme_Style {
return self::startRow().$content.self::endRow(); return self::startRow().$content.self::endRow();
} /* }}} */ } /* }}} */
static function startRow() { /* {{{ */ public function startRow() { /* {{{ */
return '<div class="row-fluid">'; ob_start();
$this->rowStart();
return ob_get_clean();
} /* }}} */ } /* }}} */
static function endRow() { /* {{{ */ public function endRow() { /* {{{ */
return '</div>'; ob_start();
$this->rowEnd();
return ob_get_clean();
} /* }}} */ } /* }}} */
static function rowButton($link, $icon, $label) { /* {{{ */ public function rowButton($link, $icon, $label) { /* {{{ */
return '<a href="'.$link.'" class="span2 btn btn-medium"><i class="fa fa-'.$icon.'"></i><br />'.getMLText($label).'</a>'; ob_start();
$this->columnStart(2);
echo '<a href="'.$link.'" class="btn btn-medium btn-light btn-block btn-md"><i class="fa fa-'.$icon.'"></i><br />'.getMLText($label).'</a>';
$this->columnEnd();
return ob_get_clean();
} /* }}} */ } /* }}} */
function show() { /* {{{ */ function show() { /* {{{ */
@ -59,7 +67,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Theme_Style {
$this->contentStart(); $this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
// $this->contentHeading(getMLText("admin_tools")); // $this->contentHeading(getMLText("admin_tools"));
$this->contentContainerStart(); // $this->contentContainerStart();
?> ?>
<div id="admin-tools"> <div id="admin-tools">
<?php echo $this->callHook('beforeRows'); ?> <?php echo $this->callHook('beforeRows'); ?>
@ -171,7 +179,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Theme_Style {
<?php echo $this->callHook('afterRows'); ?> <?php echo $this->callHook('afterRows'); ?>
</div> </div>
<?php <?php
$this->contentContainerEnd(); // $this->contentContainerEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

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

@ -79,7 +79,7 @@ $(document).ready( function() {
foreach(array('document', 'folder', 'content') as $type) { foreach(array('document', 'folder', 'content') as $type) {
$content = ''; $content = '';
if(isset($res['frequencies'][$type]) && $res['frequencies'][$type]) { if(isset($res['frequencies'][$type]) && $res['frequencies'][$type]) {
$content .= "<table class=\"table table-condensed\">"; $content .= "<table class=\"table table-condensed table-sm\">";
$content .= "<thead>\n<tr>\n"; $content .= "<thead>\n<tr>\n";
$content .= "<th>".getMLText("attribute_value")."</th>\n"; $content .= "<th>".getMLText("attribute_value")."</th>\n";
$content .= "<th>".getMLText("attribute_count")."</th>\n"; $content .= "<th>".getMLText("attribute_count")."</th>\n";

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

@ -384,6 +384,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo " <span class=\"fa fa-bars\"></span>\n"; echo " <span class=\"fa fa-bars\"></span>\n";
echo " </a>\n"; echo " </a>\n";
echo " <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n"; echo " <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
/* user profile menu {{{ */
if(isset($this->params['session']) && isset($this->params['user']) && $this->params['user']) { if(isset($this->params['session']) && isset($this->params['user']) && $this->params['user']) {
echo " <div class=\"nav-collapse nav-col1\">\n"; echo " <div class=\"nav-collapse nav-col1\">\n";
echo " <ul id=\"main-menu-admin\" class=\"nav pull-right\">\n"; echo " <ul id=\"main-menu-admin\" class=\"nav pull-right\">\n";
@ -451,6 +453,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo " </ul>\n"; echo " </ul>\n";
echo " </li>\n"; echo " </li>\n";
echo " </ul>\n"; echo " </ul>\n";
/* }}} End of user profile menu */
/* menu tasks {{{ */ /* menu tasks {{{ */
if($this->params['enablemenutasks']) { if($this->params['enablemenutasks']) {
@ -523,6 +526,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
} }
} }
echo " </ul>\n"; echo " </ul>\n";
/* search form {{{ */
echo " <form action=\"../out/out.Search.php\" class=\"form-inline navbar-search pull-left\" autocomplete=\"off\">"; echo " <form action=\"../out/out.Search.php\" class=\"form-inline navbar-search pull-left\" autocomplete=\"off\">";
if ($folder!=null && is_object($folder) && $folder->isType('folder')) { if ($folder!=null && is_object($folder) && $folder->isType('folder')) {
echo " <input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\" />"; echo " <input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\" />";
@ -536,6 +541,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
// } // }
// echo " <input type=\"submit\" value=\"".getMLText("search")."\" id=\"searchButton\" class=\"btn\"/>"; // echo " <input type=\"submit\" value=\"".getMLText("search")."\" id=\"searchButton\" class=\"btn\"/>";
echo "</form>\n"; echo "</form>\n";
/* }}} End of search form */
echo " </div>\n"; echo " </div>\n";
} }
echo " </div>\n"; echo " </div>\n";

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

@ -119,7 +119,7 @@ $(document).ready( function() {
if($selgroup) { if($selgroup) {
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
$this->contentHeading(getMLText("group_info")); $this->contentHeading(getMLText("group_info"));
echo "<table class=\"table table-condensed\">\n"; echo "<table class=\"table table-condensed table-sm\">\n";
if($workflowmode == "traditional") { if($workflowmode == "traditional") {
$reviewstatus = $selgroup->getReviewStatus(); $reviewstatus = $selgroup->getReviewStatus();
$i = 0; $i = 0;