1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 09:04:38 +02:00

Closes #134. Also added Ajax Modal Window

This commit is contained in:
Cameron
2013-03-02 21:07:42 -08:00
parent 66ca489509
commit dab2f257de
6 changed files with 481 additions and 170 deletions

View File

@@ -35,47 +35,62 @@ else
require_once (e_BASE.$e107->getFolder('themes').'templates/admin_template.php');
}
if(e_PAGE != 'menus.php') // Quick fix for Menu Manager inactive drop-down problem.
function loadJSAddons()
{
if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Quick fix for Menu Manager inactive drop-down problem.
{
return;
}
e107::js('core', 'colorbox/jquery.colorbox-min.js', 'jquery', 2);
e107::css('core', 'colorbox/colorbox.css', 'jquery');
}
// e107::js('core', 'bootstrap/js/bootstrap-modal.js', 'jquery', 2); // Special Version see: https://github.com/twitter/bootstrap/pull/4224
e107::css('core', 'bootstrap-editable/css/bootstrap-editable.css', 'jquery');
e107::js('core', 'bootstrap-editable/js/bootstrap-editable.min.js', 'jquery', 2);
e107::css('core', 'bootstrap-editable/css/bootstrap-editable.css', 'jquery');
e107::js('core', 'bootstrap-editable/js/bootstrap-editable.min.js', 'jquery', 2);
e107::css('core', 'bootstrap-select/bootstrap-select.min.css', 'jquery');
e107::js('core', 'bootstrap-select/bootstrap-select.min.js', 'jquery', 2);
e107::css('core', 'bootstrap-multiselect/css/bootstrap-multiselect.css', 'jquery');
e107::js('core', 'bootstrap-multiselect/js/bootstrap-multiselect.js', 'jquery', 2);
e107::js('core', 'bootstrap-jasny/js/jasny-bootstrap.js', 'jquery', 2);
//e107::css('core', 'bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css', 'jquery');
//e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2);
e107::js('core', 'jquery.elastic.js', 'jquery', 2);
e107::js('core', 'jquery-ui-timepicker-addon.js', 'jquery', 2);
//e107::css('core', 'chosen/chosen.css', 'jquery');
//e107::js('core', 'chosen/chosen.jquery.min.js', 'jquery', 2);
e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2);
e107::js("core", "tags/jquery.tagit.js","jquery",3);
e107::css('core', 'tags/jquery.tagit.css', 'jquery');
e107::css('core', 'core/admin.jquery.css', 'jquery');
e107::js("core", "core/admin.jquery.js","jquery",4); // Load all default functions.
e107::css('core', 'core/all.jquery.css', 'jquery');
e107::css('core', 'bootstrap-select/bootstrap-select.min.css', 'jquery');
e107::js('core', 'bootstrap-select/bootstrap-select.min.js', 'jquery', 2);
e107::js("core", "core/all.jquery.js","jquery",4); // Load all default functions.
}
e107::css('core', 'bootstrap-multiselect/css/bootstrap-multiselect.css', 'jquery');
e107::js('core', 'bootstrap-multiselect/js/bootstrap-multiselect.js', 'jquery', 2);
e107::js('core', 'bootstrap-jasny/js/jasny-bootstrap.js', 'jquery', 2);
//e107::css('core', 'bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css', 'jquery');
//e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2);
e107::js('core', 'jquery.elastic.js', 'jquery', 2);
e107::js('core', 'jquery-ui-timepicker-addon.js', 'jquery', 2);
loadJSAddons();
//e107::css('core', 'chosen/chosen.css', 'jquery');
//e107::js('core', 'chosen/chosen.jquery.min.js', 'jquery', 2);
e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2);
e107::js("core", "tags/jquery.tagit.js","jquery",3);
e107::css('core', 'tags/jquery.tagit.css', 'jquery');
e107::css('core', 'core/admin.jquery.css', 'jquery');
e107::css('core', 'core/all.jquery.css', 'jquery');
e107::js("core", "core/admin.jquery.js","jquery",4); // Load all default functions.
e107::js("core", "core/all.jquery.js","jquery",4); // Load all default functions.
@@ -400,11 +415,17 @@ echo getModal();
function getModal($caption = '', $type='')
{
if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Menu Manager iFrame disable
{
return;
}
return '
<div id="uiModal" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
&nbsp;
<h3 class="modal-caption">&nbsp;</h3>
</div>
<div class="modal-body">
<p>Loading…</p>