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

More admin styling

Browse Source
This commit is contained in:
Cameron 2013-03-15 23:35:16 -07:00
parent 196aed907e
commit 50f99af778
10 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/header.php
View File

@ -212,7 +212,7 @@ if (!defsettrue('e_IFRAME') && isset($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")
if(e107::getPref('admincss') == "admin_dark.css")
{
$e_js->coreCSS('bootstrap/css/darkstrap.css');

2
e107_admin/theme.php
View File

@ -26,7 +26,7 @@ $e_sub_cat = 'theme_manage';
e107::css("inline","
.hide { display: none }
.admin-theme-thumb { height:130px;overflow:hidden;border:1px solid black;margin-bottom:10px }
.admin-theme-thumb { height:130px;overflow:hidden;border:1px solid black; margin:0px; margin-bottom:10px; padding:0px; }
.admin-theme-thumb:hover { opacity:0.4 }
.admin-theme-options { transition: opacity .20s ease-in-out;

2
e107_handlers/form_handler.php
View File

@ -1670,7 +1670,7 @@ class e_form
function name2id($name)
{
return rtrim(str_replace(array('[]', '[', ']', '_', '/', ' '), array('-', '-', '', '-', '-', '-'), $name), '-');
return rtrim(str_replace(array('[]', '[', ']', '_', '/', ' ','.'), array('-', '-', '', '-', '-', '-', '-'), $name), '-');
}
/**

21
e107_handlers/theme_handler.php
View File

@ -707,13 +707,14 @@ class themeHandler
{
$itext .= "<tr>
<td style='vertical-align:top; width:24%'><b>".TPVLAN_50."</b>:</td>
<td style='vertical-align:top'><table class='table' style='margin-left:0px;margin-right:auto' >
<td class='well' style='vertical-align:top'>
<table class='table' style='margin-left:0px;margin-right:auto' >
<tr>";
$itext .= ($mode == 1) ? "<td class='fcaption' style='text-align:center;vertical-align:top;'>Default</td>" : "";
$itext .= "
<td class='fcaption'>Title</td>
<td class='fcaption'>Requirements</td>
<td class='fcaption' style='text-align:center;width:100px'>Menu Preset</td>
<th class='fcaption'>Title</th>
<th class='fcaption'>Requirements</th>
<th class='fcaption' style='text-align:center;width:100px'>Menu Preset</th>
</tr>\n";
foreach ($theme['layouts'] as $key=>$val)
@ -928,7 +929,7 @@ class themeHandler
$previewPath = e_BASE."index.php?themepreview.".$theme['id'];
}
$thumbnail = "<img src='".$thumbPath."' style='width:200px; height:160px;' alt='' />";
$thumbnail = "<img src='".$thumbPath."' style='width:200px; height:130px;' alt='' />";
$preview_icon = "<a title='Preview : ".$theme['name']."' rel='external' class='e-dialog' href='".$previewPath."'>".E_32_SEARCH."</a>";
// $thumbnail .= "</a>";
@ -955,7 +956,7 @@ class themeHandler
$text = "
<div class='f-left block-text admin-theme-cell ".$borderStyle."'>
<div class='admin-theme-thumb'>".$thumbnail."</div>
<div class='well admin-theme-thumb'>".$thumbnail."</div>
<div id='".$frm->name2id($theme['name'])."' class='admin-theme-options'>".$main_icon.$admin_icon.$info_icon.$preview_icon."</div>
<div class='admin-theme-title'>".$theme['name']." ".$theme['version']."</div>
</div>";
@ -1182,12 +1183,14 @@ class themeHandler
if(!$css['nonadmin'])
{
$for = $frm->name2id("admincss-".$css['name']);
$text2 = "
<td class='center'>".
$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";
<td><label for='".$for."'>".$css['info']."</label></td>";
$text2 .= "<td>".($css['info'] ? $css['info'] : ($css['name'] == "admin_style.css" ? TPVLAN_23 : TPVLAN_24))."</td>\n";
}
}
@ -1479,7 +1482,7 @@ class themeHandler
$themeArray = $this->getThemes("id");
$pref['admintheme'] = $themeArray[$this->id];
$pref['admincss'] = file_exists(e_THEME.$pref['admintheme'].'/dark_style.css') ? 'dark_style.css' : 'light_style.css';
$pref['admincss'] = file_exists(e_THEME.$pref['admintheme'].'/admin_dark.css') ? 'admin_dark.css' : 'admin_light.css';
$e107cache->clear_sys();
if(save_prefs())
{

BIN
e107_images/admin_images/nopreview.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

9
e107_themes/bootstrap/dark_style.css → e107_themes/bootstrap/admin_dark.css
View File

@ -14,4 +14,11 @@ thead tr {
.adminlist tr > td {
min-height:50px;
}
}
/*
.bootstrap-select, bootstrap-select button
{
color: rgb(255, 255, 255);
background-color: rgb(34, 34, 34);
}
*/

9
e107_themes/bootstrap/light_style.css → e107_themes/bootstrap/admin_light.css
View File

@ -9,7 +9,11 @@ body { background-color: #EEEEEE; }
border-color: rgb(37, 37, 37);
}
.popover,
.popover-title {
background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%);
border-bottom: 0px;
}
.adminlist, .adminform { border:1px solid #ddd; background-color: #F6F6F6}
@ -36,6 +40,9 @@ body { background-color: #EEEEEE; }
}
.modal-header { border-bottom:1px solid #DDDDDD; background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%); }
.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%); }

8
e107_themes/bootstrap/admin_style.css
View File

@ -84,7 +84,7 @@ a.brand:hover img {
}
.modal { min-width:800px; left:38%; z-index:10001}
.modal-header { border-radius: 6px 6px 6px 6px; border-bottom:1px solid #DDDDDD; padding-left:20px; background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%); }
.modal-header { border-radius: 6px 6px 6px 6px; padding-left:20px; }
.modal-body { max-height:500px; padding:10px }
#media-select-container { min-height:378px }
.modal.fade.in { top: 5%; }
@ -679,11 +679,7 @@ i.searchquery {
.popover,
.popover-title {
background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%);
border-bottom: 0px;
}
/* Attempt to Hide the white arrow */
.navbar .navbar-inner .nav > li > .dropdown-menu:after {

2
e107_themes/bootstrap/admin_template.php
View File

@ -156,7 +156,7 @@ $E_ADMIN_NAVIGATION['end'] = '</ul>';
</div>
*/
$inverse = (e107::getPref('admincss') == "light_style.css") ? "navbar-inverse" : "";
$inverse = (e107::getPref('admincss') == "admin_light.css") ? "navbar-inverse" : "";
$ADMIN_HEADER = '<div class="navbar '.$inverse.' navbar-fixed-top">
<div class="navbar-inner">

4
e107_themes/bootstrap/admin_theme.php
View File

@ -10,12 +10,12 @@ e107::lan('theme');
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/jquery-ui.custom.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() {