diff --git a/e107_admin/header.php b/e107_admin/header.php index 37b760bd1..7e084b64d 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -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 "\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']) { diff --git a/e107_admin/image.php b/e107_admin/image.php index 2f9eca9e3..804263b9c 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -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 .= " -
-
+
+
{$users}
{$img_src}
diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml index 6c799a6e5..3063559e1 100644 --- a/e107_core/xml/default_install.xml +++ b/e107_core/xml/default_install.xml @@ -5,7 +5,7 @@ 0 0 1 - style.css + light_style.css 0 infopanel bootstrap diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 6583c5de3..ebc14a282 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -512,8 +512,8 @@ class e_form { $ret = "
"; $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 = "{$default_url}"; + $style = ($blank) ? "width:64px;height:64px" : ""; + $label = "{$default_url}"; } else // Images @@ -526,7 +526,7 @@ class e_form $ret = "
"; $att = 'aw='.$width."'&ah=".$height."'"; $thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $tp->thumbUrl($default_thumb, $att, true); - $label = "{$default_url}"; + $label = "{$default_url}"; if($cat != 'news' && $cat !='page' && $cat !='') { @@ -1960,7 +1960,7 @@ class e_form return " - ".$text." + ".$text." "; diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index ce00f3205..29da7572b 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -951,6 +951,8 @@ class themeHandler $borderStyle = "admin-theme-cell-default"; } + $borderStyle = 'well'; + $text = "
".$thumbnail."
@@ -988,7 +990,7 @@ class themeHandler ".TPVLAN_11." ".$theme['version']." - ".$thumbnail." + ".$thumbnail." "; $text .= "".TPVLAN_4.":".$author.""; @@ -1182,7 +1184,7 @@ class themeHandler { $text2 = " ". - $frm->radio('admincss', $css['name'], vartrue($pref['admincss'],"admin_style.css"))." + $frm->radio('admincss', $css['name'], vartrue($pref['admincss'])== $css['name'])." ".($css['info'] ? $css['info'] : ($css['name'] == "admin_style.css" ? TPVLAN_23 : TPVLAN_24))."\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()) { diff --git a/e107_images/admin_images/plugins_32.png b/e107_images/admin_images/plugins_32.png index 32f71ef54..ed14d5ab6 100644 Binary files a/e107_images/admin_images/plugins_32.png and b/e107_images/admin_images/plugins_32.png differ diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 61fcd2511..b99c9cdfe 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -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 } diff --git a/e107_themes/bootstrap/admin_template.php b/e107_themes/bootstrap/admin_template.php index 40d1e8c33..10718f935 100644 --- a/e107_themes/bootstrap/admin_template.php +++ b/e107_themes/bootstrap/admin_template.php @@ -155,9 +155,10 @@ $E_ADMIN_NAVIGATION['end'] = '';
*/ - - -$ADMIN_HEADER = '