gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-14 17:19:14 +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 2017-03-24 08:29:28 +01:00
commit 923df99443
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -26,6 +26,13 @@
- add document list which can be exported as an archive
- search results can be exported
--------------------------------------------------------------------------------
Changes in version 5.1.2
--------------------------------------------------------------------------------
- do not show spinner when clipboard is loaded in menu (prevents flickering of
page)
- merged changes from 5.0.12
--------------------------------------------------------------------------------
Changes in version 5.1.1
--------------------------------------------------------------------------------

3
styles/bootstrap/application.js
View File

@ -372,7 +372,8 @@ $(document).ready( function() {
}
} else
url = href;
element.prepend('<div style="position: _absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: 200px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
if(!element.data('no-spinner'))
element.prepend('<div style="position: _absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: 200px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
$.get(url, function(data) {
element.html(data);
// $(".chzn-select").chosen();

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

@ -403,7 +403,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
if($this->params['enableclipboard']) {
echo " <div id=\"menu-clipboard\">";
echo " <div class=\"ajax\" data-view=\"Clipboard\" data-action=\"menuClipboard\"></div>";
echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\"></div>";
echo " </div>";
}