gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 21:51:32 +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 2019-11-20 19:23:48 +01:00
commit 51943050c2
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -116,6 +116,10 @@
- add document list which can be exported as an archive - add document list which can be exported as an archive
- search results can be exported - search results can be exported
--------------------------------------------------------------------------------
Changes in version 5.1.14
--------------------------------------------------------------------------------
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.13 Changes in version 5.1.13
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

1
inc/inc.ClassUI.php
View File

@ -139,6 +139,7 @@ class UI extends UI_Default {
$view->setParam('showmissingtranslations', $settings->_showMissingTranslations); $view->setParam('showmissingtranslations', $settings->_showMissingTranslations);
$view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod); $view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod);
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('onepage', $settings->_onePageMode);
foreach($decorators as $extname=>$decorator) { foreach($decorators as $extname=>$decorator) {
$filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$decorator['file']; $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$decorator['file'];
require($filename); require($filename);

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

@ -421,7 +421,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo " </li>\n"; echo " </li>\n";
echo " </ul>\n"; echo " </ul>\n";
if($this->params['enablemenutasks']) { if($this->params['enablemenutasks'] && !$this->params['user']->isGuest()) {
echo " <div id=\"menu-tasks\">"; echo " <div id=\"menu-tasks\">";
echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Tasks\" data-action=\"menuTasks\"></div>"; echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Tasks\" data-action=\"menuTasks\"></div>";
// echo " <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n"; // echo " <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";

4
views/bootstrap/class.Calendar.php
View File

@ -224,6 +224,8 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
} /* }}} */ } /* }}} */
function js() { /* {{{ */ function js() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
$strictformcheck = $this->params['strictformcheck']; $strictformcheck = $this->params['strictformcheck'];
header('Content-Type: application/javascript'); header('Content-Type: application/javascript');
?> ?>
@ -232,6 +234,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
$('#calendar').fullCalendar({ $('#calendar').fullCalendar({
height: $(window).height()-210, height: $(window).height()-210,
locale: '<?php echo substr($this->params['session']->getLanguage(), 0, 2); ?>', locale: '<?php echo substr($this->params['session']->getLanguage(), 0, 2); ?>',
<?php if(!$user->isGuest()) { ?>
customButtons: { customButtons: {
addEventButton: { addEventButton: {
text: '<?php printMLText('add_event'); ?>', text: '<?php printMLText('add_event'); ?>',
@ -241,6 +244,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
} }
} }
}, },
<?php } ?>
header: { header: {
left: 'prev,next today addEventButton', left: 'prev,next today addEventButton',
center: 'title', center: 'title',