diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php
index b29f2ba9d..ec2423ac9 100644
--- a/e107_admin/admin_log.php
+++ b/e107_admin/admin_log.php
@@ -96,7 +96,9 @@ class adminlog_admin extends e_admin_dispatcher
protected $adminMenuAliases = array(
'main/edit' => 'main/list'
- );
+ );
+
+ protected $adminMenuIcon = 'e-adminlogs-24';
protected $menuTitle = ADLAN_155;
diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php
index 9bebd3067..92bbaa17b 100644
--- a/e107_admin/banlist.php
+++ b/e107_admin/banlist.php
@@ -87,6 +87,8 @@ class banlist_admin extends e_admin_dispatcher
);
protected $menuTitle = BANLAN_16;
+
+ protected $adminMenuIcon = 'e-banlist-24';
}
diff --git a/e107_admin/comment.php b/e107_admin/comment.php
index e69c7a5b7..38d26a68f 100644
--- a/e107_admin/comment.php
+++ b/e107_admin/comment.php
@@ -47,6 +47,8 @@ class comments_admin extends e_admin_dispatcher
);
protected $menuTitle = LAN_COMMENTMAN;
+
+ protected $adminMenuIcon = 'e-comments-24';
}
class comments_admin_ui extends e_admin_ui
diff --git a/e107_admin/cron.php b/e107_admin/cron.php
index d7c1f1f87..86a85b98d 100644
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -44,6 +44,9 @@ class cron_admin extends e_admin_dispatcher
);
protected $menuTitle = PAGE_NAME;
+
+ protected $adminMenuIcon = 'e-cron-24';
+
}
class cron_admin_ui extends e_admin_ui
diff --git a/e107_admin/db.php b/e107_admin/db.php
index 1b1ae3be9..62a1664a4 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -1695,7 +1695,10 @@ function db_adminmenu() //FIXME - has problems when navigation is on the LEFT in
$var[$key]['link'] = e_SELF."?mode=".$key;
}
- e107::getNav()->admin(DBLAN_10, $_GET['mode'], $var);
+ $icon = e107::getParser()->toIcon('e-database-24');
+ $caption = $icon."<span>".DBLAN_10."</span>";
+
+ e107::getNav()->admin($caption, $_GET['mode'], $var);
}
diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php
index 0c95fcbae..02507d798 100644
--- a/e107_admin/eurl.php
+++ b/e107_admin/eurl.php
@@ -48,6 +48,8 @@ class eurl_admin extends e_admin_dispatcher
protected $defaultAction = 'config';
protected $menuTitle = LAN_EURL_MENU;
+
+ protected $adminMenuIcon = 'e-eurl-24';
}
class eurl_admin_ui extends e_admin_controller_ui
diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index 628593c3a..37a92e4ed 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -736,8 +736,11 @@ function frontpage_adminmenu()
$var['create']['text'] = LAN_CREATE;
$var['create']['link'] = e_SELF."?mode=create";
+ $icon = e107::getParser()->toIcon('e-frontpage-24');
+ $caption = $icon."<span>".FRTLAN_PAGE_TITLE."</span>";
- show_admin_menu(FRTLAN_PAGE_TITLE, $action, $var);
+
+ show_admin_menu($caption, $action, $var);
}
diff --git a/e107_admin/image.php b/e107_admin/image.php
index 1d9dcfdbf..216ba039c 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -139,6 +139,8 @@ class media_admin extends e_admin_dispatcher
'main/avatar' => array('caption'=> LAN_IMA_M_05, 'perm' => 'A')
);
+ protected $adminMenuIcon = 'e-images-24';
+
/*
$var['main']['text'] = IMALAN_7;
$var['main']['link'] = e_SELF;
diff --git a/e107_admin/language.php b/e107_admin/language.php
index 63687cc7e..b90ea26e9 100644
--- a/e107_admin/language.php
+++ b/e107_admin/language.php
@@ -57,6 +57,8 @@ if(!empty($_GET['iframe']))
'main/edit' => 'main/list'
);
+ protected $adminMenuIcon = 'e-language-24';
+
protected $menuTitle = ADLAN_132;
function init()
@@ -582,7 +584,7 @@ if(!empty($_GET['iframe']))
{
if($val != $pref['sitelanguage'])
{
- $opt .= "<tr><td class='middle' style='width:5%'>".$val."</td><td class='left inline-text'><input type='text' name='multilanguage_domain[".$val."]' value=\"".$pref['multilanguage_domain'][$val]."\" /></td></tr>";
+ $opt .= "<tr><td class='middle' style='width:5%'>".$val."</td><td class='left inline-text'><input type='text' class='form-control' name='multilanguage_domain[".$val."]' value=\"".$pref['multilanguage_domain'][$val]."\" /></td></tr>";
}
}
diff --git a/e107_admin/links.php b/e107_admin/links.php
index be65b43fa..d3d7252f3 100644
--- a/e107_admin/links.php
+++ b/e107_admin/links.php
@@ -47,6 +47,8 @@ class links_admin extends e_admin_dispatcher
);
protected $menuTitle = ADLAN_138;
+
+ protected $adminMenuIcon = 'e-links-24';
}
class links_admin_ui extends e_admin_ui
diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 18419efb0..79ceb5798 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -251,7 +251,9 @@ class mailout_admin extends e_admin_dispatcher
protected $adminMenuAliases = array(
'main/send' => 'main/create',
- );
+ );
+
+ protected $adminMenuIcon = 'e-mail-24';
protected $menuTitle = LAN_MAILOUT_15;
}
diff --git a/e107_admin/meta.php b/e107_admin/meta.php
index ba9687f13..8ea8cfdbf 100644
--- a/e107_admin/meta.php
+++ b/e107_admin/meta.php
@@ -96,12 +96,12 @@ $text = "
</tr>
<tr>
<td>".LAN_COPYRIGHT."</td>
- <td><input class='tbox input-text' size='70' type='text' name='meta_copyright' value=\"".$meta_copyright[e_LANGUAGE]."\" /></td>
+ <td><input class='tbox form-control input-xxlarge' size='70' type='text' name='meta_copyright' value=\"".$meta_copyright[e_LANGUAGE]."\" /></td>
</tr>
<tr>
<td>".LAN_AUTHOR."</td>
- <td><input class='tbox input-text' size='70' type='text' name='meta_author' value=\"".$meta_author[e_LANGUAGE]."\" /></td>
+ <td><input class='tbox form-control input-xxlarge' size='70' type='text' name='meta_author' value=\"".$meta_author[e_LANGUAGE]."\" /></td>
</tr>
<tr>
diff --git a/e107_admin/notify.php b/e107_admin/notify.php
index 019964b93..e376d1ff4 100644
--- a/e107_admin/notify.php
+++ b/e107_admin/notify.php
@@ -29,13 +29,16 @@ class plugin_notify_admin extends e_admin_dispatcher
protected $adminMenu = array(
'main/config' => array('caption'=> "Email", 'perm' => '0'),
- 'main/push' => array('caption'=> "Push (experimental)", 'perm' => '0')
+// 'main/push' => array('caption'=> "Push (experimental)", 'perm' => '0')
);
protected $adminMenuAliases = array(
'main/edit' => 'main/list'
);
+
+ protected $adminMenuIcon = 'e-notify-24';
+
/**
* Navigation menu title
* @var string
@@ -349,7 +352,7 @@ class plugin_notify_admin_ui extends e_admin_ui
$value= "";
}
- $text .= "<input type='text' style='width:200px;$disp' class='tbox' id='event_".$id."' name='event[".$id."][email]' value=\"".$value."\" />\n";
+ $text .= "<input class='form-control' type='text' style='width:200px;$disp' class='tbox' id='event_".$id."' name='event[".$id."][email]' value=\"".$value."\" />\n";
$text .= $frm->hidden("event[".$id."][include]", $include);
$text .= $frm->hidden("event[".$id."][legacy]", $legacy); // function or method
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index ef2dd90c2..f03ef0e08 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -1608,9 +1608,11 @@ class pluginManager{
{
$action = 'create';
}
-
- e107::getNav()->admin(ADLAN_98, $action, $var);
+ $icon = e107::getParser()->toIcon('e-plugmanager-24');
+ $caption = $icon."<span>".ADLAN_98."</span>";
+
+ e107::getNav()->admin($caption, $action, $var);
}
diff --git a/e107_admin/search.php b/e107_admin/search.php
index da0c337b8..578d985e5 100644
--- a/e107_admin/search.php
+++ b/e107_admin/search.php
@@ -541,6 +541,9 @@ function search_adminmenu()
$var['settings']['text'] = LAN_PREFS;
$var['settings']['link'] = e_SELF."?settings";
- e107::getNav()->admin(SEALAN_40, $action, $var);
+ $icon = e107::getParser()->toIcon('e-search-24');
+ $caption = $icon."<span>".SEALAN_40."</span>";
+
+ e107::getNav()->admin($caption, $action, $var);
}
?>
\ No newline at end of file
diff --git a/e107_admin/upload.php b/e107_admin/upload.php
index f88d26e1e..24e971d03 100644
--- a/e107_admin/upload.php
+++ b/e107_admin/upload.php
@@ -57,6 +57,8 @@ class upload_admin extends e_admin_dispatcher
);
protected $menuTitle = LAN_UPLOAD;
+
+ protected $adminMenuIcon = 'e-uploads-24';
}
diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php
index b69a7ac92..39e1021d5 100644
--- a/e107_admin/userclass2.php
+++ b/e107_admin/userclass2.php
@@ -52,6 +52,8 @@ e107::coreLan('userclass2', true);
);
protected $menuTitle = ADLAN_38;
+
+ protected $adminMenuIcon = 'e-userclass-24';
}
diff --git a/e107_admin/users.php b/e107_admin/users.php
index 5846bb195..2702883ec 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -76,6 +76,8 @@ class users_admin extends e_admin_dispatcher
protected $menuTitle = ADLAN_36; // 'Users'
+ protected $adminMenuIcon = 'e-users-24';
+
function init()
{
diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php
index b9a5de8ff..97a0c211d 100755
--- a/e107_admin/users_extended.php
+++ b/e107_admin/users_extended.php
@@ -299,6 +299,8 @@ e107::js('footer-inline', js());
// 'main/custom' => array('caption'=> 'Custom Page', 'perm' => 'P')
);
+ protected $adminMenuIcon = 'e-extended-24';
+
/*
* }
$var['main']['text'] = EXTLAN_34;
diff --git a/e107_admin/wmessage.php b/e107_admin/wmessage.php
index 058cf2f56..7a7914415 100644
--- a/e107_admin/wmessage.php
+++ b/e107_admin/wmessage.php
@@ -48,6 +48,8 @@ class wmessage_admin extends e_admin_dispatcher
);
protected $menuTitle = WMLAN_00;
+
+ protected $adminMenuIcon = 'e-welcome-24';
}
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 4f086ecf9..7dd8fdd42 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -1461,9 +1461,12 @@ Inverse 10 <span class="badge badge-inverse">10</span>
// FIX - 'perm' should not be set or navigation->admin() will be broken (bad permissions) for non main administrators
//$menu_vars[$id]['perm'] = '';
$menu_vars[$id]['sort'] = $admin_cat['sort'][$i];
+
+
}
//CORE SUBLINKS
+ $active = '';
foreach ($array_functions as $key => $subitem)
{
if(!empty($subitem[3]) && !getperms($subitem[3]))
@@ -1484,6 +1487,14 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$tmp['sub_class'] = '';
$tmp['sort'] = false;
+ if(strpos(e_REQUEST_SELF,$tmp['link'])!==false)
+ {
+ $active = $catid;
+ }
+
+
+
+ // e107::getDebug()->log($catid);
if(vartrue($pref['admin_slidedown_subs']) && vartrue($array_sub_functions[$key]))
{
@@ -1597,10 +1608,9 @@ Inverse 10 <span class="badge badge-inverse">10</span>
}
-
// ---------------- Cameron's Bit ---------------------------------
- if(!vartrue($pref['admin_separate_plugins']))
+ if(empty($pref['admin_separate_plugins']))
{
// Convert Plugin Categories to Core Categories.
$convert = array(
@@ -1613,26 +1623,34 @@ Inverse 10 <span class="badge badge-inverse">10</span>
'help' => array(20,'helpMenu')
);
+
foreach($tmp as $pg)
{
if(!empty($pg['category']))
{
$id = $convert[$pg['category']][1];
$menu_vars[$id]['sub'][] = $pg;
+
+ if(strpos(e_REQUEST_SELF,$pg['link'])!==false)
+ {
+ $active = $id;
+ }
+
+
}
}
- unset($menu_vars['plugMenu']);
-
-
// Clean up - remove empty main sections
foreach ($menu_vars as $_m => $_d)
{
+
if(!isset($_d['sub']) || empty($_d['sub']))
{
unset($menu_vars[$_m]);
}
}
+
+ unset($menu_vars['plugMenu']);
}
// ------------------------------------------------------------------
@@ -1644,7 +1662,9 @@ Inverse 10 <span class="badge badge-inverse">10</span>
}
// print_a($menu_vars);
- return e107::getNav()->admin('', e_PAGE, $menu_vars, $$tmpl, FALSE, FALSE);
+
+
+ return e107::getNav()->admin('', $active, $menu_vars, $$tmpl, FALSE, FALSE);
//return e_admin_men/u('', e_PAGE, $menu_vars, $$tmpl, FALSE, FALSE);
}
@@ -1912,9 +1932,10 @@ Inverse 10 <span class="badge badge-inverse">10</span>
e107::setRegistry('core/e107/menu-manager/curLayout',$action);
+ $icon = e107::getParser()->toIcon('e-menus-24');
+ $caption = $icon."<span>".ADLAN_6."</span>";
-
- return e107::getNav()->admin(ADLAN_6,$action, $var);
+ return e107::getNav()->admin($caption,$action, $var);
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index f9d979bda..4c375be67 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -1666,8 +1666,6 @@ class themeHandler
$price = '';
- e107::getDebug()->log($mode);
-
if(substr($theme['thumbnail'],0,4) == 'http')
{
$thumbPath = $theme['thumbnail'];
diff --git a/e107_plugins/poll/admin_config.php b/e107_plugins/poll/admin_config.php
index 63115174d..8edb61cac 100644
--- a/e107_plugins/poll/admin_config.php
+++ b/e107_plugins/poll/admin_config.php
@@ -239,6 +239,10 @@ function admin_config_adminmenu()
/* $var['import']['text'] = GSLAN_23;
$var['import']['link'] = e_SELF."?import";
$var['import']['perm'] = "0";*/
- show_admin_menu(LAN_PLUGIN_POLL_NAME, $action, $var);
+
+ $icon = e107::getParser()->toIcon(e_PLUGIN.'poll/images/polls_32.png');
+ $caption = $icon."<span>".LAN_PLUGIN_POLL_NAME."</span>";
+
+ show_admin_menu($caption, $action, $var);
}
?>
\ No newline at end of file
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index f0f2ce685..607a64e31 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -712,6 +712,89 @@ i.e-news-24{ background-position: -1442px 0; }
i.e-custom-24{ background-position: -639px 0; }
i.e-themes-24 {background-position: -416px -27px }
+
+
+i.e-add-24 { background-position: 0 0; }
+i.e-adminlogs-24 { background-position: -28px 0; }
+i.e-adminpass-24 { background-position: -56px 0; }
+i.e-admins-24 { background-position: -83px 0; }
+i.e-arrow-24 { background-position: -111px 0; }
+i.e-arrow_over-24 { background-position: -139px 0; }
+i.e-articles-24 { background-position: -167px 0; }
+i.e-banlist-24 { background-position: -194px 0; }
+i.e-banners-24 { background-position: -222px 0; }
+i.e-cache-24 { background-position: -250px 0; }
+i.e-cat_content-24 { background-position: -278px 0; }
+i.e-cat_files-24 { background-position: -305px 0; }
+i.e-cat_plugins-24 { background-position: -333px 0; }
+i.e-cat_settings-24 { background-position: -361px 0; }
+i.e-cat_tools-24 { background-position: -389px 0; }
+i.e-cat_users-24 { background-position: -416px 0; }
+i.e-chatbox-24 { background-position: -444px 0; }
+i.e-comments-24 { background-position: -472px 0; }
+i.e-configure-24 { background-position: -500px 0; }
+i.e-content-24 { background-position: -527px 0; }
+i.e-copy-24 { background-position: -555px 0; }
+i.e-credits-24 { background-position: -583px 0; }
+i.e-cron-24 { background-position: -611px 0; }
+i.e-custom-24 { background-position: -638px 0; }
+i.e-database-24 { background-position: -666px 0; }
+i.e-delete-24 { background-position: -694px 0; }
+i.e-docs-24 { background-position: -722px 0; }
+i.e-down-24 { background-position: -749px 0; }
+i.e-downloads-24 { background-position: -777px 0; }
+i.e-edit-24 { background-position: -805px 0; }
+i.e-emoticons-24 { background-position: -833px 0; }
+i.e-eurl-24 { background-position: -860px 0; }
+i.e-execute-24 { background-position: -888px 0; }
+i.e-extended-24 { background-position: -916px 0; }
+i.e-false-24 { background-position: -944px 0; }
+i.e-fileinspector-24 { background-position: -971px 0; }
+i.e-filemanager-24 { background-position: -999px 0; }
+i.e-forums-24 { background-position: -1027px 0; }
+i.e-frontpage-24 { background-position: -1055px 0; }
+i.e-images-24 { background-position: -1082px 0; }
+i.e-info-24 { background-position: -1110px 0; }
+i.e-language-24 { background-position: -1138px 0; }
+i.e-leave-24 { background-position: -1166px 0; }
+i.e-links-24 { background-position: -1193px 0; }
+i.e-logout-24 { background-position: -1221px 0; }
+i.e-mail-24 { background-position: -1249px 0; }
+i.e-main-24 { background-position: -1277px 0; }
+i.e-maintain-24 { background-position: -1304px 0; }
+i.e-manage-24 { background-position: -1332px 0; }
+i.e-menus-24 { background-position: -1360px 0; }
+i.e-meta-24 { background-position: -1388px 0; }
+i.e-move-24 { background-position: -1415px 0; }
+i.e-news-24 { background-position: -1443px 0; }
+i.e-newsfeeds-24 { background-position: -1471px 0; }
+i.e-notify-24 { background-position: 0 -28px; }
+i.e-phpinfo-24 { background-position: -28px -28px; }
+i.e-plugin_install-24 { background-position: -56px -28px; }
+i.e-plugin_uninstall-24 { background-position: -83px -28px; }
+i.e-plugins-24 { background-position: -111px -28px; }
+i.e-plugmanager-24 { background-position: -139px -28px; }
+i.e-prefs-24 { background-position: -167px -28px; }
+i.e-rename-24 { background-position: -194px -28px; }
+i.e-reviews-24 { background-position: -222px -28px; }
+i.e-search-24 { background-position: -250px -28px; }
+i.e-select_columns-24 { background-position: -278px -28px; }
+i.e-settings-24 { background-position: -305px -28px; }
+i.e-sort-24 { background-position: -333px -28px; }
+i.e-stats-24 { background-position: -361px -28px; }
+i.e-sysinfo-24 { background-position: -389px -28px; }
+i.e-themes-24 { background-position: -416px -28px; }
+i.e-true-24 { background-position: -444px -28px; }
+i.e-up-24 { background-position: -472px -28px; }
+i.e-uploads-24 { background-position: -500px -28px; }
+i.e-userclass-24 { background-position: -527px -28px; }
+i.e-users-24 { background-position: -555px -28px; }
+i.e-warning-24 { background-position: -583px -28px; }
+i.e-welcome-24 { background-position: -611px -28px; }
+
+
+
+
i.e-add-32{ background-position: 0 0; width: 32px; height: 32px; }
i.e-adminlogs-32{ background-position: -37px 0; width: 32px; height: 32px; }
i.e-adminpass-32{ background-position: -74px 0; width: 32px; height: 32px; }
diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php
index 32a1fcd6a..e5ad85c37 100644
--- a/e107_themes/bootstrap3/admin_template.php
+++ b/e107_themes/bootstrap3/admin_template.php
@@ -37,7 +37,7 @@ $E_ADMIN_NAVIGATION['button'] = '
$E_ADMIN_NAVIGATION['button_active'] = '
- <li class="dropdown">
+ <li class="dropdown active">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}">
{LINK_IMAGE} {LINK_TEXT}
<b class="caret"></b>