PATCH: [ 2116922 ] Web: Changes for new stable release 2.10.0

diff --git a/Web/404.php b/Web/404.php
index 763436e..8635bfd 100644 (file)
--- a/Web/404.php
+++ b/Web/404.php
@@ -14,12 +14,17 @@
 \r
 <h3>Were you looking for...</h3>\r
 <ul>\r
-  <li><a href="/2.8/manual/index.html">Manual</a>?</li>\r
-  <li><a href="/2.8/screenshots.php">Screenshots</a>?</li>\r
-  <!--<li><a href="/docs">Documentation</a>?</li>-->\r
-  <li><a href="/downloads">Downloads</a>?</li>\r
-  <li><a href="/support">Support</a>?</li>\r
-  <li><a href="/translations">Translations</a>?</li>\r
+  <li><a href="/about/screenshots/">Screenshots</a>?</li>\r
+  <li><a href="/docs/">Documentation</a>?\r
+    <ul>\r
+      <li><a href="/docs/manual/">Manual</a>?</li>\r
+      <li><a href="/docs/releasenotes.php">Release Notes</a>?</li>\r
+      <li><a href="/docs/changelog.php">Change Log</a>?</li>\r
+    </ul>\r
+  </li>\r
+  <li><a href="/downloads/">Downloads</a>?</li>\r
+  <li><a href="/support/">Support</a>?</li>\r
+  <li><a href="/translations/">Translations</a>?</li>\r
 </ul>\r
 <?php\r
   $page->printFoot();\r

diff --git a/Web/WinMergePAD.xml b/Web/WinMergePAD.xml
index 25b9a16..508e8a7 100644 (file)
--- a/Web/WinMergePAD.xml
+++ b/Web/WinMergePAD.xml
@@ -34,15 +34,15 @@
        </Company_Info>
        <Program_Info>
                <Program_Name>WinMerge</Program_Name>
-               <Program_Version>2.8.6</Program_Version>
-               <Program_Release_Month>08</Program_Release_Month>
-               <Program_Release_Day>07</Program_Release_Day>
+               <Program_Version>2.10.0</Program_Version>
+               <Program_Release_Month>09</Program_Release_Month>
+               <Program_Release_Day>17</Program_Release_Day>
                <Program_Release_Year>2008</Program_Release_Year>
                <Program_Cost_Dollars>0</Program_Cost_Dollars>
                <Program_Cost_Other_Code />
                <Program_Cost_Other />
                <Program_Type>Freeware</Program_Type>
-               <Program_Release_Status>Minor Update</Program_Release_Status>
+               <Program_Release_Status>Major Update</Program_Release_Status>
                <Program_Install_Support>Install and Uninstall</Program_Install_Support>
                <Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP,Windows2003,Windows Vista Starter,Windows Vista Home Basic,Windows Vista Home Premium,Windows Vista Business,Windows Vista Enterprise,Windows Vista Ultimate,Windows Vista Home Basic x64,Windows Vista Home Premium x64,Windows Vista Business x64,Windows Vista Enterprise x64,Windows Vista Ultimate x64</Program_OS_Support>
                <Program_Language>Bulgarian,Catalan,ChineseSimplified,ChineseTraditional,Croatian,Czech,Danish,Dutch,English,French,German,Greek,Hungarian,Italian,Japanese,Korean,Norwegian,Polish,Portuguese,Romanian,Russian,Slovak,Spanish,Swedish,Turkish,Ukrainian</Program_Language>
@@ -51,8 +51,8 @@
                <Program_Category_Class>System Utilities::File Compression</Program_Category_Class>
                <Program_System_Requirements />
                <File_Info>
-                       <File_Size_Bytes>3034033</File_Size_Bytes>
-                       <File_Size_K>2963</File_Size_K>
+                       <File_Size_Bytes>3232299</File_Size_Bytes>
+                       <File_Size_K>3157</File_Size_K>
                        <File_Size_MB>3</File_Size_MB>
                </File_Info>
                <Expire_Info>
@@ -77,14 +77,14 @@
        </Program_Descriptions>
        <Web_Info>
                <Application_URLs>
-                       <Application_Info_URL>http://winmerge.org/2.8/</Application_Info_URL>
-                       <Application_Order_URL>http://winmerge.org/2.8/</Application_Order_URL>
-                       <Application_Screenshot_URL>http://winmerge.org/2.8/images/screenshot.png</Application_Screenshot_URL>
-                       <Application_Icon_URL>http://winmerge.org/2.8/images/icon.gif</Application_Icon_URL>
+                       <Application_Info_URL>http://winmerge.org/about/</Application_Info_URL>
+                       <Application_Order_URL>http://winmerge.org/downloads/</Application_Order_URL>
+                       <Application_Screenshot_URL>http://winmerge.org/about/screenshots/screenshot.png</Application_Screenshot_URL>
+                       <Application_Icon_URL>http://winmerge.org/about/screenshots/icon.gif</Application_Icon_URL>
                        <Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
                </Application_URLs>
                <Download_URLs>
-                       <Primary_Download_URL>http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-Setup.exe</Primary_Download_URL>
+                       <Primary_Download_URL>http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-Setup.exe</Primary_Download_URL>
                        <Secondary_Download_URL />
                        <Additional_Download_URL_1 />
                        <Additional_Download_URL_2 />

diff --git a/Web/about/index.php b/Web/about/index.php
index e184960..96f5399 100644 (file)
--- a/Web/about/index.php
+++ b/Web/about/index.php
@@ -3,6 +3,7 @@
 \r
   $page = new Page;\r
   $page->printHead('About WinMerge', TAB_ABOUT);\r
+  $stablerelease = $page->getStableRelease();\r
 ?>\r
 <h2>About WinMerge</h2>\r
 <p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p>\r
@@ -25,7 +26,7 @@
   <li>Archive file support using 7-Zip</li>\r
   <li>Plugin support</li>\r
   <li>Localizable interface</li>\r
-  <li><a href="/2.8/manual/index.html">Online manual</a> and installed HTML Help manual</li>\r
+  <li><a href="/docs/manual/">Online manual</a> and installed HTML Help manual</li>\r
 </ul>\r
 \r
 <h3>Screenshots</h3>\r
@@ -34,16 +35,16 @@
 <p>See the <a href="screenshots/index.php">screenshots page</a> for more screenshots.</p>\r
 \r
 <h3>Installation</h3>\r
-<p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-Setup.exe">installer</a> and double-click it.</p>\r
-<p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-exe.zip">binary zip package</a> into the desired location, and run\r
+<p>Just download the <a href="<?php echo $stablerelease->getDownload('setup.exe');?>">installer</a> and double-click it.</p>\r
+<p>Or you may simply unzip the <a href="<?php echo $stablerelease->getDownload('exe.zip');?>">binary zip package</a> into the desired location, and run\r
 <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>\r
-<p>For more information, please see the <a href="/2.8/manual/Installing.html">Installation section</a> of the <a href="/2.8/manual/index.html">Manual</a>.</p>\r
+<p>For more information, please see the <a href="/docs/manual/Installing.html">Installation section</a> of the <a href="/docs/manual/">Manual</a>.</p>\r
 \r
 <h3>Using WinMerge</h3>\r
-<p>For information on using WinMerge, see our <a href="/2.8/manual/index.html">online Manual</a>,\r
+<p>For information on using WinMerge, see our <a href="/docs/manual/">online Manual</a>,\r
 or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use.</p>\r
 \r
-<p>Here is the current <a href="/2.8/changelog.php">change log</a>.</p>\r
+<p>Here is the current <a href="/docs/changelog.php">change log</a>.</p>\r
 <?php\r
   $page->printFoot();\r
 ?>
\ No newline at end of file

diff --git a/Web/downloads/index.php b/Web/downloads/index.php
index 872132a..a68ba21 100644 (file)
--- a/Web/downloads/index.php
+++ b/Web/downloads/index.php
@@ -15,7 +15,7 @@
 </ul>\r
 <h3><a name="current">Current Version</a></h3>\r
 <?php $page->printDownloadNow(); ?>\r
-<p>The current version is <strong><?php echo $stablerelease->getVersionNumber();?></strong> and was released at <strong><?php echo $stablerelease->getDate();?></strong>. For detailed info on what's new, read the <a href="/2.8/changelog.php">change log</a> and the <a href="/2.8/releasenotes.php">release notes</a>.</p>\r
+<p>The current version is <strong><?php echo $stablerelease->getVersionNumber();?></strong> and was released at <strong><?php echo $stablerelease->getDate();?></strong>. For detailed info on what's new, read the <a href="/docs/changelog.php">change log</a> and the <a href="/docs/releasenotes.php">release notes</a>.</p>\r
 <div class="downloadmatrix">\r
 <ul>\r
   <li><strong>Installer</strong>\r
@@ -43,7 +43,7 @@
   </li>\r
 </ul>\r
 </div>\r
-<p>The easiest way to install WinMerge is to download and run the Installer. Read the <a href="2.8/manual/Installing.html">online manual</a> for help using it.</p>\r
+<p>The easiest way to install WinMerge is to download and run the Installer. Read the <a href="/docs/manual/Installing.html">online manual</a> for help using it.</p>\r
 <h3><a name="other">Other Versions</a></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
@@ -79,8 +79,8 @@ You can <a href="http://winmerge.svn.sourceforge.net/viewvc/winmerge/">browse th
 <dl class="headinglist">\r
   <dt>Developer Version</dt>\r
   <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk">https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk</a></dd>\r
-  <dt>WinMerge 2.8</dt>\r
-  <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_8">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_8</a></dd>\r
+  <dt>WinMerge 2.10</dt>\r
+  <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_8">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_10</a></dd>\r
 </dl>\r
 <?php\r
   $page->printFoot();\r

diff --git a/Web/history.php b/Web/history.php
index d35af75..fce59e4 100644 (file)
--- a/Web/history.php
+++ b/Web/history.php
@@ -6,6 +6,16 @@
 ?>\r
 <h2>History</h2>\r
 <div class="infocard">\r
+  <h3>WinMerge 2.10</h3>\r
+  <ul>\r
+    <li>WinMerge 2.10.0 (2008-09-17)</li>\r
+  </ul>\r
+  <ul class="inline">\r
+    <li><a href="/docs/manual/">Manual</a></li>\r
+    <li><a href="/docs/changelog.php">Change Log</a></li>\r
+  </ul>\r
+</div>\r
+<div class="infocard">\r
   <h3>WinMerge 2.8</h3>\r
   <ul>\r
     <li>WinMerge 2.8.6 (2008-08-07)</li>\r

diff --git a/Web/index.php b/Web/index.php
index 5910123..b149f85 100644 (file)
--- a/Web/index.php
+++ b/Web/index.php
@@ -19,8 +19,8 @@
 </div>
 
 <h3>WinMerge <?php echo $stablerelease->getVersionNumber();?> - latest stable version</h3>
-<p><a href="2.8/index.php">WinMerge <?php echo $stablerelease->getVersionNumber();?></a> is the latest stable version, and is recommended for most users.</p>
-<p><a href="<?php echo $stablerelease->getDownload('setup.exe');?>">Download WinMerge <?php echo $stablerelease->getVersionNumber();?> Installer</a></p>
+<p><a href="downloads/">WinMerge <?php echo $stablerelease->getVersionNumber();?></a> is the latest stable version, and is recommended for most users.</p>
+<?php $page->printDownloadNow(); ?>
 
 <h3>Support</h3>
 <p>If you need support, look at our <a href="support/index.php">support page</a> for more information how you can get it.</p>

diff --git a/Web/page.inc b/Web/page.inc
index 788d5e2..27246cd 100644 (file)
--- a/Web/page.inc
+++ b/Web/page.inc
@@ -37,23 +37,23 @@
      * Constructor
      */
     function Page() {
-      $this->_title = 'WinMerge 2.8';
+      $this->_title = 'WinMerge';
       $this->_charset = 'ISO-8859-1';
       $this->_description = 'WinMerge HomePage: Visual text file comparison and merging (Open Source software).';
       $this->_keywords = 'WinMerge, free, download, Beyond Compare, Scooter Software, DLSuperC, DLSubCF, Component Software Diff, Viff, TreeDiff, FileSync, WMatch, Quick Spot, NTDMatch, windiff, WDIFF, FolderMatch, Merge 99, Merge99, PMdiff, PMDiff, PMDIFF, pmdiff, visual, visually, file, folder, directory, synchronization, comparison, graphical, document, text, compare, diff, difference, revision, Araxis, compare folders, compare files, synchronize folders, merge files, merge folders, Y2K, Year 2000, Year 2K, side-by-side, VFC, GFC, gdiff, CSDiff, OS2GFC, vdiff, ediff, fc';
       $this->_rssfeeds = array();
-      $this->_tab = WINMERGE_2_8;
+      $this->_tab = TAB_HOME;
       /* _Stable Release */
       $this->_stablerelease = new Release;
-      $this->_stablerelease->setVersionNumber('2.8.6');
-      $this->_stablerelease->setDate('2008-08-07');
-      $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-Setup.exe', 3051113);
-      $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-exe.zip', 3349594);
-      $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-exe.7z', 1822229);
-      $this->_stablerelease->addDownload('rt.zip', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.6.zip', 1287510);
-      $this->_stablerelease->addDownload('rt.7z', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.6.7z', 753831);
-      $this->_stablerelease->addDownload('src.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-src.zip', 8607863);
-      $this->_stablerelease->addDownload('src.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-src.7z', 4377158);
+      $this->_stablerelease->setVersionNumber('2.10.0');
+      $this->_stablerelease->setDate('2008-09-17');
+      $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-Setup.exe', 3232299);
+      $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-exe.zip', 3413050);
+      $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-exe.7z', 2006316);
+      $this->_stablerelease->addDownload('rt.zip', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.10.0.zip', 1287520);
+      $this->_stablerelease->addDownload('rt.7z', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.10.0.7z', 753835);
+      $this->_stablerelease->addDownload('src.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-src.zip', 9730347);
+      $this->_stablerelease->addDownload('src.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-src.7z', 5090123);
     }
 
     /**
@@ -141,7 +141,8 @@
         case WINMERGE_2_2: //if WinMerge 2.2 ...
         case WINMERGE_2_4: //if WinMerge 2.4 ...
         case WINMERGE_2_6: //if WinMerge 2.6 ...
-          $temp .= "<p class=\"important\">This is an old version of WinMerge, for the latest version go to the <a href=\"/index.php\">main site</a>.</p>\n";
+        case WINMERGE_2_8: //if WinMerge 2.8 ...
+          $temp .= "<p class=\"important\">This is an old version of WinMerge, for the latest version go to the <a href=\"/downloads/\">download page</a>.</p>\n";
           break;
       }
       print($temp);
@@ -200,9 +201,6 @@
       if ($this->_tab == WINMERGE_2_8) { //if WinMerge 2.8 ...
         $temp .= "  <li><strong><a href=\"/2.8/index.php\" id=\"current\">WinMerge&nbsp;2.8</a></strong></li>\n";
       }
-      else { //if NOT WinMerge 2.8 ...
-        $temp .= "  <li><a href=\"/2.8/index.php\">WinMerge&nbsp;2.8</a></li>\n";
-      }
       if ($this->_tab == WINMERGE_2_6) { //if WinMerge 2.6 ...
         $temp .= "  <li><strong><a href=\"/2.6/index.php\" id=\"current\">WinMerge&nbsp;2.6</a></strong></li>\n";
       }
@@ -221,9 +219,9 @@
       if ($this->_tab == TAB_DOCS) { //if "Documentation" ...
         $temp .= "  <li><strong><a href=\"/docs/index.php\" id=\"current\">Documentation</a></strong></li>\n";
       }
-      //else { //if NOT "Documentation" ...
-      //  $temp .= "  <li><a href=\"/docs/index.php\">Documentation</a></li>\n";
-      //}
+      else { //if NOT "Documentation" ...
+        $temp .= "  <li><a href=\"/docs/index.php\">Documentation</a></li>\n";
+      }
       if ($this->_tab == TAB_DOWNLOADS) { //if "Downloads" ...
         $temp .= "  <li><strong><a href=\"/downloads/index.php\" id=\"current\">Downloads</a></strong></li>\n";
       }