directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1404286 - in /directory/site/trunk: lib/ templates/ templates/apacheds/ templates/api/ templates/studio/
Date Wed, 31 Oct 2012 18:36:26 GMT
Author: pamarcelot
Date: Wed Oct 31 18:36:25 2012
New Revision: 1404286

URL: http://svn.apache.org/viewvc?rev=1404286&view=rev
Log:
Generalized variables in all templates. Used version variables where possible.

Modified:
    directory/site/trunk/lib/path.pm
    directory/site/trunk/templates/apacheds/download-archive.html
    directory/site/trunk/templates/apacheds/download-linux-bin.html
    directory/site/trunk/templates/apacheds/download-linux-deb.html
    directory/site/trunk/templates/apacheds/download-linux-rpm.html
    directory/site/trunk/templates/apacheds/download-macosx.html
    directory/site/trunk/templates/apacheds/download-sources.html
    directory/site/trunk/templates/apacheds/download-windows.html
    directory/site/trunk/templates/apacheds/page.html
    directory/site/trunk/templates/api/download-archive.html
    directory/site/trunk/templates/api/download-sources.html
    directory/site/trunk/templates/api/page.html
    directory/site/trunk/templates/navigation.html
    directory/site/trunk/templates/studio/download-linux.html
    directory/site/trunk/templates/studio/download-macosx.html
    directory/site/trunk/templates/studio/download-sources.html
    directory/site/trunk/templates/studio/download-windows.html
    directory/site/trunk/templates/studio/page.html

Modified: directory/site/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/directory/site/trunk/lib/path.pm?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/lib/path.pm (original)
+++ directory/site/trunk/lib/path.pm Wed Oct 31 18:36:25 2012
@@ -4,7 +4,7 @@ package path;
 our $version_api = "1.0.0-M13";
 our $version_apacheds = "2.0.0-M8";
 our $version_studio = "2.0.0.v20120224";
-our $version_studio_name = "2.0-M3";
+our $version_studio_name = "2.0 M3";
 
 # All our pages use the same view function
 our @patterns = (
@@ -19,53 +19,82 @@ our @patterns = (
     [qr!apacheds\/download\/download-archive\.mdtext$!, template_page => {
         template => "apacheds/download-archive.html",
         isDirApacheDS => true, 
-        version => $version_apacheds } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name } ],
     
     # Download ApacheDS Linux BIN page
     [qr!apacheds\/download\/download-linux-bin\.mdtext$!, template_page => {
         template => "apacheds/download-linux-bin.html",
         isDirApacheDS => true, 
-        version => $version_apacheds } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name } ],
     
     # Download ApacheDS Linux DEB page
     [qr!apacheds\/download\/download-linux-deb\.mdtext$!, template_page => {
         template => "apacheds/download-linux-deb.html",
         isDirApacheDS => true, 
-        version => $version_apacheds } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name } ],
     
     # Download ApacheDS Linux RPM page
     [qr!apacheds\/download\/download-linux-rpm\.mdtext$!, template_page => {
         template => "apacheds/download-linux-rpm.html",
         isDirApacheDS => true, 
-        version => $version_apacheds } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     # Download ApacheDS Mac OS X page
     [qr!apacheds\/download\/download-macosx\.mdtext$!, template_page => {
         template => "apacheds/download-macosx.html",
         isDirApacheDS => true, 
-        version => $version_apacheds } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     # Download ApacheDS Sources page
     [qr!apacheds\/download\/download-sources\.mdtext$!, template_page => {
         template => "apacheds/download-sources.html",
         isDirApacheDS => true, 
-        version => $version_apacheds } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     # Download ApacheDS Windows page
     [qr!apacheds\/download\/download-windows\.mdtext$!, template_page => {
         template => "apacheds/download-windows.html",
         isDirApacheDS => true, 
-        version => $version_apacheds } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
         
     # ApacheDS Index page
     [qr!apacheds\/index\.mdtext$!, template_page => {
         template => "apacheds/index.html",
-        isDirApacheDS => true } ],
+        isDirApacheDS => true, 
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     # Standard ApacheDS page
     [qr!apacheds\/.*?\.mdtext$!, template_page => {
         template => "apacheds/page.html",
-        isDirApacheDS => true } ],
+        isDirApacheDS => true,
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     #
     # Apache LDAP API sub-project pages
@@ -75,23 +104,37 @@ our @patterns = (
     [qr!api\/download\/download-archive\.mdtext$!, template_page => {
         template => "api/download-archive.html",
         isDirAPI => true, 
-        version => $version_api } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     # Download Apache LDAP API Sources page
     [qr!api\/download\/download-sources\.mdtext$!, template_page => {
         template => "api/download-sources.html",
         isDirAPI => true, 
-        version => $version_api } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
         
     # Apache LDAP API Index page
     [qr!api\/index\.mdtext$!, template_page => {
         template => "api/index.html",
-        isDirAPI => true } ],
+        isDirAPI => true, 
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     # Standard Apache LDAP API page
     [qr!api\/.*?\.mdtext$!, template_page => {
         template => "api/page.html",
-        isDirAPI => true } ],
+        isDirAPI => true, 
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     #
     # Apache Directory Studio sub-project pages
@@ -101,35 +144,55 @@ our @patterns = (
     [qr!studio\/download\/download-linux\.mdtext$!, template_page => {
         template => "studio/download-linux.html",
         isDirStudio => true, 
-        version => $version_studio } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     # Download Apache Directory Studio Mac OS X page
     [qr!studio\/download\/download-macosx\.mdtext$!, template_page => {
         template => "studio/download-macosx.html",
         isDirStudio => true, 
-        version => $version_studio } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     # Download Apache Directory Studio Sources page
     [qr!studio\/download\/download-sources\.mdtext$!, template_page => {
         template => "studio/download-sources.html",
         isDirStudio => true, 
-        version => $version_studio } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     # Download Apache Directory Studio Windows page
     [qr!studio\/download\/download-windows\.mdtext$!, template_page => {
         template => "studio/download-windows.html",
         isDirStudio => true, 
-        version => $version_studio } ],
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
         
     # Apache Directory Studio Index page
     [qr!studio\/index\.mdtext$!, template_page => {
         template => "studio/index.html",
-        isDirStudio => true } ],
+        isDirStudio => true, 
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
         
     # Standard Apache Directory Studio page
     [qr!studio\/.*?\.mdtext$!, template_page => {
         template => "studio/page.html",
-        isDirStudio => true } ],
+        isDirStudio => true, 
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     #
     # Apache Directory Project pages
@@ -138,12 +201,20 @@ our @patterns = (
     # Apache Directory Project Index page
     [qr!index\.mdtext$!, template_page => {
         template => "index.html",
-        isDirSite => true } ],
+        isDirSite => true, 
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ],
     
     # Standard Apache Directory Project page
     [qr!^/.*\.mdtext$!, template_page => {
         template => "page.html",
-        isDirSite => true } ]
+        isDirSite => true, 
+        version_api => $version_api,
+        version_apacheds => $version_apacheds,
+        version_studio => $version_studio,
+        version_studio_name => $version_studio_name} ]
 );
 
 # for specifying interdependencies between files

Modified: directory/site/trunk/templates/apacheds/download-archive.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/apacheds/download-archive.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/apacheds/download-archive.html (original)
+++ directory/site/trunk/templates/apacheds/download-archive.html Wed Oct 31 18:36:25 2012
@@ -16,20 +16,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.zip">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.zip">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.zip">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.zip">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-{{version}}.zip
+                            [preferred]/&#91;...&#93;/apacheds-{{version_apacheds}}.zip
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.zip.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.zip.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.zip.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.zip.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -43,20 +43,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.tar.gz">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.tar.gz">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.tar.gz">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.tar.gz">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-{{version}}.tar.gz
+                            [preferred]/&#91;...&#93;/apacheds-{{version_apacheds}}.tar.gz
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.tar.gz.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.tar.gz.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.tar.gz.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.tar.gz.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -104,7 +104,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}apacheds-{{version}}.zip{% endblock %}
+        {% block filename %}apacheds-{{version_apacheds}}.zip{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/apacheds/download-linux-bin.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/apacheds/download-linux-bin.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/apacheds/download-linux-bin.html (original)
+++ directory/site/trunk/templates/apacheds/download-linux-bin.html Wed Oct 31 18:36:25 2012
@@ -16,20 +16,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-64bit.bin">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-64bit.bin">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-64bit.bin">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-64bit.bin">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-{{version}}-64bit.bin
+                            [preferred]/&#91;...&#93;/apacheds-{{version_apacheds}}-64bit.bin
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-64bit.bin.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-64bit.bin.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-64bit.bin.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-64bit.bin.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -43,20 +43,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-32bit.bin">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-32bit.bin">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-32bit.bin">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-32bit.bin">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-{{version}}-32bit.bin
+                            [preferred]/&#91;...&#93;/apacheds-{{version_apacheds}}-32bit.bin
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-32bit.bin.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-32bit.bin.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-32bit.bin.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-32bit.bin.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -85,8 +85,8 @@
             <td>&nbsp;&nbsp;</td>
             <td>Open a terminal.<br>
                 Change to your downloads folder.<br>
-                Give execution rights to the installer (<em>chmod a+x apacheds-{{version}}-64bit.bin</em>).<br>
-                Run the installer (<em>./apacheds-{{version}}-64bit.bin</em>).</td>
+                Give execution rights to the installer (<em>chmod a+x apacheds-{{version_apacheds}}-64bit.bin</em>).<br>
+                Run the installer (<em>./apacheds-{{version_apacheds}}-64bit.bin</em>).</td>
         </tr>
     </table>
 </p>
@@ -106,7 +106,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}apacheds-{{version}}-64bit.bin{% endblock %}
+        {% block filename %}apacheds-{{version_apacheds}}-64bit.bin{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/apacheds/download-linux-deb.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/apacheds/download-linux-deb.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/apacheds/download-linux-deb.html (original)
+++ directory/site/trunk/templates/apacheds/download-linux-deb.html Wed Oct 31 18:36:25 2012
@@ -16,20 +16,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-amd64.deb">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-amd64.deb">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-amd64.deb">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-amd64.deb">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-{{version}}-amd64.deb
+                            [preferred]/&#91;...&#93;/apacheds-{{version_apacheds}}-amd64.deb
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-amd64.deb.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-amd64.deb.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-amd64.deb.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-amd64.deb.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -43,20 +43,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-i386.deb">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-i386.deb">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-i386.deb">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-i386.deb">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-{{version}}-i386.deb
+                            [preferred]/&#91;...&#93;/apacheds-{{version_apacheds}}-i386.deb
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-i386.deb.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-i386.deb.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-i386.deb.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-i386.deb.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -121,7 +121,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}apacheds-{{version}}-amd64.deb{% endblock %}
+        {% block filename %}apacheds-{{version_apacheds}}-amd64.deb{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/apacheds/download-linux-rpm.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/apacheds/download-linux-rpm.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/apacheds/download-linux-rpm.html (original)
+++ directory/site/trunk/templates/apacheds/download-linux-rpm.html Wed Oct 31 18:36:25 2012
@@ -16,20 +16,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-x86_64.rpm">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-x86_64.rpm">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-x86_64.rpm">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-x86_64.rpm">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-{{version}}-x86_64.rpm
+                            [preferred]/&#91;...&#93;/apacheds-{{version_apacheds}}-x86_64.rpm
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-x86_64.rpm.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-x86_64.rpm.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-x86_64.rpm.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-x86_64.rpm.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -43,20 +43,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-i386.rpm">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-i386.rpm">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-i386.rpm">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-i386.rpm">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-{{version}}-i386.rpm
+                            [preferred]/&#91;...&#93;/apacheds-{{version_apacheds}}-i386.rpm
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-i386.rpm.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-i386.rpm.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-i386.rpm.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-i386.rpm.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -115,7 +115,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}apacheds-{{version}}-x86_64.rpm{% endblock %}
+        {% block filename %}apacheds-{{version_apacheds}}-x86_64.rpm{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/apacheds/download-macosx.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/apacheds/download-macosx.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/apacheds/download-macosx.html (original)
+++ directory/site/trunk/templates/apacheds/download-macosx.html Wed Oct 31 18:36:25 2012
@@ -16,20 +16,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-64bit.dmg">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-64bit.dmg">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-64bit.dmg">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-64bit.dmg">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-{{version}}-64bit.dmg
+                            [preferred]/&#91;...&#93;/apacheds-{{version_apacheds}}-64bit.dmg
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-64bit.dmg.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-64bit.dmg.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-64bit.dmg.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-64bit.dmg.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -43,20 +43,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-32bit.dmg">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-32bit.dmg">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-32bit.dmg">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-32bit.dmg">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-{{version}}-32bit.dmg
+                            [preferred]/&#91;...&#93;/apacheds-{{version_apacheds}}-32bit.dmg
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-32bit.dmg.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}-32bit.dmg.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-32bit.dmg.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}-32bit.dmg.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -115,7 +115,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}apacheds-{{version}}-64bit.dmg{% endblock %}
+        {% block filename %}apacheds-{{version_apacheds}}-64bit.dmg{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/apacheds/download-sources.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/apacheds/download-sources.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/apacheds/download-sources.html (original)
+++ directory/site/trunk/templates/apacheds/download-sources.html Wed Oct 31 18:36:25 2012
@@ -14,20 +14,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-parent-{{version}}-source-release.zip">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-parent-{{version_apacheds}}-source-release.zip">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-parent-{{version}}-source-release.zip">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-parent-{{version_apacheds}}-source-release.zip">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-parent-{{version}}-source-release.zip
+                            [preferred]/&#91;...&#93;/apacheds-parent-{{version_apacheds}}-source-release.zip
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-parent-{{version}}-source-release.zip.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-parent-{{version}}-source-release.zip.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-parent-{{version_apacheds}}-source-release.zip.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-parent-{{version_apacheds}}-source-release.zip.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -41,7 +41,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}apacheds-parent-{{version}}-source-release.zip{% endblock %}
+        {% block filename %}apacheds-parent-{{version_apacheds}}-source-release.zip{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/apacheds/download-windows.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/apacheds/download-windows.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/apacheds/download-windows.html (original)
+++ directory/site/trunk/templates/apacheds/download-windows.html Wed Oct 31 18:36:25 2012
@@ -14,20 +14,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.exe">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.exe">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.exe">
+                    <a href="[preferred]/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.exe">
                         <strong>
-                            [preferred]/&#91;...&#93;/apacheds-{{version}}.exe
+                            [preferred]/&#91;...&#93;/apacheds-{{version_apacheds}}.exe
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.exe.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version}}/apacheds-{{version}}.exe.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.exe.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/{{version_apacheds}}/apacheds-{{version_apacheds}}.exe.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -86,7 +86,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}apacheds-{{version}}.exe{% endblock %}
+        {% block filename %}apacheds-{{version_apacheds}}.exe{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/apacheds/page.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/apacheds/page.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/apacheds/page.html (original)
+++ directory/site/trunk/templates/apacheds/page.html Wed Oct 31 18:36:25 2012
@@ -12,7 +12,7 @@
     </ul>
     <h5>Downloads</h5>
     <ul>
-        <li><a href="{{base}}apacheds/downloads.html">ApacheDS 2.0.0-M8</a>&nbsp;&nbsp;<img src="{{base}}images/new_badge.gif" alt="" style="margin- bottom:- 3px;" border="0"></li>
+        <li><a href="{{base}}apacheds/downloads.html">ApacheDS {{version_apacheds}}</a>&nbsp;&nbsp;<img src="{{base}}images/new_badge.gif" alt="" style="margin- bottom:- 3px;" border="0"></li>
         <li><a href="{{base}}apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Documentation</h5>

Modified: directory/site/trunk/templates/api/download-archive.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/api/download-archive.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/api/download-archive.html (original)
+++ directory/site/trunk/templates/api/download-archive.html Wed Oct 31 18:36:25 2012
@@ -16,20 +16,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/api/{{version}}/apache-ldap-api-{{version}}.zip">
+                    <a href="[preferred]/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}.zip">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/api/{{version}}/apache-ldap-api-{{version}}.zip">
+                    <a href="[preferred]/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}.zip">
                         <strong>
-                            [preferred]/&#91;...&#93;/apache-ldap-api-{{version}}.zip
+                            [preferred]/&#91;...&#93;/apache-ldap-api-{{version_api}}.zip
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/api/{{version}}/apache-ldap-api-{{version}}.zip.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/api/{{version}}/apache-ldap-api-{{version}}.zip.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}.zip.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}.zip.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -43,20 +43,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/api/{{version}}/apache-ldap-api-{{version}}.tar.gz">
+                    <a href="[preferred]/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}.tar.gz">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/api/{{version}}/apache-ldap-api-{{version}}.tar.gz">
+                    <a href="[preferred]/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}.tar.gz">
                         <strong>
-                            [preferred]/&#91;...&#93;/apache-ldap-api-{{version}}.tar.gz
+                            [preferred]/&#91;...&#93;/apache-ldap-api-{{version_api}}.tar.gz
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/api/{{version}}/apache-ldap-api-{{version}}.tar.gz.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/api/{{version}}/apache-ldap-api-{{version}}.tar.gz.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}.tar.gz.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}.tar.gz.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -70,7 +70,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}apache-ldap-api-{{version}}.zip{% endblock %}
+        {% block filename %}apache-ldap-api-{{version_api}}.zip{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/api/download-sources.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/api/download-sources.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/api/download-sources.html (original)
+++ directory/site/trunk/templates/api/download-sources.html Wed Oct 31 18:36:25 2012
@@ -16,20 +16,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/api/{{version}}/apache-ldap-api-{{version}}-src.zip">
+                    <a href="[preferred]/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}-src.zip">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/api/{{version}}/apache-ldap-api-{{version}}-src.zip">
+                    <a href="[preferred]/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}-src.zip">
                         <strong>
-                            [preferred]/&#91;...&#93;/apache-ldap-api-{{version}}-src.zip
+                            [preferred]/&#91;...&#93;/apache-ldap-api-{{version_api}}-src.zip
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/api/{{version}}/apache-ldap-api-{{version}}-src.zip.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/api/{{version}}/apache-ldap-api-{{version}}-src.zip.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}-src.zip.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}-src.zip.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -43,20 +43,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/api/{{version}}/apache-ldap-api-{{version}}-src.tar.gz">
+                    <a href="[preferred]/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}-src.tar.gz">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/api/{{version}}/apache-ldap-api-{{version}}-src.tar.gz">
+                    <a href="[preferred]/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}-src.tar.gz">
                         <strong>
-                            [preferred]/&#91;...&#93;/apache-ldap-api-{{version}}-src.tar.gz
+                            [preferred]/&#91;...&#93;/apache-ldap-api-{{version_api}}-src.tar.gz
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/api/{{version}}/apache-ldap-api-{{version}}-src.tar.gz.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/api/{{version}}/apache-ldap-api-{{version}}-src.tar.gz.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}-src.tar.gz.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/api/{{version_api}}/apache-ldap-api-{{version_api}}-src.tar.gz.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -70,7 +70,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}apache-ldap-api-{{version}}-src.zip{% endblock %}
+        {% block filename %}apache-ldap-api-{{version_api}}-src.zip{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/api/page.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/api/page.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/api/page.html (original)
+++ directory/site/trunk/templates/api/page.html Wed Oct 31 18:36:25 2012
@@ -7,7 +7,7 @@
     {% block project-navigation %}
     <h5>Latest Downloads</h5>
     <ul>
-	    <li><a href="{{base}}api/downloads.html">Version 1.0.0-M13</a>&nbsp;&nbsp;<IMG src="{{base}}images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+	    <li><a href="{{base}}api/downloads.html">Version {{version_api}}</a>&nbsp;&nbsp;<IMG src="{{base}}images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>

Modified: directory/site/trunk/templates/navigation.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/navigation.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/navigation.html (original)
+++ directory/site/trunk/templates/navigation.html Wed Oct 31 18:36:25 2012
@@ -9,9 +9,9 @@
     </ul>
     <h5>Latest Downloads</h5>
     <ul>
-        <li><a href="{{base}}apacheds/2.0/downloads.html">ApacheDS 2.0.0-M8</a>&nbsp;&nbsp;<IMG src="http://directory.apache.org/staticresources/images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
-        <li><a href="{{base}}studio/2.0/download/">Studio 2.0-M3</a>&nbsp;&nbsp;<IMG src="http://directory.apache.org/staticresources/images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
-        <li><a href="{{base}}api/downloads.html">LDAP API 1.0.0-M13</a>&nbsp;&nbsp;<IMG src="http://directory.apache.org/staticresources/images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="{{base}}apacheds/downloads.html">ApacheDS {{version_apacheds}}</a>&nbsp;&nbsp;<IMG src="http://directory.apache.org/staticresources/images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="{{base}}studio/downloads.html">Studio {{version_studio_name}}</a>&nbsp;&nbsp;<IMG src="http://directory.apache.org/staticresources/images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="{{base}}api/downloads.html">LDAP API {{version_api}}</a>&nbsp;&nbsp;<IMG src="http://directory.apache.org/staticresources/images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
     </ul>
     <h5>Sub-Projects</h5>
     <ul>

Modified: directory/site/trunk/templates/studio/download-linux.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/studio/download-linux.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/studio/download-linux.html (original)
+++ directory/site/trunk/templates/studio/download-linux.html Wed Oct 31 18:36:25 2012
@@ -16,20 +16,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-linux-x86_64-{{version_studio}}.tar.gz">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-linux-x86_64-{{version_studio}}.tar.gz">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-linux-x86_64-{{version_studio}}.tar.gz
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-linux-x86_64-{{version_studio}}.tar.gz.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-linux-x86_64-{{version_studio}}.tar.gz.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -43,20 +43,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86-{{version}}.tar.gz">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-linux-x86-{{version_studio}}.tar.gz">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86-{{version}}.tar.gz">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-linux-x86-{{version_studio}}.tar.gz">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-linux-x86-{{version}}.tar.gz
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-linux-x86-{{version_studio}}.tar.gz
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86-{{version}}.tar.gz.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86-{{version}}.tar.gz.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-linux-x86-{{version_studio}}.tar.gz.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-linux-x86-{{version_studio}}.tar.gz.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -103,7 +103,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz{% endblock %}
+        {% block filename %}ApacheDirectoryStudio-linux-x86_64-{{version_studio}}.tar.gz{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/studio/download-macosx.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/studio/download-macosx.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/studio/download-macosx.html (original)
+++ directory/site/trunk/templates/studio/download-macosx.html Wed Oct 31 18:36:25 2012
@@ -16,20 +16,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-macosx-x86_64-{{version_studio}}.dmg">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-macosx-x86_64-{{version_studio}}.dmg">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-x86_64-{{version_studio}}.dmg
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-macosx-x86_64-{{version_studio}}.dmg.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-macosx-x86_64-{{version_studio}}.dmg.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -43,20 +43,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86-{{version}}.dmg">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-macosx-x86-{{version_studio}}.dmg">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86-{{version}}.dmg">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-macosx-x86-{{version_studio}}.dmg">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-x86-{{version}}.dmg
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-x86-{{version_studio}}.dmg
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86-{{version}}.dmg.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86-{{version}}.dmg.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-macosx-x86-{{version_studio}}.dmg.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-macosx-x86-{{version_studio}}.dmg.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -109,7 +109,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg{% endblock %}
+        {% block filename %}ApacheDirectoryStudio-macosx-x86_64-{{version_studio}}.dmg{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/studio/download-sources.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/studio/download-sources.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/studio/download-sources.html (original)
+++ directory/site/trunk/templates/studio/download-sources.html Wed Oct 31 18:36:25 2012
@@ -14,20 +14,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-sources-{{version}}.zip">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-sources-{{version_studio}}.zip">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-sources-{{version}}.zip">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-sources-{{version_studio}}.zip">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-sources-{{version}}.zip
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-sources-{{version_studio}}.zip
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-sources-{{version}}.zip.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-sources-{{version}}.zip.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-sources-{{version_studio}}.zip.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-sources-{{version_studio}}.zip.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -41,7 +41,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}ApacheDirectoryStudio-sources-{{version}}.zip{% endblock %}
+        {% block filename %}ApacheDirectoryStudio-sources-{{version_studio}}.zip{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/studio/download-windows.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/studio/download-windows.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/studio/download-windows.html (original)
+++ directory/site/trunk/templates/studio/download-windows.html Wed Oct 31 18:36:25 2012
@@ -16,20 +16,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86_64-{{version}}.exe">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-win32-x86_64-{{version_studio}}.exe">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86_64-{{version}}.exe">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-win32-x86_64-{{version_studio}}.exe">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-win32-x86_64-{{version}}.exe
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-win32-x86_64-{{version_studio}}.exe
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86_64-{{version}}.exe.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86_64-{{version}}.exe.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-win32-x86_64-{{version_studio}}.exe.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-win32-x86_64-{{version_studio}}.exe.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -43,20 +43,20 @@
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86-{{version}}.exe">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-win32-x86-{{version_studio}}.exe">
                         <img src="{{base}}images/download.png" width="32" height="32" border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86-{{version}}.exe">
+                    <a href="[preferred]/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-win32-x86-{{version_studio}}.exe">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-win32-x86-{{version}}.exe
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-win32-x86-{{version_studio}}.exe
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86-{{version}}.exe.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86-{{version}}.exe.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-win32-x86-{{version_studio}}.exe.asc">ASC</a>-<a href="http://archive.apache.org/dist/directory/studio/stable/{{version_studio}}/ApacheDirectoryStudio-win32-x86-{{version_studio}}.exe.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -115,7 +115,7 @@
 <p>&nbsp;</p>
 
     {% extends "download-verify-file-integrity.html" %}
-        {% block filename %}ApacheDirectoryStudio-win32-x86_64-{{version}}.exe{% endblock %}
+        {% block filename %}ApacheDirectoryStudio-win32-x86_64-{{version_studio}}.exe{% endblock %}
     {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/studio/page.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/studio/page.html?rev=1404286&r1=1404285&r2=1404286&view=diff
==============================================================================
--- directory/site/trunk/templates/studio/page.html (original)
+++ directory/site/trunk/templates/studio/page.html Wed Oct 31 18:36:25 2012
@@ -13,8 +13,7 @@
         </ul>
         <h5>Downloads</h5>
         <ul>
-            <li><a href="{{base}}studio/2.0/download/">Version 2.0 M3</a>&nbsp;&nbsp;<IMG src="{{base}}images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
-            <li><a href="{{base}}studio/downloads.html">Version 1.5.3</a></li>
+            <li><a href="{{base}}studio/downloads.html">Version {{version_studio_name}}</a>&nbsp;&nbsp;<IMG src="{{base}}images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
             <li><a href="{{base}}studio/nightly-builds.html">Nightly Builds</a></li>
             <li><a href="{{base}}studio/download-old-versions.html">Older Versions</a></li>
         </ul>



Mime
View raw message