Rewl og krat... needs cleaning up - after port to GIT.origin

2 files changed, 10 insertions, 8 deletions

diff --git a/htdocs/admin.css b/htdocs/admin.css
index d81f420..d3f1e1e 100644
--- a/htdocs/admin.css
+++ b/htdocs/admin.css
@@ -25,7 +25,7 @@
 	border-radius: 6px;
 }
 
-.admin .header {
+.admin .mainheader {
 	display: inline-block;
 	text-align: center;
 	background-image: none;
@@ -64,7 +64,7 @@
 	display: box;
 }
 
-.admin .menu,
+.admin .adminmenu,
 .admin .submenu,
 .admin .form {
 	background-color: #fff;
@@ -85,7 +85,7 @@
 	border-radius: 6px;
 }
 
-.admin .menu,
+.admin .adminmenu,
 .admin .submenu {
 	width: 704px;
 }
@@ -95,18 +95,18 @@
 	padding: 10px;
 }
 
-.admin .menu {
+.admin .adminmenu {
 	margin-top: 0px;
 	min-height: 12px;
 }
 
-.admin .menu .entry,
+.admin .adminmenu .entry,
 .admin .submenu .entry {
+        border-color: #eee;
 	color: #000;
 	background-color: #eee;
 
 	text-align: center;
-	border-color: inherit;
 	border-width: inherit;
 	border-style: outset;
 	font-size: 10px;
@@ -126,7 +126,7 @@
 	min-height: 12px;
 }
 
-.admin .menu .active,
+.admin .adminmenu .active,
 .admin .submenu .active {
 	border-style: inset;
 	background-color: #ffc;
diff --git a/htdocs/index.php b/htdocs/index.php
index d389e6d..f20f0af 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -1,4 +1,5 @@
 <?php
+
 $start_time = microtime(true);
 
 if(file_exists("config.php")) include_once("config.php");
@@ -39,7 +40,8 @@ include_once($MODULES_DIR . "/pages.php");
 
 $pages = new Pages($DATA_DIR . "/pages.xml");
 
-if($config->value('splash') == "true") {
+// Skip splash if site is entered deep (page != "").
+if($page == "" && $config->value('splash') == "true") {
 	if($_GET["skipsplash"]) {
 		setcookie("skipsplash", "true", time()+$config->value('splashreshow'));
 	}