[Winmerge-svn] SF.net SVN: winmerge: [4342] trunk/Web
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2007-06-17 21:34:05
|
Revision: 4342 http://svn.sourceforge.net/winmerge/?rev=4342&view=rev Author: gerundt Date: 2007-06-17 14:34:02 -0700 (Sun, 17 Jun 2007) Log Message: ----------- PATCH: [ 1738750 ] Web: Use Eric Meyer's tabbed navbar Modified Paths: -------------- trunk/Web/Changes.txt trunk/Web/css/screen.css trunk/Web/page.inc Modified: trunk/Web/Changes.txt =================================================================== --- trunk/Web/Changes.txt 2007-06-17 19:45:26 UTC (rev 4341) +++ trunk/Web/Changes.txt 2007-06-17 21:34:02 UTC (rev 4342) @@ -1,3 +1,8 @@ +2007-06-17 Tim + PATCH: [ 1738750 ] Web: Use Eric Meyer's tabbed navbar + Web: page.inc + Web\css: screen.css + 2007-06-13 PATCH: [ 1734072 ] Upgrade website to PHP 5 Web: .htaccess Modified: trunk/Web/css/screen.css =================================================================== --- trunk/Web/css/screen.css 2007-06-17 19:45:26 UTC (rev 4341) +++ trunk/Web/css/screen.css 2007-06-17 21:34:02 UTC (rev 4342) @@ -15,9 +15,9 @@ #head { margin: 0; - padding: 5px 5px 0 1em; + padding: 5px; + padding-left: 1em; background: #FFCC00; - border-bottom: 1px solid black; } #head h1 { @@ -25,60 +25,45 @@ padding: 0; } -/* Based on "Updated Simple CSS Tabs" from silverorange labs: - http://labs.silverorange.com/archives/2004/may/updatedsimple */ +/* Based on "Eric Meyer's tabbed navbar" from Eric Meyer: + http://css.maxdesign.com.au/listamatic/horizontal05.htm */ #tabs { - position: relative; - width: 100%; - height: 3em; - width: 50em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */ -} - -#tabs ul { margin: 0; - padding: 0; - position: absolute; - bottom: -1px; - width: 50em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */ + padding: 3px 1em; + background: #FFCC00; + border-bottom: 1px solid black; } -#tabs ul li { +#tabs li { + margin: 0; display: inline; list-style: none; } -#tabs ul li a { - width: 7em; - display: block; - float: left; - padding: 4px 0; - margin: 1px 8px 0 0; - text-align: center; +#tabs li a { + margin-left: 3px; + padding: 3px 0.5em; 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; +#tabs li a:link { color: black; } +#tabs li a:visited { color: black; } + +#tabs li a:hover { + color: black; background: white; border-color: black; } +#tabs li a#current { + background: white; + border: 1px solid black; + border-bottom: 1px solid white; +} + #ads { margin: 0; padding: 10px 5px 10px 5px; Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2007-06-17 19:45:26 UTC (rev 4341) +++ trunk/Web/page.inc 2007-06-17 21:34:02 UTC (rev 4342) @@ -96,10 +96,8 @@ $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 .= " <div id=\"tabs\">\n"; - $temp .= $this->getTabs(); - $temp .= " </div>\n"; $temp .= "</div>\n"; + $temp .= $this->getTabs(); $temp .= "<div id=\"ads\">\n"; $temp .= $this->getAds(); $temp .= "</div>\n"; @@ -132,38 +130,38 @@ * get the tabs menu from the page */ function getTabs() { - $temp = "<ul>\n"; + $temp = "<ul id=\"tabs\">\n"; if ($this->_tab == TAB_HOME) { //if "Home" ... - $temp .= " <li class=\"selected\"><a href=\"/index.php\">Home</a></li>\n"; + $temp .= " <li><a href=\"/index.php\" id=\"current\">Home</a></li>\n"; } else { //if NOT "Home" ... $temp .= " <li><a href=\"/index.php\">Home</a></li>\n"; } if ($this->_tab == WINMERGE_2_6) { //if WinMerge 2.6 ... - $temp .= " <li class=\"selected\"><a href=\"/2.6/index.php\">2.6</a></li>\n"; + $temp .= " <li><a href=\"/2.6/index.php\" id=\"current\">WinMerge 2.6</a></li>\n"; } else { //if NOT WinMerge 2.6 ... - $temp .= " <li><a href=\"/2.6/index.php\">2.6</a></li>\n"; + $temp .= " <li><a href=\"/2.6/index.php\">WinMerge 2.6</a></li>\n"; } if ($this->_tab == WINMERGE_2_4) { //if WinMerge 2.4 ... - $temp .= " <li class=\"selected\"><a href=\"/2.4/index.php\">2.4</a></li>\n"; + $temp .= " <li><a href=\"/2.4/index.php\" id=\"current\">WinMerge 2.4</a></li>\n"; } if ($this->_tab == WINMERGE_2_2) { //if WinMerge 2.2 ... - $temp .= " <li class=\"selected\"><a href=\"/2.2/index.php\">2.2</a></li>\n"; + $temp .= " <li><a href=\"/2.2/index.php\" id=\"current\">WinMerge 2.2</a></li>\n"; } if ($this->_tab == WINMERGE_2_0) { //if WinMerge 2.0 ... - $temp .= " <li class=\"selected\"><a href=\"/2.0/index.php\">2.0</a></li>\n"; + $temp .= " <li><a href=\"/2.0/index.php\" id=\"current\">WinMerge 2.0</a></li>\n"; } if ($this->_tab == WINMERGE_1_7) { //if WinMerge 1.7 ... - $temp .= " <li class=\"selected\"><a href=\"/1.7/index.php\">1.7</a></li>\n"; + $temp .= " <li><a href=\"/1.7/index.php\" id=\"current\">WinMerge 1.7</a></li>\n"; } if ($this->_tab == TAB_SUPPORT) { //if "Support" ... - $temp .= " <li class=\"selected\"><a href=\"/support/index.php\">Support</a></li>\n"; + $temp .= " <li><a href=\"/support/index.php\" id=\"current\">Support</a></li>\n"; } else { //if NOT "Support" ... $temp .= " <li><a href=\"/support/index.php\">Support</a></li>\n"; } - $temp .= " <li><a href=\"/Wiki/\">Wiki</a></li>\n"; + $temp .= " <li><a href=\"/Wiki/\">Developer Wiki</a></li>\n"; $temp .= "</ul>\n"; return $temp; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |