[Gpg4win-commits] r295 - trunk/doc/website

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Fri Apr 28 09:46:57 CEST 2006 

Author: wilde
Date: 2006-04-28 09:46:56 +0200 (Fri, 28 Apr 2006)
New Revision: 295

Modified:
   trunk/doc/website/build-installer.htm4
   trunk/doc/website/candidates.htm4
   trunk/doc/website/gpg4win.css
   trunk/doc/website/index-de.htm4
   trunk/doc/website/index.htm4
   trunk/doc/website/package-integrity-de.htm4
   trunk/doc/website/template.m4
   trunk/doc/website/template_header.m4
   trunk/doc/website/template_link_boxes_de.m4
   trunk/doc/website/template_link_boxes_en.m4
   trunk/doc/website/website-maintenance.htm4
Log:
Fixes for Issue #71 by Torsten Irl?\195?\164nder <torsten.irlaender at intevation.de>
see
http://wald.intevation.org/tracker/?func=detail&atid=126&aid=71&group_id=11
for details.


Modified: trunk/doc/website/build-installer.htm4
===================================================================
--- trunk/doc/website/build-installer.htm4	2006-04-27 10:46:17 UTC (rev 294)
+++ trunk/doc/website/build-installer.htm4	2006-04-28 07:46:56 UTC (rev 295)
@@ -187,4 +187,3 @@
 <em>src/gpg4win-src-n.n.n.exe</em><br>
 </p>
 
-PAGE_BOXES

Modified: trunk/doc/website/candidates.htm4
===================================================================
--- trunk/doc/website/candidates.htm4	2006-04-27 10:46:17 UTC (rev 294)
+++ trunk/doc/website/candidates.htm4	2006-04-28 07:46:56 UTC (rev 295)
@@ -33,4 +33,3 @@
 for the email tool Microsoft Outlook Express.
 </p>
 
-PAGE_BOXES

Modified: trunk/doc/website/gpg4win.css
===================================================================
--- trunk/doc/website/gpg4win.css	2006-04-27 10:46:17 UTC (rev 294)
+++ trunk/doc/website/gpg4win.css	2006-04-28 07:46:56 UTC (rev 295)
@@ -65,6 +65,7 @@
     font-weight: normal;
     color: black;
     white-space:pre;
+    margin:0;
     font-family: Helvetica, Arial, sans-serif;
     font-size: 12px;
 }
@@ -104,6 +105,10 @@
 
 /* Head */
 
+#header {
+    clear: both;
+}
+
 #navbar {
     background-color: white;
     color: black;
@@ -154,13 +159,12 @@
 /* Content */
 
 #main {
-    position: absolute;
     min-width: 250px;
     padding: 40px;
     padding-top: 20px;
-    left: 0px;
-    right: 200px;
+    padding-right: 0px;
     line-height: 150%;
+    margin-right: 250px;
 }
 
 #main TABLE {
@@ -182,9 +186,7 @@
 }
 
 #boxes {
-    position: absolute;
-    overflow: visible;
-    right: 0px;
+    float: right;
     width: 200px;
     padding: 10px;
 }
@@ -208,4 +210,4 @@
     margin: 0px;
     padding: 0px;
     margin-top: 5px;
-}
\ No newline at end of file
+}

Modified: trunk/doc/website/index-de.htm4
===================================================================
--- trunk/doc/website/index-de.htm4	2006-04-27 10:46:17 UTC (rev 294)
+++ trunk/doc/website/index-de.htm4	2006-04-28 07:46:56 UTC (rev 295)
@@ -153,4 +153,3 @@
 </p>
 
 
-PAGE_BOXES

Modified: trunk/doc/website/index.htm4
===================================================================
--- trunk/doc/website/index.htm4	2006-04-27 10:46:17 UTC (rev 294)
+++ trunk/doc/website/index.htm4	2006-04-28 07:46:56 UTC (rev 295)
@@ -4,8 +4,8 @@
 
 m4_define(`EN')
 m4_define(`DE_FILE', `index-de.html')
-PAGE_START
 
+PAGE_START
 <h2>New User?</h2>
 
 gpg4win is a installer package for Windows (95/98/ME/2000/XP/2003)
@@ -151,4 +151,3 @@
 Phone: +49 2104 173855<br>
 </p>
 
-PAGE_BOXES

Modified: trunk/doc/website/package-integrity-de.htm4
===================================================================
--- trunk/doc/website/package-integrity-de.htm4	2006-04-27 10:46:17 UTC (rev 294)
+++ trunk/doc/website/package-integrity-de.htm4	2006-04-28 07:46:56 UTC (rev 295)
@@ -48,4 +48,3 @@
 GPA oder WinPT. Die Prüfung einer Signatur kann man leicht mit GPGee
 über den Explorer erledigen.
 </p>
-PAGE_BOXES

Modified: trunk/doc/website/template.m4
===================================================================
--- trunk/doc/website/template.m4	2006-04-27 10:46:17 UTC (rev 294)
+++ trunk/doc/website/template.m4	2006-04-28 07:46:56 UTC (rev 295)
@@ -13,6 +13,3 @@
 m4_define(`PAGE_TITLE',`m4_define(`__TMPL_PAGE_TITLE',`$1')')
 m4_define(`PAGE_ROOT',`m4_define(`__TMPL_ROOT',`$1')')
 m4_define(`PAGE_START',`m4_include(`template_header.m4')')
-m4_define(`PAGE_BOXES',`m4_include(m4_dnl
-I18N(`DE', `template_link_boxes_de.m4')`'m4_dnl
-I18N(`EN', `template_link_boxes_en.m4'))')

Modified: trunk/doc/website/template_header.m4
===================================================================
--- trunk/doc/website/template_header.m4	2006-04-27 10:46:17 UTC (rev 294)
+++ trunk/doc/website/template_header.m4	2006-04-28 07:46:56 UTC (rev 295)
@@ -16,6 +16,7 @@
     <title>__TMPL_PAGE_TITLE</title>
   </head>
   <body>
+  <div id="header">
     <table id="navbar">
       <tr valign="bottom">
         <td style="width:172px; text-align: left; padding-bottom: 8px;">
@@ -35,7 +36,7 @@
       <tr><td id="vertable" style="white-space: nowrap;">
       I18N(`EN',`Version VERSION (DL_DATE) includes:')
       I18N(`DE',`Version VERSION (DL_DATE) enthält:')
-            <br><pre class="swlist">SOFTWARE</pre>
+           <pre class="swlist">SOFTWARE</pre>
           </td>
           <td class="center">
             <a href="DOWNLOAD_URL" class="dlbutton">Download<br> 
@@ -45,6 +46,9 @@
                   >SHA1/MD5/OpenPGP-Sig</a>
       </td></tr>
     </table>
+  </div>
+m4_include(I18N(`DE', `template_link_boxes_de.m4')`'m4_dnl
+I18N(`EN', `template_link_boxes_en.m4'))
     <div id="main">
 m4_divert(999)
     </div>

Modified: trunk/doc/website/template_link_boxes_de.m4
===================================================================
--- trunk/doc/website/template_link_boxes_de.m4	2006-04-27 10:46:17 UTC (rev 294)
+++ trunk/doc/website/template_link_boxes_de.m4	2006-04-28 07:46:56 UTC (rev 295)
@@ -2,7 +2,6 @@
 m4_dnl THIS IS INCLUDED BY `template.m4'
 m4_dnl DONT USE THIS FILE DIRECTLY
 
-</div>
 <div id="boxes">
 
 <div class="box">
@@ -48,3 +47,4 @@
   <a href="website-maintenance-de.html">Website pflegen</a><br>
   <a href="candidates-de.html">Kandidaten zur Integration</a><br>
 </div>
+</div>

Modified: trunk/doc/website/template_link_boxes_en.m4
===================================================================
--- trunk/doc/website/template_link_boxes_en.m4	2006-04-27 10:46:17 UTC (rev 294)
+++ trunk/doc/website/template_link_boxes_en.m4	2006-04-28 07:46:56 UTC (rev 295)
@@ -2,7 +2,6 @@
 m4_dnl THIS IS INCLUDED BY `template.m4'
 m4_dnl DONT USE THIS FILE DIRECTLY
 
-</div>
 <div id="boxes">
 
 <div class="box">
@@ -49,3 +48,4 @@
   <a href="website-maintenance.html">Maintaining Website</a><br>
   <a href="candidates.html">Candidates for Integration</a><br>
 </div>
+</div>

Modified: trunk/doc/website/website-maintenance.htm4
===================================================================
--- trunk/doc/website/website-maintenance.htm4	2006-04-27 10:46:17 UTC (rev 294)
+++ trunk/doc/website/website-maintenance.htm4	2006-04-28 07:46:56 UTC (rev 295)
@@ -85,4 +85,3 @@
      <em>make -f buildhtml.mk online</em><br>
 </ol>
 
-PAGE_BOXES

More information about the Gpg4win-commits mailing list