directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1331375 - in /directory/site/trunk: content/css/ content/images/ content/studio/download/images/ templates/ templates/studio/
Date Fri, 27 Apr 2012 12:13:44 GMT
Author: pamarcelot
Date: Fri Apr 27 12:13:43 2012
New Revision: 1331375

URL: http://svn.apache.org/viewvc?rev=1331375&view=rev
Log:
Added content for the windows download page.

Added:
    directory/site/trunk/content/images/download.png   (with props)
    directory/site/trunk/content/images/figure_1.gif   (with props)
    directory/site/trunk/content/images/figure_2.gif   (with props)
    directory/site/trunk/content/images/figure_3.gif   (with props)
    directory/site/trunk/content/images/figure_4.gif   (with props)
    directory/site/trunk/content/images/warning.gif   (with props)
    directory/site/trunk/content/studio/download/images/
    directory/site/trunk/content/studio/download/images/installation_linux_1.jpg   (with props)
    directory/site/trunk/content/studio/download/images/installation_linux_2.jpg   (with props)
    directory/site/trunk/content/studio/download/images/installation_macosx_1.jpg   (with
props)
    directory/site/trunk/content/studio/download/images/installation_macosx_2.jpg   (with
props)
    directory/site/trunk/content/studio/download/images/installation_macosx_3.jpg   (with
props)
    directory/site/trunk/content/studio/download/images/installation_sources_1.jpg   (with
props)
    directory/site/trunk/content/studio/download/images/installation_sources_2.jpg   (with
props)
    directory/site/trunk/content/studio/download/images/installation_windows_1.jpg   (with
props)
    directory/site/trunk/content/studio/download/images/installation_windows_2.jpg   (with
props)
    directory/site/trunk/content/studio/download/images/installation_windows_3.jpg   (with
props)
    directory/site/trunk/content/studio/download/images/installation_windows_4.jpg   (with
props)
Modified:
    directory/site/trunk/content/css/common.css
    directory/site/trunk/templates/page.html
    directory/site/trunk/templates/studio/download-windows.html

Modified: directory/site/trunk/content/css/common.css
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/css/common.css?rev=1331375&r1=1331374&r2=1331375&view=diff
==============================================================================
--- directory/site/trunk/content/css/common.css (original)
+++ directory/site/trunk/content/css/common.css Fri Apr 27 12:13:43 2012
@@ -386,9 +386,11 @@ th 
 .noteMacro 
 {
 	border: 1px solid #f0c000;
-	background-color: #ffffce;
+	background: #ffffce url('../images/warning.gif') no-repeat 5px 5px;
+	text-align: left;
 	margin-top: 5px;
-	margin-bottom: 5px
+	margin-bottom: 5px;
+	padding: 5px 5px 5px 28px;
 }
 
 .warningMacro 
@@ -397,7 +399,7 @@ th 
 	background-color: #fcc;
 	text-align: left;
 	margin-top: 5px;
-	margin-bottom: 5px
+	margin-bottom: 5px;
 }
 
 .infoMacro 
@@ -406,7 +408,7 @@ th 
 	background-color: #D8E4F1;
 	text-align: left;
 	margin-top: 5px;
-	margin-bottom: 5px
+	margin-bottom: 5px;
 }
 
 .tipMacro 
@@ -415,7 +417,7 @@ th 
 	background-color: #dfd;
 	text-align: left;
 	margin-top: 5px;
-	margin-bottom: 5px
+	margin-bottom: 5px;
 }
 
 .code 
@@ -476,4 +478,41 @@ th 
 {
 	color: #000091;
 	background-color: inherit;
+}
+
+.noBorder
+{
+	border: 0 none transparent;
+}
+
+.noBorder tr
+{
+	border: 0 none transparent;
+}
+
+.noBorder th
+{
+	border: 0 none transparent;
+}
+
+.noBorder td
+{
+	border: 0 none transparent;
+}
+
+.download
+{
+    padding: 7px 12px 3px 12px;
+    border: 1px solid #aee756;
+    background: #e9fad0;
+}
+
+.download table
+{
+    margin: 0;
+}
+
+.download td
+{
+    padding: 0;
 }
\ No newline at end of file

Added: directory/site/trunk/content/images/download.png
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/images/download.png?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/images/download.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/images/figure_1.gif
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/images/figure_1.gif?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/images/figure_1.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/images/figure_2.gif
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/images/figure_2.gif?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/images/figure_2.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/images/figure_3.gif
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/images/figure_3.gif?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/images/figure_3.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/images/figure_4.gif
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/images/figure_4.gif?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/images/figure_4.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/images/warning.gif
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/images/warning.gif?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/images/warning.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/studio/download/images/installation_linux_1.jpg
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download/images/installation_linux_1.jpg?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/studio/download/images/installation_linux_1.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/studio/download/images/installation_linux_2.jpg
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download/images/installation_linux_2.jpg?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/studio/download/images/installation_linux_2.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/studio/download/images/installation_macosx_1.jpg
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download/images/installation_macosx_1.jpg?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/studio/download/images/installation_macosx_1.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/studio/download/images/installation_macosx_2.jpg
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download/images/installation_macosx_2.jpg?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/studio/download/images/installation_macosx_2.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/studio/download/images/installation_macosx_3.jpg
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download/images/installation_macosx_3.jpg?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/studio/download/images/installation_macosx_3.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/studio/download/images/installation_sources_1.jpg
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download/images/installation_sources_1.jpg?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/studio/download/images/installation_sources_1.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/studio/download/images/installation_sources_2.jpg
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download/images/installation_sources_2.jpg?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/studio/download/images/installation_sources_2.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/studio/download/images/installation_windows_1.jpg
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download/images/installation_windows_1.jpg?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/studio/download/images/installation_windows_1.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/studio/download/images/installation_windows_2.jpg
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download/images/installation_windows_2.jpg?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/studio/download/images/installation_windows_2.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/studio/download/images/installation_windows_3.jpg
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download/images/installation_windows_3.jpg?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/studio/download/images/installation_windows_3.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/site/trunk/content/studio/download/images/installation_windows_4.jpg
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/studio/download/images/installation_windows_4.jpg?rev=1331375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/site/trunk/content/studio/download/images/installation_windows_4.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: directory/site/trunk/templates/page.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/page.html?rev=1331375&r1=1331374&r2=1331375&view=diff
==============================================================================
--- directory/site/trunk/templates/page.html (original)
+++ directory/site/trunk/templates/page.html Fri Apr 27 12:13:43 2012
@@ -5,7 +5,7 @@
 	{% endblock %}
 {% endextends %}
 
-{% block content %}{{ content|safe }}{% endblock %}
+{% block content %}{{ content|markdown }}{% endblock %}
 {{ headers.test }}
 
 {% include "footer.html" %}
\ 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=1331375&r1=1331374&r2=1331375&view=diff
==============================================================================
--- directory/site/trunk/templates/studio/download-windows.html (original)
+++ directory/site/trunk/templates/studio/download-windows.html Fri Apr 27 12:13:43 2012
@@ -1,6 +1,6 @@
 {% extends "studio/page.html" %}
     {% block content %}
-<h1>Download for Mac OS X</h1>
+<h1>Download for Windows</h1>
 
 <p>
     [if-any logo]
@@ -10,24 +10,24 @@
 </p>
 
 <p>
-    <div id="downloadContent">
-        <table border="0" width="100%">
+    <div class="download">
+        <table width="100%" class="noBorder">
             <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 href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-{{version}}.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-macosx-{{version}}.dmg">
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-{{version}}.exe">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-{{version}}.dmg
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-win32-{{version}}.exe
                         </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>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-{{version}}.exe.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-{{version}}.exe.md5">MD5</a>]
                 </td>
             </tr>
         </table>
@@ -57,5 +57,93 @@
         <input type="submit" value="Change Mirror"/>
     </form>
 </p>
+
+<p>
+    <div class="noteMacro" align="center" border="0" cellpadding="5" cellspacing="8" width="85%">
+        We encourage you to <a href="#verifyIntegrity">verify the integrity</a>
of the downloaded file using:
+        <ul>
+            <li>the ASC file (OpenPGP compatible signature) with the <a href="http://www.apache.org/dist/directory/KEYS">KEYS
file</a> (code signing keys used to sign the product)</li>
+            <li>the MD5 file (checksum).</li>
+        </ul>
+    </div>
+</p>
+
+<p>&nbsp;</p>
+
+<h1>Installation</h1>
+                    
+<p>
+    <table class="noBorder">
+        <tr>
+            <td width="64" height="64"><img src="{{base}}images/figure_1.gif" width="64"
height="64"/></td>
+            <td><img src="images/installation_windows_1.jpg" width="225" height="141"/></td>
+            <td>&nbsp;&nbsp;</td>
+            <td>Click on the link above to download Apache Directory Studio for Windows.<br
/>Your download appears in the download manager of your web browser.</td>
+        </tr>
+        <tr>
+            <td width="64" height="64"><img src="{{base}}images/figure_2.gif" width="64"
height="64"/></td>
+            <td><img src="images/installation_windows_2.jpg" width="225" height="150"/></td>
+            <td>&nbsp;&nbsp;</td>
+            <td>Double-click on the installer to open it.<br/>It may have already
been opened by your web browser.</td>
+        </tr>
+        <tr>
+            <td width="64" height="64"><img src="{{base}}images/figure_3.gif" width="64"
height="64"/></td>
+            <td><img src="images/installation_windows_3.jpg" width="225" height="180"/></td>
+            <td>&nbsp;&nbsp;</td>
+            <td>You may be prompted to confirm that you are sure you want to open the
installer. Answer <em>Run</em> if such a popup is displayed.</td>
+        </tr>
+        <tr>
+            <td width="64" height="64"><img src="{{base}}images/figure_4.gif" width="64"
height="64"/></td>
+            <td><img src="images/installation_windows_4.jpg" width="225" height="176"/></td>
+            <td>&nbsp;&nbsp;</td>
+            <td>Follow the instructions of the installer to complete the installation.</td>
+        </tr>
+    </table>
+</p>
+
+<p>&nbsp;</p>
+
+<h1>Requirements</h1>
+
+<p>
+    Apache Directory Studio for Windows requires at least:
+    <ul>
+	    <li>Windows XP, Vista or 7.</li>
+	    <li><span class="nobr"><a href="http://www.java.com/">a 32-bit Java
Runtime Environment</a></span> 5 or later.</li>
+    </ul>
+</p>
+
+<p>&nbsp;</p>
+
+<h1>Verify the integrity of the file</h1>
+                    
+<p>The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/directory/KEYS">KEYS</a>
as well as the <em>asc</em> signature file for the relevant distribution. Then
verify the signatures using:</p>
+
+<div class="preformatted">
+    <div class="preformattedContent">
+        <pre>$ pgpk -a KEYS
+$ pgpv ApacheDirectoryStudio-win32-{{version}}.exe.asc</pre>
+    </div>
+</div>
+or
+<div class="preformatted">
+    <div class="preformattedContent">
+        <pre>$ pgp -ka KEYS
+$ pgp ApacheDirectoryStudio-win32-{{version}}.exe.asc</pre>
+    </div>
+</div>
+or
+<div class="preformatted">
+    <div class="preformattedContent">
+        <pre>$ gpg --import KEYS
+$ gpg --verify ApacheDirectoryStudio-win32-{{version}}.exe.asc</pre>
+    </div>
+</div>
+
+<p>&nbsp;</p>
+
+<p>Alternatively, you can verify the MD5 signature on the files. A unix program called
<em>md5</em> or <em>md5sum</em> is included in many unix distributions.
It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU
Textutils</a>. Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>,
<a href="http://www.pc-tools.net/win32/freeware/console/">here</a>, or <a href="http://www.slavasoft.com/fsum/">here</a>.</p>
+
+<p>&nbsp;</p>
     {% endblock %}
 {% endextends %}
\ No newline at end of file



Mime
View raw message