[Phpcms-plugins-cvs] admin4phpCMS/modules/layout layout.css,1.8,1.9 class.module_layout.php,1.14,1.15

[Martin J. <mj...@us...>]

Update of /cvsroot/phpcms-plugins/admin4phpCMS/modules/layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20482/modules/layout

Modified Files:
	layout.css class.module_layout.php 
Log Message:
Commit as backup during development

Index: class.module_layout.php
===================================================================
RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/modules/layout/class.module_layout.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- class.module_layout.php	7 Apr 2005 14:09:04 -0000	1.14
+++ class.module_layout.php	15 Apr 2005 15:20:03 -0000	1.15
@@ -30,6 +30,9 @@
 
 /*
 * $Log$
+* Revision 1.15  2005/04/15 15:20:03  mjahn
+* Commit as backup during development
+*
 * Revision 1.14  2005/04/07 14:09:04  mjahn
 * Commit as backup during development
 *
@@ -150,9 +153,9 @@
 				$lang = $actiondata1 ['lang'] ['en'];
 				unset ($actiondata1 ['lang'] ['en']);
 			}
-			foreach ($actiondata1 ['lang'] as $lang=>$data) {
-				if (!isset ($actiondata1 ['lang'] [$lang]) || !is_array ($actiondata1 ['lang'] [$lang])) {
-					$lang = array_merge ($lang, $actiondata1 ['lang'] [$lang]);
+			foreach ($actiondata1 ['lang'] as $language=>$data) {
+				if (!isset ($actiondata1 ['lang'] [$language]) || !is_array ($actiondata1 ['lang'] [$language])) {
+					$lang = array_merge ($lang, $actiondata1 ['lang'] [$language]);
 				}
 			}
 		}
@@ -176,6 +179,7 @@
 		$smarty->assign ('ADMIN4PHPCMS_VERSION', ADMIN4PHPCMS_VERSION);
 		$smarty->assign ('DEBUG', DEBUG);
 		$smarty->assign ('INDEX_FILE', INDEX_FILE);
+		$smarty->register_modifier ('entities', 'smarty_modifier_entities');
 
 		if ($this->views !== false) {
 			// show only one view
@@ -186,9 +190,22 @@
 			foreach ($this->showtags as $tag=>$event) {
 				$smarty->assign ($tag, ${$tag});
 			}
-			$smarty->display ('framework.tpl');
+			$smarty->display ('framework.tpl', md5 ($_SERVER ['QUERY_STRING']));
 		}
 	}
+
 }
 
+	function smarty_modifier_entities ($string) {
+		if (is_string ($string)) {
+			return htmlentities ($string);
+		}
+		if (is_object ($string)) {
+			return 'Object';
+		}
+		if (is_array ($string)) {
+			return 'Array';
+		}
+	}
+	
 ?>
\ No newline at end of file

Index: layout.css
===================================================================
RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/modules/layout/layout.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- layout.css	7 Apr 2005 14:09:04 -0000	1.8
+++ layout.css	15 Apr 2005 15:20:03 -0000	1.9
@@ -28,8 +28,8 @@
 	height:100%;
 	width:170px;
 	padding:0 10px;
-	border-right:2px outset #eee;
-	border-bottom:2px outset #eee;
+	border-right:1px outset #eee;
+	border-bottom:1px outset #eee;
 	background:#f0f0f0;
 	font-size:0.9em;
 }
@@ -113,6 +113,7 @@
 fieldset {
 	background:#f0f0f0;
 	max-width:60em;
+	margin-bottom:1em;
 }
 
 .content .label,
@@ -131,6 +132,7 @@
 }
 
 .content input,
+.content button,
 .content textarea,
 .content select {
 	width:34%;
@@ -143,6 +145,7 @@
 }
 
 .content input,
+.content button,
 .content textarea,
 .content select,
 .content fieldset {
@@ -186,8 +189,7 @@
 .content .label:hover,
 .content label.hover,
 .content label:hover {
-	background:#029544;
-	color:#fff;
+	background:#ddd;
 }
 /** Liste ohne Symbole **/
 ul.none {
@@ -258,7 +260,8 @@
 
 table {
 	border-collapse:collapse;
-	max-width:60em;
+	width:99%;
+	margin-top:1em;
 }
 
 tfoot,
@@ -283,6 +286,7 @@
 th,
 td {
 	padding:0.2em;
+	overflow:scroll;
 }
 
 tbody .line3,
@@ -300,4 +304,10 @@
 dl.horizontal dt {
 	clear:left;
 	width:20em;
+}
+
+.center {
+	text-align:center;
+	margin-left:auto;
+	margin-right:auto;
 }
\ No newline at end of file