From 18ab5a50ade8f9d1bfc4160cf69491f40d45422f Mon Sep 17 00:00:00 2001
From: david <>
Date: Mon, 5 Aug 2002 00:57:10 +0000
Subject: [PATCH] UI tweaks and miscellaneous bugfixes. LDP logo at 200x80

---
 LDP/lampadas/database/tables/block/EN.m4     |   4 ++--
 LDP/lampadas/database/tables/page_i18n/DE.m4 |   2 +-
 LDP/lampadas/database/tables/page_i18n/EN.m4 |  16 ++++++++--------
 LDP/lampadas/database/tables/page_i18n/FR.m4 |   2 +-
 LDP/lampadas/database/tables/template/EN.m4  |  12 +++++++-----
 LDP/lampadas/pylib/HTML.py                   |   2 --
 LDP/lampadas/pylib/Tables.py                 |   4 ++--
 LDP/lampadas/www/css/ldp.css                 |   2 +-
 LDP/lampadas/www/images/ldp200x80.png        | Bin 0 -> 1771 bytes
 9 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 LDP/lampadas/www/images/ldp200x80.png

diff --git a/LDP/lampadas/database/tables/block/EN.m4 b/LDP/lampadas/database/tables/block/EN.m4
index 62d85a9d..7aff415f 100644
--- a/LDP/lampadas/database/tables/block/EN.m4
+++ b/LDP/lampadas/database/tables/block/EN.m4
@@ -12,7 +12,7 @@ insert([blklogo],
     <table class="logo">
       <tr>
         <td valign="middle">
-          LOGO
+          <a href="|base|home|uri.lang_ext|" alt=="Home"><img src="|uri.base|images/ldp200x80.png" alt="LDP" height="80" width="200"></a>
         </td>
       </tr>
     </table>
@@ -45,7 +45,7 @@ insert([blkfooter],
       <a href="http://www.python.org"><img src="|uri.base|images/PythonPowered.gif" alt="Python Powered!"></a>
       <a href="http://www.opensource.org"><img src="http://www.opensource.org/trademarks/osi-certified/web/osi-certified-90x75.png" height=75 width=90 alt="OSI Certified"></a>
       <a href="http://www.gnome.org"><img src="|uri.base|images/gnome2.png" height="48" width="48" alt="Gnome"></a>
-      <a href="http://www.tldp.org"><img src="|uri.base|images/ldp.gif" height="60" width="150" alt="TLDP"></a>
+      <a href="http://www.tldp.org"><img src="|uri.base|images/ldp200x80.png" height="60" width="133" alt="TLDP"></a>
       <br>|strrender_time|: |elapsed_time|
     </center>
 ])
diff --git a/LDP/lampadas/database/tables/page_i18n/DE.m4 b/LDP/lampadas/database/tables/page_i18n/DE.m4
index 64dc9431..e378034b 100644
--- a/LDP/lampadas/database/tables/page_i18n/DE.m4
+++ b/LDP/lampadas/database/tables/page_i18n/DE.m4
@@ -19,7 +19,7 @@ insert([newdocument], [Dokument hinzuf
 insert([users], [Liste der Benutzer], [],
 [
     |tabletters|
-    <p>|tabusers|
+    |tabusers|
 ], 1)
 
 insert([sessions], [Benutzersitzungen], [],
diff --git a/LDP/lampadas/database/tables/page_i18n/EN.m4 b/LDP/lampadas/database/tables/page_i18n/EN.m4
index 5429e599..d6952b91 100644
--- a/LDP/lampadas/database/tables/page_i18n/EN.m4
+++ b/LDP/lampadas/database/tables/page_i18n/EN.m4
@@ -16,7 +16,7 @@ insert([newdocument], [Add Document], [],
 insert([users], [User List], [],
 [
     |tabletters|
-    <p>|tabusers|
+    |tabusers|
 ], 1)
 
 insert([sessions], [User Sessions], [],
@@ -33,13 +33,13 @@ insert([my], [My Home], [],
     <p>|session_user_docs|</p>
 ], 1)
 
-insert([home], [|strproject|], [Home], 
+insert([home], [|strprojectshort| Home Page], [Home], 
 [
-    <p>Welcome to |strproject|.
+    <p>Welcome to |strproject|.</p>
 
     <p>This site is based on a development version of the
     Lampadas Document Management System from
-    <a href="http://www.tldp.org">The Linux Documentation Project</a>
+    <a href="http://www.tldp.org">The Linux Documentation Project</a></p>
 
     <p>This is <i><b>alpha quality</b></i> code, updated from the cvs tree
     very frequently, whenever there are significant features or
@@ -47,7 +47,7 @@ insert([home], [|strproject|], [Home],
     This happens at least once a day and sometimes
     several times a day.
     The system is fairly stable, although some half-
-    implemented features will cause ugly error dumps.
+    implemented features will cause ugly error dumps.</p>
     
     <p>This demo site is populated with data from the LDPDB.
     If you had an account on the LDPDB, you have one here.
@@ -55,12 +55,12 @@ insert([home], [|strproject|], [Home],
     hashed form, I was unable to port them over, and you\'ve been
     given a new password. To get it, click the "Mail Password"
     link and your new password will be mailed to your address
-    of record.
+    of record.</p>
 
     <p>There are also a set of additional test users.
     Log in as one of them to see the site through their eyes.
     The pages change depending on your access level.
-    These users\'passwords are "password".
+    These users\'passwords are "password".</p>
 
     <ul>
         <li>sysadmin - the SUPERUSER, who manages the system.</li>
@@ -77,7 +77,7 @@ insert([home], [|strproject|], [Home],
     project.
     You can find out more about it by reading the
     <a href="http://www.lupercalia.net/lampadas/">Lampadas Developer\'s
-    Guide</a>.
+    Guide</a>.</p>
 ], 1)
 
 insert([doctable], [DocTable], [],
diff --git a/LDP/lampadas/database/tables/page_i18n/FR.m4 b/LDP/lampadas/database/tables/page_i18n/FR.m4
index 14af63b9..3bfc5816 100644
--- a/LDP/lampadas/database/tables/page_i18n/FR.m4
+++ b/LDP/lampadas/database/tables/page_i18n/FR.m4
@@ -16,7 +16,7 @@ insert([newdocument], [Add Document], [],
 insert([users], [User List], [],
 [
     |tabletters|
-    <p>|tabusers|
+    |tabusers|
 ], 1)
 
 insert([sessions], [User Sessions], [],
diff --git a/LDP/lampadas/database/tables/template/EN.m4 b/LDP/lampadas/database/tables/template/EN.m4
index 5e79f368..c4c3bfe7 100644
--- a/LDP/lampadas/database/tables/template/EN.m4
+++ b/LDP/lampadas/database/tables/template/EN.m4
@@ -20,8 +20,10 @@ insert(index,
             <td class="sidebarleft">
               |blklogo|
             </td>
-            <td width="100%" colspan="2">
+            <td class="center" width="100%" colspan="2">
               |blkheader|
+            </td>
+            <td>
             </td>
 	      </tr>
 	      <tr>
@@ -31,7 +33,7 @@ insert(index,
               <p>|navtypes|
               <p>|navlanguages|
             </td>
-            <td class="body" width="100%" valign="top">
+            <td class="center body" width="100%" valign="top">
               |body|
             </td>
             <td class="sidebarright" valign="top">
@@ -60,7 +62,7 @@ insert(default,
             <td class="sidebarleft">
               |blklogo|
             </td>
-            <td width="100%">
+            <td class="center" width="100%">
               |blkheader|
             </td>
 	      </tr>
@@ -71,12 +73,12 @@ insert(default,
               <p>|navtypes|
               <p>|navlanguages|
             </td>
-            <td class="body" width="100%" valign="top">
+            <td class="center body" width="100%" valign="top">
               |body|
             </td>
 	      </tr>
 	      <tr>
-            <td>
+            <td colspan="2">
               |blkfooter|
             </td>
 	      </tr>
diff --git a/LDP/lampadas/pylib/HTML.py b/LDP/lampadas/pylib/HTML.py
index de1f9d8e..ac2112a3 100755
--- a/LDP/lampadas/pylib/HTML.py
+++ b/LDP/lampadas/pylib/HTML.py
@@ -143,8 +143,6 @@ class PageFactory:
                     if config.port > '':
                         newstring = newstring + ':' + config.port
                     newstring = newstring + config.root_dir
-                    if uri.force_lang:
-                        newstring = newstring + uri.lang + '/'
 
                 # Meta-data from the page's URL
                 elif token=='uri.lang_ext':
diff --git a/LDP/lampadas/pylib/Tables.py b/LDP/lampadas/pylib/Tables.py
index b9c0b2cd..31cc7c2b 100644
--- a/LDP/lampadas/pylib/Tables.py
+++ b/LDP/lampadas/pylib/Tables.py
@@ -541,7 +541,7 @@ class Tables:
 
     def letters(self, uri):
         log(3, 'Creating letter table')
-        box = '<table class="box" width="100%"><tr>\n'
+        box = '<table class="tab"><tr>\n'
         for letter in string.uppercase:
             if letter==uri.letter:
                 box = box + '<td>' + letter + '</td>\n'
@@ -1114,7 +1114,7 @@ class Tables:
         """
         log(3, 'Creating tabslashlanguages table')
         box = WOStringIO('<p class="hide"><div class="map">\n' \
-                         '<p id="p1">|strprojectshort|</p>\n')
+                         '<p id="p1">|strproject|</p>\n')
         id = 1
         langkeys = lampadas.languages.keys()
         for langkey in langkeys:
diff --git a/LDP/lampadas/www/css/ldp.css b/LDP/lampadas/www/css/ldp.css
index bf52bb0a..0359a60b 100644
--- a/LDP/lampadas/www/css/ldp.css
+++ b/LDP/lampadas/www/css/ldp.css
@@ -251,7 +251,7 @@ DIV.map {
   margin: 0;
   padding: 10;
   background-color: #bbccee;
-  font: bold 64pt "Georgia", serif;
+  font: bold 24pt "Georgia", serif;
 }
   
 #p2, #p2 A, #p3, #p3 A, #p4, #p4 A, #p5, #p5 A, #p6, #p6 A, #p7, #p7 A, #p8, #p8 A, #p9, #p9 A, #p10, #p10 A {
diff --git a/LDP/lampadas/www/images/ldp200x80.png b/LDP/lampadas/www/images/ldp200x80.png
new file mode 100644
index 0000000000000000000000000000000000000000..0dd7b7e787fd32dfa71a8d35e0a3b5c0a02d2d4a
GIT binary patch
literal 1771
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
N002ovPDHLkV1mlqH_`wA

literal 0
HcmV?d00001