From: garvinhicking <garvinhicking>
Date: Fri, 2 Jun 2006 09:27:05 +0000 (+0000)
Subject: CSS fixes
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ddf10533b9eb1b4cd81a9ec475c975100d76ac7f;p=s9y.git

CSS fixes
---

diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 738bb58..30411de 100644
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -256,15 +256,15 @@ function serendipity_getTemplateFile($file, $key = 'serendipityHTTPPath') {
     $directories = array();
 
     $directories[] = isset($serendipity['template']) ? $serendipity['template'] . '/' : '';
-    if ( isset($serendipity['template_engine']) ) {
+    if (isset($serendipity['template_engine']) && $serendipity['template_engine'] != 'default') {
          $directories[] = $serendipity['template_engine'] . '/';
     }
+
     $directories[] = $serendipity['defaultTemplate'] .'/';
     $directories[] = 'default/';
 
     foreach ($directories as $directory) {
         $templateFile = $serendipity['templatePath'] . $directory . $file;
-
         if (file_exists($serendipity['serendipityPath'] . $templateFile)) {
             return $serendipity[$key] . $templateFile;
         }
diff --git a/serendipity.css.php b/serendipity.css.php
index e8ea137..bc5c332 100644
--- a/serendipity.css.php
+++ b/serendipity.css.php
@@ -35,7 +35,7 @@ switch($css_mode) {
 
 function serendipity_printStylesheet($file, $dir = '') {
     global $serendipity;
-    return str_replace(
+    return "/* $dir  */\n" . str_replace(
              array(
                '{TEMPLATE_PATH}',
                '{LANG_DIRECTION}'
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index ca70fb3..7137d32 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -29,9 +29,6 @@ include(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 // The version string
 $serendipity['version']         = '1.1-alpha6';
 
-// Name of folder for the default theme
-$serendipity['defaultTemplate'] = 'carl_contest';
-
 // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
 $serendipity['production']      = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);
 
@@ -233,6 +230,9 @@ if (isset($_SESSION['serendipityAuthorid'])) {
     serendipity_load_configuration($_SESSION['serendipityAuthorid']);
 }
 
+// Name of folder for the default theme
+$serendipity['defaultTemplate'] = 'carl_contest';
+
 $serendipity['lang'] = serendipity_getSessionLanguage(); // @see function declaration for todo
 
 // Try to fix some path settings. It seems common users have this setting wrong
diff --git a/templates/carl_contest/admin/style.css b/templates/carl_contest/admin/style.css
index 0b38f8d..349e3ba 100644
--- a/templates/carl_contest/admin/style.css
+++ b/templates/carl_contest/admin/style.css
@@ -222,7 +222,9 @@ a:hover.serendipityPrettyButton {
 .serendipityPrettyButton {
 	padding: 1px;
 	background: url({TEMPLATE_PATH}img/button_background.png) repeat-x top;
+	background-color: #95accc;
 	color: #1D2E3F;
+	height: 20px;
 	font-weight: bold;
 	font-size: 0.9em;
 	border: 1px outset #000;
@@ -271,7 +273,7 @@ table#serendipity_customfields .customfield_value textarea {
 	height: 100px; }
 
 
-.further_links {
+.serendipityAdminContent .further_links {
     float: right;
     font-size: 0.8em;
     border: 1px solid black;
@@ -291,3 +293,12 @@ table#serendipity_customfields .customfield_value textarea {
     margin: 5px;
     padding: 0px;
 }
+
+#serendipityAdminBodyImageSelectorTree .serendipityAdminContent {
+    width: auto;
+}
+
+#serendipityAdminBodyImageSelector .serendipityAdminContent {
+    width: auto;
+    margin: 0px;
+}
\ No newline at end of file
diff --git a/templates/default/admin/style.css b/templates/default/admin/style.css
index 8979f16..a2da7c9 100644
--- a/templates/default/admin/style.css
+++ b/templates/default/admin/style.css
@@ -235,6 +235,7 @@ a:hover.serendipityPrettyButton {
 .serendipityPrettyButton {
     padding: 1px;
     background: url({TEMPLATE_PATH}img/button_background.png) repeat-x top;
+	background-color: #95accc;
     color: #1D2E3F;
     font-weight: bold;
     font-size: 0.9em;
diff --git a/templates/default/treeview/tree.css b/templates/default/treeview/tree.css
index afcde17..91611f8 100644
--- a/templates/default/treeview/tree.css
+++ b/templates/default/treeview/tree.css
@@ -18,6 +18,12 @@
 #footerContainer {
     text-align: center;
     margin: 0px auto 0px auto;
+    white-space: nowrap;
+}
+
+
+#serendipityAdminBodyImageSelectorTree .serendipityAdminContent {
+    padding: 0px;
 }
 
 /* Copyright (c) 2006 Yahoo! Inc. All rights reserved. */