[Winmerge-svn] SF.net SVN: winmerge: [3970] trunk/Web

[<ge...@us...>]

Revision: 3970
          http://svn.sourceforge.net/winmerge/?rev=3970&view=rev
Author:   gerundt
Date:     2006-12-17 13:28:36 -0800 (Sun, 17 Dec 2006)

Log Message:
-----------
PATCH: [ 1617518 ] Web: Remove "main" <div>

Modified Paths:
--------------
    trunk/Web/Changes.txt
    trunk/Web/css/all.css
    trunk/Web/page.inc

Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt	2006-12-17 06:43:34 UTC (rev 3969)
+++ trunk/Web/Changes.txt	2006-12-17 21:28:36 UTC (rev 3970)
@@ -1,3 +1,8 @@
+2006-12-17 Tim
+ PATCH: [ 1617518 ] Web: Remove "main" <div>
+  Web: page.inc
+  Web\css: all.css
+
 2006-12-15 Tim
  PATCH: [ 1616076 ] Web: Changes for new stable release 2.6.2
   Web: downloads.php index.php page.inc WinMergePAD.xml

Modified: trunk/Web/css/all.css
===================================================================
--- trunk/Web/css/all.css	2006-12-17 06:43:34 UTC (rev 3969)
+++ trunk/Web/css/all.css	2006-12-17 21:28:36 UTC (rev 3970)
@@ -16,6 +16,7 @@
 	margin: 0;
 	padding: 5px 5px 0 15px;
 	background: #FFCC00;
+	border-bottom: 1px solid black;
 }
 
 #head h1 {
@@ -77,12 +78,6 @@
 	border-color: black;
 }
 
-#main {
-	clear: both;
-	border-top: 1px solid black;
-	background: white;
-}
-
 #ads {
 	margin: 0;
 	padding: 10px 5px 10px 5px;

Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc	2006-12-17 06:43:34 UTC (rev 3969)
+++ trunk/Web/page.inc	2006-12-17 21:28:36 UTC (rev 3970)
@@ -134,14 +134,13 @@
       $temp .= "</ul>\n";
       $temp .= "  </div>\n";
       $temp .= "</div>\n";
-      $temp .= "<div id=\"main\">\n";
-      $temp .= "  <div id=\"ads\">\n";
+      $temp .= "<div id=\"ads\">\n";
       $temp .= $this->getAds();
-      $temp .= "  </div>\n";
-      $temp .= "  <div id=\"nav\">\n";
+      $temp .= "</div>\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);
     }
 
@@ -149,8 +148,7 @@
      * print the foot from the page
      */
     function printFoot() {
-      $temp = "  </div>\n";
-      $temp .= "</div>\n";
+      $temp = "</div>\n";
       $temp .= "</body>\n\n";
       $temp .= "</html>\n";
       print($temp);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.