gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +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-11-22 12:53:23 +01:00
commit 858c449489
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -194,6 +194,8 @@
- fix .htaccess file in restapi
- restapi: add setDocumentOwner, owner can be set when uploading a document
- theme in configuration can override theme of user
- saving the settings will no longer reenable an extention with no configuration
- put a red/green bullet before the extension name in the settings
--------------------------------------------------------------------------------
Changes in version 5.1.20

2
styles/bootstrap/application.css
View File

@ -284,7 +284,9 @@ ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
}
i.success {color: #00b000;}
i.enabled {color: #00b000;}
i.error {color: #b00000;}
i.disabled {color: #b00000;}
i.warning {color: #ff9900;}
i.initstate {color: #ff9900;}
i.released {color: #00b000;}

2
styles/bootstrap/application.js
View File

@ -64,7 +64,7 @@ $(document).ready( function() {
$('body').on('touchstart.dropdown', '.dropdown-menu', function (e) { e.stopPropagation(); });
$('.datepicker, #expirationdate, #fromdate, #todate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate, #revisionstartdate')
.datepicker()
.datepicker({todayHighlight: true, toggleActive: true})
.on('changeDate', function(ev){
if(ev.date && $(ev.target).data('selectmenu')) {
$("#"+$(ev.target).data('selectmenu')).val('date');

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

@ -38,7 +38,8 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
protected function showStartPaneContent($name, $isactive) { /* {{{ */
echo '<div class="tab-pane'.($isactive ? ' active' : '').'" id="'.$name.'">';
$this->contentContainerStart();
echo '<table class="table-condensed">';
echo '<table class="table-condensed" style="table-layout: fixed;">';
echo '<tr><td width="20%"></td><td width="80%"></td></tr>';
} /* }}} */
protected function showEndPaneContent($name, $currentab) { /* {{{ */
@ -532,7 +533,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
if($this->hasHook('processConfig'))
$extconf = $this->callHook('processConfig', $extname, $extconf);
if($extconf['config']) {
$this->showRawConfigHeadline("<a name=\"".$extname."\"></a>".'<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" />'.$extconf['title']);
$this->showRawConfigHeadline("<a name=\"".$extname."\"></a>".'<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" /><i class="fa fa-circle'.($settings->_extensions[$extname]["__disable__"] ? ' disabled' : ' enabled').'"></i> <span title="'.$extname.'">'.$extconf['title'].'</span>');
foreach($extconf['config'] as $confkey=>$conf) {
ob_start();
switch($conf['type']) {
@ -653,6 +654,12 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
$html = ob_get_clean();
$this->showConfigPlain($conf['title'], isset($conf['help']) ? $conf['help'] : '', $html);
}
} else {
/* Even no configuration exists, output the input field to enable/disable
* the extension. Otherwise it will be enabled each time the config is
* saved.
*/
echo '<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" />'."\n";
}
}
$this->showEndPaneContent('extensions', $currenttab);