Module: website Branch: master Commit: 2dab31286e72d24b2196ee008db8c4e3ffbf01f8 URL: http://source.winehq.org/git/website.git/?a=commit;h=2dab31286e72d24b2196ee0...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Jun 25 12:25:57 2008 +0200
Add support for separate stable and development releases.
---
include/html.php | 4 ++-- templates/en/download.template | 3 ++- templates/en/wine_release.template | 14 ++++++++++---- templates/es/wine_release.template | 14 ++++++++++---- 4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/include/html.php b/include/html.php index 171436d..fd1ee7d 100644 --- a/include/html.php +++ b/include/html.php @@ -875,8 +875,8 @@ class html $vars['self'] =& $_SERVER['PHP_SELF']; $vars['request_uri'] =& $_SERVER['REQUEST_URI']; $vars['base_url'] =& $GLOBALS['config']->base_url; - $vars['snapshot_date'] = $config->snapshot_date; - $vars['snapshot_date_rh'] = $config->snapshot_date_rh; + $vars['stable_release'] = $config->stable_release; + $vars['master_release'] = $config->master_release;
// replace vars in template // NOTE: using preg_replace() breaks as it wants to interpret '$1' in $val diff --git a/templates/en/download.template b/templates/en/download.template index 6df9b7d..147bc8e 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -10,7 +10,8 @@ Updated with each release.</p> <a href="{$root}/site/howto">installation and configuration how-to</a> for post-installation instructions.</b></p>
-<p>Snapshot Date: {$snapshot_date}</p> +<p><table><tr><td>Latest stable release:</td><td>Wine {$stable_release}</td></tr> +<tr><td>Latest development release:</td><td>Wine {$master_release}</td></tr></table></p>
<table width="95%" border=0 cellpadding=5 cellspacing=1 bgcolor="#EFEFEF">
diff --git a/templates/en/wine_release.template b/templates/en/wine_release.template index d19e403..ba51573 100644 --- a/templates/en/wine_release.template +++ b/templates/en/wine_release.template @@ -1,5 +1,11 @@ -<b><a href="?announce={$snapshot_date}">Wine {$snapshot_date}</a></b> - +<table class="releases" cellspacing=5> +<tr><td>Stable:</td> +<td><b><a href="?announce={$stable_release}">Wine {$stable_release}</a></b> <span class="small"> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$snapshot_date}">shortlog</a>) -</span> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$stable_release}">shortlog</a>) +</span></td></tr> +<tr><td>Development:</td> +<td><b><a href="?announce={$master_release}">Wine {$master_release}</a></b> +<span class="small"> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$master_release}">shortlog</a>) +</span></td></tr></table> diff --git a/templates/es/wine_release.template b/templates/es/wine_release.template index d19e403..ba51573 100644 --- a/templates/es/wine_release.template +++ b/templates/es/wine_release.template @@ -1,5 +1,11 @@ -<b><a href="?announce={$snapshot_date}">Wine {$snapshot_date}</a></b> - +<table class="releases" cellspacing=5> +<tr><td>Stable:</td> +<td><b><a href="?announce={$stable_release}">Wine {$stable_release}</a></b> <span class="small"> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$snapshot_date}">shortlog</a>) -</span> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$stable_release}">shortlog</a>) +</span></td></tr> +<tr><td>Development:</td> +<td><b><a href="?announce={$master_release}">Wine {$master_release}</a></b> +<span class="small"> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$master_release}">shortlog</a>) +</span></td></tr></table>