gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-16 14:41:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2017-01-18 08:10:59 +01:00
commit c943c2d81b
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

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

9
styles/bootstrap/application.js
View File

@ -989,9 +989,10 @@ $(document).ready(function() { /* {{{ */
}); });
}); });
$('span.openpopupbox').on('click', function(e) { $("body").on("click", "span.openpopupbox", function(e) {
$('div.popupbox').toggle(); $(""+$(e.target).data("href")).toggle();
console.log('Hallo'); });
$("body").on("click", "span.closepopupbox", function(e) {
$(this).parent().hide();
}); });
}); /* }}} */ }); /* }}} */

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

@ -2554,10 +2554,20 @@ mayscript>
} /* }}} */ } /* }}} */
protected function printPopupBox($title, $content, $ret=false) { /* {{{ */ 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 = ' $html = '
<span class="openpopupbox">'.$title.'</span> <span class="openpopupbox" data-href="#'.$id.'">'.$title.'</span>
<div class="popupbox" style="display: none;"> <div id="'.$id.'" class="popupbox" style="display: none;">
'.$content.' '.$content.'
<span class="closepopupbox"><i class="icon-remove"></i></span>
</div>'; </div>';
if($ret) if($ret)
return $html; return $html;