Code

Temporary style patchworks
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 21 May 2007 08:08:34 +0000 (08:08 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 21 May 2007 08:08:34 +0000 (08:08 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6410 594d385d-05f5-0310-b6e9-bd551577e9d8

html/themes/default/style.css
ihtml/themes/default/framework.tpl
include/class_pluglist.inc

index f3659248c092b8c93608c78324b97206287c1af7..1eeff811597f8eb102a67b51a5cd34c0d81b180d 100644 (file)
@@ -23,6 +23,10 @@ td.listheader {
        height:22px;
 }
 
+td#menucell {
+       border:1px solid #AAA;
+}
+
 td.scrollhead {
        vertical-align:top;
        padding:0px;
@@ -211,8 +215,6 @@ body {
        margin-top:0px;
        margin-bottom:0px;
        background-color:white;
-       background-image:url("images/border.png"); 
-       background-repeat:repeat-y;
        color:#00008F;
        font-family:arial,helvetica,sans-serif;
        font-size:12px;
@@ -249,21 +251,22 @@ a.maintitlebar:hover {
 
 p.menuheader {
        font-family:arial,helvetica,sans-serif;
-       color:#00378a;
+       color:#00008F;
        text-decoration:none;
-       background-color:#CDF6BD;
+       border-bottom:1px dashed #AAA;
        font-weight:bold;
        font-size:12px;
        text-align:center;
        width:100%;
        vertical-align:middle;
-       padding:3px;
-       margin-top:20px;
+       padding:5px;
+       margin-top:0px;
+       margin-bottom:3px;
 }
 
 p.menuitem {
        font-family:arial,helvetica,sans-serif;
-       color:#00378a;
+       color:#00008F;
        text-decoration:none;
        font-weight:normal;
        font-size:12px;
@@ -273,12 +276,12 @@ p.menuitem {
        padding-bottom:2px;
        vertical-align:middle;
        margin:2px;
-       background-color:#dfffdf;
+       background-color:#F8F8F8;
        padding-right:5px;
 }
 
 p.menuitem:hover {
-       background-color:#d2f6c2;
+       background-color:#F0F0F0;
 }
 
 table.menuitem {
@@ -389,20 +392,14 @@ h1.plugtop{
 }
 
 div.plugtop {
-       border-style:solid;
-       border-color:#b0b0b0;
        width:100%;
-       border-top-color:#e0e0f0;
-       border-top-width:6px;
-       border-bottom-width:1px;
-       border-left-width:0px;
-       border-right-width:0px;
+       border-bottom:1px dashed #B0B0B0;
        padding-top:0px;
        padding-bottom:6px;
        margin-bottom: 0px;
        text-align:left;
        vertical-align:middle;
-       background-color:#e0e0f0;
+       background-color:white;
        font-family:arial,helvetica,sans-serif;
        font-weight:bold;
        font-size:24px;
@@ -670,7 +667,7 @@ table.framework {
        border-spacing:0px;
        padding:0px;
        margin:0px;
-       background-color:#cdf6bd;
+        background-color: #A9FBA6;
        vertical-align:top;
 }
 
@@ -681,7 +678,7 @@ table.maintab {
         border-spacing:0px;
         padding:0px;
         margin:0px;
-        background-color:#cdf6bd;
+        background-color: #A9FBA6;
         vertical-align:top;
 }
 
index f51784b56461c7754e611e427150c6147013d228..03d9f0da255725a2ab7937df0eacaa0f164c0dbd 100644 (file)
@@ -2,50 +2,37 @@
 <body>
 {$php_errors}
 <form action='main.php{$plug}' name='mainform' method='post' enctype='multipart/form-data'>
-<table summary="" class="framework" cellspacing="0" cellpadding="0">
-  <tr>
-    <td style="height:36px; width:140px; vertical-align:bottom; text-align:center">
-     <a href="main.php" style="vertical-align:bottom;"><img src='{$go_logo}' border="0" alt="GOSA2" style='vertical-align:bottom;'></a>
-    </td>
-    <td>
-      <table style="margin-left:20px;" border="0" summary="">
-       <tr>
-        <td style="vertical-align:middle;">
-        <a class="maintitlebar" href='main.php?reset=1' onClick='return question("{t}You are currently editing a database entry. Do you want to dismiss the changes?{/t}", "main.php?reset=1");' >
-         <img src='{$go_home}' class='center' border="0" alt="Main">&nbsp;{t}Main{/t}
-        </a>
-       </td>
-        <td>
-        <a class="maintitlebar" style="margin-left:35px" {$help_method}>
-          <img src='{$go_help}' class='center' border="0" alt="Help">&nbsp;{t}Help{/t}
-         </a>
-       </td>
-       <td>
-        <a class="maintitlebar" href='logout.php?request' onClick='return question("{t}You are currently editing a database entry. Do you want to dismiss the changes?{/t}", "logout.php?request");' style="margin-left:35px;">
-          <img src='{$go_out}' class='center' border="0" alt="Sign out">&nbsp;{t}Sign out{/t}
-         </a>
-       </td>
-       </tr>
-      </table>
-    </td>
-    <td style="text-align:right;">
-      <div class="maintitlebar" style="padding-right:10px;text-align:right">
-        <a>{t}Signed in:{/t} <b>{$username}</b></a>
-      </div>
-    </td>
-  </tr>
+<div class='setup_header'>
+  <div style="float:left;"><img src='themes/default/images/go_logo.png' class='center' alt='GOsa'>
+    <a class="maintitlebar" href='main.php?reset=1' onClick='return question("{t}You are currently editing a database entry.
+ Do you want to dismiss the changes?{/t}", "main.php?reset=1");' ><img src='{$go_home}' class='center' border="0" alt="Main">&nbsp;{t}Main{/t}
+    </a>
+    &nbsp;
+    <a class="maintitlebar" style="margin-left:35px" {$help_method}>
+       <img src='{$go_help}' class='center' border="0" alt="Help">&nbsp;{t}Help{/t}
+    </a>
+    &nbsp;
+    <a class="maintitlebar" href='logout.php?request' onClick='return question("{t}You are currently editing a database entry. Do you want to dismiss the changes?{/t}", "logout.php?request");' style="margin-left:35px;">
+      <img src='{$go_out}' class='center' border="0" alt="Sign out">&nbsp;{t}Sign out{/t}
+    </a>
+  </div>
+  <div style="padding-top:8px;text-align:right;height:28px"><a>{t}Signed in:{/t} <b>{$username}</b></a></div>
+</div>
+<!--<div class='setup_menu'>
+  <b>{t}GOsa main menu{/t}</b>
+</div>-->
 
+<table summary="" class="framework" cellspacing="0" cellpadding="0" style='margin-top:7px; margin-left:3px'>
   <tr style="vertical-align:top;">
     <!-- Menu -->
-    <td style="background-color:#EEFFE6; vertical-align:top;" id="menucell">
-      <div style="background-color:#CDF6BD; height:12px; width:100%;">&nbsp;</div>
+    <td style="background-color:white; vertical-align:top;" id="menucell">
       {$menu}
          <br />
          <div style="height:1px; width:140px;"></div>
     </td>
     <!-- Plugin window -->
-    <td style="background-color:white; width:100%; vertical-align:top; height:15px; border-left:1px solid #778F6E; border-top:1px solid #778F6E" colspan="2">
-      <table style="vertical-align:top; text-align:justify; background-color: #F8F8F8; margin-top:7px; margin-left:7px; margin-right:7px; width:99%" summary="">
+    <td style="background-color:white; width:100%; vertical-align:top; height:15px;" colspan="2">
+      <table style="vertical-align:top; text-align:justify; background-color: white; border:1px solid #AAA; margin-top:0px; margin-left:7px; margin-right:7px; width:99%" summary="">
        <tr>
         <td>
         {$contents}
index 8a354af6a81024f6c8abdec8c96bb8eb43ffac10..384817bd303c7cf032f354c00a9b75f8fb9920c9 100644 (file)
@@ -117,11 +117,18 @@ class pluglist {
        function gen_menu()
        {
                if ($this->menu == ""){
+                       $first= TRUE;
                        $cfg= $this->config->data['MENU'];
 
                        /* Parse headlines */
                        foreach ($cfg as $headline => $plug){
-                               $menu= "<p class=\"menuheader\">"._($headline)."</p>\n";
+                               if ($first){
+                                       $style= "";
+                                       $first= FALSE;
+                               } else {
+                                       $style= "style='border-top:1px solid #AAA; margin-top:0.8em;'";
+                               }
+                               $menu= "<p class=\"menuheader\" $style>"._($headline)."</p>\n";
                                $entries= "";
                                $this->menuparts[_($headline)]= array();