'; +echo '

'; if (isset ($_SESSION['UID'])) { if (isset ($_SESSION['oldurl'])) diff --git a/includes/menu.php b/includes/menu.php index 61a3ea73..3ca5e8ae 100644 --- a/includes/menu.php +++ b/includes/menu.php @@ -31,26 +31,28 @@ if ($submenus >= 1) {
-

+ -

+ - diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index 27e20788..6c0bc298 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -4,7 +4,6 @@ } body { - background: #f0f0f0; font-family: Arial; sans-serif; font-size: @@ -78,18 +77,22 @@ nav { margin: 0 10px 10px 0; } -nav, #content { - border: 1px solid #888; -} - #content article { padding: 10px; } -nav ul, nav p, #content article { - background: #fff; -} - a.sprache img { margin: 5px; } + +.background { + background: #f0f0f0; +} + +.container { + border: 1px solid #888; +} + +.content { + background: #fff; +} diff --git a/www-ssl/css/style1.css b/www-ssl/css/style1.css index 8fec5db0..fd8426f1 100644 --- a/www-ssl/css/style1.css +++ b/www-ssl/css/style1.css @@ -1,84 +1,83 @@ -body { - background-color: #131313; - - color: #424242; - - line-height: 150%; - font-family: Trebuchet MS, Lucida Grande, Arial, sans-serif; - - margin-bottom: 20px; +body, .background { + background-color: #131313; + color: #424242; + line-height: 150%; + font-family: Trebuchet MS, Lucida Grande, Arial, sans-serif; } a { - text-decoration: none; - color: #424242 + text-decoration: none; + color: #424242 } td { - font-size: small + font-size: small } a:active, a:hover { - font-weight: bold + font-weight: bold } - + li { - font-size: small + font-size: small } .content { - background-color: #131313; - color: #424242; + background-color: #131313; + color: #424242; } -.contenttopic { - font-weight: bold; - font-size: small; - color: #000000; - background-color: #333333 +.contenttopic, h1 { + font-weight: bold; + font-size: small; + color: #000000; + background-color: #333333 } -.border { - background-color: #333333 +.border, .container { + background-color: #333333; + border: 1px solid #424242; } .menu { - background-color: #131313; - color: #424242; - font-size: small + background-color: #131313; + color: #424242; + font-size: small } -h4.menu { - background-color: #333333; - font-weight: bold; - font-size: small; - color: #000000 + +h4 { + background-color: #333333; + font-weight: bold; + font-size: small; + color: #000000 } .linkbox { - background-color: #ffffff + background-color: #ffffff } .linkboxtitle { - font-weight: bold; - background-color: #000000; - color: #ffffff + font-weight: bold; + background-color: #000000; + color: #ffffff } .question { - font-weight: bold; - font-size: 9pt + font-weight: bold; + font-size: 9pt } .engeltreffen { - font-weight: bold; - font-size: 9pt; - color: #ff0000; + font-weight: bold; + font-size: 9pt; + color: #ff0000; } .answer { - font-size: 9pt; + font-size: 9pt; } + .comment { - font-size : 6pt; + font-size: 6pt; } -- cgit v1.2.3-54-g00ecf From 208c76fcb2f597d22d4339227b88099f91305522 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 1 Jun 2011 18:16:47 +0200 Subject: html5, css rewrite --- default-conf/var_www_includes/config_db.php | 8 +++++--- includes/funktion_flag.php | 2 +- includes/menu.php | 10 ++-------- www-ssl/admin/schichtplan.1.php | 6 +++--- www-ssl/nonpublic/einstellungen.php | 1 + 5 files changed, 12 insertions(+), 15 deletions(-) (limited to 'includes/menu.php') diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php index b49e5e0c..428a9339 100644 --- a/default-conf/var_www_includes/config_db.php +++ b/default-conf/var_www_includes/config_db.php @@ -1,6 +1,8 @@ diff --git a/includes/funktion_flag.php b/includes/funktion_flag.php index 7e88466d..6b4e2f06 100644 --- a/includes/funktion_flag.php +++ b/includes/funktion_flag.php @@ -4,6 +4,6 @@ if (strpos($_SERVER["REQUEST_URI"], "?") > 0) else $URL = $_SERVER["REQUEST_URI"] . "?SetLanguage="; -echo '

'; +echo '

'; echo '

'; ?> diff --git a/includes/menu.php b/includes/menu.php index 3ca5e8ae..6a209a0f 100644 --- a/includes/menu.php +++ b/includes/menu.php @@ -20,15 +20,9 @@ if ($submenus >= 1) { for ($index_nummer = 1; $index_nummer <= $submenus; $index_nummer++) { ?> - - - - -

- -
+

Schichtplan - +

Schichtplan

Ein-/Austragen
Druckversion

\ No newline at end of file diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php index 81dda869..713425bb 100644 --- a/www-ssl/nonpublic/einstellungen.php +++ b/www-ssl/nonpublic/einstellungen.php @@ -128,6 +128,7 @@ if (!isset ($_POST["action"])) { + -- cgit v1.2.3-54-g00ecf From 7bee3ce4d20a569e76ad6405e3cafa4aebe23c58 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 16:30:00 +0200 Subject: config cleanup, removed unused files --- default-conf/var_www_includes/config.php | 3 -- includes/UserCVS.php | 80 -------------------------------- includes/menu.php | 52 --------------------- www-ssl/ShowUserPicture.php | 3 ++ www-ssl/lageplan.php | 12 ----- 5 files changed, 3 insertions(+), 147 deletions(-) delete mode 100644 includes/UserCVS.php delete mode 100644 includes/menu.php delete mode 100644 www-ssl/lageplan.php (limited to 'includes/menu.php') diff --git a/default-conf/var_www_includes/config.php b/default-conf/var_www_includes/config.php index ca0c39c9..574c44ae 100644 --- a/default-conf/var_www_includes/config.php +++ b/default-conf/var_www_includes/config.php @@ -23,9 +23,6 @@ $LETZTES_AUSTRAGEN=3; $crypt_system="md5"; //$crypt_system="crypt"; -// the archangels -$arch_angels="fnord"; - // timezonen offsett $gmdateOffset=3600; diff --git a/includes/UserCVS.php b/includes/UserCVS.php deleted file mode 100644 index b7fb412c..00000000 --- a/includes/UserCVS.php +++ /dev/null @@ -1,80 +0,0 @@ - $v) { - if($v == "G") - $_SESSION['CVS'][$k] = $_SESSION['CVS_Group'][$k]; - } - } - - // pagename ermitteln -// $Page["Name"] = basename($_SERVER['PHP_SELF']); - $Page["Name"] = str_replace($ENGEL_ROOT, '', $_SERVER['PHP_SELF']); - - //recht fuer diese seite auslesen - if(isset($_SESSION['CVS'][$Page["Name"]])) - $Page["CVS"] = $_SESSION['CVS'][$Page["Name"]]; - else { - echo "SYSTEM ERROR: no right for " . $Page["Name"] . " exists."; - die; - } - - if($debug) { - echo "

\$_SESSION:\n";
-    print_r($_SESSION);
-    echo "

"; - - if( strlen($Page["CVS"]) == 0 ) - echo "

CVS ERROR, on page '". $Page["Name"]. "'

"; - else - echo "CVS: ". $Page["Name"]. " => '". $Page["CVS"]. "'
"; - } - - function funktion_isLinkAllowed($PageName) { - global $_SESSION; - - // separate page parameter - $ParameterPos = strpos($PageName, ".php?"); - - if($ParameterPos === false) - $pName = $PageName; - else - $pName = substr($PageName, 0, $ParameterPos + 4); - - // check rights - if((isset( $_SESSION['CVS'][ $pName ]) === true) && $_SESSION['CVS'][ $pName ] == "Y") - return true; - - return false; - } - - function funktion_isLinkAllowed_addLink_OrLinkText( $PageName, $LinkText) { - global $url, $ENGEL_ROOT; - - if(funktion_isLinkAllowed( $PageName) === true) - return "" . $LinkText . ""; - - return $LinkText; - } - - function funktion_isLinkAllowed_addLink_OrEmpty( $PageName, $LinkText) { - global $url, $ENGEL_ROOT; - - if(funktion_isLinkAllowed( $PageName) === true) - return "" . $LinkText . ""; - - return ""; - } -?> diff --git a/includes/menu.php b/includes/menu.php deleted file mode 100644 index 6a209a0f..00000000 --- a/includes/menu.php +++ /dev/null @@ -1,52 +0,0 @@ - - - -= 1) { - $inc_name = $_SERVER['PHP_SELF']; - $filenamepos = strrpos($inc_name, '/'); - $filenamepos += 1; - $filename = substr($inc_name, $filenamepos); - $filepost = substr($filename, 0, -4); - $filepre = substr($filename, -4); - $verzeichnis = substr($inc_name, 0, $filenamepos); - - for ($index_nummer = 1; $index_nummer <= $submenus; $index_nummer++) { -?> - - - - - - - - diff --git a/www-ssl/ShowUserPicture.php b/www-ssl/ShowUserPicture.php index 96b1092a..5a222c07 100644 --- a/www-ssl/ShowUserPicture.php +++ b/www-ssl/ShowUserPicture.php @@ -1,4 +1,7 @@ " . Get_Text("lageplan_text1") . "

"; -echo "

$\"\"$ "; - -include "includes/footer.php"; -?> -- cgit v1.2.3-54-g00ecf

© copyleft - Kontakt -

" . Get_Text("index_text4") . "

Engel online

" . Get_Text("$MenuName/") . "