OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5c6c6a6)
PATCH: [ 1534820 ] Web: Pimp my tabs ;)
authorTim Gerundt <tim@gerundt.de>
Sat, 5 Aug 2006 08:57:11 +0000 (08:57 +0000)
committerTim Gerundt <tim@gerundt.de>
Sat, 5 Aug 2006 08:57:11 +0000 (08:57 +0000)
Web/Changes.txt patch | blob | history
Web/css/all.css patch | blob | history
Web/page.inc patch | blob | history

diff --git a/Web/Changes.txt b/Web/Changes.txt
index 8f56b44..b07428c 100644 (file)
--- a/Web/Changes.txt
+++ b/Web/Changes.txt
@@ -1,3 +1,8 @@
+2006-08-05 Tim
+ PATCH: [ 1534820 ] Web: Pimp my tabs ;)
+  Web: page.inc
+  Web\css: all.css
+
 2006-07-31 Tim
  PATCH: [ 1531259 ] Web: Known limitation: In linefilters $ does not match EOL
   Web\2.4: limitations.php
diff --git a/Web/css/all.css b/Web/css/all.css
index 0217a45..bd796d6 100644 (file)
--- a/Web/css/all.css
+++ b/Web/css/all.css
@@ -8,7 +8,7 @@ body {
 
 #head {
        margin: 0;
-       padding: 5px;
+       padding: 5px 5px 0 15px;
        background: #FFCC00;
 }
 
@@ -17,36 +17,72 @@ body {
        padding: 0;
 }
 
+/* Based on "Updated Simple CSS Tabs" from silverorange labs:
+   http://labs.silverorange.com/archives/2004/may/updatedsimple */
 #tabs {
-       margin: 0 0 5px 0;
-       padding: 5px 5px 4px 5px;
-       background: #FFCC00;
-       border-bottom: 1px solid black;
+       position: relative;
+       width: 100%;
+       height: 3em;
+       width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
 }
 
 #tabs ul {
-       display: inline;
        margin: 0;
        padding: 0;
+       position: absolute;
+       bottom: -1px;
+       width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
 }
 
 #tabs ul li {
        display: inline;
        list-style: none;
-       margin: 0;
-       padding: 2px 10px 5px 10px;
-       background: #FFFFCC;
+}
+
+#tabs ul li a,#tabs ul li a.selected {
+       width: 7em;
+       display: block;
+       float: left;
+       padding: 4px 0;
+       margin: 1px 8px 0 0;
+       text-align: center;
+       font-family: tahoma, verdana, sans-serif;
+       font-size: 85%;
+       text-decoration: none;
+       color: black;
+}
+
+#tabs ul li.selected a,#tabs ul li.selected a:hover {
+       margin-top: 0;
+       padding-bottom: 6px;
+       background: white;
        border: 1px solid black;
+       border-bottom: none;
+}
+
+#tabs ul li a {
+       background: #FFFFCC;
+       border: 1px solid #808080;
+       border-bottom: none;
+}
+
+#tabs ul li a:hover {
+       margin-top: 0;
+       padding-bottom: 5px;
+       background: white;
+       border-color: black;
 }
 
-#tabs ul li.selected {
+#main {
+       clear: both;
+       border-top: 1px solid black;
        background: white;
-       border-bottom: 1px solid white;
 }
 
 #nav {
        float: left;
        margin: 5px;
+       margin-top: 10px;
        padding: 5px;
        width: 11.2em;
        background: #C0C0C0;
diff --git a/Web/page.inc b/Web/page.inc
index d68d4a4..df5ad9a 100644 (file)
--- a/Web/page.inc
+++ b/Web/page.inc
@@ -95,8 +95,7 @@
       $temp .= "<body>\n";
       $temp .= "<div id=\"head\">\n";
       $temp .= "<h1><a href=\"/index.php\"><img src=\"/images/icon.gif\" height=\"32\" width=\"32\" align=\"top\" alt=\"WinMerge logo\" border=\"0\"></a> <img src=\"/images/logo.gif\" height=\"50\" width=\"218\" align=\"top\" alt=\"WinMerge\" border=\"0\"></h1>\n";
-      $temp .= "</div>\n";
-      $temp .= "<div id=\"tabs\">\n";
+      $temp .= "  <div id=\"tabs\">\n";
       $temp .= "<ul>\n";
       if ($this->_version == WINMERGE_USR) { //if "Users" ...
         $temp .= "  <li class=\"selected\"><a href=\"/index.php\">Users</a></li>\n";
@@ -132,11 +131,13 @@
         $temp .= "  <li><a href=\"/developer/index.php\">Developers</a></li>\n";
       }
       $temp .= "</ul>\n";
+      $temp .= "  </div>\n";
       $temp .= "</div>\n";
-      $temp .= "<div id=\"nav\">\n";
+      $temp .= "<div id=\"main\">\n";
+      $temp .= "  <div id=\"nav\">\n";
       $temp .= $this->getMenu();
-      $temp .= "</div>\n";
-      $temp .= "<div id=\"content\">\n";
+      $temp .= "  </div>\n";
+      $temp .= "  <div id=\"content\">\n";
       print($temp);
     }
 
@@ -144,6 +145,7 @@
      * print the foot from the page
      */
     function printFoot() {
+      $temp = "  </div>\n";
       $temp = "</div>\n";
       $temp .= "</body>\n\n";
       $temp .= "</html>\n";
About OSDN
Find Software
Develop Software
Help