directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1330780 - in /directory/site/trunk: content/index.mdtext content/studio/download-test.mdtext lib/path.pm templates/page.html templates/studio/ templates/studio/download-test.html
Date Thu, 26 Apr 2012 11:25:15 GMT
Author: pamarcelot
Date: Thu Apr 26 11:25:15 2012
New Revision: 1330780

URL: http://svn.apache.org/viewvc?rev=1330780&view=rev
Log:
Made the version number on the download page dynamic.
It can be modified in the 'lib/path.pm' file and will have an impact on all the download pages
for the given sub-project.

Added:
    directory/site/trunk/templates/studio/
    directory/site/trunk/templates/studio/download-test.html
Modified:
    directory/site/trunk/content/index.mdtext
    directory/site/trunk/content/studio/download-test.mdtext
    directory/site/trunk/lib/path.pm
    directory/site/trunk/templates/page.html

Modified: directory/site/trunk/content/index.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/index.mdtext?rev=1330780&r1=1330779&r2=1330780&view=diff
==============================================================================
--- directory/site/trunk/content/index.mdtext (original)
+++ directory/site/trunk/content/index.mdtext Thu Apr 26 11:25:15 2012
@@ -1,5 +1,7 @@
 Title: Welcome to Apache Directory
+test: { test1 }
 
 This is the content in **Markdown**.
 
+
 <div style="border: 1px black solid;">And this is an HTML div.</div>
\ No newline at end of file

Modified: directory/site/trunk/content/studio/download-test.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download-test.mdtext?rev=1330780&r1=1330779&r2=1330780&view=diff
==============================================================================
--- directory/site/trunk/content/studio/download-test.mdtext (original)
+++ directory/site/trunk/content/studio/download-test.mdtext Thu Apr 26 11:25:15 2012
@@ -1,59 +1 @@
-Title: Download for Mac OS X
-
-<h1>Download for Mac OS X</h1>
-
-<p>
-    [if-any logo]
-    <a href="[link]"><img align="right" src="[logo]" border="0" /></a>
-    [end]
-    We suggest the following mirror site for your download:
-</p>
-
-<p>
-    <div id="downloadContent">
-        <table border="0" width="100%">
-            <tr>
-                <td>
-                    <a href="[preferred]/directory/studio/stable/1.5.3.v20100330/ApacheDirectoryStudio-macosx-1.5.3.v20100330.dmg">
-                        <img src="images/download.png" width="32" height="32" border="0"/>
-                    </a>
-                </td>
-                <td>&nbsp;</td>
-                <td>
-                    <a href="[preferred]/directory/studio/stable/1.5.3.v20100330/ApacheDirectoryStudio-macosx-1.5.3.v20100330.dmg">
-                        <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-1.5.3.v20100330.dmg
-                        </strong>
-                    </a>
-                </td>
-                <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/1.5.3.v20100330/ApacheDirectoryStudio-macosx-1.5.3.v20100330.dmg.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/1.5.3.v20100330/ApacheDirectoryStudio-macosx-1.5.3.v20100330.dmg.md5">MD5</a>]
-                </td>
-            </tr>
-        </table>
-    </div>
-</p>
-
-<p>
-    <form action="[location]" method="get" id="SelectMirror">
-        Other mirrors:
-        <select name="Preferred">
-            [if-any http]
-            <optgroup label="HTTP mirrors">
-                [for http]<option value="[http]">[http]</option>[end]
-            </potgroup>
-            [end]
-            [if-any ftp]
-            <optgroup label="FTP mirrors">
-                [for ftp]<option value="[ftp]">[ftp]</option>[end]
-            </potgroup>
-            [end]
-            [if-any backup]
-            <optgroup label="Backup mirrors">
-                [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-            </potgroup>
-            [end]
-        </select>
-        <input type="submit" value="Change Mirror"/>
-    </form>
-</p>
\ No newline at end of file
+Title: Download for Mac OS X
\ No newline at end of file

Modified: directory/site/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/directory/site/trunk/lib/path.pm?rev=1330780&r1=1330779&r2=1330780&view=diff
==============================================================================
--- directory/site/trunk/lib/path.pm (original)
+++ directory/site/trunk/lib/path.pm Thu Apr 26 11:25:15 2012
@@ -1,9 +1,14 @@
 package path;
 
+# Versions (for download links)
+our $version_api = "1.O.0-M11";
+our $version_apacheds = "2.0.0-M6";
+our $version_studio = "2.0.0.v20120224";
+
 # All our pages use the same view function
 our @patterns = (
     # Basic HTML content
-    [qr!^/.*\.html$!,   template_page => {} ],
+    [qr!^/.*\.html$!, template_page => {} ],
     
     # Apache DS sub-project pages
     [qr!apacheds\/.*?\.mdtext$!, template_page => {
@@ -14,10 +19,18 @@ our @patterns = (
     [qr!api\/.*?\.mdtext$!, template_page => {
         template => "page-api.html",
         isDirAPI => true } ],
+        
+    # Apache Directory Studio sub-project pages
+    [qr!studio\/download-test\.mdtext$!, template_page => {
+        template => "studio/download-test.html",
+        isDirStudio => true, 
+        version => $version_studio } ],
+        
     # Apache Directory Studio sub-project pages
     [qr!studio\/.*?\.mdtext$!, template_page => {
         template => "page-studio.html",
-        isDirStudio => true  } ],
+        isDirStudio => true } ],
+        
     # Directory project global pages  
     [qr!^/.*\.mdtext$!, template_page => {
         template => "page.html",

Modified: directory/site/trunk/templates/page.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/page.html?rev=1330780&r1=1330779&r2=1330780&view=diff
==============================================================================
--- directory/site/trunk/templates/page.html (original)
+++ directory/site/trunk/templates/page.html Thu Apr 26 11:25:15 2012
@@ -5,6 +5,7 @@
 	{% endblock %}
 {% endextends %}
 
-{% block content %}{{ content|markdown }}{% endblock %}
+{% block content %}{{ content|safe }}{% endblock %}
+{{ headers.test }}
 
 {% include "footer.html" %}
\ No newline at end of file

Added: directory/site/trunk/templates/studio/download-test.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/studio/download-test.html?rev=1330780&view=auto
==============================================================================
--- directory/site/trunk/templates/studio/download-test.html (added)
+++ directory/site/trunk/templates/studio/download-test.html Thu Apr 26 11:25:15 2012
@@ -0,0 +1,61 @@
+{% extends "../page-studio.html" %}
+    {% block content %}
+<h1>Download for Mac OS X</h1>
+
+<p>
+    [if-any logo]
+    <a href="[link]"><img align="right" src="[logo]" border="0" /></a>
+    [end]
+    We suggest the following mirror site for your download:
+</p>
+
+<p>
+    <div id="downloadContent">
+        <table border="0" width="100%">
+            <tr>
+                <td>
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg">
+                        <img src="images/download.png" width="32" height="32" border="0"/>
+                    </a>
+                </td>
+                <td>&nbsp;</td>
+                <td>
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg">
+                        <strong>
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-{{version}}.dmg
+                        </strong>
+                    </a>
+                </td>
+                <td align="right">
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg.md5">MD5</a>]
+                </td>
+            </tr>
+        </table>
+    </div>
+</p>
+
+<p>
+    <form action="[location]" method="get" id="SelectMirror">
+        Other mirrors:
+        <select name="Preferred">
+            [if-any http]
+            <optgroup label="HTTP mirrors">
+                [for http]<option value="[http]">[http]</option>[end]
+            </potgroup>
+            [end]
+            [if-any ftp]
+            <optgroup label="FTP mirrors">
+                [for ftp]<option value="[ftp]">[ftp]</option>[end]
+            </potgroup>
+            [end]
+            [if-any backup]
+            <optgroup label="Backup mirrors">
+                [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+            </potgroup>
+            [end]
+        </select>
+        <input type="submit" value="Change Mirror"/>
+    </form>
+</p>
+    {% endblock %}
+{% endextends %}
\ No newline at end of file



Mime
View raw message