|
From: <ge...@us...> - 2007-03-20 23:01:42
|
Revision: 4180
http://svn.sourceforge.net/winmerge/?rev=4180&view=rev
Author: gerundt
Date: 2007-03-20 15:43:45 -0700 (Tue, 20 Mar 2007)
Log Message:
-----------
Known issue: unset WinMerge integration from ClearCase
Modified Paths:
--------------
trunk/Web/2.6/limitations.php
trunk/Web/Changes.txt
Modified: trunk/Web/2.6/limitations.php
===================================================================
--- trunk/Web/2.6/limitations.php 2007-03-20 16:43:41 UTC (rev 4179)
+++ trunk/Web/2.6/limitations.php 2007-03-20 22:43:45 UTC (rev 4180)
@@ -25,6 +25,18 @@
or use the <a href="http://www.microsoft.com/downloads/details.aspx?familyid=7b9ba261-7a9c-43e7-9117-f673077ffb3c">Run-Time Redistribution Pack</a> from Microsoft.</p>
<p><i>Workaround 2</i>: If you don't need the plugin, you can safely remove it.</p>
</li>
+ <li>
+ <p><strong>Unset WinMerge integration from ClearCase</strong></p>
+ <p>To remove WinMerge integration, you'll need to edit one file by hand:</p>
+ <ol>
+ <li>Find ClearCase installation folder<br />
+ Usually it is something like <code>C:\Program Files\Rational\ClearCase</code></li>
+ <li>Go to subfolder <code>lib\mgrs\</code></li>
+ <li>Open file <code>map</code> in there to editor program</li>
+ <li>Comment-out the line starting with "<code>text_file_delta xcompare</code>", containing "<code>WinMergeU.exe</code>"</li>
+ <li>Uncomment the line starting with "<code>text_file_delta xcompare</code>", containing "<code>cleardiffmrg.exe</code>"</li>
+ </ol>
+ </li>
</ul>
<?php
$page->printFoot();
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-03-20 16:43:41 UTC (rev 4179)
+++ trunk/Web/Changes.txt 2007-03-20 22:43:45 UTC (rev 4180)
@@ -2,6 +2,10 @@
Redirect translations status page to Wiki.
Web: .htaccess
+2007-03-20 Tim
+ PATCH: [ 1680165 ] Known issue: unset WinMerge integration from ClearCase
+ Web\2.6: limitations.php
+
2007-03-13 Tim
PATCH: [ 1679324 ] Web: Add "Wiki" tab
Web: page.inc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-03-31 14:18:43
|
Revision: 4217
http://svn.sourceforge.net/winmerge/?rev=4217&view=rev
Author: gerundt
Date: 2007-03-31 07:18:39 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
PATCH: [ 1691700 ] Web: Changes for new stable release 2.6.6
Modified Paths:
--------------
trunk/Web/2.6/changes.txt
trunk/Web/2.6/index.php
trunk/Web/Changes.txt
trunk/Web/WinMergePAD.xml
trunk/Web/downloads.php
trunk/Web/index.php
trunk/Web/page.inc
Modified: trunk/Web/2.6/changes.txt
===================================================================
--- trunk/Web/2.6/changes.txt 2007-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/2.6/changes.txt 2007-03-31 14:18:39 UTC (rev 4217)
@@ -1,3 +1,50 @@
+2007-03-29 2.6.6 Stable Release (R4204)
+
+2007-03-19 Kimmo
+ PATCH: [ 1659183 ] Add Vista security attributes to manifest files
+ Src/res: WinMerge.exe.manifest WinMergeU.exe.manifest
+
+2007-03-11 Tim
+ PATCH: [ 1582537 ] CSS syntax highlighter
+ Src: Merge.dsp
+ editlib: ccrystaltextview.cpp ccrystaltextview.h
+ editlib new file: css.cpp
+
+2007-03-07 Takashi
+ PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
+ Src/DirView.cpp
+
+2007-03-04 Kimmo
+ BUG: [ 1664832 ] Typo Error in the Registry
+ ShellExtension: WinMergeShell.rgs
+ Bump ShellExtension version to 1.9.2
+ ShellExtension: ShellExtension.rc
+
+2007-03-04 Tim
+ BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
+ Src/Languages/Russian: MergeRussian.rc
+
+2007-03-01 Kimmo
+ PATCH: [ 1664689 ] French translation (Update)
+ Submitted by Jean-F Jolin
+ Src/Languages/French: MergeFrench.rc
+
+2007-02-27 Kimmo
+ PATCH: [ 1664689 ] French translation
+ Submitted by Jean-F Jolin
+ Src/Languages/French: MergeFrench.rc
+
+2007-02-10 Kimmo
+ PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
+ Submitted by dr_prozac
+ Src/Languages/Polish: MergePolish.rc
+
+2007-01-30 Kimmo
+ PATCH: [ 1639493 ] Updated Bulgarian language files
+ Submitted by tigertron
+ Src/Languages/Bulgarian: MergeBulgarian.rc
+ Docs/Users/Languages: Readme-Bulgarian.txt
+
2007-01-17 2.6.4 Stable Release (R4067)
2007-01-15 Kimmo
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2007-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/2.6/index.php 2007-03-31 14:18:39 UTC (rev 4217)
@@ -31,8 +31,8 @@
<p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/Changes.txt 2007-03-31 14:18:39 UTC (rev 4217)
@@ -1,3 +1,8 @@
+2007-03-31 Tim
+ PATCH: [ 1691700 ] Web: Changes for new stable release 2.6.6
+ Web: downloads.php index.php page.inc WinMergePAD.xml
+ Web\2.6: changes.txt index.php
+
2007-03-18 Tim
Redirect translations status page to Wiki.
Web: .htaccess
Modified: trunk/Web/WinMergePAD.xml
===================================================================
--- trunk/Web/WinMergePAD.xml 2007-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/WinMergePAD.xml 2007-03-31 14:18:39 UTC (rev 4217)
@@ -34,9 +34,9 @@
</Company_Info>
<Program_Info>
<Program_Name>WinMerge</Program_Name>
- <Program_Version>2.6.4</Program_Version>
- <Program_Release_Month>01</Program_Release_Month>
- <Program_Release_Day>17</Program_Release_Day>
+ <Program_Version>2.6.6</Program_Version>
+ <Program_Release_Month>03</Program_Release_Month>
+ <Program_Release_Day>29</Program_Release_Day>
<Program_Release_Year>2007</Program_Release_Year>
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Cost_Other_Code />
@@ -55,14 +55,14 @@
<Includes_VB_Runtime>N</Includes_VB_Runtime>
<Includes_DirectX>N</Includes_DirectX>
<File_Info>
- <Filename_Versioned>WinMerge-2.6.4-Setup.exe</Filename_Versioned>
- <Filename_Previous>WinMerge-2.6.2-Setup.exe</Filename_Previous>
+ <Filename_Versioned>WinMerge-2.6.6-Setup.exe</Filename_Versioned>
+ <Filename_Previous>WinMerge-2.6.4-Setup.exe</Filename_Previous>
<Filename_Generic>WinMergeSetup.exe</Filename_Generic>
<Filename_Long>WinMergeSetup.exe</Filename_Long>
- <File_Size_Bytes>2981157</File_Size_Bytes>
- <File_Size_K>2911</File_Size_K>
- <File_Size_MB>2.84</File_Size_MB>
+ <File_Size_Bytes>2985028</File_Size_Bytes>
+ <File_Size_K>2915</File_Size_K>
+ <File_Size_MB>2.85</File_Size_MB>
</File_Info>
<Expire_Info>
<Has_Expire_Info>N</Has_Expire_Info>
@@ -93,7 +93,7 @@
<Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
</Application_URLs>
<Download_URLs>
- <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe</Primary_Download_URL>
+ <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-Setup.exe</Primary_Download_URL>
<Secondary_Download_URL />
<Additional_Download_URL_1 />
<Additional_Download_URL_2 />
Modified: trunk/Web/downloads.php
===================================================================
--- trunk/Web/downloads.php 2007-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/downloads.php 2007-03-31 14:18:39 UTC (rev 4217)
@@ -5,18 +5,18 @@
$page->printHead('WinMerge: Downloads', WINMERGE_USR);
?>
<h2>Downloads</h2>
-<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=479250">WinMerge 2.6.4</a></h3>
+<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=497312">WinMerge 2.6.6</a></h3>
<dl>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe">Installer</a></dt>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-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.4-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.4-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-exe.7z">.7z</a>).</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-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.4-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-src.7z">.7z</a>).</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0018-311-442.exe ">7-Zip Plugin</a> (DllBuild 0018)</dt>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-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.6-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-exe.7z">.7z</a>).</p></dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-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.6-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-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&release_id=428331">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
+ <p>You can also read the <a href="http://sourceforge.net/project/shownotes.php?group_id=13216&release_id=482019">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
</dd>
</dl>
<?php
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/index.php 2007-03-31 14:18:39 UTC (rev 4217)
@@ -30,13 +30,13 @@
<a href="2.6/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.6/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
<p>See the <a href="2.6/screenshots.php">screenshots page</a> for more screenshots.</p>
-<h2>WinMerge 2.6.4 - latest stable version</h2>
-<p><a href="2.6/index.php">WinMerge 2.6.4</a> is the latest stable version, and is recommended for most users.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe">Download WinMerge 2.6.4 Installer</a></p>
+<h2>WinMerge 2.6.6 - latest stable version</h2>
+<p><a href="2.6/index.php">WinMerge 2.6.6</a> is the latest stable version, and is recommended for most users.</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-Setup.exe">Download WinMerge 2.6.6 Installer</a></p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="2.6/manual/Installing.html">Installation section</a> of the <a href="2.6/manual/index.html">Manual</a>.</p>
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/page.inc 2007-03-31 14:18:39 UTC (rev 4217)
@@ -289,7 +289,7 @@
$temp .= "<ul>\n";
$temp .= " <li><a href=\"/downloads.php\">Downloads</a>\n";
$temp .= " <ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=479250\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=479250\" title=\"Release Notes\">Notes</a>)</li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=497312\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=497312\" title=\"Release Notes\">Notes</a>)</li>\n";
$temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957\">7-Zip Plugin</a></li>\n";
$temp .= " </ul>\n";
$temp .= " </li>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-04-02 21:55:08
|
Revision: 4225
http://svn.sourceforge.net/winmerge/?rev=4225&view=rev
Author: gerundt
Date: 2007-04-02 14:54:55 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
PATCH: [ 1692305 ] Known limitation: VSS integration cannot add new files
Modified Paths:
--------------
trunk/Web/2.6/limitations.php
trunk/Web/Changes.txt
Modified: trunk/Web/2.6/limitations.php
===================================================================
--- trunk/Web/2.6/limitations.php 2007-04-02 20:29:50 UTC (rev 4224)
+++ trunk/Web/2.6/limitations.php 2007-04-02 21:54:55 UTC (rev 4225)
@@ -26,6 +26,10 @@
<p><i>Workaround 2</i>: If you don't need the plugin, you can safely remove it.</p>
</li>
<li>
+ <p><strong>VSS integration cannot add new files to VSS</strong></p>
+ <p>If you need to add a new file, you must add it via VSS client program.</p>
+ </li>
+ <li>
<p><strong>Unset WinMerge integration from ClearCase</strong></p>
<p>To remove WinMerge integration, you'll need to edit one file by hand:</p>
<ol>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-04-02 20:29:50 UTC (rev 4224)
+++ trunk/Web/Changes.txt 2007-04-02 21:54:55 UTC (rev 4225)
@@ -1,3 +1,7 @@
+2007-04-02 Tim
+ PATCH: [ 1692305 ] Known limitation: VSS integration cannot add new files
+ Web\2.6: limitations.php
+
2007-03-31 Tim
PATCH: [ 1691700 ] Web: Changes for new stable release 2.6.6
Web: downloads.php index.php page.inc WinMergePAD.xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-04-11 20:49:55
|
Revision: 4246
http://svn.sourceforge.net/winmerge/?rev=4246&view=rev
Author: gerundt
Date: 2007-04-11 13:49:51 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
PATCH: [ 1697984 ] Web: Move tracker shortcuts creator to support
Modified Paths:
--------------
trunk/Web/.htaccess
trunk/Web/Changes.txt
trunk/Web/sitemap.txt
Added Paths:
-----------
trunk/Web/support/tracker-shortcuts.php
Removed Paths:
-------------
trunk/Web/developer/tracker-shortcuts.php
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2007-04-11 14:53:36 UTC (rev 4245)
+++ trunk/Web/.htaccess 2007-04-11 20:49:51 UTC (rev 4246)
@@ -17,6 +17,7 @@
Redirect permanent /2.2/images/filecomp1.gif http://winmerge.org/2.2/images/screenshot.gif
#Move developer pages to Wiki...
+Redirect permanent /developer/tracker-shortcuts.php http://winmerge.org/support/tracker-shortcuts.php
Redirect permanent /developer/l10n/status.php http://winmerge.org/Wiki/index.php?title=Translations
#Tracker shortcuts...
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-04-11 14:53:36 UTC (rev 4245)
+++ trunk/Web/Changes.txt 2007-04-11 20:49:51 UTC (rev 4246)
@@ -1,3 +1,9 @@
+2007-04-11 Tim
+ PATCH: [ 1697984 ] Web: Move tracker shortcuts creator to support
+ Web: .htaccess sitemap.txt
+ Web\developer: deleted tracker-shortcuts.php
+ Web\support: new file tracker-shortcuts.php
+
2007-04-02 Tim
PATCH: [ 1692305 ] Known limitation: VSS integration cannot add new files
Web\2.6: limitations.php
Deleted: trunk/Web/developer/tracker-shortcuts.php
===================================================================
--- trunk/Web/developer/tracker-shortcuts.php 2007-04-11 14:53:36 UTC (rev 4245)
+++ trunk/Web/developer/tracker-shortcuts.php 2007-04-11 20:49:51 UTC (rev 4246)
@@ -1,51 +0,0 @@
-<?php
- include('../page.inc');
-
- $page = new Page;
- $page->printHead('WinMerge: Tracker Shortcuts', WINMERGE_DEV);
-?>
-<h2>Tracker Shortcuts</h2>
-<p><em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href="http://sourceforge.net/tracker/?group_id=13216">Tracker</a>
-items from our <a href="http://sourceforge.net/projects/winmerge">SF.net project page</a>.</p>
-<p>You can use this page, to create a shortcut:</p>
-<?php
- $types['bug'] = 'Bug';
- $types['patch'] = 'Patch';
- $types['support'] = 'Support Request';
- $types['rfe'] = 'Feature Request';
- $types['todo'] = 'Todo Item';
-?>
-<form action="tracker-shortcuts.php" method="post">
-<table>
- <tr>
- <td><label for="type">Type:</label></td>
- <td>
- <select name="type" id="type" size="1">
-<?php
- foreach ($types as $value => $name) { //For all types...
- if ($value == $_POST['type']) $selected = ' selected="selected"'; else $selected = '';
- echo " <option value=\"" . $value . "\"" . $selected . ">" . $name . "</option>\n";
- }
-?>
- </select>
- </td>
- <td rowspan="2" valign="bottom">
- <input type="submit" name="submit" value="Generate" />
- </td>
- </tr>
- <tr>
- <td><label for="id">ID:</label></td>
- <td>
- <input type="text" name="id" id="id" size="8" maxlength="8" value="<?php echo htmlentities($_POST['id']); ?>" />
- </td>
- </tr>
-</table>
-</form>
-<?php
- if (isset($_POST['type']) && ($_POST['type'] != '') && isset($_POST['id']) && ($_POST['id'] > 0)) {
- echo "<p />\n";
- echo "<p style=\"font-size:larger;\"><code>http://winmerge.org/" . htmlentities($_POST['type']) . "/" . htmlentities($_POST['id']) . "</code></p>\n";
- echo "<p />\n";
- }
- $page->printFoot();
-?>
\ No newline at end of file
Modified: trunk/Web/sitemap.txt
===================================================================
--- trunk/Web/sitemap.txt 2007-04-11 14:53:36 UTC (rev 4245)
+++ trunk/Web/sitemap.txt 2007-04-11 20:49:51 UTC (rev 4246)
@@ -58,8 +58,8 @@
http://winmerge.org/2.6/manual/Whatsnew.html
http://winmerge.org/developer/index.php
http://winmerge.org/developer/needed.php
-http://winmerge.org/developer/tracker-shortcuts.php
http://winmerge.org/developer/l10n/index.php
http://winmerge.org/developer/l10n/instructions.php
http://winmerge.org/developer/l10n/status.php
http://winmerge.org/support/index.php
+http://winmerge.org/support/tracker-shortcuts.php
Added: trunk/Web/support/tracker-shortcuts.php
===================================================================
--- trunk/Web/support/tracker-shortcuts.php (rev 0)
+++ trunk/Web/support/tracker-shortcuts.php 2007-04-11 20:49:51 UTC (rev 4246)
@@ -0,0 +1,51 @@
+<?php
+ include('../page.inc');
+
+ $page = new Page;
+ $page->printHead('WinMerge: Tracker Shortcuts', WINMERGE_SUP);
+?>
+<h2>Tracker Shortcuts</h2>
+<p><em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href="http://sourceforge.net/tracker/?group_id=13216">Tracker</a>
+items from our <a href="http://sourceforge.net/projects/winmerge">SF.net project page</a>.</p>
+<p>You can use this page, to create a shortcut:</p>
+<?php
+ $types['bug'] = 'Bug';
+ $types['patch'] = 'Patch';
+ $types['support'] = 'Support Request';
+ $types['rfe'] = 'Feature Request';
+ $types['todo'] = 'Todo Item';
+?>
+<form action="tracker-shortcuts.php" method="post">
+<table>
+ <tr>
+ <td><label for="type">Type:</label></td>
+ <td>
+ <select name="type" id="type" size="1">
+<?php
+ foreach ($types as $value => $name) { //For all types...
+ if ($value == $_POST['type']) $selected = ' selected="selected"'; else $selected = '';
+ echo " <option value=\"" . $value . "\"" . $selected . ">" . $name . "</option>\n";
+ }
+?>
+ </select>
+ </td>
+ <td rowspan="2" valign="bottom">
+ <input type="submit" name="submit" value="Generate" />
+ </td>
+ </tr>
+ <tr>
+ <td><label for="id">ID:</label></td>
+ <td>
+ <input type="text" name="id" id="id" size="8" maxlength="8" value="<?php echo htmlentities($_POST['id']); ?>" />
+ </td>
+ </tr>
+</table>
+</form>
+<?php
+ if (isset($_POST['type']) && ($_POST['type'] != '') && isset($_POST['id']) && ($_POST['id'] > 0)) {
+ echo "<p />\n";
+ echo "<p style=\"font-size:larger;\"><code>http://winmerge.org/" . htmlentities($_POST['type']) . "/" . htmlentities($_POST['id']) . "</code></p>\n";
+ echo "<p />\n";
+ }
+ $page->printFoot();
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-04-14 17:00:40
|
Revision: 4256
http://svn.sourceforge.net/winmerge/?rev=4256&view=rev
Author: gerundt
Date: 2007-04-14 10:00:36 -0700 (Sat, 14 Apr 2007)
Log Message:
-----------
PATCH: [ 1700349 ] Web: Move developers area to Wiki
Modified Paths:
--------------
trunk/Web/.htaccess
trunk/Web/Changes.txt
trunk/Web/index.php
trunk/Web/page.inc
trunk/Web/sitemap.txt
Removed Paths:
-------------
trunk/Web/developer/
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2007-04-14 08:08:54 UTC (rev 4255)
+++ trunk/Web/.htaccess 2007-04-14 17:00:36 UTC (rev 4256)
@@ -4,7 +4,7 @@
</FilesMatch>
Redirect permanent /developer/wincvs.php http://sourceforge.net/cvs/?group_id=13216
-Redirect permanent /developer/translate.php http://winmerge.org/developer/l10n/index.php
+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
Redirect permanent /WinMerge17/docs http://winmerge.org/1.7/docs
@@ -17,7 +17,11 @@
Redirect permanent /2.2/images/filecomp1.gif http://winmerge.org/2.2/images/screenshot.gif
#Move developer pages to Wiki...
+Redirect permanent /developer/index.php http://winmerge.org/Wiki/index.php?title=Developers
+Redirect permanent /developer/needed.php http://winmerge.org/Wiki/index.php?title=Help_Needed
Redirect permanent /developer/tracker-shortcuts.php http://winmerge.org/support/tracker-shortcuts.php
+Redirect permanent /developer/l10n/index.php http://winmerge.org/Wiki/index.php?title=Translations
+Redirect permanent /developer/l10n/instructions.php http://svn.sourceforge.net/viewvc/*checkout*/winmerge/trunk/Docs/Developers/Translations.html
Redirect permanent /developer/l10n/status.php http://winmerge.org/Wiki/index.php?title=Translations
#Tracker shortcuts...
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-04-14 08:08:54 UTC (rev 4255)
+++ trunk/Web/Changes.txt 2007-04-14 17:00:36 UTC (rev 4256)
@@ -1,3 +1,8 @@
+2007-04-14 Tim
+ PATCH: [ 1700349 ] Web: Move developers area to Wiki
+ Web: .htaccess index.php page.inc sitemap.txt
+ Web\developer: deleted *.*
+
2007-04-11 Tim
PATCH: [ 1697984 ] Web: Move tracker shortcuts creator to support
Web: .htaccess sitemap.txt
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-04-14 08:08:54 UTC (rev 4255)
+++ trunk/Web/index.php 2007-04-14 17:00:36 UTC (rev 4256)
@@ -51,10 +51,10 @@
<h2>Developers</h2>
<p>WinMerge is an open source project, which means that the program is maintained and developed by
-volunteers. If you''re interested in contributing work to the project, see our <a href="developer/needed.php">developer page</a>
+volunteers. If you''re interested in contributing work to the project, see our <a href="http://winmerge.org/Wiki/index.php?title=Help_Needed">developer page</a>
for further information on how you may contribute.</p>
-<p>In addition, WinMerge is translated into a number of different languages. See our <a href="developer/translate.php">information on translating WinMerge</a> into your own language.</p>
-<p><a href="developer/index.php">The WinMerge Development Team</a></p>
+<p>In addition, WinMerge is translated into a number of different languages. See our <a href="http://winmerge.org/Wiki/index.php?title=Translations">information on translating WinMerge</a> into your own language.</p>
+<p><a href="http://winmerge.org/Wiki/index.php?title=Developers">The WinMerge Development Team</a></p>
<?php
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-04-14 08:08:54 UTC (rev 4255)
+++ trunk/Web/page.inc 2007-04-14 17:00:36 UTC (rev 4256)
@@ -16,7 +16,6 @@
define ('WINMERGE_2_4', '2.4');
define ('WINMERGE_2_6', '2.6');
define ('WINMERGE_SUP', 'sup');
- define ('WINMERGE_DEV', 'dev');
/**
* ...
@@ -164,12 +163,6 @@
else { //if NOT "Support" ...
$temp .= " <li><a href=\"/support/index.php\">Support</a></li>\n";
}
- if ($this->_version == WINMERGE_DEV) { //if "Developers" ...
- $temp .= " <li class=\"selected\"><a href=\"/developer/index.php\">Developers</a></li>\n";
- }
- else { //if NOT "Developers" ...
- $temp .= " <li><a href=\"/developer/index.php\">Developers</a></li>\n";
- }
$temp .= " <li><a href=\"/Wiki/\">Wiki</a></li>\n";
$temp .= "</ul>\n";
return $temp;
@@ -308,32 +301,6 @@
$temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=313216\">Submit a Patch</a></li>\n";
$temp .= "</ul>\n";
break;
- case WINMERGE_DEV: //if "Developers" ...
- $temp .= "<h2><a href=\"/developer/index.php\">Developers</a></h2>\n";
- $temp .= "<ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/projects/winmerge/\">Project Home</a></li>\n";
- $temp .= " <li>Subversion\n";
- $temp .= " <ul>\n";
- $temp .= " <li><a href=\"http://svn.sourceforge.net/winmerge\">Browse Subversion Tree</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/svn/?group_id=13216\">Subversion Access</a></li>\n";
- $temp .= " </ul>\n";
- $temp .= " </li>\n";
- $temp .= " <li><a href=\"/developer/l10n/index.php\">Translations</a>\n";
- $temp .= " <ul>\n";
- $temp .= " <li><a href=\"/developer/l10n/instructions.php\">Instructions</a></li>\n";
- $temp .= " <li><a href=\"/developer/l10n/status.php\">Status</a></li>\n";
- $temp .= " </ul>\n";
- $temp .= " </li>\n";
- $temp .= " <li>Downloads\n";
- $temp .= " <ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248\">Stable versions</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158\">Beta versions</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=92246\">Experimental builds</a></li>\n";
- $temp .= " </ul>\n";
- $temp .= " </li>\n";
- $temp .= " <li><a href=\"/developer/needed.php\">Help Needed!</a></li>\n";
- $temp .= "</ul>\n";
- break;
}
$temp .= "<ul>\n";
$temp .= " <li><a href=\"/links.php\">Links</a></li>\n";
Modified: trunk/Web/sitemap.txt
===================================================================
--- trunk/Web/sitemap.txt 2007-04-14 08:08:54 UTC (rev 4255)
+++ trunk/Web/sitemap.txt 2007-04-14 17:00:36 UTC (rev 4256)
@@ -56,10 +56,5 @@
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/developer/index.php
-http://winmerge.org/developer/needed.php
-http://winmerge.org/developer/l10n/index.php
-http://winmerge.org/developer/l10n/instructions.php
-http://winmerge.org/developer/l10n/status.php
http://winmerge.org/support/index.php
http://winmerge.org/support/tracker-shortcuts.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-04-25 20:15:33
|
Revision: 4261
http://svn.sourceforge.net/winmerge/?rev=4261&view=rev
Author: gerundt
Date: 2007-04-25 13:15:30 -0700 (Wed, 25 Apr 2007)
Log Message:
-----------
RFE: [ 1700099 ] Web: Mailing list page?
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/page.inc
trunk/Web/sitemap.txt
Added Paths:
-----------
trunk/Web/support/mailing-lists.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-04-22 20:37:50 UTC (rev 4260)
+++ trunk/Web/Changes.txt 2007-04-25 20:15:30 UTC (rev 4261)
@@ -1,3 +1,8 @@
+2007-04-25 Tim
+ RFE: [ 1700099 ] Web: Mailing list page?
+ Web: page.inc sitemap.txt
+ Web\support: new file mailing-lists.php
+
2007-04-14 Tim
PATCH: [ 1700349 ] Web: Move developers area to Wiki
Web: .htaccess index.php page.inc sitemap.txt
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-04-22 20:37:50 UTC (rev 4260)
+++ trunk/Web/page.inc 2007-04-25 20:15:30 UTC (rev 4261)
@@ -197,6 +197,7 @@
* @todo the menu items should swap out to a own file (*.xml for example)
*/
function getMenu() {
+ $temp = '';
switch ($this->_version) {
case WINMERGE_1_7: //if WinMerge 1.7 ...
$temp .= "<h2><a href=\"/1.7/index.php\">WinMerge 1.7</a></h2>\n";
@@ -291,7 +292,7 @@
case WINMERGE_SUP: //if "Support" ...
$temp .= "<h2><a href=\"/support/index.php\">Support</a></h2>\n";
$temp .= "<ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/mail/?group_id=13216\">Mailing Lists</a></li>\n";
+ $temp .= " <li><a href=\"/support/mailing-lists.php\">Mailing Lists</a></li>\n";
$temp .= " <li><a href=\"http://sourceforge.net/forum/?group_id=13216\">Discussion Forums</a></li>\n";
$temp .= "</ul>\n";
$temp .= "<ul>\n";
Modified: trunk/Web/sitemap.txt
===================================================================
--- trunk/Web/sitemap.txt 2007-04-22 20:37:50 UTC (rev 4260)
+++ trunk/Web/sitemap.txt 2007-04-25 20:15:30 UTC (rev 4261)
@@ -57,4 +57,5 @@
http://winmerge.org/2.6/manual/VersionControl.html
http://winmerge.org/2.6/manual/Whatsnew.html
http://winmerge.org/support/index.php
+http://winmerge.org/support/mailing-lists.php
http://winmerge.org/support/tracker-shortcuts.php
Added: trunk/Web/support/mailing-lists.php
===================================================================
--- trunk/Web/support/mailing-lists.php (rev 0)
+++ trunk/Web/support/mailing-lists.php 2007-04-25 20:15:30 UTC (rev 4261)
@@ -0,0 +1,67 @@
+<?php
+ include('../page.inc');
+
+ $page = new Page;
+ $page->printHead('WinMerge: Mailing lists', WINMERGE_SUP);
+?>
+<h2>Mailing lists</h2>
+<ul>
+ <li><a href="#announce">Announce List</a></li>
+ <li><a href="#support">Support List</a></li>
+ <li><a href="#user">User List</a></li>
+ <li><a href="#translate">Translate List</a></li>
+ <li><a href="#development">Development List</a></li>
+ <li><a href="#svn">SVN List</a></li>
+</ul>
+<p>You should read the "<a href="http://sourceforge.net/docman/display_doc.php?docid=12983&group_id=1">Guide to SourceForge.net Mailing List Services</a>" before subscribing and posting to any of the lists below.</p>
+<h3><a name="announce">Announce List</a></h3>
+<ul>
+ <li><strong>Low Traffic</strong></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce">Subscribe</a></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce">Unsubscribe</a></li>
+ <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-announce">Archive</a></li>
+</ul>
+<p>This list is only for announcing new releases of WinMerge.</p>
+<h3><a name="support">Support List</a></h3>
+<ul>
+ <li><strong>Normal Traffic</strong></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support">Subscribe</a></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support">Unsubscribe</a></li>
+ <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-support">Archive</a></li>
+</ul>
+<p>You should ask all your support questions on this list.</p>
+<h3><a name="user">User List</a></h3>
+<ul>
+ <li><strong>Normal Traffic</strong></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user">Subscribe</a></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user">Unsubscribe</a></li>
+ <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-user">Archive</a></li>
+</ul>
+<p>This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own.</p>
+<h3><a name="translate">Translate List</a></h3>
+<ul>
+ <li><strong>Low Traffic</strong></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate">Subscribe</a></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate">Unsubscribe</a></li>
+ <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-translate">Archive</a></li>
+</ul>
+<p>This list is used for coordinating the translations.</p>
+<h3><a name="development">Development List</a></h3>
+<ul>
+ <li><strong>Normal Traffic</strong></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development">Subscribe</a></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development">Unsubscribe</a></li>
+ <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-development">Archive</a></li>
+</ul>
+<p>This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc.</p>
+<h3><a name="svn">SVN List</a></h3>
+<ul>
+ <li><strong>High Traffic</strong></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-svn">Subscribe</a></li>
+ <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-svn">Unsubscribe</a></li>
+ <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-svn">Archive</a></li>
+</ul>
+<p>Subscribers to this list get notices of each and every code change commited to Subversion.</p>
+<?php
+ $page->printFoot();
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-05-07 19:35:33
|
Revision: 4268
http://svn.sourceforge.net/winmerge/?rev=4268&view=rev
Author: gerundt
Date: 2007-05-07 12:35:30 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Rename function setVersion() to setTab().
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/page.inc
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-05-06 20:35:44 UTC (rev 4267)
+++ trunk/Web/Changes.txt 2007-05-07 19:35:30 UTC (rev 4268)
@@ -1,3 +1,7 @@
+2007-05-07 Tim
+ Rename function setVersion() to setTab().
+ Web: page.inc
+
2007-04-25 Tim
RFE: [ 1700099 ] Web: Mailing list page?
Web: page.inc sitemap.txt
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-05-06 20:35:44 UTC (rev 4267)
+++ trunk/Web/page.inc 2007-05-07 19:35:30 UTC (rev 4268)
@@ -23,7 +23,7 @@
class Page {
var $_title, $_charset;
var $_description, $_keywords;
- var $_version;
+ var $_tab;
/**
* Constructor
@@ -33,7 +33,7 @@
$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->_version = WINMERGE_2_6;
+ $this->_tab = WINMERGE_2_6;
}
/**
@@ -65,21 +65,21 @@
}
/**
- * set the WinMerge version from the page
+ * set the tab from the page
*/
- function setVersion($version) {
- $this->_version = $version;
+ function setTab($tab) {
+ $this->_tab = $tab;
}
/**
* print the head from the page
*/
- function printHead($title = '', $version = '') {
+ function printHead($title = '', $tab = '') {
if ($title != '') {
$this->_title = $title;
}
- if ($version != '') {
- $this->_version = $version;
+ if ($tab != '') {
+ $this->_tab = $tab;
}
$temp = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n";
$temp .= " \"http://www.w3.org/TR/html4/loose.dtd\">\n";
@@ -107,7 +107,7 @@
$temp .= $this->getMenu();
$temp .= "</div>\n";
$temp .= "<div id=\"content\">\n";
- switch ($this->_version) {
+ switch ($this->_tab) {
case WINMERGE_1_7: //if WinMerge 1.7 ...
case WINMERGE_2_0: //if WinMerge 2.0 ...
case WINMERGE_2_2: //if WinMerge 2.2 ...
@@ -133,31 +133,31 @@
*/
function getTabs() {
$temp = "<ul>\n";
- if ($this->_version == WINMERGE_USR) { //if "Users" ...
+ if ($this->_tab == WINMERGE_USR) { //if "Users" ...
$temp .= " <li class=\"selected\"><a href=\"/index.php\">Users</a></li>\n";
}
else { //if NOT "Users" ...
$temp .= " <li><a href=\"/index.php\">Users</a></li>\n";
}
- if ($this->_version == WINMERGE_2_6) { //if WinMerge 2.6 ...
+ 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";
}
else { //if NOT WinMerge 2.6 ...
$temp .= " <li><a href=\"/2.6/index.php\">2.6</a></li>\n";
}
- if ($this->_version == WINMERGE_2_4) { //if WinMerge 2.4 ...
+ 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";
}
- if ($this->_version == WINMERGE_2_2) { //if WinMerge 2.2 ...
+ 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";
}
- if ($this->_version == WINMERGE_2_0) { //if WinMerge 2.0 ...
+ 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";
}
- if ($this->_version == WINMERGE_1_7) { //if WinMerge 1.7 ...
+ 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";
}
- if ($this->_version == WINMERGE_SUP) { //if "Support" ...
+ if ($this->_tab == WINMERGE_SUP) { //if "Support" ...
$temp .= " <li class=\"selected\"><a href=\"/support/index.php\">Support</a></li>\n";
}
else { //if NOT "Support" ...
@@ -198,7 +198,7 @@
*/
function getMenu() {
$temp = '';
- switch ($this->_version) {
+ switch ($this->_tab) {
case WINMERGE_1_7: //if WinMerge 1.7 ...
$temp .= "<h2><a href=\"/1.7/index.php\">WinMerge 1.7</a></h2>\n";
$temp .= "<ul>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-05-07 19:57:46
|
Revision: 4269
http://svn.sourceforge.net/winmerge/?rev=4269&view=rev
Author: gerundt
Date: 2007-05-07 12:57:41 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Fix wrong tab from WinMerge 2.2 download page.
Modified Paths:
--------------
trunk/Web/2.2/downloads.php
trunk/Web/Changes.txt
Modified: trunk/Web/2.2/downloads.php
===================================================================
--- trunk/Web/2.2/downloads.php 2007-05-07 19:35:30 UTC (rev 4268)
+++ trunk/Web/2.2/downloads.php 2007-05-07 19:57:41 UTC (rev 4269)
@@ -2,7 +2,7 @@
include('../page.inc');
$page = new Page;
- $page->printHead('WinMerge: Downloads', WINMERGE_USR);
+ $page->printHead('WinMerge: Downloads', WINMERGE_2_2);
?>
<h2>Downloads</h2>
<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>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-05-07 19:35:30 UTC (rev 4268)
+++ trunk/Web/Changes.txt 2007-05-07 19:57:41 UTC (rev 4269)
@@ -1,6 +1,8 @@
2007-05-07 Tim
Rename function setVersion() to setTab().
Web: page.inc
+ Fix wrong tab from WinMerge 2.2 download page.
+ Web\2.2: downloads.php
2007-04-25 Tim
RFE: [ 1700099 ] Web: Mailing list page?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-05-07 20:08:19
|
Revision: 4270
http://svn.sourceforge.net/winmerge/?rev=4270&view=rev
Author: gerundt
Date: 2007-05-07 13:08:16 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Fix the double "This is an old version" info for WinMerge 2.2 amd 2.4.
Modified Paths:
--------------
trunk/Web/2.2/downloads.php
trunk/Web/2.4/downloads.php
trunk/Web/Changes.txt
Modified: trunk/Web/2.2/downloads.php
===================================================================
--- trunk/Web/2.2/downloads.php 2007-05-07 19:57:41 UTC (rev 4269)
+++ trunk/Web/2.2/downloads.php 2007-05-07 20:08:16 UTC (rev 4270)
@@ -5,7 +5,6 @@
$page->printHead('WinMerge: Downloads', WINMERGE_2_2);
?>
<h2>Downloads</h2>
-<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>
<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=331334">WinMerge 2.2.4</a></h3>
<dl>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-Setup.exe">Installer</a></dt>
Modified: trunk/Web/2.4/downloads.php
===================================================================
--- trunk/Web/2.4/downloads.php 2007-05-07 19:57:41 UTC (rev 4269)
+++ trunk/Web/2.4/downloads.php 2007-05-07 20:08:16 UTC (rev 4270)
@@ -5,7 +5,6 @@
$page->printHead('WinMerge: Downloads', WINMERGE_2_4);
?>
<h2>Downloads</h2>
-<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>
<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=438554">WinMerge 2.4.10</a></h3>
<dl>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">Installer</a></dt>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-05-07 19:57:41 UTC (rev 4269)
+++ trunk/Web/Changes.txt 2007-05-07 20:08:16 UTC (rev 4270)
@@ -3,6 +3,9 @@
Web: page.inc
Fix wrong tab from WinMerge 2.2 download page.
Web\2.2: downloads.php
+ Fix the double "This is an old version" info for WinMerge 2.2 amd 2.4.
+ Web\2.2: downloads.php
+ Web\2.4: downloads.php
2007-04-25 Tim
RFE: [ 1700099 ] Web: Mailing list page?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-05-10 20:39:43
|
Revision: 4272
http://svn.sourceforge.net/winmerge/?rev=4272&view=rev
Author: gerundt
Date: 2007-05-10 13:39:33 -0700 (Thu, 10 May 2007)
Log Message:
-----------
PATCH: [ 1714596 ] Web: Rename "Users" tab to "Home"
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/WinMergePAD.php
trunk/Web/downloads.php
trunk/Web/index.php
trunk/Web/links.php
trunk/Web/page.inc
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-05-07 20:17:39 UTC (rev 4271)
+++ trunk/Web/Changes.txt 2007-05-10 20:39:33 UTC (rev 4272)
@@ -1,3 +1,7 @@
+2007-05-10 Tim
+ PATCH: [ 1714596 ] Web: Rename "Users" tab to "Home"
+ Web: downloads.php index.php links.php page.inc WinMergePAD.php
+
2007-05-07 Tim
Rename function setVersion() to setTab().
Web: page.inc
Modified: trunk/Web/WinMergePAD.php
===================================================================
--- trunk/Web/WinMergePAD.php 2007-05-07 20:17:39 UTC (rev 4271)
+++ trunk/Web/WinMergePAD.php 2007-05-10 20:39:33 UTC (rev 4272)
@@ -2,7 +2,7 @@
include('page.inc');
$page = new Page;
- $page->printHead('WinMerge: PAD file', WINMERGE_USR);
+ $page->printHead('WinMerge: PAD file', TAB_HOME);
?>
<h2>PAD file</h2>
<p>The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href="http://www.asp-shareware.org/pad/">Portable Application Description</a> file, which you find here:</p>
Modified: trunk/Web/downloads.php
===================================================================
--- trunk/Web/downloads.php 2007-05-07 20:17:39 UTC (rev 4271)
+++ trunk/Web/downloads.php 2007-05-10 20:39:33 UTC (rev 4272)
@@ -2,7 +2,7 @@
include('page.inc');
$page = new Page;
- $page->printHead('WinMerge: Downloads', WINMERGE_USR);
+ $page->printHead('WinMerge: Downloads', TAB_HOME);
?>
<h2>Downloads</h2>
<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=497312">WinMerge 2.6.6</a></h3>
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-05-07 20:17:39 UTC (rev 4271)
+++ trunk/Web/index.php 2007-05-10 20:39:33 UTC (rev 4272)
@@ -2,7 +2,7 @@
include('page.inc');
$page = new Page;
- $page->printHead('WinMerge', WINMERGE_USR);
+ $page->printHead('WinMerge', TAB_HOME);
?>
<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p>
<h2>Features</h2>
Modified: trunk/Web/links.php
===================================================================
--- trunk/Web/links.php 2007-05-07 20:17:39 UTC (rev 4271)
+++ trunk/Web/links.php 2007-05-10 20:39:33 UTC (rev 4272)
@@ -2,7 +2,7 @@
include('page.inc');
$page = new Page;
- $page->printHead('WinMerge: Links', WINMERGE_USR);
+ $page->printHead('WinMerge: Links', TAB_HOME);
?>
<h2>Links</h2>
<p>Here is a collection of links to tools and reference material that we find is generally useful when you work with WinMerge.</p>
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-05-07 20:17:39 UTC (rev 4271)
+++ trunk/Web/page.inc 2007-05-10 20:39:33 UTC (rev 4272)
@@ -9,7 +9,7 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
- define ('WINMERGE_USR', 'usr');
+ define ('TAB_HOME', 'home');
define ('WINMERGE_1_7', '1.7');
define ('WINMERGE_2_0', '2.0');
define ('WINMERGE_2_2', '2.2');
@@ -133,11 +133,11 @@
*/
function getTabs() {
$temp = "<ul>\n";
- if ($this->_tab == WINMERGE_USR) { //if "Users" ...
- $temp .= " <li class=\"selected\"><a href=\"/index.php\">Users</a></li>\n";
+ if ($this->_tab == TAB_HOME) { //if "Home" ...
+ $temp .= " <li class=\"selected\"><a href=\"/index.php\">Home</a></li>\n";
}
- else { //if NOT "Users" ...
- $temp .= " <li><a href=\"/index.php\">Users</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";
@@ -271,7 +271,7 @@
$temp .= "</ul>\n";
break;
case WINMERGE_2_6: //if WinMerge 2.6 ...
- case WINMERGE_USR: //OR if "Users" ...
+ case TAB_HOME: //OR if "Home" ...
$temp .= "<h2><a href=\"/2.6/index.php\">WinMerge 2.6</a></h2>\n";
$temp .= "<ul>\n";
$temp .= " <li><a href=\"/2.6/manual/index.html\">Manual</a></li>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-05-10 21:25:51
|
Revision: 4273
http://svn.sourceforge.net/winmerge/?rev=4273&view=rev
Author: gerundt
Date: 2007-05-10 14:25:35 -0700 (Thu, 10 May 2007)
Log Message:
-----------
Rename constant WINMERGE_SUP to TAB_SUPPORT.
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/page.inc
trunk/Web/support/index.php
trunk/Web/support/mailing-lists.php
trunk/Web/support/tracker-shortcuts.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-05-10 20:39:33 UTC (rev 4272)
+++ trunk/Web/Changes.txt 2007-05-10 21:25:35 UTC (rev 4273)
@@ -1,6 +1,9 @@
2007-05-10 Tim
PATCH: [ 1714596 ] Web: Rename "Users" tab to "Home"
Web: downloads.php index.php links.php page.inc WinMergePAD.php
+ Rename constant WINMERGE_SUP to TAB_SUPPORT.
+ Web: page.inc
+ Web\support: index.php mailing-lists.php tracker-shortcuts.php
2007-05-07 Tim
Rename function setVersion() to setTab().
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-05-10 20:39:33 UTC (rev 4272)
+++ trunk/Web/page.inc 2007-05-10 21:25:35 UTC (rev 4273)
@@ -15,7 +15,7 @@
define ('WINMERGE_2_2', '2.2');
define ('WINMERGE_2_4', '2.4');
define ('WINMERGE_2_6', '2.6');
- define ('WINMERGE_SUP', 'sup');
+ define ('TAB_SUPPORT', 'support');
/**
* ...
@@ -157,7 +157,7 @@
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";
}
- if ($this->_tab == WINMERGE_SUP) { //if "Support" ...
+ if ($this->_tab == TAB_SUPPORT) { //if "Support" ...
$temp .= " <li class=\"selected\"><a href=\"/support/index.php\">Support</a></li>\n";
}
else { //if NOT "Support" ...
@@ -289,7 +289,7 @@
$temp .= " </li>\n";
$temp .= "</ul>\n";
break;
- case WINMERGE_SUP: //if "Support" ...
+ case TAB_SUPPORT: //if "Support" ...
$temp .= "<h2><a href=\"/support/index.php\">Support</a></h2>\n";
$temp .= "<ul>\n";
$temp .= " <li><a href=\"/support/mailing-lists.php\">Mailing Lists</a></li>\n";
Modified: trunk/Web/support/index.php
===================================================================
--- trunk/Web/support/index.php 2007-05-10 20:39:33 UTC (rev 4272)
+++ trunk/Web/support/index.php 2007-05-10 21:25:35 UTC (rev 4273)
@@ -2,7 +2,7 @@
include('../page.inc');
$page = new Page;
- $page->printHead('WinMerge: Support', WINMERGE_SUP);
+ $page->printHead('WinMerge: Support', TAB_SUPPORT);
?>
<h2>Support</h2>
<p>WinMerge is an Open Source project, that is covered
Modified: trunk/Web/support/mailing-lists.php
===================================================================
--- trunk/Web/support/mailing-lists.php 2007-05-10 20:39:33 UTC (rev 4272)
+++ trunk/Web/support/mailing-lists.php 2007-05-10 21:25:35 UTC (rev 4273)
@@ -2,7 +2,7 @@
include('../page.inc');
$page = new Page;
- $page->printHead('WinMerge: Mailing lists', WINMERGE_SUP);
+ $page->printHead('WinMerge: Mailing lists', TAB_SUPPORT);
?>
<h2>Mailing lists</h2>
<ul>
Modified: trunk/Web/support/tracker-shortcuts.php
===================================================================
--- trunk/Web/support/tracker-shortcuts.php 2007-05-10 20:39:33 UTC (rev 4272)
+++ trunk/Web/support/tracker-shortcuts.php 2007-05-10 21:25:35 UTC (rev 4273)
@@ -2,7 +2,7 @@
include('../page.inc');
$page = new Page;
- $page->printHead('WinMerge: Tracker Shortcuts', WINMERGE_SUP);
+ $page->printHead('WinMerge: Tracker Shortcuts', TAB_SUPPORT);
?>
<h2>Tracker Shortcuts</h2>
<p><em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href="http://sourceforge.net/tracker/?group_id=13216">Tracker</a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-05-11 23:08:47
|
Revision: 4274
http://svn.sourceforge.net/winmerge/?rev=4274&view=rev
Author: gerundt
Date: 2007-05-11 16:08:44 -0700 (Fri, 11 May 2007)
Log Message:
-----------
Web: Remove unneeded CSS rule from tabs code.
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/css/screen.css
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-05-10 21:25:35 UTC (rev 4273)
+++ trunk/Web/Changes.txt 2007-05-11 23:08:44 UTC (rev 4274)
@@ -1,3 +1,7 @@
+2007-05-12 Tim
+ Remove unneeded CSS rule from tabs code.
+ Web\css: screen.css
+
2007-05-10 Tim
PATCH: [ 1714596 ] Web: Rename "Users" tab to "Home"
Web: downloads.php index.php links.php page.inc WinMergePAD.php
Modified: trunk/Web/css/screen.css
===================================================================
--- trunk/Web/css/screen.css 2007-05-10 21:25:35 UTC (rev 4273)
+++ trunk/Web/css/screen.css 2007-05-11 23:08:44 UTC (rev 4274)
@@ -47,7 +47,7 @@
list-style: none;
}
-#tabs ul li a,#tabs ul li a.selected {
+#tabs ul li a {
width: 7em;
display: block;
float: left;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-06-01 22:50:13
|
Revision: 4310
http://svn.sourceforge.net/winmerge/?rev=4310&view=rev
Author: gerundt
Date: 2007-06-01 15:50:10 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Use more flexible SF.net URL for tracker shortcuts.
Modified Paths:
--------------
trunk/Web/.htaccess
trunk/Web/Changes.txt
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2007-06-01 05:26:33 UTC (rev 4309)
+++ trunk/Web/.htaccess 2007-06-01 22:50:10 UTC (rev 4310)
@@ -27,8 +27,8 @@
#Tracker shortcuts...
RewriteEngine On
RewriteBase /
-RewriteRule ^bug/([0-9]+)$ http://sourceforge.net/tracker/index.php?func=detail&aid=$1&group_id=13216&atid=113216 [R]
-RewriteRule ^patch/([0-9]+)$ http://sourceforge.net/tracker/index.php?func=detail&aid=$1&group_id=13216&atid=313216 [R]
-RewriteRule ^support/([0-9]+)$ http://sourceforge.net/tracker/index.php?func=detail&aid=$1&group_id=13216&atid=213216 [R]
-RewriteRule ^rfe/([0-9]+)$ http://sourceforge.net/tracker/index.php?func=detail&aid=$1&group_id=13216&atid=363216 [R]
-RewriteRule ^todo/([0-9]+)$ http://sourceforge.net/tracker/index.php?func=detail&aid=$1&group_id=13216&atid=759426 [R]
\ No newline at end of file
+RewriteRule ^bug/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R]
+RewriteRule ^patch/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R]
+RewriteRule ^support/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R]
+RewriteRule ^rfe/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R]
+RewriteRule ^todo/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R]
\ No newline at end of file
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-06-01 05:26:33 UTC (rev 4309)
+++ trunk/Web/Changes.txt 2007-06-01 22:50:10 UTC (rev 4310)
@@ -1,3 +1,7 @@
+2007-06-02 Tim
+ Use more flexible SF.net URL for tracker shortcuts.
+ Web: .htaccess
+
2007-05-12 Tim
Remove unneeded CSS rule from tabs code.
Web\css: screen.css
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-06-14 02:28:09
|
Revision: 4332
http://svn.sourceforge.net/winmerge/?rev=4332&view=rev
Author: christianlist
Date: 2007-06-13 19:28:07 -0700 (Wed, 13 Jun 2007)
Log Message:
-----------
PATCH: [ 1734072 ] Upgrade website to PHP 5
Modified Paths:
--------------
trunk/Web/.htaccess
trunk/Web/Changes.txt
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2007-06-13 21:43:17 UTC (rev 4331)
+++ trunk/Web/.htaccess 2007-06-14 02:28:07 UTC (rev 4332)
@@ -3,6 +3,9 @@
Deny from all
</FilesMatch>
+#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
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-06-13 21:43:17 UTC (rev 4331)
+++ trunk/Web/Changes.txt 2007-06-14 02:28:07 UTC (rev 4332)
@@ -1,3 +1,7 @@
+2007-06-13
+ PATCH: [ 1734072 ] Upgrade website to PHP 5
+ Web: .htaccess
+
2007-06-02 Tim
Use more flexible SF.net URL for tracker shortcuts.
Web: .htaccess
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
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.
|
|
From: <ge...@us...> - 2007-06-19 21:26:48
|
Revision: 4346
http://svn.sourceforge.net/winmerge/?rev=4346&view=rev
Author: gerundt
Date: 2007-06-19 14:26:46 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
PATCH: [ 1739980 ] Web: Changes for new stable release 2.6.8
Modified Paths:
--------------
trunk/Web/2.6/changes.txt
trunk/Web/2.6/index.php
trunk/Web/Changes.txt
trunk/Web/WinMergePAD.xml
trunk/Web/downloads.php
trunk/Web/index.php
trunk/Web/page.inc
Modified: trunk/Web/2.6/changes.txt
===================================================================
--- trunk/Web/2.6/changes.txt 2007-06-19 20:29:16 UTC (rev 4345)
+++ trunk/Web/2.6/changes.txt 2007-06-19 21:26:46 UTC (rev 4346)
@@ -1,3 +1,51 @@
+2007-06-19 2.6.8 Stable Release (R4343)
+
+2007-06-17 Tim
+ PATCH: [ 1722213 ] Fix wrong </endtag> syntax color in HTML highlighters
+ Src/editlib: asp.cpp html.cpp php.cpp
+
+2007-06-17 Gal
+ BUG: [ 1705874 ] Hitting escape during listitem rename also exited winmerge
+ Src: DirView.cpp
+
+2007-06-16 Jochen
+ PATCH: [ 1734439 ] Fix Bug #1723263 "Zip --> Both" operation give unwanted content in output
+ Src: 7zCommon.cpp
+
+2007-06-14 Kimmo
+ Bump ShellExtension version to 1.9.3
+ ShellExtension: ShellExtension.rc
+ PATCH: [ 1735240 ] Copy new Delphi- and Symbian -file filters to 2.6 branch
+ Filters new files: Delphi.flt Symbian.flt
+ PATCH: [ 1727878 ] 26Branch: Disable hiding folder compare confirmation dialogs
+ Src: DirActions.cpp
+
+2007-06-07 Kimmo
+ PATCH: [ 1721815 ] Add CSharp file filter for 2.6.x
+ Filters new file: CSharp_loose.flt
+
+2007-05-31 Tim
+ PATCH: [ 1729179 ] Change "Rational Clearcase" to "Rational ClearCase"
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2007-05-29 Takashi
+ BUG [ 1722197 ] Downgrading from 2.7.3.4 to 2.6.6 causes Explorer crash
+ ShellExtension: WinMergeShell.cpp
+
+2007-05-19 Tim
+ Fix white space indenting in C# highlighter (included with PATCH #1556685).
+ Src/editlib: csharp.cpp
+
+2007-05-13 Takashi
+ BUG: [ 1717814 ] Fix header drawing issue on WinXP with Luna Theme
+ Src/Common/SortHeaderCtrl.cpp
+
+2007-04-29 Kimmo
+ PATCH: [ 1704904 ] Korean Translation 2.6.X
+ Submitted by Sukjoon, Hwang
+ Src/Languages/Korean: MergeKorean.rc
+
2007-03-29 2.6.6 Stable Release (R4204)
2007-03-19 Kimmo
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2007-06-19 20:29:16 UTC (rev 4345)
+++ trunk/Web/2.6/index.php 2007-06-19 21:26:46 UTC (rev 4346)
@@ -31,8 +31,8 @@
<p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-06-19 20:29:16 UTC (rev 4345)
+++ trunk/Web/Changes.txt 2007-06-19 21:26:46 UTC (rev 4346)
@@ -3,6 +3,9 @@
Web: page.inc
Web\css: print.css screen.css
Web\developer: deleted sourceforge.png valid-css.gif valid-html401.gif
+ PATCH: [ 1739980 ] Web: Changes for new stable release 2.6.8
+ Web: downloads.php index.php page.inc WinMergePAD.xml
+ Web\2.6: changes.txt index.php
2007-06-17 Tim
PATCH: [ 1738750 ] Web: Use Eric Meyer's tabbed navbar
Modified: trunk/Web/WinMergePAD.xml
===================================================================
--- trunk/Web/WinMergePAD.xml 2007-06-19 20:29:16 UTC (rev 4345)
+++ trunk/Web/WinMergePAD.xml 2007-06-19 21:26:46 UTC (rev 4346)
@@ -34,9 +34,9 @@
</Company_Info>
<Program_Info>
<Program_Name>WinMerge</Program_Name>
- <Program_Version>2.6.6</Program_Version>
- <Program_Release_Month>03</Program_Release_Month>
- <Program_Release_Day>29</Program_Release_Day>
+ <Program_Version>2.6.8</Program_Version>
+ <Program_Release_Month>06</Program_Release_Month>
+ <Program_Release_Day>19</Program_Release_Day>
<Program_Release_Year>2007</Program_Release_Year>
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Cost_Other_Code />
@@ -55,14 +55,14 @@
<Includes_VB_Runtime>N</Includes_VB_Runtime>
<Includes_DirectX>N</Includes_DirectX>
<File_Info>
- <Filename_Versioned>WinMerge-2.6.6-Setup.exe</Filename_Versioned>
- <Filename_Previous>WinMerge-2.6.4-Setup.exe</Filename_Previous>
+ <Filename_Versioned>WinMerge-2.6.8-Setup.exe</Filename_Versioned>
+ <Filename_Previous>WinMerge-2.6.6-Setup.exe</Filename_Previous>
<Filename_Generic>WinMergeSetup.exe</Filename_Generic>
<Filename_Long>WinMergeSetup.exe</Filename_Long>
-
- <File_Size_Bytes>2985028</File_Size_Bytes>
- <File_Size_K>2915</File_Size_K>
- <File_Size_MB>2.85</File_Size_MB>
+
+ <File_Size_Bytes>3023263</File_Size_Bytes>
+ <File_Size_K>2952</File_Size_K>
+ <File_Size_MB>2.88</File_Size_MB>
</File_Info>
<Expire_Info>
<Has_Expire_Info>N</Has_Expire_Info>
@@ -93,7 +93,7 @@
<Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
</Application_URLs>
<Download_URLs>
- <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-Setup.exe</Primary_Download_URL>
+ <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe</Primary_Download_URL>
<Secondary_Download_URL />
<Additional_Download_URL_1 />
<Additional_Download_URL_2 />
Modified: trunk/Web/downloads.php
===================================================================
--- trunk/Web/downloads.php 2007-06-19 20:29:16 UTC (rev 4345)
+++ trunk/Web/downloads.php 2007-06-19 21:26:46 UTC (rev 4346)
@@ -5,14 +5,14 @@
$page->printHead('WinMerge: Downloads', TAB_HOME);
?>
<h2>Downloads</h2>
-<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=497312">WinMerge 2.6.6</a></h3>
+<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=517309">WinMerge 2.6.8</a></h3>
<dl>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-Setup.exe">Installer</a></dt>
+ <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.6-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.6-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-exe.7z">.7z</a>).</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-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.6-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-src.7z">.7z</a>).</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>
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-06-19 20:29:16 UTC (rev 4345)
+++ trunk/Web/index.php 2007-06-19 21:26:46 UTC (rev 4346)
@@ -30,13 +30,13 @@
<a href="2.6/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.6/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
<p>See the <a href="2.6/screenshots.php">screenshots page</a> for more screenshots.</p>
-<h2>WinMerge 2.6.6 - latest stable version</h2>
-<p><a href="2.6/index.php">WinMerge 2.6.6</a> is the latest stable version, and is recommended for most users.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-Setup.exe">Download WinMerge 2.6.6 Installer</a></p>
+<h2>WinMerge 2.6.8 - latest stable version</h2>
+<p><a href="2.6/index.php">WinMerge 2.6.8</a> is the latest stable version, and is recommended for most users.</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe">Download WinMerge 2.6.8 Installer</a></p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="2.6/manual/Installing.html">Installation section</a> of the <a href="2.6/manual/index.html">Manual</a>.</p>
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-06-19 20:29:16 UTC (rev 4345)
+++ trunk/Web/page.inc 2007-06-19 21:26:46 UTC (rev 4346)
@@ -286,7 +286,7 @@
$temp .= "<ul>\n";
$temp .= " <li><a href=\"/downloads.php\">Downloads</a>\n";
$temp .= " <ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=497312\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=497312\" title=\"Release Notes\">Notes</a>)</li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&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&package_id=143957\">7-Zip Plugin</a></li>\n";
$temp .= " </ul>\n";
$temp .= " </li>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-06-27 21:32:51
|
Revision: 4354
http://svn.sourceforge.net/winmerge/?rev=4354&view=rev
Author: gerundt
Date: 2007-06-27 14:32:48 -0700 (Wed, 27 Jun 2007)
Log Message:
-----------
Use nicer Wiki URLs.
Modified Paths:
--------------
trunk/Web/.htaccess
trunk/Web/Changes.txt
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2007-06-27 19:07:48 UTC (rev 4353)
+++ trunk/Web/.htaccess 2007-06-27 21:32:48 UTC (rev 4354)
@@ -34,4 +34,11 @@
RewriteRule ^patch/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R]
RewriteRule ^support/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R]
RewriteRule ^rfe/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R]
-RewriteRule ^todo/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R]
\ No newline at end of file
+RewriteRule ^todo/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R]
+
+#Nicer Wiki URLs...
+RewriteEngine On
+RewriteBase /
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^Wiki/(.*)$ /Wiki/index.php?title=$1 [PT,L,QSA]
\ No newline at end of file
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-06-27 19:07:48 UTC (rev 4353)
+++ trunk/Web/Changes.txt 2007-06-27 21:32:48 UTC (rev 4354)
@@ -1,3 +1,7 @@
+2007-06-27 Tim
+ Use nicer Wiki URLs.
+ Web: .htaccess
+
2007-06-19 Tim
PATCH: [ 1739404 ] Web: Move buttons to right corner
Web: page.inc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-07-02 19:25:31
|
Revision: 4357
http://svn.sourceforge.net/winmerge/?rev=4357&view=rev
Author: gerundt
Date: 2007-07-02 12:25:29 -0700 (Mon, 02 Jul 2007)
Log Message:
-----------
PATCH: [ 1746188 ] Web: Move "Downloads" page to own tab
Modified Paths:
--------------
trunk/Web/.htaccess
trunk/Web/Changes.txt
trunk/Web/page.inc
trunk/Web/sitemap.txt
Added Paths:
-----------
trunk/Web/downloads/
trunk/Web/downloads/index.php
Removed Paths:
-------------
trunk/Web/downloads.php
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2007-07-01 17:48:47 UTC (rev 4356)
+++ trunk/Web/.htaccess 2007-07-02 19:25:29 UTC (rev 4357)
@@ -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/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
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-07-01 17:48:47 UTC (rev 4356)
+++ trunk/Web/Changes.txt 2007-07-02 19:25:29 UTC (rev 4357)
@@ -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
Added: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php (rev 0)
+++ trunk/Web/downloads/index.php 2007-07-02 19:25:29 UTC (rev 4357)
@@ -0,0 +1,30 @@
+<?php
+ include('../page.inc');
+
+ $page = new Page;
+ $page->printHead('WinMerge: Downloads', TAB_DOWNLOADS);
+?>
+<h2>Downloads</h2>
+<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=517309">WinMerge 2.6.8</a> (<a href="http://sourceforge.net/project/shownotes.php?release_id=517309">Release Notes</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&release_id=482019">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
+ </dd>
+</dl>
+<h3>Other Versions</h3>
+<ul>
+ <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248">Stable Versions</a></li>
+ <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158">Beta Versions</a></li>
+ <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=92246">Experimental Builds</a></li>
+</ul>
+<?php
+ $page->printFoot();
+?>
\ No newline at end of file
Deleted: trunk/Web/downloads.php
===================================================================
--- trunk/Web/downloads.php 2007-07-01 17:48:47 UTC (rev 4356)
+++ trunk/Web/downloads.php 2007-07-02 19:25:29 UTC (rev 4357)
@@ -1,24 +0,0 @@
-<?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&package_id=11248&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&release_id=482019">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
- </dd>
-</dl>
-<?php
- $page->printFoot();
-?>
\ No newline at end of file
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-07-01 17:48:47 UTC (rev 4356)
+++ trunk/Web/page.inc 2007-07-02 19:25:29 UTC (rev 4357)
@@ -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 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&package_id=11248&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&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&package_id=11248&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&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&package_id=11248\">Stable Versions</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158\">Beta Versions</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&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";
Modified: trunk/Web/sitemap.txt
===================================================================
--- trunk/Web/sitemap.txt 2007-07-01 17:48:47 UTC (rev 4356)
+++ trunk/Web/sitemap.txt 2007-07-02 19:25:29 UTC (rev 4357)
@@ -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/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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-07-03 20:03:13
|
Revision: 4358
http://svn.sourceforge.net/winmerge/?rev=4358&view=rev
Author: gerundt
Date: 2007-07-03 13:03:09 -0700 (Tue, 03 Jul 2007)
Log Message:
-----------
PATCH: [ 1746777 ] Web: Horizontal Navigation
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/css/print.css
trunk/Web/css/screen.css
trunk/Web/page.inc
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-07-02 19:25:29 UTC (rev 4357)
+++ trunk/Web/Changes.txt 2007-07-03 20:03:09 UTC (rev 4358)
@@ -1,3 +1,8 @@
+2007-07-03 Tim
+ PATCH: [ 1746777 ] Web: Horizontal Navigation
+ Web: page.inc
+ Web\css: screen.css print.css
+
2007-07-02 Tim
PATCH: [ 1746188 ] Web: Move "Downloads" page to own tab
Web: .htaccess page.inc sitemap.txt deleted downloads.php
Modified: trunk/Web/css/print.css
===================================================================
--- trunk/Web/css/print.css 2007-07-02 19:25:29 UTC (rev 4357)
+++ trunk/Web/css/print.css 2007-07-03 20:03:09 UTC (rev 4358)
@@ -31,11 +31,11 @@
display: none;
}
-#ads {
+#subtabs {
display: none;
}
-#nav {
+#ads {
display: none;
}
Modified: trunk/Web/css/screen.css
===================================================================
--- trunk/Web/css/screen.css 2007-07-02 19:25:29 UTC (rev 4357)
+++ trunk/Web/css/screen.css 2007-07-03 20:03:09 UTC (rev 4358)
@@ -69,39 +69,32 @@
border-bottom: 1px solid white;
}
-#ads {
+#subtabs {
margin: 0;
- padding: 10px 5px 10px 5px;
- text-align: center;
+ padding: 5px;
+ background: white;
}
-#nav {
- float: left;
+#subtabs li {
margin: 0;
- margin-left: 5px;
- padding: 5px;
- width: 12em;
- background: #C0C0C0;
- border: 1px solid #808080;
+ padding: 0 .5em 0 .5em;
+ display: inline;
+ list-style: none;
+ border: none;
+ border-right: 1px dotted #AAAAAA;
}
-#nav h2 {
+#subtabs li:last-child { border: none; }
+
+#ads {
margin: 0;
- padding: 0 0 5px 0;
- font-size: medium;
+ padding: 10px 5px 10px 5px;
+ text-align: center;
}
-#nav ul {
- margin-top: 0;
- padding-top: 0;
- margin-left: 0.5em;
- padding-left: 0.5em;
-}
-
#content {
margin: 0;
- margin-left: 14em;
- padding: 5px;
+ padding: 1em;
}
#content h2, p {
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-07-02 19:25:29 UTC (rev 4357)
+++ trunk/Web/page.inc 2007-07-03 20:03:09 UTC (rev 4358)
@@ -104,12 +104,7 @@
$temp .= "</p>\n";
$temp .= "</div>\n";
$temp .= $this->getTabs();
- $temp .= "<div id=\"ads\">\n";
- $temp .= $this->getAds();
- $temp .= "</div>\n";
- $temp .= "<div id=\"nav\">\n";
- $temp .= $this->getMenu();
- $temp .= "</div>\n";
+ $temp .= $this->getAds();;
$temp .= "<div id=\"content\">\n";
switch ($this->_tab) {
case WINMERGE_1_7: //if WinMerge 1.7 ...
@@ -136,6 +131,7 @@
* get the tabs menu from the page
*/
function getTabs() {
+ /* Main Tabs */
$temp = "<ul id=\"tabs\">\n";
if ($this->_tab == TAB_HOME) { //if "Home" ...
$temp .= " <li><a href=\"/index.php\" id=\"current\">Home</a></li>\n";
@@ -175,163 +171,108 @@
}
$temp .= " <li><a href=\"/Wiki/\">Developer Wiki</a></li>\n";
$temp .= "</ul>\n";
- return $temp;
- }
-
- /**
- * get the ads to display on the page
- */
- function getAds() {
- $temp = "<script type=\"text/javascript\"><!--\n";
- $temp .= "google_ad_client = \"pub-1411904495533584\";\n";
- $temp .= "google_ad_width = 728;\n";
- $temp .= "google_ad_height = 90;\n";
- $temp .= "google_ad_format = \"728x90_as\";\n";
- $temp .= "google_ad_type = \"text\";\n";
- $temp .= "google_ad_channel =\"\";\n";
- $temp .= "google_color_border = \"FFCC00\";\n";
- $temp .= "google_color_bg = \"FFFFCC\";\n";
- $temp .= "google_color_link = \"0000FF\";\n";
- $temp .= "google_color_text = \"000000\";\n";
- $temp .= "google_color_url = \"008000\";\n";
- $temp .= "//--></script>\n";
- $temp .= "<script type=\"text/javascript\"\n";
- $temp .= " src=\"http://pagead2.googlesyndication.com/pagead/show_ads.js\">\n";
- $temp .= "</script>\n";
- return $temp;
- }
-
- /**
- * get the HTML menu from the page
- *
- * @todo the menu items should swap out to a own file (*.xml for example)
- */
- function getMenu() {
- $temp = '';
+ /* Sub Tabs */
switch ($this->_tab) {
+ case TAB_HOME: //if "Home" ...
+ $temp .= "<ul id=\"subtabs\">\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/projects/winmerge\">Project Page</a></li>\n";
+ $temp .= " <li><a href=\"/links.php\">Links</a></li>\n";
+ $temp .= " <li><a href=\"/WinMergePAD.php\">PAD file</a></li>\n";
+ $temp .= "</ul>\n";
+ break;
case WINMERGE_1_7: //if WinMerge 1.7 ...
- $temp .= "<h2><a href=\"/1.7/index.php\">WinMerge 1.7</a></h2>\n";
- $temp .= "<ul>\n";
+ $temp .= "<ul id=\"subtabs\">\n";
$temp .= " <li><a href=\"/1.7/docs/index.html\">User's Guide</a></li>\n";
$temp .= " <li><a href=\"/1.7/changes.php\">Change History</a></li>\n";
+ $temp .= " <li>Downloads: <a href=\"http://download.sourceforge.net/winmerge/WinMergeSetup.exe\">WinMerge</a>, <a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=14951\">Languages</a>, <a href=\"http://download.sourceforge.net/winmerge/WinMergeDocs1_7.zip\">Documentation</a></li>\n";
$temp .= "</ul>\n";
- $temp .= "<ul>\n";
- $temp .= " <li>Downloads\n";
- $temp .= " <ul>\n";
- $temp .= " <li><a href=\"http://download.sourceforge.net/winmerge/WinMergeSetup.exe\">WinMerge</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=14951\">Languages</a></li>\n";
- $temp .= " <li><a href=\"http://download.sourceforge.net/winmerge/WinMergeDocs1_7.zip\">Documentation</a></li>\n";
- $temp .= " </ul>\n";
- $temp .= " </li>\n";
- $temp .= "</ul>\n";
break;
case WINMERGE_2_0: //if WinMerge 2.0 ...
- $temp .= "<h2><a href=\"/2.0/index.php\">WinMerge 2.0</a></h2>\n";
- $temp .= "<ul>\n";
+ $temp .= "<ul id=\"subtabs\">\n";
$temp .= " <li><a href=\"/2.0/docs/index.html\">User's Guide</a></li>\n";
$temp .= " <li><a href=\"/2.0/changes.php\">Change History</a></li>\n";
$temp .= " <li><a href=\"/2.0/docs/faq.htm\" title=\"Frequently asked questions\">FAQ</a></li>\n";
+ $temp .= " <li>Downloads: <a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=202894\">WinMerge</a>, <a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=177570\">Languages</a>, <a href=\"http://prdownloads.sourceforge.net/winmerge/WinMergeDocs2_0.zip\">Documentation</a></li>\n";
$temp .= "</ul>\n";
- $temp .= "<ul>\n";
- $temp .= " <li>Downloads\n";
- $temp .= " <ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=202894\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=202894\" title=\"Release Notes\">Notes</a>)</li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=177570\">Languages</a></li>\n";
- $temp .= " <li><a href=\"http://prdownloads.sourceforge.net/winmerge/WinMergeDocs2_0.zip\">Documentation</a></li>\n";
- $temp .= " </ul>\n";
- $temp .= " </li>\n";
- $temp .= "</ul>\n";
break;
case WINMERGE_2_2: //if WinMerge 2.2 ...
- $temp .= "<h2><a href=\"/2.2/index.php\">WinMerge 2.2</a></h2>\n";
- $temp .= "<ul>\n";
+ $temp .= "<ul id=\"subtabs\">\n";
$temp .= " <li><a href=\"/2.2/manual/index.html\">Manual</a></li>\n";
$temp .= " <li><a href=\"/2.2/screenshots.php\">Screenshots</a></li>\n";
$temp .= " <li><a href=\"/2.2/changes.php\">Change History</a></li>\n";
$temp .= " <li><a href=\"/2.2/manual/faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
+ $temp .= " <li><a href=\"/2.2/downloads.php\">Downloads</a></li>\n";
$temp .= "</ul>\n";
- $temp .= "<ul>\n";
- $temp .= " <li><a href=\"/2.2/downloads.php\">Downloads</a>\n";
- $temp .= " <ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=331334\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=331334\" title=\"Release Notes\">Notes</a>)</li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957\">7-Zip Plugin</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=283717\">Languages</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=331358\">Documentation</a></li>\n";
- $temp .= " </ul>\n";
- $temp .= " </li>\n";
- $temp .= "</ul>\n";
break;
case WINMERGE_2_4: //if WinMerge 2.4 ...
- $temp .= "<h2><a href=\"/2.4/index.php\">WinMerge 2.4</a></h2>\n";
- $temp .= "<ul>\n";
+ $temp .= "<ul id=\"subtabs\">\n";
$temp .= " <li><a href=\"/2.4/manual/index.html\">Manual</a></li>\n";
$temp .= " <li><a href=\"/2.4/screenshots.php\">Screenshots</a></li>\n";
$temp .= " <li><a href=\"/2.4/changes.php\">Change History</a></li>\n";
$temp .= " <li><a href=\"/2.4/limitations.php\">Known Limitations</a></li>\n";
$temp .= " <li><a href=\"/2.4/manual/faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
+ $temp .= " <li><a href=\"/2.4/downloads.php\">Downloads</a></li>\n";
$temp .= "</ul>\n";
- $temp .= "<ul>\n";
- $temp .= " <li><a href=\"/2.4/downloads.php\">Downloads</a>\n";
- $temp .= " <ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=438554\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=438554\" title=\"Release Notes\">Notes</a>)</li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957\">7-Zip Plugin</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=438564\">Documentation</a></li>\n";
- $temp .= " </ul>\n";
- $temp .= " </li>\n";
- $temp .= "</ul>\n";
break;
case WINMERGE_2_6: //if WinMerge 2.6 ...
- case TAB_HOME: //OR if "Home" ...
- $temp .= "<h2><a href=\"/2.6/index.php\">WinMerge 2.6</a></h2>\n";
- $temp .= "<ul>\n";
+ $temp .= "<ul id=\"subtabs\">\n";
$temp .= " <li><a href=\"/2.6/manual/index.html\">Manual</a></li>\n";
$temp .= " <li><a href=\"/2.6/screenshots.php\">Screenshots</a></li>\n";
$temp .= " <li><a href=\"/2.6/changes.php\">Change History</a></li>\n";
$temp .= " <li><a href=\"/2.6/limitations.php\">Known Limitations</a></li>\n";
$temp .= " <li><a href=\"/2.6/manual/Faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
+ $temp .= " <li><a href=\"/downloads/index.php\">Downloads</a></li>\n";
$temp .= "</ul>\n";
- $temp .= "<ul>\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&package_id=11248&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&package_id=143957\">7-Zip Plugin</a></li>\n";
- $temp .= " </ul>\n";
- $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&package_id=11248&release_id=517309\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=517309\" title=\"Release Notes\">Notes</a>)</li>\n";
+ $temp .= "<ul id=\"subtabs\">\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=517309\">WinMerge 2.6.8</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&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&package_id=11248\">Stable Versions</a></li>\n";
$temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158\">Beta Versions</a></li>\n";
$temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&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";
- $temp .= " <li><a href=\"/support/mailing-lists.php\">Mailing Lists</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/forum/?group_id=13216\">Discussion Forums</a></li>\n";
+ $temp .= "<ul id=\"subtabs\">\n";
+ $temp .= " <li><a href=\"/support/mailing-lists.php\" title=\"Mailing Lists\">Mailing Lists</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/forum/?group_id=13216\" title=\"Discussion Forums\">Discussion Forums</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=113216\" title=\"Submit a Bug Report\">Bug Reports</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=363216\" title=\"Submit a Feature Request\">Feature Requests</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=213216\" title=\"Submit a Support Request\">Support Requests</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=313216\" title=\"Submit a Patch\">Patches</a></li>\n";
$temp .= "</ul>\n";
- $temp .= "<ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=113216\">Submit a Bug Report</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=363216\">Submit a Feature Request</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=213216\">Submit a Support Request</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=313216\">Submit a Patch</a></li>\n";
- $temp .= "</ul>\n";
break;
}
- $temp .= "<ul>\n";
- $temp .= " <li><a href=\"/links.php\">Links</a></li>\n";
- $temp .= "</ul>\n";
return $temp;
}
/**
+ * get the ads to display on the page
+ */
+ function getAds() {
+ $temp = "<div id=\"ads\">\n";
+ $temp .= "<script type=\"text/javascript\"><!--\n";
+ $temp .= "google_ad_client = \"pub-1411904495533584\";\n";
+ $temp .= "google_ad_width = 728;\n";
+ $temp .= "google_ad_height = 90;\n";
+ $temp .= "google_ad_format = \"728x90_as\";\n";
+ $temp .= "google_ad_type = \"text\";\n";
+ $temp .= "google_ad_channel =\"\";\n";
+ $temp .= "google_color_border = \"FFCC00\";\n";
+ $temp .= "google_color_bg = \"FFFFCC\";\n";
+ $temp .= "google_color_link = \"0000FF\";\n";
+ $temp .= "google_color_text = \"000000\";\n";
+ $temp .= "google_color_url = \"008000\";\n";
+ $temp .= "//--></script>\n";
+ $temp .= "<script type=\"text/javascript\"\n";
+ $temp .= " src=\"http://pagead2.googlesyndication.com/pagead/show_ads.js\">\n";
+ $temp .= "</script>\n";
+ $temp .= "</div>\n";
+ return $temp;
+ }
+
+ /**
* convert a xml file into an array
*
* @link http://www.devdump.com/phpxml.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-07-12 19:10:31
|
Revision: 4365
http://svn.sourceforge.net/winmerge/?rev=4365&view=rev
Author: gerundt
Date: 2007-07-12 12:10:26 -0700 (Thu, 12 Jul 2007)
Log Message:
-----------
PATCH: [ 1752239 ] Web: "Download Now!" link
Modified Paths:
--------------
trunk/Web/2.6/index.php
trunk/Web/css/screen.css
trunk/Web/downloads/index.php
trunk/Web/index.php
trunk/Web/page.inc
Added Paths:
-----------
trunk/Web/release.inc
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2007-07-11 08:14:25 UTC (rev 4364)
+++ trunk/Web/2.6/index.php 2007-07-12 19:10:26 UTC (rev 4365)
@@ -5,6 +5,7 @@
$page->printHead('WinMerge 2.6', WINMERGE_2_6);
?>
<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p>
+<?php $page->printDownloadNow(); ?>
<h2>Features</h2>
<ul>
<li>Visual differencing and merging of text files</li>
Modified: trunk/Web/css/screen.css
===================================================================
--- trunk/Web/css/screen.css 2007-07-11 08:14:25 UTC (rev 4364)
+++ trunk/Web/css/screen.css 2007-07-12 19:10:26 UTC (rev 4365)
@@ -101,6 +101,38 @@
margin-top: 0;
}
+/* "Download Now!" link */
+a.downloadnow {
+ display: block;
+ width: 12em;
+ margin: 0;
+ padding: 5px;
+ text-align: center;
+ text-decoration: none;
+ color: black;
+ background: #00B300;
+ border: 1px solid black;
+ -moz-border-radius: 0.5em;
+}
+
+a.downloadnow:hover {
+ color: black;
+ background: #00CC00;
+}
+
+a.downloadnow strong {
+ display: block;
+ text-decoration: underline;
+ font-size: larger;
+ font-weight: bold;
+}
+
+a.downloadnow em {
+ display: block;
+ font-size: smaller;
+ font-style: normal;
+}
+
p.important {
padding: 5px;
background-color: #FFDDDD;
Modified: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php 2007-07-11 08:14:25 UTC (rev 4364)
+++ trunk/Web/downloads/index.php 2007-07-12 19:10:26 UTC (rev 4365)
@@ -5,6 +5,7 @@
$page->printHead('WinMerge: Downloads', TAB_DOWNLOADS);
?>
<h2>Downloads</h2>
+<?php $page->printDownloadNow(); ?>
<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=517309">WinMerge 2.6.8</a> (<a href="http://sourceforge.net/project/shownotes.php?release_id=517309">Release Notes</a>)</h3>
<dl>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe">Installer</a></dt>
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-07-11 08:14:25 UTC (rev 4364)
+++ trunk/Web/index.php 2007-07-12 19:10:26 UTC (rev 4365)
@@ -5,6 +5,7 @@
$page->printHead('WinMerge', TAB_HOME);
?>
<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p>
+<?php $page->printDownloadNow(); ?>
<h2>Features</h2>
<ul>
<li>Visual differencing and merging of text files</li>
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-07-11 08:14:25 UTC (rev 4364)
+++ trunk/Web/page.inc 2007-07-12 19:10:26 UTC (rev 4365)
@@ -18,6 +18,8 @@
define ('TAB_DOWNLOADS', 'downloads');
define ('TAB_SUPPORT', 'support');
+ include 'release.inc';
+
/**
* ...
*/
@@ -25,6 +27,7 @@
var $_title, $_charset;
var $_description, $_keywords;
var $_tab;
+ var $_stablerelease;
/**
* Constructor
@@ -35,6 +38,11 @@
$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->_tab = WINMERGE_2_6;
+ /* _Stable Release */
+ $this->_stablerelease = new Release;
+ $this->_stablerelease->setVersionNumber('2.6.8');
+ $this->_stablerelease->setSetupDownload('http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe');
+ $this->_stablerelease->setSetupSize(3023263);
}
/**
@@ -128,6 +136,17 @@
}
/**
+ * print the "Download Now!" link
+ */
+ function printDownloadNow() {
+ $temp = "<p><a class=\"downloadnow\" href=\"" . $this->_stablerelease->getSetupDownload() . "\">";
+ $temp .= "<strong>Download Now!</strong> ";
+ $temp .= "<em>Version " . $this->_stablerelease->getVersionNumber() . "; " . $this->_stablerelease->getSetupSizeFormatted('mb') . " MB</em>";
+ $temp .= "</a></p>\n";
+ print($temp);
+ }
+
+ /**
* get the tabs menu from the page
*/
function getTabs() {
@@ -273,6 +292,13 @@
}
/**
+ * get the stable release
+ */
+ function getStableRelease() {
+ return $this->_stablerelease;
+ }
+
+ /**
* convert a xml file into an array
*
* @link http://www.devdump.com/phpxml.php
Added: trunk/Web/release.inc
===================================================================
--- trunk/Web/release.inc (rev 0)
+++ trunk/Web/release.inc 2007-07-12 19:10:26 UTC (rev 4365)
@@ -0,0 +1,91 @@
+<?php
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+ /**
+ * ...
+ */
+ class Release {
+ var $_versionnumber;
+ var $_setupdownload, $_setupsize;
+
+ /**
+ * Constructor
+ */
+ function Release() {
+ $this->_versionnumber = '';
+ }
+
+ /**
+ * set the version number from the release
+ */
+ function setVersionNumber($versionnumber) {
+ $this->_versionnumber = $versionnumber;
+ }
+
+ /**
+ * get the version number from the release
+ */
+ function getVersionNumber() {
+ return $this->_versionnumber;
+ }
+
+ /**
+ * set the setup download from the release
+ */
+ function setSetupDownload($setupdownload) {
+ $this->_setupdownload = $setupdownload;
+ }
+
+ /**
+ * get the setup download from the release
+ */
+ function getSetupDownload() {
+ return $this->_setupdownload;
+ }
+
+ /**
+ * set the setup size (in bytes) from the release
+ */
+ function setSetupSize($setupsize) {
+ $this->_setupsize = $setupsize;
+ }
+
+ /**
+ * get the setup size (in bytes) from the release
+ */
+ function getSetupSize() {
+ return $this->_setupsize;
+ }
+
+ /**
+ * get the formatted setup size from the release
+ */
+ function getSetupSizeFormatted($unit = '') {
+ return $this->formatSize($this->_setupsize, $unit);
+ }
+
+ /**
+ * format the size
+ */
+ function formatSize($bytes, $unit = '') {
+ switch (strtolower($unit)) {
+ case 'kb':
+ return number_format($bytes / 1024);
+ break;
+ case 'mb':
+ return number_format($bytes / 1048576, 2);
+ break;
+ default:
+ return number_format($bytes);
+ }
+ }
+ }
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-07-15 20:56:00
|
Revision: 4368
http://svn.sourceforge.net/winmerge/?rev=4368&view=rev
Author: gerundt
Date: 2007-07-15 13:55:56 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
PATCH: [ 1753826 ] Web: Centralize download pages
Modified Paths:
--------------
trunk/Web/.htaccess
trunk/Web/page.inc
Removed Paths:
-------------
trunk/Web/2.2/downloads.php
trunk/Web/2.4/downloads.php
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2007-07-14 01:33:13 UTC (rev 4367)
+++ trunk/Web/.htaccess 2007-07-15 20:55:56 UTC (rev 4368)
@@ -17,7 +17,11 @@
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
+
+#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
+Redirect permanent /2.2/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
Deleted: trunk/Web/2.2/downloads.php
===================================================================
--- trunk/Web/2.2/downloads.php 2007-07-14 01:33:13 UTC (rev 4367)
+++ trunk/Web/2.2/downloads.php 2007-07-15 20:55:56 UTC (rev 4368)
@@ -1,26 +0,0 @@
-<?php
- include('../page.inc');
-
- $page = new Page;
- $page->printHead('WinMerge: Downloads', WINMERGE_2_2);
-?>
-<h2>Downloads</h2>
-<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=331334">WinMerge 2.2.4</a></h3>
-<dl>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-Setup.exe">Installer</a></dt>
- <dd><p>The easiest way to install WinMerge is to download and run this installer. Read <a href="manual/installing.html">online manual</a> for help using it.</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-exe.zip">Binaries</a></dt>
- <dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-exe.7z">.7z</a>).</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-src.zip">Source code</a></dt>
- <dd><p>Source code is available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-src.7z">.7z</a>).</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0014-311-426.exe">7-Zip Plugin</a> (DllBuild 0014)</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&release_id=351569">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
- </dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-manual.zip">Manual</a></dt>
- <dd><p>This is the offline version from our Manual in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-manual.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-manual.7z">.7z</a>).</p></dd>
-</dl>
-<?php
- $page->printFoot();
-?>
\ No newline at end of file
Deleted: trunk/Web/2.4/downloads.php
===================================================================
--- trunk/Web/2.4/downloads.php 2007-07-14 01:33:13 UTC (rev 4367)
+++ trunk/Web/2.4/downloads.php 2007-07-15 20:55:56 UTC (rev 4368)
@@ -1,26 +0,0 @@
-<?php
- include('../page.inc');
-
- $page = new Page;
- $page->printHead('WinMerge: Downloads', WINMERGE_2_4);
-?>
-<h2>Downloads</h2>
-<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=438554">WinMerge 2.4.10</a></h3>
-<dl>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">Installer</a></dt>
- <dd><p>The easiest way to install WinMerge is to download and run this installer. Read the <a href="manual/installing.html">online manual</a> for help using it.</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">Binaries</a></dt>
- <dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.7z">.7z</a>).</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-src.zip">Source code</a></dt>
- <dd><p>Source code is available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-src.7z">.7z</a>).</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0018-311-442.exe ">7-Zip Plugin</a> (DllBuild 0018)</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&release_id=428331">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
- </dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-manual.zip">Manual</a></dt>
- <dd><p>This is the offline version of the manual in archived format (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-manual.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-manual.7z">.7z</a>).</p></dd>
-</dl>
-<?php
- $page->printFoot();
-?>
\ No newline at end of file
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-07-14 01:33:13 UTC (rev 4367)
+++ trunk/Web/page.inc 2007-07-15 20:55:56 UTC (rev 4368)
@@ -203,7 +203,6 @@
$temp .= "<ul id=\"subtabs\">\n";
$temp .= " <li><a href=\"/1.7/docs/index.html\">User's Guide</a></li>\n";
$temp .= " <li><a href=\"/1.7/changes.php\">Change History</a></li>\n";
- $temp .= " <li>Downloads: <a href=\"http://download.sourceforge.net/winmerge/WinMergeSetup.exe\">WinMerge</a>, <a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=14951\">Languages</a>, <a href=\"http://download.sourceforge.net/winmerge/WinMergeDocs1_7.zip\">Documentation</a></li>\n";
$temp .= "</ul>\n";
break;
case WINMERGE_2_0: //if WinMerge 2.0 ...
@@ -211,7 +210,6 @@
$temp .= " <li><a href=\"/2.0/docs/index.html\">User's Guide</a></li>\n";
$temp .= " <li><a href=\"/2.0/changes.php\">Change History</a></li>\n";
$temp .= " <li><a href=\"/2.0/docs/faq.htm\" title=\"Frequently asked questions\">FAQ</a></li>\n";
- $temp .= " <li>Downloads: <a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=202894\">WinMerge</a>, <a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=177570\">Languages</a>, <a href=\"http://prdownloads.sourceforge.net/winmerge/WinMergeDocs2_0.zip\">Documentation</a></li>\n";
$temp .= "</ul>\n";
break;
case WINMERGE_2_2: //if WinMerge 2.2 ...
@@ -220,7 +218,6 @@
$temp .= " <li><a href=\"/2.2/screenshots.php\">Screenshots</a></li>\n";
$temp .= " <li><a href=\"/2.2/changes.php\">Change History</a></li>\n";
$temp .= " <li><a href=\"/2.2/manual/faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
- $temp .= " <li><a href=\"/2.2/downloads.php\">Downloads</a></li>\n";
$temp .= "</ul>\n";
break;
case WINMERGE_2_4: //if WinMerge 2.4 ...
@@ -230,7 +227,6 @@
$temp .= " <li><a href=\"/2.4/changes.php\">Change History</a></li>\n";
$temp .= " <li><a href=\"/2.4/limitations.php\">Known Limitations</a></li>\n";
$temp .= " <li><a href=\"/2.4/manual/faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
- $temp .= " <li><a href=\"/2.4/downloads.php\">Downloads</a></li>\n";
$temp .= "</ul>\n";
break;
case WINMERGE_2_6: //if WinMerge 2.6 ...
@@ -240,13 +236,10 @@
$temp .= " <li><a href=\"/2.6/changes.php\">Change History</a></li>\n";
$temp .= " <li><a href=\"/2.6/limitations.php\">Known Limitations</a></li>\n";
$temp .= " <li><a href=\"/2.6/manual/Faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
- $temp .= " <li><a href=\"/downloads/index.php\">Downloads</a></li>\n";
$temp .= "</ul>\n";
break;
case TAB_DOWNLOADS: //if "Downloads" ...
$temp .= "<ul id=\"subtabs\">\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=517309\">WinMerge 2.6.8</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&package_id=143957\">7-Zip Plugin</a></li>\n";
$temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248\">Stable Versions</a></li>\n";
$temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158\">Beta Versions</a></li>\n";
$temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=92246\">Experimental Builds</a></li>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-07-18 20:54:27
|
Revision: 4372
http://svn.sourceforge.net/winmerge/?rev=4372&view=rev
Author: gerundt
Date: 2007-07-18 13:54:21 -0700 (Wed, 18 Jul 2007)
Log Message:
-----------
PATCH: [ 1755755 ] Web: New Download Matrix
Modified Paths:
--------------
trunk/Web/css/screen.css
trunk/Web/downloads/index.php
Modified: trunk/Web/css/screen.css
===================================================================
--- trunk/Web/css/screen.css 2007-07-18 08:02:46 UTC (rev 4371)
+++ trunk/Web/css/screen.css 2007-07-18 20:54:21 UTC (rev 4372)
@@ -133,6 +133,46 @@
font-style: normal;
}
+/* Download Matrix based on "Tutorial 3" from Listutorial:
+ http://css.maxdesign.com.au/listutorial/sub_master.htm */
+.downloadmatrix {
+ margin-bottom: 1em;
+}
+
+.downloadmatrix ul {
+ margin: 0;
+ padding: 0;
+ list-style-type: none;
+}
+
+.downloadmatrix a,
+.downloadmatrix strong {
+ display: block;
+ width: 20em;
+ padding: 3px 12px 3px 8px;
+ text-decoration: none;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #003366;
+ border-bottom: 1px solid #FFFFFF;
+}
+
+.downloadmatrix a:hover {
+ color: #FFFFFF;
+ background-color: #336699;
+}
+
+.downloadmatrix li li a {
+ display: block;
+ width: 20em;
+ padding: 3px 3px 3px 17px;
+ text-decoration: none;
+ font-weight: normal;
+ color: #FFFFFF;
+ background-color: #6699CC;
+ border-bottom: 1px solid #FFFFFF;
+}
+
p.important {
padding: 5px;
background-color: #FFDDDD;
Modified: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php 2007-07-18 08:02:46 UTC (rev 4371)
+++ trunk/Web/downloads/index.php 2007-07-18 20:54:21 UTC (rev 4372)
@@ -3,29 +3,54 @@
$page = new Page;
$page->printHead('WinMerge: Downloads', TAB_DOWNLOADS);
+ $stablerelease = $page->getStableRelease();
?>
<h2>Downloads</h2>
<?php $page->printDownloadNow(); ?>
-<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=517309">WinMerge 2.6.8</a> (<a href="http://sourceforge.net/project/shownotes.php?release_id=517309">Release Notes</a>)</h3>
+<h3>Current Version</h3>
+<p>The current version is <strong>2.6.8</strong> and was released at <strong>2007-06-19</strong>. For detailed info on what's new, read the <a href="/2.6/changes.php">changelog</a> and the <a href="http://sourceforge.net/project/shownotes.php?release_id=517309">release notes</a>.</p>
+<div class="downloadmatrix">
+<ul>
+ <li><strong>Installer</strong>
+ <ul>
+ <li><a href="<?php echo $stablerelease->getSetupDownload();?>">Exe-Format (<?php echo $stablerelease->getSetupSizeFormatted('mb');?> MB)</a></li>
+ </ul>
+ </li>
+ <li><strong>Binaries</strong>
+ <ul>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.zip">Zip-Format (5.18 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.7z">7z-Format (1.67 MB)</a></li>
+ </ul>
+ </li>
+ <li><strong>Runtimes</strong>
+ <ul>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.8.zip">Zip-Format (1.23 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.8.7z">7z-Format (0.72 MB)</a></li>
+ </ul>
+ </li>
+ <li><strong>Source Code</strong>
+ <ul>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.zip">Zip-Format (5.06 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.7z">7z-Format (2.78 MB)</a></li>
+ </ul>
+ </li>
+</ul>
+</div>
+<p>The easiest way to install WinMerge is to download and run the Installer. Read the <a href="2.6/manual/Installing.html">online manual</a> for help using it.</p>
+<h3>Other Versions</h3>
+<ul>
+ <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248">Stable Versions</a></li>
+ <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158">Beta Versions</a></li>
+ <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=92246">Experimental Builds</a></li>
+</ul>
+<h3>Plugins</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&release_id=482019">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
</dd>
</dl>
-<h3>Other Versions</h3>
-<ul>
- <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248">Stable Versions</a></li>
- <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158">Beta Versions</a></li>
- <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=92246">Experimental Builds</a></li>
-</ul>
<?php
$page->printFoot();
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-10-17 18:25:11
|
Revision: 4643
http://winmerge.svn.sourceforge.net/winmerge/?rev=4643&view=rev
Author: gerundt
Date: 2007-10-17 11:25:03 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
PATCH: [ 1814760 ] Web: Changes for new stable release 2.6.12
Modified Paths:
--------------
trunk/Web/2.6/changes.txt
trunk/Web/2.6/index.php
trunk/Web/WinMergePAD.xml
trunk/Web/downloads/index.php
trunk/Web/index.php
trunk/Web/page.inc
Modified: trunk/Web/2.6/changes.txt
===================================================================
--- trunk/Web/2.6/changes.txt 2007-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/2.6/changes.txt 2007-10-17 18:25:03 UTC (rev 4643)
@@ -1,3 +1,42 @@
+2007-09-26 2.6.12 Stable Release (R4567)
+
+ Fixed uninstalling bug (BUG: [ 1802179 ] Runtime error on uninstalling 2.6.10)
+ Withdrawn 2.6.10 release due to above bug
+
+2007-09-25 2.6.10 Stable Release (R4561)
+
+2007-09-18 Kimmo
+ BUG: [ 1791351 ] Go To Line Number does not change pane focus.
+ Src: MergeEditView.cpp
+
+2007-09-17 Takashi
+ BUG: [ 1795814 ] When word wrap+scroll to first are on, it fails to scroll
+ Src: MergeDoc.cpp
+
+2007-09-15 Kimmo
+ BUG: [ 1777054 ] Next difference sometimes not seen with Wrap Lines enabled
+ Src: MergeEditView.cpp MergeEditView.h
+ BUG: [ 1787816 ] Bug in File Rename
+ Src: DirActions.cpp
+ BUG: [ 1776487 ] REPLACE dialog, copy highlighted text to FIND fileld
+ Src/editlib: ccrystaleditview.cpp
+
+2007-08-22 Tim
+ PATCH: [ 1743623 ] ChineseSimplified language .rc file for trunk rev.4317
+ Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
+
+2007-08-22 Takashi
+ BUG: [ 1759793 ] Filter test dialog problem with directory filters
+ Src: TestFilterDlg.cpp
+
+2007-08-12 Tim
+ PATCH: [ 1772028 ] Russian translation update (from WinMergeMod)
+ Src/Languages/Russian: MergeRussian.rc
+
+2007-07-13 Kimmo
+ Add Alberto Kalb to contributors list
+ Docs/Users: Contributors.txt
+
2007-06-19 2.6.8 Stable Release (R4343)
2007-06-17 Tim
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2007-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/2.6/index.php 2007-10-17 18:25:03 UTC (rev 4643)
@@ -32,8 +32,8 @@
<p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p>
Modified: trunk/Web/WinMergePAD.xml
===================================================================
--- trunk/Web/WinMergePAD.xml 2007-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/WinMergePAD.xml 2007-10-17 18:25:03 UTC (rev 4643)
@@ -34,9 +34,9 @@
</Company_Info>
<Program_Info>
<Program_Name>WinMerge</Program_Name>
- <Program_Version>2.6.8</Program_Version>
- <Program_Release_Month>06</Program_Release_Month>
- <Program_Release_Day>19</Program_Release_Day>
+ <Program_Version>2.6.12</Program_Version>
+ <Program_Release_Month>09</Program_Release_Month>
+ <Program_Release_Day>26</Program_Release_Day>
<Program_Release_Year>2007</Program_Release_Year>
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Cost_Other_Code />
@@ -45,7 +45,7 @@
<Program_Release_Status>Minor Update</Program_Release_Status>
<Program_Install_Support>Install and Uninstall</Program_Install_Support>
<Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP</Program_OS_Support>
- <Program_Language>English,ChineseSimplified,ChineseTraditional,Czech,Danish,French,German,Hungarian,Italian,Japanese,Korean,Polish,Portuguese,Romanian,Russian,Spanish,Swedish,Turkish</Program_Language>
+ <Program_Language>English,ChineseSimplified,ChineseTraditional,Czech,Danish,French,German,Hungarian,Italian,Japanese,Korean,Polish,PortugueseBrazilian,Romanian,Russian,Spanish,Swedish,Turkish</Program_Language>
<Program_Change_Info />
<Program_Specific_Category>Utilities</Program_Specific_Category>
<Program_Category_Class>System Utilities::Other</Program_Category_Class>
@@ -55,14 +55,14 @@
<Includes_VB_Runtime>N</Includes_VB_Runtime>
<Includes_DirectX>N</Includes_DirectX>
<File_Info>
- <Filename_Versioned>WinMerge-2.6.8-Setup.exe</Filename_Versioned>
- <Filename_Previous>WinMerge-2.6.6-Setup.exe</Filename_Previous>
+ <Filename_Versioned>WinMerge-2.6.12-Setup.exe</Filename_Versioned>
+ <Filename_Previous>WinMerge-2.6.8-Setup.exe</Filename_Previous>
<Filename_Generic>WinMergeSetup.exe</Filename_Generic>
<Filename_Long>WinMergeSetup.exe</Filename_Long>
- <File_Size_Bytes>3023263</File_Size_Bytes>
- <File_Size_K>2952</File_Size_K>
- <File_Size_MB>2.88</File_Size_MB>
+ <File_Size_Bytes>3025610</File_Size_Bytes>
+ <File_Size_K>2955</File_Size_K>
+ <File_Size_MB>2.89</File_Size_MB>
</File_Info>
<Expire_Info>
<Has_Expire_Info>N</Has_Expire_Info>
@@ -93,7 +93,7 @@
<Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
</Application_URLs>
<Download_URLs>
- <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe</Primary_Download_URL>
+ <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe</Primary_Download_URL>
<Secondary_Download_URL />
<Additional_Download_URL_1 />
<Additional_Download_URL_2 />
Modified: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php 2007-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/downloads/index.php 2007-10-17 18:25:03 UTC (rev 4643)
@@ -8,7 +8,7 @@
<h2>Downloads</h2>
<?php $page->printDownloadNow(); ?>
<h3>Current Version</h3>
-<p>The current version is <strong>2.6.8</strong> and was released at <strong>2007-06-19</strong>. For detailed info on what's new, read the <a href="/2.6/changes.php">changelog</a> and the <a href="http://sourceforge.net/project/shownotes.php?release_id=517309">release notes</a>.</p>
+<p>The current version is <strong>2.6.12</strong> and was released at <strong>2007-09-26</strong>. For detailed info on what's new, read the <a href="/2.6/changes.php">changelog</a> and the <a href="http://sourceforge.net/project/shownotes.php?release_id=542344">release notes</a>.</p>
<div class="downloadmatrix">
<ul>
<li><strong>Installer</strong>
@@ -18,20 +18,20 @@
</li>
<li><strong>Binaries</strong>
<ul>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.zip">Zip-Format (5.18 MB)</a></li>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.7z">7z-Format (1.67 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-exe.zip">Zip-Format (5.18 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-exe.7z">7z-Format (1.68 MB)</a></li>
</ul>
</li>
<li><strong>Runtimes</strong>
<ul>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.8.zip">Zip-Format (1.23 MB)</a></li>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.8.7z">7z-Format (0.72 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.12.zip">Zip-Format (1.23 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.12.7z">7z-Format (0.72 MB)</a></li>
</ul>
</li>
<li><strong>Source Code</strong>
<ul>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.zip">Zip-Format (5.06 MB)</a></li>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.7z">7z-Format (2.78 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-src.zip">Zip-Format (5.06 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-src.7z">7z-Format (2.79 MB)</a></li>
</ul>
</li>
</ul>
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/index.php 2007-10-17 18:25:03 UTC (rev 4643)
@@ -31,13 +31,13 @@
<a href="2.6/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.6/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
<p>See the <a href="2.6/screenshots.php">screenshots page</a> for more screenshots.</p>
-<h2>WinMerge 2.6.8 - latest stable version</h2>
-<p><a href="2.6/index.php">WinMerge 2.6.8</a> is the latest stable version, and is recommended for most users.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe">Download WinMerge 2.6.8 Installer</a></p>
+<h2>WinMerge 2.6.12 - latest stable version</h2>
+<p><a href="2.6/index.php">WinMerge 2.6.12</a> is the latest stable version, and is recommended for most users.</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe">Download WinMerge 2.6.12 Installer</a></p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="2.6/manual/Installing.html">Installation section</a> of the <a href="2.6/manual/index.html">Manual</a>.</p>
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/page.inc 2007-10-17 18:25:03 UTC (rev 4643)
@@ -40,9 +40,9 @@
$this->_tab = WINMERGE_2_6;
/* _Stable Release */
$this->_stablerelease = new Release;
- $this->_stablerelease->setVersionNumber('2.6.8');
- $this->_stablerelease->setSetupDownload('http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe');
- $this->_stablerelease->setSetupSize(3023263);
+ $this->_stablerelease->setVersionNumber('2.6.12');
+ $this->_stablerelease->setSetupDownload('http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe');
+ $this->_stablerelease->setSetupSize(3025610);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-10-23 18:54:08
|
Revision: 4656
http://winmerge.svn.sourceforge.net/winmerge/?rev=4656&view=rev
Author: gerundt
Date: 2007-10-23 11:54:01 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
PATCH: [ 1818167 ] Web: Add source code links to download page
Modified Paths:
--------------
trunk/Web/css/print.css
trunk/Web/css/screen.css
trunk/Web/downloads/index.php
trunk/Web/page.inc
Modified: trunk/Web/css/print.css
===================================================================
--- trunk/Web/css/print.css 2007-10-22 20:09:10 UTC (rev 4655)
+++ trunk/Web/css/print.css 2007-10-23 18:54:01 UTC (rev 4656)
@@ -48,6 +48,17 @@
margin-top: 0;
}
+/* Heading list */
+.headinglist dt {
+ font-weight: bold;
+}
+
+.headinglist dd {
+ margin: 0;
+ margin-bottom: 1em;
+ padding: 0;
+}
+
p.important {
padding: 5px;
background-color: #FFFFFF;
Modified: trunk/Web/css/screen.css
===================================================================
--- trunk/Web/css/screen.css 2007-10-22 20:09:10 UTC (rev 4655)
+++ trunk/Web/css/screen.css 2007-10-23 18:54:01 UTC (rev 4656)
@@ -173,6 +173,17 @@
border-bottom: 1px solid #FFFFFF;
}
+/* Heading list */
+.headinglist dt {
+ font-weight: bold;
+}
+
+.headinglist dd {
+ margin: 0;
+ margin-bottom: 1em;
+ padding: 0;
+}
+
p.important {
padding: 5px;
background-color: #FFDDDD;
Modified: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php 2007-10-22 20:09:10 UTC (rev 4655)
+++ trunk/Web/downloads/index.php 2007-10-23 18:54:01 UTC (rev 4656)
@@ -6,8 +6,14 @@
$stablerelease = $page->getStableRelease();
?>
<h2>Downloads</h2>
+<ul>
+ <li><a href="#current">Current Version</a></li>
+ <li><a href="#other">Other Versions</a></li>
+ <li><a href="#plugins">Plugins</a></li>
+ <li><a href="#sourcecode">Source Code</a></li>
+</ul>
+<h3><a name="current">Current Version</a></h3>
<?php $page->printDownloadNow(); ?>
-<h3>Current Version</h3>
<p>The current version is <strong>2.6.12</strong> and was released at <strong>2007-09-26</strong>. For detailed info on what's new, read the <a href="/2.6/changes.php">changelog</a> and the <a href="http://sourceforge.net/project/shownotes.php?release_id=542344">release notes</a>.</p>
<div class="downloadmatrix">
<ul>
@@ -37,13 +43,13 @@
</ul>
</div>
<p>The easiest way to install WinMerge is to download and run the Installer. Read the <a href="2.6/manual/Installing.html">online manual</a> for help using it.</p>
-<h3>Other Versions</h3>
+<h3><a name="other">Other Versions</a></h3>
<ul>
<li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248">Stable Versions</a></li>
<li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158">Beta Versions</a></li>
<li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=92246">Experimental Builds</a></li>
</ul>
-<h3>Plugins</h3>
+<h3><a name="plugins">Plugins</a></h3>
<h4>7-Zip Plugin</h4>
<p>This is the 7-Zip plugin for WinMerge and the current version <strong>DllBuild 0025</strong> was released at <strong>2007-09-07</strong>.</p>
<div class="downloadmatrix">
@@ -61,6 +67,16 @@
</ul>
</div>
<p>You can also read the <a href="http://sourceforge.net/project/shownotes.php?release_id=537779&group_id=13216">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
+<h3><a name="sourcecode">Source Code</a></h3>
+<p>WinMerge is released under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License</a>. That means you can get the whole source code and can build the program yourself.<br />
+The source code is hosted on <a href="http://sourceforge.net/">SourceForge.net</a> in a <a href="http://sourceforge.net/svn/?group_id=13216">Subversion</a> repository.<br />
+You can <a href="http://winmerge.svn.sourceforge.net/viewvc/winmerge/">browse the source code</a> with a web browser or you can check out the whole code by clicking on one of the following links (if you have <a href="http://tortoisesvn.net/">TortoiseSVN</a> installed):</p>
+<dl class="headinglist">
+ <dt>Developer Version</dt>
+ <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk">https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk</a></dd>
+ <dt>WinMerge 2.6</dt>
+ <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_6">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_6</a></dd>
+</dl>
<?php
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-10-22 20:09:10 UTC (rev 4655)
+++ trunk/Web/page.inc 2007-10-23 18:54:01 UTC (rev 4656)
@@ -238,13 +238,6 @@
$temp .= " <li><a href=\"/2.6/manual/Faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
$temp .= "</ul>\n";
break;
- case TAB_DOWNLOADS: //if "Downloads" ...
- $temp .= "<ul id=\"subtabs\">\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248\">Stable Versions</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158\">Beta Versions</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=92246\">Experimental Builds</a></li>\n";
- $temp .= "</ul>\n";
- break;
case TAB_SUPPORT: //if "Support" ...
$temp .= "<ul id=\"subtabs\">\n";
$temp .= " <li><a href=\"/support/mailing-lists.php\" title=\"Mailing Lists\">Mailing Lists</a></li>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
