From e4805b8a53453d00928e97b63484086b1282f7e5 Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 6 Feb 2013 13:01:09 -0800 Subject: [PATCH] Infopanel icon styling and renaming of 'Custom Pages' to 'Pages' --- e107_admin/includes/infopanel.php | 2 +- e107_handlers/sitelinks_class.php | 4 ++-- e107_languages/English/admin/lan_admin.php | 2 +- e107_themes/bootstrap/admin_style.css | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index 47a63d44d..f6d8c414b 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -172,7 +172,7 @@ EOF; { if (!vartrue($user_pref['core-infopanel-mye107']) || in_array($key, $user_pref['core-infopanel-mye107'])) { - $mainPanel .= e107::getNav()->renderAdminButton($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div-icon-only"); + $mainPanel .= e107::getNav()->renderAdminButton($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div"); } } diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index 184d4f095..80657ade3 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -1172,8 +1172,8 @@ class e_navigation break; case 'div': - $text .= "
".$icon."
- ".$tp->toHTML($title,FALSE,"defs, emotes_off")." + $text .= ""; break; diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 6fda3cffd..1970d69ee 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -46,7 +46,7 @@ define("ADLAN_38", "User Classes"); define("ADLAN_39", "Create/edit user classes"); define("ADLAN_40", "Maintenance"); define("ADLAN_41", "Take site down for maintenance"); -define("ADLAN_42", "Custom Menus/Pages"); +define("ADLAN_42", "Pages/Menus"); define("ADLAN_43", "Create custom menu items"); define("ADLAN_44", "Database"); define("ADLAN_45", "Database utilities"); diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 81d663a1b..d09b7dd58 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -35,8 +35,8 @@ e-tabs fieldset { padding:0px ; padding-left:3px; border-top:0px;} #tab-container td { border-top:0px; border-bottom:1px solid rgb(221, 221, 221) } .tab-border { border-left: 1px solid #ddd; } -.core-mainpanel-block { text-align:center; width:100px; float:left; height:48px; display:block;margin:15px; } -.core-mainpanel-link-text { font-weight:bold; text-decoration: none; padding:3px } +.core-mainpanel-block { text-align:center; width:120px; float:left; height:48px; display:block; margin: 0px 6px 60px 6px; } +.core-mainpanel-link-text { text-decoration: none; padding:0px; } td.center, th.center { text-align:center }