mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-19 20:21:51 +02:00
Code Issues Releases Wiki Activity

Admin GUI styling fixes.

Browse Source
This commit is contained in:
Cameron 2013-03-15 03:54:34 -07:00
parent 8b82720f39
commit 340156aebd
12 changed files with 1134 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/header.php
View File

@ -209,6 +209,14 @@ if (!defsettrue('e_IFRAME') && isset($pref['admincss']) && $pref['admincss'])
$css_file = file_exists(THEME.'admin_'.$pref['admincss']) ? 'admin_'.$pref['admincss'] : $pref['admincss'];
//echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
$e_js->themeCSS($css_file);
if(e107::getPref('admincss') == "dark_style.css")
{
$e_js->coreCSS('bootstrap/css/darkstrap.css');
}
}
elseif (isset($pref['themecss']) && $pref['themecss'])
{

4
e107_admin/image.php
View File

@ -2191,8 +2191,8 @@ function show_avatars()
//style attribute allowed here - server side width/height control
//autocheck class - used for JS selectors (see eCoreImage object)
$text .= "
<div class='image-box f-left center autocheck' style='width: ".(intval($pref['im_width'])+40)."px; height: ".(intval($pref['im_height'])+100)."px;'>
<div class='spacer'>
<div class='image-box f-left center autocheck' style='margin:5px; width: ".(intval($pref['im_width'])+40)."px; height: ".(intval($pref['im_height'])+100)."px;'>
<div class='well'>
<div class='image-users'>{$users}</div>
<div class='image-preview'>{$img_src}</div>
<div class='image-delete'>

2
e107_core/xml/default_install.xml
View File

@ -5,7 +5,7 @@
<core name="admin_alerts_uniquemenu">0</core>
<core name="admin_separate_plugins">0</core>
<core name="admin_slidedown_subs">1</core>
<core name="admincss">style.css</core>
<core name="admincss">light_style.css</core>
<core name="adminpwordchange">0</core>
<core name="adminstyle">infopanel</core>
<core name="admintheme">bootstrap</core>

8
e107_handlers/form_handler.php
View File

@ -512,8 +512,8 @@ class e_form
{
$ret = "<div class='imgselector-container' style='display:block;width:64px;min-height:64px'>";
$thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $default_thumb;
$style = ($blank) ? "border:1px dashed black;width:64px;height:64px" : "border:1px dashed black";
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='{$style}' />";
$style = ($blank) ? "width:64px;height:64px" : "";
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='well well-small image-selector' style='{$style}' />";
}
else // Images
@ -526,7 +526,7 @@ class e_form
$ret = "<div class='imgselector-container e-tip' {$title} style='display:block;width:".$width."px;min-height:".$height."px;'>";
$att = 'aw='.$width."'&ah=".$height."'";
$thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $tp->thumbUrl($default_thumb, $att, true);
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='display:block;border:1px dashed black;' />";
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='well well-small image-selector' style='display:block;' />";
if($cat != 'news' && $cat !='page' && $cat !='')
{
@ -1960,7 +1960,7 @@ class e_form
return "
<thead>
<tr>".$text."</tr>
<tr >".$text."</tr>
</thead>
";

10
e107_handlers/theme_handler.php
View File

@ -951,6 +951,8 @@ class themeHandler
$borderStyle = "admin-theme-cell-default";
}
$borderStyle = 'well';
$text = "
<div class='f-left block-text admin-theme-cell ".$borderStyle."'>
<div class='admin-theme-thumb'>".$thumbnail."</div>
@ -988,7 +990,7 @@ class themeHandler
<tr>
<td><b>".TPVLAN_11."</b></td>
<td>".$theme['version']."</td>
<td class='center middle' rowspan='6' style='text-align:center; vertical-align:middle;width:25%'>".$thumbnail."</td>
<td class='well center middle' rowspan='6' style='text-align:center; vertical-align:middle;width:25%'>".$thumbnail."</td>
</tr>";
$text .= "<tr><td style='vertical-align:top; width:25%'><b>".TPVLAN_4."</b>:</td><td style='vertical-align:top'>".$author."</td></tr>";
@ -1182,7 +1184,7 @@ class themeHandler
{
$text2 = "
<td class='center'>".
$frm->radio('admincss', $css['name'], vartrue($pref['admincss'],"admin_style.css"))."
$frm->radio('admincss', $css['name'], vartrue($pref['admincss'])== $css['name'])."
</td>
<td><label for='admincss'>".$css['name']."</label></td>
<td>".($css['info'] ? $css['info'] : ($css['name'] == "admin_style.css" ? TPVLAN_23 : TPVLAN_24))."</td>\n";
@ -1191,7 +1193,7 @@ class themeHandler
if($mode == 1) // SITE-THEME Mode
{
if(substr($css['name'], 0, 6) == "admin_")
if(substr($css['name'], 0, 6) == "admin_" || !strstr($css['name'],'style'))
{
continue;
}
@ -1477,7 +1479,7 @@ class themeHandler
$themeArray = $this->getThemes("id");
$pref['admintheme'] = $themeArray[$this->id];
$pref['admincss'] = file_exists(e_THEME.$pref['admintheme'].'/admin_style.css') ? 'admin_style.css' : 'style.css';
$pref['admincss'] = file_exists(e_THEME.$pref['admintheme'].'/dark_style.css') ? 'dark_style.css' : 'light_style.css';
$e107cache->clear_sys();
if(save_prefs())
{

BIN
e107_images/admin_images/plugins_32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

44
e107_themes/bootstrap/admin_style.css
View File

@ -1,6 +1,5 @@
/* info: Default stylesheet */
body { padding-top: 75px; background-color: #EEEEEE; }
body { padding-top: 75px; }
.well { padding:10px; }
.navbar { }
@ -173,14 +172,15 @@ img.S32:hover {}
/*******************************************************************************************************************/
/* Admin List Table */
.adminlist, .adminform { width:100%; border:1px solid #ddd; background-color: #F6F6F6}
.adminlist, .adminform { width:100%; }
/*
.adminlist th { border-bottom:1px solid #ddd; }
.adminlist td { border-bottom:1px solid #ddd }
*/
.adminlist th.last,
.adminlist td.last { border-right: 0px solid;}
.adminlist tr.last td { border-bottom: 0px solid;}
.adminlist thead { background-color:#f2f2f2; }
.adminlist tr.even { background-color:#f6f6f6; }
.adminlist .col-selection-cont { position: relative; float:right; }
div.e-search input[type='text'] { padding-left:25px }
@ -584,7 +584,7 @@ i.e-seamonkey-32{ background-position: -485px 0; width: 32px; height: 32px; }
/* NEw */
th, .fcaption { font: 12px HelveticaNeue,Helvetica,Arial; color: rgb(102, 102, 102); background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%); }
th, .fcaption { font: 12px HelveticaNeue,Helvetica,Arial; }
tr.first a, th a { color: rgb(102, 102, 102); }
/* Dark Drop-Down Menus */
ul.col-selection { text-align:left; overflow:visible; z-index:101; max-height:600px; overflow:auto; background-color: rgb(23, 23, 23); }
@ -646,9 +646,6 @@ li.separator {
font-size: 10px;
}
div.left-panel {
background-color: yellow;
}
#tab-container {
background-color: transparent;
@ -680,12 +677,7 @@ i.searchquery {
text-shadow: none;
}
.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a
{
background-color: rgb(230, 230, 230);
border-bottom: 1px solid rgb(221, 221, 221);
color: rgb(153, 153, 153);
}
.popover,
.popover-title {
@ -722,25 +714,31 @@ i.searchquery {
/********************* Make Bootstrap Tabs more like Jquery-ui **********************/
.nav-tabs { border-bottom: 1px solid rgb(221, 221, 221); margin-bottom:0px;}
/* .nav-tabs { border-bottom: 1px solid rgb(221, 221, 221); margin-bottom:0px;} */
.nav-tabs li { margin-right: 2px; }
.nav-tabs li a { cursor: pointer; background-color: rgb(230, 230, 230); color: rgb(153, 153, 153);
padding: 0px 15px; line-height: 34px; border-bottom: 1px solid rgb(221, 221, 221);
.nav-tabs li a { cursor: pointer;
padding: 0px 15px; line-height: 34px; /* border-bottom: 1px solid rgb(221, 221, 221) */
}
.nav-tabs li a:hover { background-color: rgb(255, 255, 255); color: rgb(0, 67, 138); }
.nav-tabs li a:hover { }
/*
.nav-tabs > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus
{
background-color: rgb(246, 246, 246);
margin-bottom:-1px;
background-image: -moz-linear-gradient(to bottom, rgb(255, 255, 255) 0%, rgb(246, 246, 246) 100%);
border-bottom:1px solid rgb(246, 246, 246);
}
*/
.tab-pane { }
/*
.tab-pane table.adminform { border-top:0px}
.tab-pane table.adminform td { border-top:0px}
.tab-pane table.adminform tr { border-bottom:1px solid #DDDDDD}
*/
.tab-pane table tr:first-child td {
border-top:0px;
}
.table .options { white-space:nowrap }

7
e107_themes/bootstrap/admin_template.php
View File

@ -155,9 +155,10 @@ $E_ADMIN_NAVIGATION['end'] = '</ul>';
<div class="clear"><!-- --></div>
</div>
*/
$ADMIN_HEADER = '<div class="navbar navbar-inverse navbar-fixed-top">
$inverse = (e107::getPref('admincss') == "light_style.css") ? "navbar-inverse" : "";
$ADMIN_HEADER = '<div class="navbar '.$inverse.' navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
<a class="brand " href="'.e_ADMIN_ABS.'admin.php" title="Return to Front Panel"><img class="admin-logo" src="'.THEME.'images/e107_adminlogo.png" alt="e107" /></a>

4
e107_themes/bootstrap/admin_theme.php
View File

@ -11,9 +11,11 @@ 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','bootstrap/css/jquery-ui.custom.css');
//e107::css('core','bootstrap/css/demo.css');
e107::css('theme','admin_style.css');
e107::css('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->");
// e107::css('theme','dark_style.css');
/*
$drop = "
$(function() {

17
e107_themes/bootstrap/dark_style.css Normal file
View File

@ -0,0 +1,17 @@
/* info: Dark stylesheet */
tr.first a, th a {
color: rgb(198, 198, 198);
}
thead tr {
background-color: rgb(54, 54, 54);
background-image: linear-gradient(to bottom, rgb(68, 68, 68), rgb(34, 34, 34));
border: 1px solid rgb(3, 3, 3);
}
.adminlist tr > td {
min-height:50px;
}

41
e107_themes/bootstrap/light_style.css Normal file
View File

@ -0,0 +1,41 @@
/* info: Light stylesheet */
body { background-color: #EEEEEE; }
.navbar .navbar-inner {
background-color: rgb(27, 27, 27);
background-image: linear-gradient(to bottom, rgb(34, 34, 34), rgb(17, 17, 17));
background-repeat: repeat-x;
border-color: rgb(37, 37, 37);
}
.adminlist, .adminform { border:1px solid #ddd; background-color: #F6F6F6}
.adminlist thead { background-color:#f2f2f2; }
.adminlist tr.even { background-color:#f6f6f6; }
.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a
{
background-color: rgb(230, 230, 230);
border-bottom: 1px solid rgb(221, 221, 221);
color: rgb(153, 153, 153);
}
.nav-tabs li a { background-color: rgb(230, 230, 230); color: rgb(153, 153, 153);
border-bottom: 1px solid rgb(221, 221, 221);
}
.nav-tabs li a:hover { background-color: rgb(255, 255, 255); color: rgb(0, 67, 138); }
.nav-tabs > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus
{
background-color: rgb(246, 246, 246);
}
.tab-pane table.adminform td { border-top:0px}
th, .fcaption { color: rgb(102, 102, 102); background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%); }

1027
e107_web/js/bootstrap/css/darkstrap.css Normal file
View File

File diff suppressed because it is too large Load Diff