gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 17:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-01-18 08:11:12 +01:00
commit d3c7ef3088
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
styles/bootstrap/application.css
View File

@ -261,7 +261,13 @@ div.popupbox {
padding: 15px;
display: none;
position: absolute;
width: 200px;
width: 250px;
}
div.popupbox span.closepopupbox {
position: absolute;
right: 5px;
top: 0px;
}
@media (max-width: 480px) {

9
styles/bootstrap/application.js
View File

@ -990,11 +990,12 @@ $(document).ready(function() { /* {{{ */
});
});
$('span.openpopupbox').on('click', function(e) {
$('div.popupbox').toggle();
console.log('Hallo');
$("body").on("click", "span.openpopupbox", function(e) {
$(""+$(e.target).data("href")).toggle();
});
$("body").on("click", "span.closepopupbox", function(e) {
$(this).parent().hide();
});
}); /* }}} */
var approval_count, review_count, receipt_count, revision_count;

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

@ -2781,10 +2781,20 @@ mayscript>
} /* }}} */
protected function printPopupBox($title, $content, $ret=false) { /* {{{ */
$id = md5(uniqid());
/*
$this->addFooterJS('
$("body").on("click", "span.openpopupbox", function(e) {
$(""+$(e.target).data("href")).toggle();
// $("div.popupbox").toggle();
});
');
*/
$html = '
<span class="openpopupbox">'.$title.'</span>
<div class="popupbox" style="display: none;">
'.$content.'
<span class="openpopupbox" data-href="#'.$id.'">'.$title.'</span>
<div id="'.$id.'" class="popupbox" style="display: none;">
'.$content.'
<span class="closepopupbox"><i class="icon-remove"></i></span>
</div>';
if($ret)
return $html;