diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 83d6d8c12..0e7925781 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -334,14 +334,15 @@ class e_form $title = "Media Manager : ".$category; - $ret = "".$label.""; // using colorbox. - // $ret = "".$label.""; // using bootstrap. + // $ret = "".$label.""; // using colorbox. + $ret = "".$label.""; // using bootstrap. // $footer = "
Save
"; $footer = ''; if(!e107::getRegistry('core/form/mediaurl')) { + /* e107::js('core','core/admin.js','prototype'); e107::js('core','core/dialog.js','prototype'); e107::js('core','core/draggable.js','prototype'); @@ -360,7 +361,7 @@ class e_form }); ','prototype'); - + */ e107::setRegistry('core/form/mediaurl', true); } return $ret; @@ -2474,9 +2475,9 @@ class e_form $thparms['aw'] = intval($parms['thumb_aw']); } $thsrc = $tp->thumbUrl(vartrue($parms['pre']).$value, $thparms, varset($parms['thumb_urlraw'])); - $alt = $src; + $alt = basename($src); $ttl = ''.$alt.''; - $value = ''.$ttl.''; + $value = ''.$ttl.''; } else { diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php index 0e231aef7..87ab1d246 100644 --- a/e107_handlers/menumanager_class.php +++ b/e107_handlers/menumanager_class.php @@ -144,7 +144,7 @@ class e_menuManager { $cnt = $sql->select("menus", "*", "menu_location > 0 AND menu_layout = '$curLayout' ORDER BY menu_name "); // calculate height to remove vertical scroll-bar. - $text = ""; + $text = ""; return $text; } diff --git a/e107_plugins/pm/admin_config.php b/e107_plugins/pm/admin_config.php index a4ceb5195..1b45704df 100644 --- a/e107_plugins/pm/admin_config.php +++ b/e107_plugins/pm/admin_config.php @@ -72,9 +72,9 @@ class private_msg_ui extends e_admin_ui protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), 'pm_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'pm_from' => array ( 'title' => 'From', 'type' => 'user', 'noedit'=>true, 'data' => 'int', 'filter'=>true, 'width' => '10%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'pm_to' => array ( 'title' => 'To', 'type' => 'user', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - 'pm_sent' => array ( 'title' => LAN_DATE, 'type' => 'datestamp', 'data' => 'int', 'width' => '10%', 'help' => '', 'readParms' => '', 'writeParms' => 'auto=1&readonly=1', 'class' => 'center', 'thclass' => 'center', ), + 'pm_from' => array ( 'title' => 'From', 'type' => 'user', 'noedit'=>true, 'data' => 'int', 'filter'=>true, 'width' => '5%%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'pm_to' => array ( 'title' => 'To', 'type' => 'user', 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), + 'pm_sent' => array ( 'title' => LAN_DATE, 'type' => 'datestamp', 'data' => 'int', 'width' => '15%', 'help' => '', 'readParms' => '', 'writeParms' => 'auto=1&readonly=1', 'class' => 'center', 'thclass' => 'center', ), 'pm_subject' => array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'str', 'width' => '15%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'pm_text' => array ( 'title' => 'Message', 'type' => 'bbarea', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => 'expand=1&truncate=50', 'writeParms' => 'size=medium', 'class' => 'left', 'thclass' => 'left', ), 'pm_read' => array ( 'title' => 'Read', 'type' => 'boolean', 'noedit'=>1, 'data' => 'int', 'batch'=>true, 'filter'=>true, 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js index 2cb03c2e8..ff778b168 100644 --- a/e107_web/js/core/admin.jquery.js +++ b/e107_web/js/core/admin.jquery.js @@ -49,12 +49,18 @@ $(document).ready(function() $('#uiModal .modal-label').text('Loading...'); $('#uiModal .modal-body').html(' '); }); + + + $('a[data-toggle="modal"]').on('click', function() { var link = $(this).attr('href'); var caption = $(this).attr('data-modal-caption'); + var height = ($(window).height() * 0.9) - 50; + $('#uiModal .modal-caption').text(caption); + $('.modal').height(height); // $('#uiModal .modal-label').text('Loading...'); // $('#uiModal .modal-body').html(link); // alert(caption); diff --git a/e107_web/js/core/all.jquery.js b/e107_web/js/core/all.jquery.js index e8a116e1b..974e9c73d 100644 --- a/e107_web/js/core/all.jquery.js +++ b/e107_web/js/core/all.jquery.js @@ -405,7 +405,9 @@ $(document).ready(function() $(".e-dialog-close").live("click", function(){ - parent.$.colorbox.close() + parent.$('.modal').modal('hide'); + + // parent.$.colorbox.close() }); @@ -430,16 +432,10 @@ $(document).ready(function() return false; }); */ - - - - - $(".e-dialog-close").click(function () { - parent.$.colorbox.close() - }); // Modal Box - uses inline hidden content + /* $(".e-modal").click(function () { var id = $(this).attr("href"); $(id).dialog({ @@ -449,7 +445,7 @@ $(document).ready(function() modal: true }); }); - + */