mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00
Code Issues Releases Wiki Activity

icon tweaks

Browse Source
This commit is contained in:
Cameron
2013-07-12 12:06:19 -07:00
parent 63deda350d
commit 917bbef849
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_admin/header.php
View File

@@ -79,6 +79,7 @@ function loadJSAddons()
// e107::css('core', 'bootstrap-tag/bootstrap-tag.css', 'jquery');
e107::js('core', 'bootstrap-tag/bootstrap-tag.js', 'jquery', 2);
// e107::js("core", "tags/jquery.tagit.js","jquery",3);
// e107::css('core', 'tags/jquery.tagit.css', 'jquery');
@@ -88,6 +89,7 @@ function loadJSAddons()
e107::css('core', 'core/all.jquery.css', 'jquery');
e107::js("core", "core/all.jquery.js","jquery",4); // Load all default functions.
}
loadJSAddons();
@@ -215,6 +217,7 @@ if (isset($eplug_css) && $eplug_css)
if(e107::getPref('admincss') == "admin_dark.css" && !vartrue($_GET['configure']))
{
$e_js->coreCSS('bootstrap/css/darkstrap.css');
}
@@ -246,6 +249,10 @@ if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Quick fix for Menu M
$e_js->themeCSS($css_file); // Test with superhero.css for frontend bootstrap and 'dark' for backend bootstrap.
// return;
}
else
{
$e_js->coreCSS('font-awesome/css/font-awesome.min.css');
}

10
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -696,7 +696,7 @@ class admin_shortcodes
$text = '<ul class="nav nav-pills">
<li class="dropdown">
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" >
<i class="icon-envelope icon-white active"></i>'.$countDisp.'<b class="caret"></b>
<i class="icon-envelope active"></i>'.$countDisp.'<b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu" >
<li class="nav-header">Private Messages</li>
@@ -1725,7 +1725,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$menu_vars['home']['text'] = ""; // ADLAN_53;
$menu_vars['home']['link'] = e_HTTP.'index.php';
$menu_vars['home']['image'] = "<i class='icon-home icon-white'></i>" ; // "<img src='".E_16_NAV_LEAV."' alt='".ADLAN_151."' class='icon S16' />";
$menu_vars['home']['image'] = "<i class='icon-home'></i>" ; // "<img src='".E_16_NAV_LEAV."' alt='".ADLAN_151."' class='icon S16' />";
$menu_vars['home']['image_src'] = ADLAN_151;
$menu_vars['home']['perm'] = '';
$menu_vars['home']['sort'] = 1;
@@ -1848,7 +1848,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$menu_vars['logout']['text'] = ""; // ADMINNAME;
$menu_vars['logout']['link'] = '#';
$menu_vars['logout']['image'] = "<i class='icon-user icon-white'></i>"; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
$menu_vars['logout']['image'] = "<i class='icon-user'></i>"; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
$menu_vars['logout']['image_src'] = ADLAN_46;
$menu_vars['logout']['perm'] = '';
$menu_vars['logout']['sub'] = $tmp;
@@ -1863,7 +1863,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$c = 0;
foreach($languages as $lng)
{
$checked = ($lng == e_LANGUAGE) ? "<i class='icon-ok icon-white'></i> " : "<i >&nbsp;</i>&nbsp;";
$checked = ($lng == e_LANGUAGE) ? "<i class='icon-ok'></i> " : "<i >&nbsp;</i>&nbsp;";
$tmp[$c]['text'] = $lng;
$tmp[$c]['description'] = '';
@@ -1878,7 +1878,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$menu_vars['language']['text'] = ""; // e_LANGUAGE;
$menu_vars['language']['link'] = '#';
$menu_vars['language']['image'] = "<i class='icon-globe icon-white'></i>" ;
$menu_vars['language']['image'] = "<i class='icon-globe'></i>" ;
$menu_vars['language']['image_src'] = ADLAN_46;
$menu_vars['language']['perm'] = '';
$menu_vars['language']['sub'] = $tmp;

2
e107_themes/bootstrap/admin_template.php
View File

@@ -100,7 +100,7 @@ $E_ADMIN_NAVIGATION['button_logout'] = '
$E_ADMIN_NAVIGATION['button_pm'] = '
<li class="dropdown">
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" >
<i class="icon-envelope icon-white" class="active"></i> 3
<i class="icon-envelope" class="active"></i> 3
<b class="caret"></b>
</a>
<div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px">

2
e107_themes/bootstrap/admin_theme.php
View File

@@ -7,7 +7,7 @@ define("SEP"," <i class='icon-play e-breadcrumb'></i> ");
e107::js('core','bootstrap/js/bootstrap.min.js');
e107::css('core','bootstrap/css/bootstrap.min.css');
e107::css('core','bootstrap/css/bootstrap-responsive.min.css');
e107::css('core', "font-awesome/css/font-awesome.css");
// e107::css('core','bootstrap/css/jquery-ui.custom.css');
e107::css('theme','admin_style.css');