gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 04:56:06 +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 2022-06-16 17:07:21 +02:00
commit dee7977016
6 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.htaccess
View File

@ -30,7 +30,7 @@ RewriteRule "^styles/.*$" "-" [L]
# Added for old extensions which do not use routes # Added for old extensions which do not use routes
RewriteRule ^ext/[^/]+/icon.(?:png|svg)$ - [L] RewriteRule ^ext/[^/]+/icon.(?:png|svg)$ - [L]
RewriteCond %{REQUEST_URI} "ext/[^/]+/" RewriteCond %{REQUEST_URI} "ext/[^/]+/"
RewriteRule !^ext/[^/]+/.*(?:op|out|res) - [F] RewriteRule !^ext/[^/]+/.*(?:op|out|res|node_modules) - [F]
RewriteCond %{REQUEST_URI} "ext/[^/]+/res/.*$" [NC] RewriteCond %{REQUEST_URI} "ext/[^/]+/res/.*$" [NC]
RewriteRule !^ext/[^/]+/res/.*\.(?:css|js|png|svg) - [F] RewriteRule !^ext/[^/]+/res/.*\.(?:css|js|png|svg) - [F]
RewriteCond %{REQUEST_FILENAME} -f RewriteCond %{REQUEST_FILENAME} -f

1
inc/inc.ClassUI.php
View File

@ -49,6 +49,7 @@ class UI extends UI_Default {
global $settings, $dms, $user, $session, $extMgr; global $settings, $dms, $user, $session, $extMgr;
if(!$class) { if(!$class) {
$class = 'Bootstrap'; $class = 'Bootstrap';
$class = 'Style';
$classname = "SeedDMS_Bootstrap_Style"; $classname = "SeedDMS_Bootstrap_Style";
} else { } else {
$classname = "SeedDMS_View_".$class; $classname = "SeedDMS_View_".$class;

13
inc/inc.ClassViewCommon.php
View File

@ -217,13 +217,16 @@ class SeedDMS_View_Common {
*/ */
public function getHookObjects($classname='') { /* {{{ */ public function getHookObjects($classname='') { /* {{{ */
if($classname) if($classname)
$tmp = explode('_', $classname); $tmps = array(explode('_', $classname)[2]);
else else
$tmp = explode('_', get_class($this)); $tmps = $this->getHookClassNames();
if(isset($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp[2])])) { $hooks = [];
return $GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp[2])]; foreach($tmps as $tmp) {
if(isset($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp)])) {
$hooks = array_merge($hooks, $GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp)]);
}
} }
return array(); return $hooks;
} /* }}} */ } /* }}} */
/** /**

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

@ -844,21 +844,16 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$menuitems['transfer_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.TransferDocument". $docid, 'label'=>getMLText('transfer_document')); $menuitems['transfer_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.TransferDocument". $docid, 'label'=>getMLText('transfer_document'));
} }
/* Check if hook exists because otherwise callHook() will override $menuitems */ /* Do not use $this->callHook() because $menuitems must be returned by the the
if($this->hasHook('documentNavigationBar')) * first hook and passed to next hook. $this->callHook() will just pass
$menuitems = $this->callHook('documentNavigationBar', $document, $menuitems); * the menuitems to each single hook. Hence, the last hook will win.
/* Do not use $this->callHook() because $menuitems must be returned by the hook
* or left unchanged
*/ */
/*
$hookObjs = $this->getHookObjects(); $hookObjs = $this->getHookObjects();
foreach($hookObjs as $hookObj) { foreach($hookObjs as $hookObj) {
if (method_exists($hookObj, 'documentNavigationBar')) { if (method_exists($hookObj, 'documentNavigationBar')) {
$menuitems = $hookObj->documentNavigationBar($this, $document, $menuitems); $menuitems = $hookObj->documentNavigationBar($this, $document, $menuitems);
} }
} }
*/
self::showNavigationBar($menuitems); self::showNavigationBar($menuitems);

11
views/bootstrap4/class.Bootstrap4.php
View File

@ -763,21 +763,16 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$menuitems['transfer_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.TransferDocument". $docid, 'label'=>getMLText('transfer_document')); $menuitems['transfer_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.TransferDocument". $docid, 'label'=>getMLText('transfer_document'));
} }
/* Check if hook exists because otherwise callHook() will override $menuitems */ /* Do not use $this->callHook() because $menuitems must be returned by the the
if($this->hasHook('documentNavigationBar')) * first hook and passed to next hook. $this->callHook() will just pass
$menuitems = $this->callHook('documentNavigationBar', $document, $menuitems); * the menuitems to each single hook. Hence, the last hook will win.
/* Do not use $this->callHook() because $menuitems must be returned by the hook
* or left unchanged
*/ */
/*
$hookObjs = $this->getHookObjects(); $hookObjs = $this->getHookObjects();
foreach($hookObjs as $hookObj) { foreach($hookObjs as $hookObj) {
if (method_exists($hookObj, 'documentNavigationBar')) { if (method_exists($hookObj, 'documentNavigationBar')) {
$menuitems = $hookObj->documentNavigationBar($this, $document, $menuitems); $menuitems = $hookObj->documentNavigationBar($this, $document, $menuitems);
} }
} }
*/
self::showNavigationBar($menuitems); self::showNavigationBar($menuitems);
} /* }}} */ } /* }}} */

7
views/bootstrap4/styles/styles.css
View File

@ -25,9 +25,6 @@ body {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
/* Set the fixed height of the footer here */
height: 68px;
_line-height: 17px; /* Vertically center the text there */
background-color: #f5f5f5; background-color: #f5f5f5;
} }
@media (max-width: 991px) { @media (max-width: 991px) {
@ -45,9 +42,9 @@ body {
} }
.footer .disclaimer { .footer .disclaimer {
display: inline-block; display: inline-block;
padding: 15px 0px 0px 0px; padding: 7px 0px 7px 0px;
} }
.footer .footNote { .footer .footNote {
display: inline-block; display: inline-block;
padding: 0px 0px 15px 0px; padding: 7px 0px 7px 0px;
} }