Mercurial > moin-modernized
changeset 22:39a9824402c9
Heading tweaks for 1.8
| author | Radomir Dopieralski <devel@sheep.art.pl> |
|---|---|
| date | Mon, 23 Jun 2008 13:22:53 +0200 |
| parents | f6d1d84100ba |
| children | c1057fed252f |
| files | css/screen.css modernized.py |
| diffstat | 2 files changed, 93 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/css/screen.css Tue May 20 13:31:44 2008 +0200 +++ b/css/screen.css Mon Jun 23 13:22:53 2008 +0200 @@ -78,22 +78,12 @@ text-decoration: none; } -#utils { - float: right; - clear: right; - text-align: right; -} -#utils[dir="rtl"] { - float: left; - clear: left; - text-align: left; -} #username { - margin: 5px 12px; + display; block; + margin: 8px 12px 4px 12px; padding: 0; font-size: 0.82em; - white-space: nowrap; } #username form { @@ -105,7 +95,7 @@ padding: 0; margin: 0; border: none; - background: #E7E7E7; /* inherit doesnt work on IE */ + background: transparent; color: blue; font-size: 0.82em; cursor: pointer; @@ -116,16 +106,29 @@ } #searchform { - margin: 0 10px; + margin: 4px 0.5em 8px 0.5em; padding: 0; - white-space: nowrap; font-size: 0.82em; } - +#searchform { + float: right; + clear: right; + text-align: right; +} +#searchform[dir="rtl"] { + float: left; + clear: left; + text-align: left; +} +#searchform input { + max-width: 100%; + font-size: 100%; + vertical-align: middle; +} #pagetrail { clear: right; display: inline; - margin: 5px 0; + margin: 0.5em 0; padding: 0; font-size: 0.88em; } @@ -139,10 +142,11 @@ } #locationline { + clear: right; padding: 0; font-size: 100%; font-weight: normal; - margin: 1em 12px 5px 12px; + margin: 0.25em 12px 5px 12px; } #pagelocation { @@ -228,7 +232,6 @@ display: block; margin: 0; padding: 2px 8px; - white-space: nowrap; background: #d6e4f9; font-size: 0.8em; border-bottom: 1px solid #4d7da9; @@ -241,6 +244,11 @@ margin: 0; } +.editbar select { + font-size: 100%; + vertical-align: middle; +} + .editbar li { display: inline; padding: 0;
--- a/modernized.py Tue May 20 13:31:44 2008 +0200 +++ b/modernized.py Mon Jun 23 13:22:53 2008 +0200 @@ -14,6 +14,70 @@ name = "modernized" + _ = lambda x: x # We don't have gettext at this moment, so we fake it + icons = { + # key alt icon filename w h + # FileAttach + 'attach': ("%(attach_count)s", "moin-attach.png", 16, 16), + 'info': ("[INFO]", "moin-info.png", 16, 16), + 'attachimg': (_("[ATTACH]"), "attach.png", 32, 32), + # RecentChanges + 'rss': (_("[RSS]"), "moin-rss.png", 16, 16), + 'deleted': (_("[DELETED]"), "moin-deleted.png",16, 16), + 'updated': (_("[UPDATED]"), "moin-updated.png",16, 16), + 'renamed': (_("[RENAMED]"), "moin-renamed.png",16, 16), + 'conflict': (_("[CONFLICT]"), "moin-conflict.png", 16, 16), + 'new': (_("[NEW]"), "moin-new.png", 16, 16), + 'diffrc': (_("[DIFF]"), "moin-diff.png", 16, 16), + # General + 'bottom': (_("[BOTTOM]"), "moin-bottom.png", 16, 16), + 'top': (_("[TOP]"), "moin-top.png", 16, 16), + 'www': ("[WWW]", "moin-www.png", 16, 16), + 'mailto': ("[MAILTO]", "moin-email.png", 16, 16), + 'news': ("[NEWS]", "moin-news.png", 16, 16), + 'telnet': ("[TELNET]", "moin-telnet.png", 16, 16), + 'ftp': ("[FTP]", "moin-ftp.png", 16, 16), + 'file': ("[FILE]", "moin-ftp.png", 16, 16), + # search forms + 'searchbutton': ("[?]", "moin-search.png", 16, 16), + 'interwiki': ("[%(wikitag)s]", "moin-inter.png", 16, 16), + + # smileys (this is CONTENT, but good looking smileys depend on looking + # adapted to the theme background color and theme style in general) + #vvv == vvv this must be the same for GUI editor converter + 'X-(': ("X-(", 'angry.png', 16, 16), + ':D': (":D", 'biggrin.png', 16, 16), + '<:(': ("<:(", 'frown.png', 16, 16), + ':o': (":o", 'redface.png', 16, 16), + ':(': (":(", 'sad.png', 16, 16), + ':)': (":)", 'smile.png', 16, 16), + 'B)': ("B)", 'smile2.png', 16, 16), + ':))': (":))", 'smile3.png', 16, 16), + ';)': (";)", 'smile4.png', 16, 16), + '/!\\': ("/!\\", 'alert.png', 16, 16), + '<!>': ("<!>", 'attention.png', 16, 16), + '(!)': ("(!)", 'idea.png', 16, 16), + ':-?': (":-?", 'tongue.png', 16, 16), + ':\\': (":\\", 'ohwell.png', 16, 16), + '>:>': (">:>", 'devil.png', 16, 16), + '|)': ("|)", 'tired.png', 16, 16), + ':-(': (":-(", 'sad.png', 16, 16), + ':-)': (":-)", 'smile.png', 16, 16), + 'B-)': ("B-)", 'smile2.png', 16, 16), + ':-))': (":-))", 'smile3.png', 16, 16), + ';-)': (";-)", 'smile4.png', 16, 16), + '|-)': ("|-)", 'tired.png', 16, 16), + '(./)': ("(./)", 'checkmark.png', 16, 16), + '{OK}': ("{OK}", 'thumbs-up.png', 16, 16), + '{X}': ("{X}", 'icon-error.png', 16, 16), + '{i}': ("{i}", 'icon-info.png', 16, 16), + '{1}': ("{1}", 'prio1.png', 15, 13), + '{2}': ("{2}", 'prio2.png', 15, 13), + '{3}': ("{3}", 'prio3.png', 15, 13), + '{*}': ("{*}", 'star_on.png', 16, 16), + '{o}': ("{o}", 'star_off.png', 16, 16), + } + del _ def header(self, d, **kw): """ Assemble wiki header @@ -27,11 +91,9 @@ # Header u'<div id="header">', - u'<div id="utils">', + self.searchform(d), + self.logo(), self.username(d), - self.searchform(d), - u'</div>', - self.logo(), u'<h1 id="locationline">', self.interwiki(d), self.title(d),