OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f4bd896)
PATCH: [ 1739404 ] Web: Move buttons to right corner
authorTim Gerundt <tim@gerundt.de>
Tue, 19 Jun 2007 20:29:16 +0000 (20:29 +0000)
committerTim Gerundt <tim@gerundt.de>
Tue, 19 Jun 2007 20:29:16 +0000 (20:29 +0000)
Web/Changes.txt patch | blob | history
Web/css/print.css patch | blob | history
Web/css/screen.css patch | blob | history
Web/images/sourceforge.png [deleted file] patch | blob | history
Web/images/valid-css.gif [deleted file] patch | blob | history
Web/images/valid-html401.gif [deleted file] patch | blob | history
Web/page.inc patch | blob | history

diff --git a/Web/Changes.txt b/Web/Changes.txt
index 3fe8727..dc4f11d 100644 (file)
--- a/Web/Changes.txt
+++ b/Web/Changes.txt
@@ -1,3 +1,9 @@
+2007-06-19 Tim
+ PATCH: [ 1739404 ] Web: Move buttons to right corner
+  Web: page.inc
+  Web\css: print.css screen.css
+  Web\developer: deleted sourceforge.png valid-css.gif valid-html401.gif
+
 2007-06-17 Tim
  PATCH: [ 1738750 ] Web: Use Eric Meyer's tabbed navbar
   Web: page.inc
diff --git a/Web/css/print.css b/Web/css/print.css
index 3e9c182..71f7805 100644 (file)
--- a/Web/css/print.css
+++ b/Web/css/print.css
@@ -23,6 +23,10 @@ code,pre {
        padding: 0;
 }
 
+#rightcorner {
+       display: none;
+}
+
 #tabs {
        display: none;
 }
diff --git a/Web/css/screen.css b/Web/css/screen.css
index a74de41..87cc6d9 100644 (file)
--- a/Web/css/screen.css
+++ b/Web/css/screen.css
@@ -21,10 +21,15 @@ code,pre {
 }
 
 #head h1 {
+       float: left;
        margin: 0;
        padding: 0;
 }
 
+#rightcorner {
+       text-align: right;
+}
+
 /* Based on "Eric Meyer's tabbed navbar" from Eric Meyer:
    http://css.maxdesign.com.au/listamatic/horizontal05.htm */
 #tabs {
diff --git a/Web/images/sourceforge.png b/Web/images/sourceforge.png
deleted file mode 100644 (file)
index b2a9e99..0000000
Binary files a/Web/images/sourceforge.png and /dev/null differ
diff --git a/Web/images/valid-css.gif b/Web/images/valid-css.gif
deleted file mode 100644 (file)
index 020c75a..0000000
Binary files a/Web/images/valid-css.gif and /dev/null differ
diff --git a/Web/images/valid-html401.gif b/Web/images/valid-html401.gif
deleted file mode 100644 (file)
index 1270561..0000000
Binary files a/Web/images/valid-html401.gif and /dev/null differ
diff --git a/Web/page.inc b/Web/page.inc
index ccdaca4..336eca6 100644 (file)
--- a/Web/page.inc
+++ b/Web/page.inc
@@ -96,6 +96,11 @@
       $temp .= "<body>\n";
       $temp .= "<div id=\"head\">\n";
       $temp .= "<h1><a href=\"/index.php\"><img src=\"/images/icon.gif\" height=\"48\" width=\"48\" 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 .= "<p id=\"rightcorner\">\n";
+      $temp .= "  <a href=\"http://sourceforge.net/\"><img src=\"http://sourceforge.net/sflogo.php?group_id=13216\" width=\"88\" height=\"31\" border=\"0\" alt=\"SourceForge\" title=\"SourceForge.net\"></a>\n";
+      $temp .= "  <a href=\"/WinMergePAD.php\"><img src=\"/images/padbutton.gif\" width=\"80\" height=\"31\" border=\"0\" alt=\"PAD Enabled\" title=\"PAD Enabled\"></a>\n";
+      $temp .= "  <a href=\"http://sourceforge.net/donate/index.php?group_id=13216\"><img src=\"/images/project-support.jpg\" width=\"88\" height=\"32\" border=\"0\" alt=\"Donate\" title=\"Donate money to WinMerge\"></a>\n";
+      $temp .= "</p>\n";
       $temp .= "</div>\n";
       $temp .= $this->getTabs();
       $temp .= "<div id=\"ads\">\n";
@@ -304,26 +309,6 @@
       $temp .= "<ul>\n";
       $temp .= "  <li><a href=\"/links.php\">Links</a></li>\n";
       $temp .= "</ul>\n";
-      $temp .= "<p align=\"center\">\n";
-      $temp .= "  <a href=\"http://sourceforge.net/donate/index.php?group_id=13216\">\n";
-      $temp .= "    <img src=\"/images/project-support.jpg\" width=\"88\" height=\"32\" border=\"0\" alt=\"Donate money to WinMerge\">\n";
-      $temp .= "  </a>\n";
-      $temp .= "</p>\n";
-      $temp .= "<p align=\"center\">\n";
-      $temp .= "  <a href=\"/WinMergePAD.php\">\n";
-      $temp .= "    <img src=\"/images/padbutton.gif\" alt=\"PAD Enabled\" border=\"0\">\n";
-      $temp .= "  </a>\n";
-      $temp .= "</p>\n";
-      $temp .= "<p align=\"center\">\n";
-      $temp .= "  <a href=\"http://validator.w3.org/check/referer\">\n";
-      $temp .= "    <img src=\"/images/valid-html401.gif\" alt=\"Valid HTML 4.01!\" width=\"88\" height=\"31\" border=\"0\">\n";
-      $temp .= "  </a>\n";
-      $temp .= "</p>\n";
-      $temp .= "<p align=\"center\">\n";
-      $temp .= "  <a href=\"http://jigsaw.w3.org/css-validator\">\n";
-      $temp .= "    <img src=\"/images/valid-css.gif\" alt=\"Valid CSS!\" width=\"88\" height=\"31\" border=\"0\">\n";
-      $temp .= "  </a>\n";
-      $temp .= "</p>\n";
       return $temp;
     }
 
About OSDN
Find Software
Develop Software
Help