PATCH: [ 1746188 ] Web: Move "Downloads" page to own tab

diff --git a/Web/.htaccess b/Web/.htaccess
index 4f05c46..fab977e 100644 (file)
--- a/Web/.htaccess
+++ b/Web/.htaccess
@@ -6,7 +6,6 @@
 #Use PHP5 instead of PHP4
 AddType x-mapp-php5 .php
 
-Redirect permanent /developer/wincvs.php http://sourceforge.net/cvs/?group_id=13216
 Redirect permanent /developer/translate.php http://winmerge.org/Wiki/index.php?title=Translations
 Redirect permanent /WinMerge17/index.html http://winmerge.org/1.7/index.php
 Redirect permanent /WinMerge17/WinMergeChanges.html http://winmerge.org/1.7/changes.php
@@ -18,6 +17,7 @@ Redirect permanent /images/screenshot.png http://winmerge.org/2.0/images/screens
 Redirect permanent /images/winmerge.gif http://winmerge.org/2.0/images/icon.gif
 Redirect permanent /images/winmerge22.gif http://winmerge.org/2.2/images/icon.gif
 Redirect permanent /2.2/images/filecomp1.gif http://winmerge.org/2.2/images/screenshot.gif
+Redirect permanent /downloads.php http://winmerge.org/downloads/index.php
 
 #Move developer pages to Wiki...
 Redirect permanent /developer/index.php http://winmerge.org/Wiki/index.php?title=Developers

diff --git a/Web/Changes.txt b/Web/Changes.txt
index 78ab7a0..ed2b20b 100644 (file)
--- a/Web/Changes.txt
+++ b/Web/Changes.txt
@@ -1,3 +1,8 @@
+2007-07-02 Tim
+ PATCH: [ 1746188 ] Web: Move "Downloads" page to own tab
+  Web: .htaccess page.inc sitemap.txt deleted downloads.php
+  Web\downloads: new file index.php
+
 2007-06-27 Tim
  Use nicer Wiki URLs.
   Web: .htaccess

diff --git a/Web/downloads.php b/Web/downloads/index.php
similarity index 72%
rename from Web/downloads.php
rename to Web/downloads/index.php
index 53e809d..b2e6b86 100644 (file)
--- a/Web/downloads.php
+++ b/Web/downloads/index.php
@@ -1,24 +1,30 @@
-<?php
-  include('page.inc');
-
-  $page = new Page;
-  $page->printHead('WinMerge: Downloads', TAB_HOME);
-?>
-<h2>Downloads</h2>
-<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248&amp;release_id=517309">WinMerge 2.6.8</a></h3>
-<dl>
-  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe">Installer</a></dt>
-  <dd><p>The easiest way to install WinMerge is to download and run this installer. Read the <a href="2.6/manual/Installing.html">online manual</a> for help using it.</p></dd>
-  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.zip">Binaries</a></dt>
-  <dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.7z">.7z</a>).</p></dd>
-  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.zip">Source code</a></dt>
-  <dd><p>Source code is available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.7z">.7z</a>).</p></dd>
-  <dt><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0019-311-444.exe">7-Zip Plugin</a> (DllBuild 0019)</dt>
-  <dd>
-    <p>This is the 7-Zip plugin for WinMerge.</p>
-    <p>You can also read the <a href="http://sourceforge.net/project/shownotes.php?group_id=13216&amp;release_id=482019">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=143957">other versions</a>.</p>
-  </dd>
-</dl>
-<?php
-  $page->printFoot();
+<?php\r
+  include('../page.inc');\r
+\r
+  $page = new Page;\r
+  $page->printHead('WinMerge: Downloads', TAB_DOWNLOADS);\r
+?>\r
+<h2>Downloads</h2>\r
+<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248&amp;release_id=517309">WinMerge 2.6.8</a> (<a href="http://sourceforge.net/project/shownotes.php?release_id=517309">Release Notes</a>)</h3>\r
+<dl>\r
+  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe">Installer</a></dt>\r
+  <dd><p>The easiest way to install WinMerge is to download and run this installer. Read the <a href="2.6/manual/Installing.html">online manual</a> for help using it.</p></dd>\r
+  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.zip">Binaries</a></dt>\r
+  <dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.7z">.7z</a>).</p></dd>\r
+  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.zip">Source code</a></dt>\r
+  <dd><p>Source code is available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.7z">.7z</a>).</p></dd>\r
+  <dt><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0019-311-444.exe">7-Zip Plugin</a> (DllBuild 0019)</dt>\r
+  <dd>\r
+    <p>This is the 7-Zip plugin for WinMerge.</p>\r
+    <p>You can also read the <a href="http://sourceforge.net/project/shownotes.php?group_id=13216&amp;release_id=482019">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=143957">other versions</a>.</p>\r
+  </dd>\r
+</dl>\r
+<h3>Other Versions</h3>\r
+<ul>\r
+  <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248">Stable Versions</a></li>\r
+  <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=29158">Beta Versions</a></li>\r
+  <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=92246">Experimental Builds</a></li>\r
+</ul>\r
+<?php\r
+  $page->printFoot();\r
 ?>
\ No newline at end of file

diff --git a/Web/page.inc b/Web/page.inc
index bc3de9e..94213e2 100644 (file)
--- a/Web/page.inc
+++ b/Web/page.inc
@@ -15,6 +15,7 @@
   define ('WINMERGE_2_2', '2.2');
   define ('WINMERGE_2_4', '2.4');
   define ('WINMERGE_2_6', '2.6');
+  define ('TAB_DOWNLOADS', 'downloads');
   define ('TAB_SUPPORT', 'support');
 
   /**
@@ -160,6 +161,12 @@
       if ($this->_tab == WINMERGE_1_7) { //if WinMerge 1.7 ...
         $temp .= "  <li><a href=\"/1.7/index.php\" id=\"current\">WinMerge&nbsp;1.7</a></li>\n";
       }
+      if ($this->_tab == TAB_DOWNLOADS) { //if "Downloads" ...
+        $temp .= "  <li><a href=\"/downloads/index.php\" id=\"current\">Downloads</a></li>\n";
+      }
+      else { //if NOT "Downloads" ...
+        $temp .= "  <li><a href=\"/downloads/index.php\">Downloads</a></li>\n";
+      }
       if ($this->_tab == TAB_SUPPORT) { //if "Support" ...
         $temp .= "  <li><a href=\"/support/index.php\" id=\"current\">Support</a></li>\n";
       }
@@ -284,7 +291,7 @@
           $temp .= "  <li><a href=\"/2.6/manual/Faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
           $temp .= "</ul>\n";
           $temp .= "<ul>\n";
-          $temp .= "  <li><a href=\"/downloads.php\">Downloads</a>\n";
+          $temp .= "  <li><a href=\"/downloads/index.php\">Downloads</a>\n";
           $temp .= "    <ul>\n";
           $temp .= "      <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248&amp;release_id=517309\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=517309\" title=\"Release Notes\">Notes</a>)</li>\n";
           $temp .= "      <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=143957\">7-Zip Plugin</a></li>\n";
@@ -292,6 +299,18 @@
           $temp .= "  </li>\n";
           $temp .= "</ul>\n";
           break;
+        case TAB_DOWNLOADS: //if "Downloads" ...
+          $temp .= "<h2><a href=\"/downloads/index.php\">Downloads</a></h2>\n";
+          $temp .= "<ul>\n";
+          $temp .= "  <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248&amp;release_id=517309\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=517309\" title=\"Release Notes\">Notes</a>)</li>\n";
+          $temp .= "  <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=143957\">7-Zip Plugin</a></li>\n";
+          $temp .= "</ul>\n";
+          $temp .= "<ul>\n";
+          $temp .= "  <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248\">Stable Versions</a></li>\n";
+          $temp .= "  <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=29158\">Beta Versions</a></li>\n";
+          $temp .= "  <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=92246\">Experimental Builds</a></li>\n";
+          $temp .= "</ul>\n";
+          break;
         case TAB_SUPPORT: //if "Support" ...
           $temp .= "<h2><a href=\"/support/index.php\">Support</a></h2>\n";
           $temp .= "<ul>\n";

diff --git a/Web/sitemap.txt b/Web/sitemap.txt
index bcfc4a6..20d7de8 100644 (file)
--- a/Web/sitemap.txt
+++ b/Web/sitemap.txt
@@ -1,4 +1,3 @@
-http://winmerge.org/downloads.php
 http://winmerge.org/index.php
 http://winmerge.org/links.php
 http://winmerge.org/WinMergePAD.php
@@ -56,6 +55,7 @@ http://winmerge.org/2.6/manual/Shortcuts.html
 http://winmerge.org/2.6/manual/TextEncoding.html
 http://winmerge.org/2.6/manual/VersionControl.html
 http://winmerge.org/2.6/manual/Whatsnew.html
+http://winmerge.org/downloads/index.php
 http://winmerge.org/support/index.php
 http://winmerge.org/support/mailing-lists.php
 http://winmerge.org/support/tracker-shortcuts.php