CSS fixes

diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 738bb588d0778fa828ed3faf95d0e5723f7d0fa7..30411de9a717e8f6d3db69fd0f9047446e88da7a 100644 (file)
--- 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 e8ea1379debdea751f3648c8d9d05f9d958535f1..bc5c33248494444f9742691f852d36d535306798 100644 (file)
--- 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 ca70fb3ba79925edd2af226f0309063780423302..7137d325d73f4b5c53a2b77a6be893e8e62d3d5c 100644 (file)
--- 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 0b38f8d20dde2e9c9ed566496173ae915443990a..349e3ba82b8e38da88b9adb3ac9e27df86fc28a5 100644 (file)
--- a/templates/carl_contest/admin/style.css
+++ b/templates/carl_contest/admin/style.css
@@ -222,7 +222,9 @@ a:hover.serendipityPrettyButton {
 .serendipityPrettyButton {\r
        padding: 1px;\r
        background: url({TEMPLATE_PATH}img/button_background.png) repeat-x top;\r
+       background-color: #95accc;\r
        color: #1D2E3F;\r
+       height: 20px;\r
        font-weight: bold;\r
        font-size: 0.9em;\r
        border: 1px outset #000;\r
@@ -271,7 +273,7 @@ table#serendipity_customfields .customfield_value textarea {
        height: 100px; }\r
 \r
 \r
-.further_links {\r
+.serendipityAdminContent .further_links {\r
     float: right;\r
     font-size: 0.8em;\r
     border: 1px solid black;\r
@@ -291,3 +293,12 @@ table#serendipity_customfields .customfield_value textarea {
     margin: 5px;\r
     padding: 0px;\r
 }\r
+\r
+#serendipityAdminBodyImageSelectorTree .serendipityAdminContent {\r
+    width: auto;\r
+}\r
+\r
+#serendipityAdminBodyImageSelector .serendipityAdminContent {\r
+    width: auto;\r
+    margin: 0px;\r
+}
\ No newline at end of file

diff --git a/templates/default/admin/style.css b/templates/default/admin/style.css
index 8979f16b86f5b091ac9e20f3dc47ba2ecf0117c1..a2da7c9a578a0bc132ada15f3336a4f9e8dc4425 100644 (file)
--- 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 afcde17b9b3095b67f1f9b6842529d88ea06ce72..91611f85ce7085ef30717e4b12e17075adcb82b3 100644 (file)
--- 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. */