[Winmerge-svn] SF.net SVN: winmerge: [4345] trunk/Web
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2007-06-19 20:29:19
|
Revision: 4345 http://svn.sourceforge.net/winmerge/?rev=4345&view=rev Author: gerundt Date: 2007-06-19 13:29:16 -0700 (Tue, 19 Jun 2007) Log Message: ----------- PATCH: [ 1739404 ] Web: Move buttons to right corner Modified Paths: -------------- trunk/Web/Changes.txt trunk/Web/css/print.css trunk/Web/css/screen.css trunk/Web/page.inc Removed Paths: ------------- trunk/Web/images/sourceforge.png trunk/Web/images/valid-css.gif trunk/Web/images/valid-html401.gif Modified: trunk/Web/Changes.txt =================================================================== --- trunk/Web/Changes.txt 2007-06-19 16:46:35 UTC (rev 4344) +++ trunk/Web/Changes.txt 2007-06-19 20:29:16 UTC (rev 4345) @@ -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 Modified: trunk/Web/css/print.css =================================================================== --- trunk/Web/css/print.css 2007-06-19 16:46:35 UTC (rev 4344) +++ trunk/Web/css/print.css 2007-06-19 20:29:16 UTC (rev 4345) @@ -23,6 +23,10 @@ padding: 0; } +#rightcorner { + display: none; +} + #tabs { display: none; } Modified: trunk/Web/css/screen.css =================================================================== --- trunk/Web/css/screen.css 2007-06-19 16:46:35 UTC (rev 4344) +++ trunk/Web/css/screen.css 2007-06-19 20:29:16 UTC (rev 4345) @@ -21,10 +21,15 @@ } #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 { Deleted: trunk/Web/images/sourceforge.png =================================================================== (Binary files differ) Deleted: trunk/Web/images/valid-css.gif =================================================================== (Binary files differ) Deleted: trunk/Web/images/valid-html401.gif =================================================================== (Binary files differ) Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2007-06-19 16:46:35 UTC (rev 4344) +++ trunk/Web/page.inc 2007-06-19 20:29:16 UTC (rev 4345) @@ -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; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |