Web: Move history page to "About" tab

diff --git a/Web/.htaccess b/Web/.htaccess
index 1a8bd6b..8ca4276 100644 (file)
--- a/Web/.htaccess
+++ b/Web/.htaccess
@@ -19,6 +19,9 @@ 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
 
+#Move history page to "About" tab...
+Redirect permanent /history.php http://winmerge.org/about/history.php
+
 #Centralize download pages...
 Redirect permanent /downloads.php http://winmerge.org/downloads/index.php
 Redirect permanent /2.4/downloads.php http://winmerge.org/downloads/index.php

diff --git a/Web/history.php b/Web/about/history.php
similarity index 93%
rename from Web/history.php
rename to Web/about/history.php
index fce59e4..7bd023b 100644 (file)
--- a/Web/history.php
+++ b/Web/about/history.php
@@ -1,8 +1,8 @@
 <?php\r
-  include('page.inc');\r
+  include('../page.inc');\r
 \r
   $page = new Page;\r
-  $page->printHead('WinMerge: History', TAB_HOME);\r
+  $page->printHead('WinMerge History', TAB_ABOUT);\r
 ?>\r
 <h2>History</h2>\r
 <div class="infocard">\r

diff --git a/Web/page.inc b/Web/page.inc
index d7a48cc..8a0bb16 100644 (file)
--- a/Web/page.inc
+++ b/Web/page.inc
@@ -246,7 +246,6 @@
         case TAB_HOME: //if "Home" ...
           $temp .= "<ul id=\"subtabs\">\n";
           $temp .= "  <li><a href=\"http://sourceforge.net/projects/winmerge\">Project&nbsp;Page</a></li>\n";
-          $temp .= "  <li><a href=\"/history.php\">History</a></li>\n";
           $temp .= "  <li><a href=\"/links.php\">Links</a></li>\n";
           $temp .= "  <li><a href=\"/WinMergePAD.php\">PAD&nbsp;file</a></li>\n";
           $temp .= "</ul>\n";
@@ -255,6 +254,7 @@
           $temp .= "<ul id=\"subtabs\">\n";
           $temp .= "  <li><a href=\"/about/index.php\" title=\"Index\">Index</a></li>\n";
           $temp .= "  <li><a href=\"/about/screenshots/index.php\" title=\"Screenshots\">Screenshots</a></li>\n";
+          $temp .= "  <li><a href=\"/about/history.php\">History</a></li>\n";
           $temp .= "</ul>\n";
           break;
         case WINMERGE_1_7: //if WinMerge 1.7 ...

diff --git a/Web/sitemap.txt b/Web/sitemap.txt
index b93fdf3..0b94274 100644 (file)
--- a/Web/sitemap.txt
+++ b/Web/sitemap.txt
@@ -1,5 +1,4 @@
 http://winmerge.org/index.php
-http://winmerge.org/history.php
 http://winmerge.org/links.php
 http://winmerge.org/WinMergePAD.php
 http://winmerge.org/2.4/changes.php
@@ -75,6 +74,7 @@ http://winmerge.org/2.8/manual/Shortcuts.html
 http://winmerge.org/2.8/manual/TextEncoding.html
 http://winmerge.org/2.8/manual/VersionControl.html
 http://winmerge.org/about/index.php
+http://winmerge.org/about/history.php
 http://winmerge.org/about/screenshots/index.php
 http://winmerge.org/docs/changelog.php
 http://winmerge.org/docs/index.php