changeset 401:61e50f3aaf68

fix projection CSS, fix win32 request init, revert Florian's langAttr fix (already done in refactor branch) imported from: moin--main--1.5--patch-405
author Thomas Waldmann <tw@waldmann-edv.de>
date Fri, 27 Jan 2006 18:47:39 +0000
parents 850c6ba2dd23
children c04edbe29fac
files ChangeLog MoinMoin/formatter/base.py MoinMoin/formatter/text_html.py MoinMoin/request.py wiki/htdocs/modern/css/projection.css wiki/htdocs/modern/css/screen.css
diffstat 6 files changed, 66 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 26 22:39:22 2006 +0000
+++ b/ChangeLog	Fri Jan 27 18:47:39 2006 +0000
@@ -2,6 +2,23 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-01-27 19:47:39 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-405
+
+    Summary:
+      fix projection CSS, fix win32 request init, revert Florian's langAttr fix (already done in refactor branch)
+    Revision:
+      moin--main--1.5--patch-405
+
+    fix projection CSS, fix win32 request init, revert Florian's langAttr fix (already done in refactor branch)
+    
+
+    modified files:
+     ChangeLog MoinMoin/formatter/base.py
+     MoinMoin/formatter/text_html.py MoinMoin/request.py
+     wiki/htdocs/modern/css/projection.css
+     wiki/htdocs/modern/css/screen.css
+
+
 2006-01-26 23:39:22 GMT	Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de>	patch-404
 
     Summary:
--- a/MoinMoin/formatter/base.py	Thu Jan 26 22:39:22 2006 +0000
+++ b/MoinMoin/formatter/base.py	Fri Jan 27 18:47:39 2006 +0000
@@ -41,27 +41,6 @@
         else:
             self._highlight_re = hi_re
 
-    def langAttr(self, lang=None):
-        """ Return lang and dir attribute
-
-        Must be used on all block elements - div, p, table, etc.
-        @param lang: if defined, will return attributes for lang. if not
-            defined, will return attributes only if the current lang is
-            different from the content lang.
-        @rtype: dict
-        @retrun: language attributes
-        """
-        if not lang:
-            lang = self.request.current_lang
-            # Actions that generate content in user language should change
-            # the content lang from the default defined in cfg.
-            if lang == self.request.content_lang:
-                # lang is inherited from content div
-                return {}
-
-        attr = {'lang': lang, 'dir': i18n.getDirection(lang),}
-        return attr
-
     def lang(self, on, lang_name):
         return ""
 
--- a/MoinMoin/formatter/text_html.py	Thu Jan 26 22:39:22 2006 +0000
+++ b/MoinMoin/formatter/text_html.py	Fri Jan 27 18:47:39 2006 +0000
@@ -49,6 +49,27 @@
     # code clean and handle pathological cases like unclosed p and
     # inline tags.
 
+    def langAttr(self, lang=None):
+        """ Return lang and dir attribute
+
+        Must be used on all block elements - div, p, table, etc.
+        @param lang: if defined, will return attributes for lang. if not
+            defined, will return attributes only if the current lang is
+            different from the content lang.
+        @rtype: dict
+        @retrun: language attributes
+        """
+        if not lang:
+            lang = self.request.current_lang
+            # Actions that generate content in user language should change
+            # the content lang from the default defined in cfg.
+            if lang == self.request.content_lang:
+                # lang is inherited from content div
+                return {}
+
+        attr = {'lang': lang, 'dir': i18n.getDirection(lang),}
+        return attr
+
     def formatAttributes(self, attr=None):
         """ Return formatted attributes string
 
--- a/MoinMoin/request.py	Thu Jan 26 22:39:22 2006 +0000
+++ b/MoinMoin/request.py	Fri Jan 27 18:47:39 2006 +0000
@@ -1324,15 +1324,15 @@
 
     def __init__(self, properties={}):
         try:
-            self._setup_vars_from_std_env(os.environ)
-            RequestBase.__init__(self, properties)
-
             # force input/output to binary
             if sys.platform == "win32":
                 import msvcrt
                 msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
                 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
 
+            self._setup_vars_from_std_env(os.environ)
+            RequestBase.__init__(self, properties)
+
         except Exception, err:
             self.fail(err)
             
--- a/wiki/htdocs/modern/css/projection.css	Thu Jan 26 22:39:22 2006 +0000
+++ b/wiki/htdocs/modern/css/projection.css	Fri Jan 27 18:47:39 2006 +0000
@@ -7,21 +7,27 @@
 
 html { line-height: 1.8em; }
 
-body, b, em, a, span, div, p, td { font-size: 22pt; }
+body, b, em, a, span, div, p, td { font-size: 18pt; }
 
-h1 { font-size: 28pt; }
-h2 { font-size: 24pt; }
-h3 { font-size: 22pt; }
-h4 { font-size: 20pt; }
-h5 { font-size: 18pt; }
-h6 { font-size: 16pt; }
+h1 { font-size: 26pt; }
+h2 { font-size: 22pt; }
+h3 { font-size: 20pt; }
+h4 { font-size: 18pt; }
+h5 { font-size: 16pt; }
+h6 { font-size: 14pt; }
 
-tt,pre { font-size: 18pt; }
-sup, sub { font-size: 14pt; }
+tt, pre { font-size: 16pt; }
+sup, sub { font-size: 12pt; }
 
-.navigation {
-	font-size: 16pt;
-	padding-top: 8pt;
-	padding-bottom: 8pt;
+table.navigation {
+    float: right;
+    margin: 2px;
 }
 
+.navigation td, .navigation a {
+	font-size: 10pt;
+    padding: 2px;
+}
+
+#interwiki, #pagelocation, #pageinfo { display: none; }
+
--- a/wiki/htdocs/modern/css/screen.css	Thu Jan 26 22:39:22 2006 +0000
+++ b/wiki/htdocs/modern/css/screen.css	Fri Jan 27 18:47:39 2006 +0000
@@ -457,6 +457,12 @@
     background-color: #FFFF80;
 }
 
+table.navigation {
+    float: right;
+    margin: 2px;
+}
+        
+
 /* Spans for line-anchors - uses * html hack so that the rule only applies to
  * IE (where omitting the "display: none" triggers rendering bugs).
  */