diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 413f120c1..9083219f5 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -58,11 +58,13 @@ if(strpos(e_QUERY, 'configure') !== FALSE ) e107::js('core', 'core/admin.jquery.js', 'jquery', 4); - e107::css('inline'," .column { width: 170px; float: left; padding-bottom: 100px; } + e107::css('inline'," .column { width:100%; padding-bottom: 100px; } + .regularMenu { border:1px dotted silver; margin-bottom:6px; padding-left:3px; padding-right:3px } + .menuOptions { padding-top:7px; padding-right:5px; text-align:right; } .portlet { margin: 0 1em 1em 0; } .portlet-header { margin: 0.3em; padding-bottom: 4px; padding-left: 0.2em; cursor:move } .portlet-header .ui-icon { float: right; } - .portlet-content { padding: 10px; } + .portlet-content { padding: 7px; } .ui-sortable-placeholder { border: 1px dotted black; visibility: visible !important; height: 50px !important; } .ui-sortable-placeholder * { visibility: hidden; } ",'jquery'); @@ -84,7 +86,7 @@ require_once(e_HANDLER."menumanager_class.php"); $rs = new form; $frm = new e_form(); - $men = new e_menuManager(1); // use 1 for dragdrop. + $men = new e_menuManager(0); // use 1 for dragdrop. if(e_AJAX_REQUEST) diff --git a/e107_files/jslib/core/admin.jquery.js b/e107_files/jslib/core/admin.jquery.js index 99c664b5d..8c2153b79 100644 --- a/e107_files/jslib/core/admin.jquery.js +++ b/e107_files/jslib/core/admin.jquery.js @@ -20,6 +20,8 @@ $(document).ready(function() }); + + $(".e-radio-multi").each(function() { // $(this).nextAll(".field-help").hide(); // $(this).nextAll(":input").tipsy({title: 'hello'}); @@ -371,6 +373,7 @@ $(document).ready(function() }); $( ".portlet" ).addClass( "ui-widget ui-widget-content ui-helper-clearfix ui-corner-all" ) + // $( ".portlet" ).addClass( "ui-widget ui-widget-content ui-helper-clearfix ui-corner-all" ) .find( ".portlet-header" ) .addClass( "ui-widget-header ui-corner-all" ) .prepend( "") diff --git a/e107_files/jslib/core/all.jquery.js b/e107_files/jslib/core/all.jquery.js index 45c2ef989..533d844ab 100644 --- a/e107_files/jslib/core/all.jquery.js +++ b/e107_files/jslib/core/all.jquery.js @@ -5,8 +5,10 @@ $(document).ready(function() $(".e-expandit").show(); $(".e-expandit").click(function () { - var id = $(this).attr("href"); + + var id = $(this).attr("href"); $(id).toggle("slow"); + return false; }); // Dates -------------------------------------------------- @@ -119,7 +121,7 @@ $(document).ready(function() // Tooltips for bbarea. $(".bbcode_buttons").tipsy({gravity: 's',opacity: 1.0, fade: true,html: true}); - + $("a.e-tip").tipsy({gravity: 'w',opacity: 1.0, fade: true,html: true}); // var tabs = $('#tab-container').clone(true); // $('#htmlEditor').append(tabs); diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php index f25355f7c..5f9f6602c 100644 --- a/e107_handlers/menumanager_class.php +++ b/e107_handlers/menumanager_class.php @@ -28,6 +28,7 @@ class e_menuManager { var $menuActivateIds; var $debug; var $menuMessage; + var $style = 'default'; function __construct($dragdrop=FALSE) { @@ -1035,6 +1036,7 @@ class e_menuManager { } else if(strstr($str, "MENU")) { + $matches = array(); if(preg_match_all("/\{MENU=([\d]{1,3})(:[\w\d]*)?\}/", $str, $matches)) { @@ -1075,11 +1077,13 @@ class e_menuManager { $sql9->db_Select("menus", "*", "menu_location='$menu' AND menu_layout='" . $this->dbLayout . "' ORDER BY menu_order"); $menu_count = $sql9->db_Rows(); + $cl = ($this->dragDrop) ? "'portlet" : "regularMenu"; + $menuText .= "\n
\n\n"; while($row = $sql9->db_Fetch(MYSQL_ASSOC)) { $menuText .= "\n\n\n \n"; - $menuText .= "
\n"; + $menuText .= "
\n"; // echo "
"; @@ -1120,6 +1124,8 @@ class e_menuManager { { $tmp = explode("=", $str); $style = preg_replace("/\{SETSTYLE=(.*?)\}/si", "\\1", $str); + $this->style = $style; + } else if(strstr($str, "SITEDISCLAIMER")) { @@ -1131,6 +1137,8 @@ class e_menuManager { function menuRenderMenu($row,$menu_count,$rep = FALSE) { global $ns,$rs,$menu,$menu_info,$menu_act; + global $style; + $style = $this->style; // $menu_count is empty in here //FIXME extract extract($row); @@ -1207,7 +1215,7 @@ class e_menuManager { //DEBUG remove inline style, switch to simple quoted string for title text value //TODO hardcoded text - $text .= '
+ $text .= '
'.ADMIN_VIEW_ICON.''; if($conf) @@ -1219,33 +1227,18 @@ class e_menuManager { $text .= ''.ADMIN_EDIT_ICON.''; - $text .= ''.ADMIN_DELETE_ICON.' + $text .= ''.ADMIN_DELETE_ICON.'
'; $text .= ($rep == true) ? "
" : ""; -/* - if($this->dragDrop) - { - $text .= ' -
- x e -
- '; - } -*/ if(!$this->dragDrop) { + ob_start(); $ns->tablerender($caption, $text); @@ -1256,10 +1249,10 @@ class e_menuManager { } else { + return "
".$caption."
-
".$text."
"; - +
".$text."
"; } diff --git a/e107_plugins/faqs/faqs_shortcodes.php b/e107_plugins/faqs/faqs_shortcodes.php index 435aa4e4c..1390216ca 100644 --- a/e107_plugins/faqs/faqs_shortcodes.php +++ b/e107_plugins/faqs/faqs_shortcodes.php @@ -30,8 +30,9 @@ class faqs_shortcodes if($parm == 'expand') { - $text = "".$tp->toHtml($this->row['faq_question'])." -
".$tp->toHTML($this->row['faq_answer'],TRUE)."
"; + $id = "faq_".$this->row['faq_id']; + $text = "".$tp->toHtml($this->row['faq_question'])." +
".$tp->toHTML($this->row['faq_answer'],TRUE)."
"; } else { diff --git a/e107_themes/templates/header_default.php b/e107_themes/templates/header_default.php index 3851a2b18..7c6860f61 100644 --- a/e107_themes/templates/header_default.php +++ b/e107_themes/templates/header_default.php @@ -32,6 +32,7 @@ e107::js("core", "tooltip/jquery.tipsy.js","jquery",3); e107::css('core', 'tooltip/tipsy.css', 'jquery'); // ------------------ +e107::js('core', 'jquery.elastic.js', 'jquery', 2); e107::js('core', 'rate/js/jquery.raty.js', 'jquery', 2); e107::css('core', 'core/all.jquery.css', 'jquery');