gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +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-05-04 15:57:20 +02:00
commit 431a2e581c
4 changed files with 52 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,13 +82,13 @@ $(document).ready(function() {
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
$this->contentHeading(getMLText("edit_comment"));
$this->contentContainerStart();
?>
<form class="form-horizontal" action="../op/op.EditComment.php" id="form1" name="form1" method="post">
<?php echo createHiddenFieldWithKey('editcomment'); ?>
<input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
<input type="Hidden" name="version" value="<?php print $version->getVersion();?>">
<?php
$this->contentContainerStart();
$this->formField(
getMLText("comment"),
array(
@ -99,11 +99,11 @@ $(document).ready(function() {
'value'=>htmlspecialchars($version->getComment())
)
);
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

5
views/bootstrap/class.OverrideContentStatus.php
View File

@ -80,8 +80,6 @@ $(document).ready(function() {
$this->contentHeading(getMLText("change_status"));
$this->contentContainerStart();
// Display the Review form.
?>
<form class="form-horizontal" method="post" action="../op/op.OverrideContentStatus.php" id="form1" name="form1">
@ -89,6 +87,7 @@ $(document).ready(function() {
<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
<?php
$this->contentContainerStart();
$this->formField(
getMLText("comment"),
array(
@ -115,11 +114,11 @@ $(document).ready(function() {
'options'=>$options,
)
);
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('update'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

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

@ -1733,7 +1733,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
}
print "</td>";
print "<td><ul class=\"unstyled\">\n";
print "<td><ul class=\"actions unstyled\">\n";
print "<li>".htmlspecialchars($file->getName())."</li>\n";
if($file->getName() != $file->getOriginalFileName())
print "<li>".htmlspecialchars($file->getOriginalFileName())."</li>\n";

128
views/bootstrap4/styles/application.js
View File

@ -47,47 +47,7 @@ function treeDocumentSelected(formid, nodeid, nodename) {
$('#docChooser'+formid).modal('hide');
}
$(document).ready( function() {
// $('.dropdown-menu a.dropdown-toggle').on('click', function(e) {
$('body').on('click', '.dropdown-menu a.dropdown-toggle', function (e) {
if (!$(this).next().hasClass('show')) {
$(this).parents('.dropdown-menu').first().find('.show').removeClass("show");
}
var $subMenu = $(this).next(".dropdown-menu");
$subMenu.toggleClass('show');
$(this).parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', function(e) {
$('.dropdown-submenu .show').removeClass("show");
});
return false;
});
/* close popovers when clicking somewhere except in the popover or the
* remove icon
*/
$('html').on('click', function(e) {
if (typeof $(e.target).data('original-title') == 'undefined' && !$(e.target).parents().is('.popover.in') && !$(e.target).is('.fa fa-remove')) {
$('[data-original-title]').popover('hide');
}
});
$('body').on('hidden', '.modal', function () {
$(this).removeData('modal');
});
/* Bootstrap 4 does not support to the remote loading of the modal content
* anymore. This adds it by using jquery.
*/
$('body').on('click', '[data-toggle="modal"]', function(ev){
ev.preventDefault();
$($(this).data("target")+' .modal-body').load($(this).data("remote"));
});
// $('body').on('touchstart.dropdown', '.dropdown-menu', function (e) { e.stopPropagation(); });
function initMost() {
$('.datepicker, #expirationdate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate')
.datepicker({todayHighlight: true, toggleActive: true, autoclose: "true"})
/*
@ -282,6 +242,50 @@ $(document).ready( function() {
return '<i class="fa fa-folder-o"></i> ' + strarr[1].replace(/</g, '&lt;');
}
}); /* }}} */
}
$(document).ready( function() {
// $('.dropdown-menu a.dropdown-toggle').on('click', function(e) {
$('body').on('click', '.dropdown-menu a.dropdown-toggle', function (e) {
if (!$(this).next().hasClass('show')) {
$(this).parents('.dropdown-menu').first().find('.show').removeClass("show");
}
var $subMenu = $(this).next(".dropdown-menu");
$subMenu.toggleClass('show');
$(this).parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', function(e) {
$('.dropdown-submenu .show').removeClass("show");
});
return false;
});
/* close popovers when clicking somewhere except in the popover or the
* remove icon
*/
$('html').on('click', function(e) {
if (typeof $(e.target).data('original-title') == 'undefined' && !$(e.target).parents().is('.popover.in') && !$(e.target).is('.fa fa-remove')) {
$('[data-original-title]').popover('hide');
}
});
$('body').on('hidden', '.modal', function () {
$(this).removeData('modal');
});
/* Bootstrap 4 does not support to the remote loading of the modal content
* anymore. This adds it by using jquery.
*/
$('body').on('click', '[data-toggle="modal"]', function(ev){
ev.preventDefault();
$($(this).data("target")+' .modal-body').load($(this).data("remote"));
});
// $('body').on('touchstart.dropdown', '.dropdown-menu', function (e) { e.stopPropagation(); });
initMost();
$('body').on('click', '[id^=clearfolder]', function(ev) { /* {{{ */
ev.preventDefault();
@ -509,32 +513,13 @@ $(document).ready( function() {
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").select2({
theme: "bootstrap4",
width: '100%',
templateResult: chzn_template_func//,
//templateSelection: chzn_template_func
});
$(".pwd").passStrength({ /* {{{ */
url: "../op/op.Ajax.php",
onChange: function(data, target) {
pwsp = 100*data.score;
$('#'+target+' div.bar').width(pwsp+'%');
if(data.ok) {
$('#'+target+' div.bar').removeClass('bg-danger');
$('#'+target+' div.bar').addClass('bg-success');
} else {
$('#'+target+' div.bar').removeClass('bg-success');
$('#'+target+' div.bar').addClass('bg-danger');
}
}
}); /* }}} */
if(afterload) {
var func = eval(afterload);
if(typeof func === "function"){
func();
}
}
initMost();
});
}); /* }}} */
@ -576,26 +561,6 @@ $(document).ready( function() {
element.prepend('<div style="position: absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: '+element.height()+'px; 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").select2({
theme: "bootstrap4",
width: '100%',
templateResult: chzn_template_func//,
//templateSelection: chzn_template_func
});
$(".pwd").passStrength({ /* {{{ */
url: "../op/op.Ajax.php",
onChange: function(data, target) {
pwsp = 100*data.score;
$('#'+target+' div.bar').width(pwsp+'%');
if(data.ok) {
$('#'+target+' div.bar').removeClass('bg-danger');
$('#'+target+' div.bar').addClass('bg-success');
} else {
$('#'+target+' div.bar').removeClass('bg-success');
$('#'+target+' div.bar').addClass('bg-danger');
}
}
}); /* }}} */
if(callback)
callback.call();
if(afterload) {
@ -604,6 +569,7 @@ $(document).ready( function() {
func();
}
}
initMost();
});
}); /* }}} */