From 4e616f95842f72314bf7e89da586812bc34b27cf Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 14 Apr 2013 18:41:53 -0700 Subject: [PATCH] Menu Manager GUI styling --- e107_admin/menus.php | 19 ++++++++---- .../shortcodes/batch/admin_shortcodes.php | 2 ++ e107_handlers/menumanager_class.php | 30 ++++++++++--------- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 986046ef6..67f8e2107 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -141,8 +141,9 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) e107::css('inline'," .column { width:100%; padding-bottom: 100px; } + .regularMenu { border-bottom:1px dotted silver; margin-bottom:6px; padding-left:3px; padding-right:3px; padding-bottom:20px } - + #core-menumanager-main th {color: silver; font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; font-size:14px; font-weight: bold; line-height:24px; background-color:#2F2F2F } .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; } @@ -220,9 +221,10 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) #menu-manage-actions { width:50%; vertical-align:top; text-align:center; padding:15px } select.menu-btn { text-align:left } + - label { font-size: 12px; line-height:14px } - label.input {margin-right:10px; } + label { font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; color:black; line-height:14px } + label.input { margin-right:10px; } #core-menumanager-main { width:100%; margin-left:auto; margin-right:auto } @@ -240,10 +242,13 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) font-size: 14px; line-height: 2em; padding-left: 15px; + font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; + color:black; + } - table.table tbody > tr >td label > input { margin-right: 10px; float: left; } + table.table tbody > tr >td label > input { margin-left:5px; margin-right: 10px; float: left; } .table-striped tbody > tr:nth-child(2n+1) > td, .table-striped tbody > tr:nth-child(2n+1) > th { @@ -256,8 +261,11 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) margin-bottom: 20px; background-color: rgb(245, 245, 245); border: 1px solid rgb(227, 227, 227); - border-radius: 4px 4px 4px 4px; + border-radius: 5px; box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05) inset; + color: #2F2F2F; + font-size: 13px; + font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; } .menu-panel-header @@ -266,6 +274,7 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) padding: 10px; font-size: 13px; font-weight: bold; + font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; line-height: 20px; border-radius: 5px; diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 5c6364582..1d729f0a4 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -1815,6 +1815,8 @@ Inverse 10 10 $var['menumanager']['text'] = LAN_MENULAYOUT; $var['menumanager']['link'] = e_ADMIN_ABS.'menus.php'; + + $var['nothing']['divider'] = true; if(vartrue($pref['menuconfig_list'])) { diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php index 646b146a3..a721d7d1c 100644 --- a/e107_handlers/menumanager_class.php +++ b/e107_handlers/menumanager_class.php @@ -498,8 +498,7 @@ class e_menuManager { "; return $text; - //$caption = MENLAN_7." ".$row['menu_name']; - //$ns->tablerender($caption, $text); + } @@ -932,11 +931,11 @@ class e_menuManager { echo "
"; echo $rs->form_open("post", e_SELF."?configure=".$this->curLayout, "menuActivation"); - $text = ""; + $text = "
"; - $text .= " - "; + $text .= " + "; $text .= ""; $text .= "
".MENLAN_36."......".MENLAN_37."
".MENLAN_36."......".MENLAN_37."
"; @@ -994,7 +993,7 @@ class e_menuManager { $text .= "
"; - $ns -> tablerender(MENLAN_22, $text); + + + // $ns -> tablerender(MENLAN_22.'blabla', $text); + echo $this->renderPanel(MENLAN_22, $text); echo $rs->form_close(); echo "
"; @@ -1038,8 +1040,8 @@ class e_menuManager { // onchange=\"urljump(this.options[selectedIndex].value);\" $text = "
"; - $text .= "
Layout "; - $text .= "\n"; //tbox class will break links. // window.frames['menu_iframe'].location=this.options[selectedIndex].value ??? $search = array("_","legacyDefault","legacyCustom"); @@ -1376,18 +1378,18 @@ class e_menuManager { $visibilityLink = e_SELF."?enc=".base64_encode('lay='.$this->curLayout.'&vis='.$menu_id.'&iframe=1'); $text .= ' - '.ADMIN_VIEW_ICON.''; + '; if($conf) { $text .= ''.ADMIN_CONFIGURE_ICON.''; + title="Configure menu">'; } $editLink = e_SELF."?enc=".base64_encode('lay='.$this->curLayout.'&parmsId='.$menu_id.'&iframe=1'); - $text .= ''.ADMIN_EDIT_ICON.''; + $text .= ''; - $text .= ''.ADMIN_DELETE_ICON.' + $text .= '
';