changeset 1527:d7ccb653e7aa

Pulled from main repo
author Jaiditya Mathur <jaiditya.mathur@gmail.com>
date Wed, 11 Jul 2012 01:32:16 +0530
parents de029fd0bf9c (diff) 2a59cb0f0755 (current diff)
children 49804b398c8c
files MoinMoin/apps/admin/views.py
diffstat 79 files changed, 1212 insertions(+), 195 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/admin/templates/admin/highlighterhelp.html	Mon Jul 09 12:15:16 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-{% import "utils.html" as utils %}
-{% extends theme("layout.html") %}
-{% block content %}
-<h1>{{ _("Available Highlighters") }}</h1>
-{{ utils.table(headings, rows) }}
-{% endblock %}
--- a/MoinMoin/apps/admin/templates/admin/index.html	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/apps/admin/templates/admin/index.html	Wed Jul 11 01:32:16 2012 +0530
@@ -11,12 +11,4 @@
     <li><a href="{{ url_for('admin.wikiconfig') }}">{{ _("Show Wiki Configuration") }}</a></li>
     <li><a href="{{ url_for('admin.wikiconfighelp') }}">{{ _("Show Wiki Configuration Help") }}</a></li>
 </ul>
-<h1>{{ _("User Menu") }}</h1>
-<ul>
-    <li><a href="{{ url_for('frontend.wanted_items') }}">{{ _("Wanted Items") }}</a></li>
-    <li><a href="{{ url_for('frontend.orphaned_items') }}">{{ _("Orphaned Items") }}</a></li>
-    <li><a href="{{ url_for('admin.itemsize') }}">{{ _("Item sizes (latest revision)") }}</a></li>
-    <li><a href="{{ url_for('admin.interwikihelp') }}">{{ _("Known InterWiki names") }}</a></li>
-    <li><a href="{{ url_for('admin.highlighterhelp') }}">{{ _("Available Highlighters") }}</a></li>
-</ul>
 {% endblock %}
--- a/MoinMoin/apps/admin/templates/admin/interwikihelp.html	Mon Jul 09 12:15:16 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-{% import "utils.html" as utils %}
-{% extends theme("layout.html") %}
-{% block content %}
-<h1>{{ _("Known InterWiki names") }}</h1>
-{{ utils.table(headings, rows) }}
-{% endblock %}
--- a/MoinMoin/apps/admin/templates/admin/itemsize.html	Mon Jul 09 12:15:16 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-{% import "utils.html" as utils %}
-{% extends theme("layout.html") %}
-{% block content %}
-<h1>{{ _("Item sizes (latest revision)") }}</h1>
-{{ utils.table(headings, rows) }}
-{% endblock %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/user/highlighterhelp.html	Wed Jul 11 01:32:16 2012 +0530
@@ -0,0 +1,6 @@
+{% import "utils.html" as utils %}
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("Available Highlighters") }}</h1>
+{{ utils.table(headings, rows) }}
+{% endblock %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/user/index_user.html	Wed Jul 11 01:32:16 2012 +0530
@@ -0,0 +1,11 @@
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("User Menu") }}</h1>
+<ul>
+    <li><a href="{{ url_for('frontend.wanted_items') }}">{{ _("Wanted Items") }}</a></li>
+    <li><a href="{{ url_for('frontend.orphaned_items') }}">{{ _("Orphaned Items") }}</a></li>
+    <li><a href="{{ url_for('admin.itemsize') }}">{{ _("Item sizes (latest revision)") }}</a></li>
+    <li><a href="{{ url_for('admin.interwikihelp') }}">{{ _("Known InterWiki names") }}</a></li>
+    <li><a href="{{ url_for('admin.highlighterhelp') }}">{{ _("Available Highlighters") }}</a></li>
+</ul>
+{% endblock %}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/user/interwikihelp.html	Wed Jul 11 01:32:16 2012 +0530
@@ -0,0 +1,6 @@
+{% import "utils.html" as utils %}
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("Known InterWiki names") }}</h1>
+{{ utils.table(headings, rows) }}
+{% endblock %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/user/itemsize.html	Wed Jul 11 01:32:16 2012 +0530
@@ -0,0 +1,6 @@
+{% import "utils.html" as utils %}
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("Item sizes (latest revision)") }}</h1>
+{{ utils.table(headings, rows) }}
+{% endblock %}
--- a/MoinMoin/apps/admin/views.py	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/apps/admin/views.py	Wed Jul 11 01:32:16 2012 +0530
@@ -25,10 +25,14 @@
 from MoinMoin.config import SUPERUSER
 from MoinMoin.security import require_permission
 
-@admin.route('/')
+@admin.route('/superuser')
 def index():
     return render_template('admin/index.html', title_name=_(u"Admin"))
 
+@admin.route('/user')    
+def index_user():
+    return render_template('user/index_user.html', title_name=_(u"User"))
+
 
 @admin.route('/userbrowser')
 @require_permission(SUPERUSER)
@@ -201,7 +205,7 @@
     lexers = pygments.lexers.get_all_lexers()
     rows = sorted([[desc, ' '.join(names), ' '.join(patterns), ' '.join(mimetypes), ]
                    for desc, names, patterns, mimetypes in lexers])
-    return render_template('admin/highlighterhelp.html',
+    return render_template('user/highlighterhelp.html',
                            title_name=_(u"Highlighter Help"),
                            headings=headings,
                            rows=rows)
@@ -214,7 +218,7 @@
                 _('URL'),
                ]
     rows = sorted(app.cfg.interwiki_map.items())
-    return render_template('admin/interwikihelp.html',
+    return render_template('user/interwikihelp.html',
                            title_name=_(u"Interwiki Help"),
                            headings=headings,
                            rows=rows)
@@ -229,7 +233,7 @@
     rows = [(rev.meta[SIZE], rev.meta[NAME])
             for rev in flaskg.storage.documents(wikiname=app.cfg.interwikiname)]
     rows = sorted(rows, reverse=True)
-    return render_template('admin/itemsize.html',
+    return render_template('user/itemsize.html',
                            title_name=_(u"Item Size"),
                            headings=headings,
                            rows=rows)
--- a/MoinMoin/config/default.py	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/config/default.py	Wed Jul 11 01:32:16 2012 +0530
@@ -334,7 +334,8 @@
         ('wikilink', 'frontend.global_history', dict(), L_('History'), L_('Global History')),
         ('wikilink', 'frontend.index', dict(), L_('Index'), L_('Global Index')),
         ('wikilink', 'frontend.global_tags', dict(), L_('Tags'), L_('Global Tags Index')),
-        ('wikilink', 'admin.index', dict(), L_('More'), L_('Administration & Docs')),
+        ('wikilink', 'admin.index_user', dict(), L_('User'), L_('User')),
+        ('wikilink', 'admin.index', dict(), L_('Admin'), L_('Administration & Docs')),
      ],
      'Data to create the navi_bar from. Users can add more items in their quick links in user preferences. You need to configure a list of tuples (css_class, endpoint, args, label, title). Use L_() for translating. [list of tuples]'),
 
--- a/MoinMoin/static/js/common.js	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/static/js/common.js	Wed Jul 11 01:32:16 2012 +0530
@@ -462,7 +462,7 @@
                 return;
             }
             // remove all flash messages previously added via javascript
-            $('#moin-header .moin-flash-javascript').remove();
+            $('#moin-flash .moin-flash-javascript').remove();
             // add new flash messages from the response
             for (i = 0; i < data.flash.length; i += 1) {
                 f = $(document.createElement('p'));
Binary file MoinMoin/static/logos/moinmoin.png has changed
--- a/MoinMoin/templates/itemviews.html	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/templates/itemviews.html	Wed Jul 11 01:32:16 2012 +0530
@@ -35,7 +35,7 @@
 
             {%- if endpoint in [
                 'frontend.global_history', 'frontend.global_index', 'frontend.global_tags',
-                'admin.index',
+                'admin.index', 'admin.index_user',
             ] %}
                 <li>
                     <a href="{{ url_for(endpoint) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
--- a/MoinMoin/themes/foobar/static/css/common.css	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/themes/foobar/static/css/common.css	Wed Jul 11 01:32:16 2012 +0530
@@ -147,41 +147,211 @@
 .center { text-align: center; }
 .right { text-align: right; }
 .justify { text-align: justify; }
-body{color:#444;background-color:#eee;font-family:sans-serif}
+a.moin-www:before,a.moin-http:before,a.moin-https:before{content:url("../img/moin-www.png");margin:0 .2em;vertical-align:middle}
+a.moin-file:before,a.moin-ftp:before{content:url("../img/moin-ftp.png");margin:0 .2em;vertical-align:middle}
+a.moin-nntp:before,a.moin-news:before{content:url("../img/moin-news.png");margin:0 .2em;vertical-align:middle}
+a.moin-telnet:before,a.moin-ssh:before,a.moin-irc:before,a.moin-ircs:before{content:url("../img/moin-telnet.png");margin:0 .2em;vertical-align:middle}
+a.moin-mailto:before{content:url("../img/moin-email.png");margin:0 .2em;vertical-align:middle}
+a.moin-attachment:before{content:url("../img/moin-attach.png");margin:0 .2em;vertical-align:middle}
+a.moin-interwiki:before{content:url("../img/moin-inter.png");margin:0 .2em;vertical-align:middle}
+a.moin-action:before{content:url("../img/moin-action.png");margin:0 .2em;vertical-align:middle}
+a.moin-mime-text:before{content:url("../img/moin-text.png");margin:0 .2em;vertical-align:middle}
+a.moin-mime-image:before{content:url("../img/moin-image.png");margin:0 .2em;vertical-align:middle}
+a.moin-mime-audio:before{content:url("../img/moin-audio.png");margin:0 .2em;vertical-align:middle}
+a.moin-mime-video:before{content:url("../img/moin-video.png");margin:0 .2em;vertical-align:middle}
+a.moin-mime-application:before{content:url("../img/moin-application.png");margin:0 .2em;vertical-align:middle}
+a.moin-mime-pdf:before{content:url("../img/moin-pdf.png");margin:0 .2em;vertical-align:middle}
+a.moin-mime-package:before{content:url("../img/moin-package.png");margin:0 .2em;vertical-align:middle}
+a.moin-mime-drawing:before{content:url("../img/moin-drawing.png");margin:0 .2em;vertical-align:middle}
+.moin-diff{width:99%;table-layout:fixed;margin:.3em}
+.moin-diff-header{vertical-align:top;font-size:92%}
+.moin-diff-info{margin:.33em .25em}
+.moin-diff-info-value{white-space:normal}
+.moin-diff-info-caption{display:inline-block;min-width:5em}
+.moin-diff-line-number{background-color:#ffe6e6}
+.moin-diff-added{background-color:#e0ffe0;vertical-align:top;width:50%;white-space:pre-wrap;word-wrap:break-word;font-family:monospace;}
+.moin-diff-added span{background-color:#80ff80}
+.moin-diff-removed{background-color:#ffffe0;vertical-align:top;width:50%;white-space:pre-wrap;word-wrap:break-word;font-family:monospace;}
+.moin-diff-removed span{background-color:#ffff80}
+body{color:#000;background-color:#d6d5d0;font-family:verdana,sans-serif;background-image:url("../img/base.png")}
+div p{margin:.5em .2em;font-size:.9em;line-height:1.2em;text-align:justify}
 #moin-global-tray{float:left;width:16.666666666666668%;padding:.5%;overflow:hidden}
 #moin-main-container{float:left;width:81.13333333333333%;padding:.5%}
-#moin-main-box{background-color:#fff;border:1px solid #ccc;border-radius:6px;box-shadow:2px 2px 4px #444;overflow:hidden}
-#moin-header{background-color:#efe;border-bottom:1px solid #ccc;padding:.2% .5%;overflow:auto}
+#moin-main-box{background-color:#f4f4f4;border:1px solid #ccc;border-radius:6px;box-shadow:2px 2px 4px #9d9d9b;overflow:hidden}
+#moin-header{background-color:#2d2d2d;color:#fff;border-bottom:1px solid #ccc;padding:.2% .5%;overflow:auto;}
+#moin-header a{color:#fff}
 #moin-content-no-panel{float:left;width:98.56746096959736%;padding:.6162695152013148%;border-right:1px solid #ccc}
 #moin-content-with-panel{float:left;width:76.79260476581759%;padding:.6162695152013148%;border-right:1px solid #ccc}
 #moin-local-panel{float:left;width:20.54231717337716%;padding:.6162695152013148%;margin-left:-1px;border-left:1px solid #ccc}
-#moin-footer{clear:both;font-size:.8em;color:#888;padding:.5% .5%;overflow:auto}
+#moin-footer{clear:both;font-size:.8em;color:#616161;padding:.5% .5%;overflow:auto}
 #moin-breadcrumbs-location{float:left;padding:.3em .5em .2em .5em;font-weight:bold}
+#moin-pagelocation{vertical-align:middle}
+.moin-pagepath{vertical-align:middle}
 #moin-search{float:right;padding:.3em .5em .2em .5em}
+#moin-search-submit{vertical-align:middle}
 #moin-logo{width:100%;padding:0 0 1em 0;}
 #moin-logo a{display:block;width:100%;height:70px;background-repeat:no-repeat;background-position:center center}
 #moin-global-panel ul,#moin-local-panel ul{list-style-type:none;margin:0;}
-#moin-global-panel ul li,#moin-local-panel ul li{font-size:1em;color:#008;font-weight:bold;padding:.5em;border:1px solid #ccc;border-radius:4px;box-shadow:1px 1px 2px #444;margin-left:.5em;margin-bottom:.5em;overflow:hidden;word-wrap:break-word;}
+#moin-global-panel ul li,#moin-local-panel ul li{background-color:#f1f1f1;font-size:1em;color:#696969;font-weight:bold;padding:.5em;border:1px solid #ccc;border-radius:4px;box-shadow:1px 1px 2px #9d9d9b;margin-left:.5em;margin-bottom:.5em;overflow:hidden;word-wrap:break-word;}
 #moin-global-panel ul li ul,#moin-local-panel ul li ul{padding:.2em .1em;}
-#moin-global-panel ul li ul li,#moin-local-panel ul li ul li{font-size:.8em;color:#000;font-weight:normal;padding:.1em .1em .1em .1em;border:none;box-shadow:none;margin:0}
+#moin-global-panel ul li ul li,#moin-local-panel ul li ul li{font-size:.8em;color:#808080;font-weight:normal;padding:.1em .1em .1em .1em;border:none;box-shadow:none;margin:0}
 #moin-footer ul,#moin-credits{float:left;list-style-type:none;}
 #moin-footer ul li,#moin-credits li{padding:.1em}
+#moin-footer ul a,#moin-credits a{color:#616161}
 #moin-footer-logos{float:right;}
 #moin-footer-logos ul li{display:inline}
+.moin-itemviews a:visited,#moin-trail a:visited,#moin-user a:visited{color:#1e90ff}
+.moin-itemviews a:hover,#moin-trail a:hover,#moin-user a:hover{color:#007cef}
+label{display:block;font-weight:bold}
+input[type="submit"],input[type="button"],button{font-weight:bold;font-size:.75em;background:#d6d5d0;padding:4px 15px;border:1px solid #ccc;border-radius:6px;box-shadow:1px 1px 2px #9d9d9b;cursor:pointer;}
+input[type="submit"]:hover,input[type="button"]:hover,button:hover{box-shadow:1px 1px 2px #000}
+input[type="submit"]:active,input[type="button"]:active,button:active{position:relative;top:1px}
+input,select{padding:3px;background:#f4f4f4;border:1px solid #ccc;border-radius:2px}
+input[type="text"]{width:96%}
+input.blank{border-color:#ccc;border-width:2px}
+.moin-form dd{float:left;width:65%;margin-bottom:1em;margin-left:0;}
+.moin-form dd input{width:70%}
+.moin-form dt{clear:both;float:left;width:30%;text-align:right;margin-top:.3em;padding-right:1%;}
+.moin-form dt label.required:after{content:'*';color:#000}
+.moin-form button,.moin-form input[type="submit"]{margin-left:48%}
+#moin-modify dd{margin-left:.9em;width:100%;float:none}
+#moin-modify dt{float:none;text-align:left;width:auto}
+#moin-modify input[type="submit"]{margin-left:0}
+#moin-options dd{float:none;width:38%;display:table-cell;padding:1.2em}
+#moin-options dt{margin-left:10%;text-align:left;width:61%;margin-top:1.3em}
+#moin-create-table{width:95%;margin-left:auto;margin-right:auto;}
+#moin-create-table tbody tr th{text-align:center;background:#d9d9d9;margin:2px}
+#moin-create-table tbody tr td{text-align:center;background:#f4f4f4;}
+#moin-create-table tbody tr td a{color:#000}
+.moin-clr{clear:both}
+.moin-index-message{width:50%;margin:1em auto;text-align:center;display:none;}
+.moin-index-message span{padding:4px;background-color:#007cef;color:#fff;border:1px solid #ccc;border-radius:5px}
+.moin-download-link{display:none}
+.moin-index-path{margin-left:.5em;}
+.moin-index-path:before{content:url("../img/moin-parent.png");margin:0 .3em}
+#moin-initials{width:90%;margin:5px auto;text-align:center;}
+#moin-initials a{display:inline-block;margin:0;padding:4px 5px;}
+#moin-initials a:hover,#moin-initials a.selected{background:#1e90ff;border-radius:5px;color:#fff;text-decoration:none}
+.moin-item-index{width:100%;margin-left:.5em;}
+.moin-item-index div{float:left;width:13em;line-height:2em;}
+.moin-item-index div .moin-select-item{visibility:hidden;display:inline-block;vertical-align:middle;width:17px;cursor:default;background:transparent url("../img/moin-checkbox-off.png") no-repeat;margin-top:1em}
+.moin-item-index div.selected-item .moin-select-item,.moin-item-index div:hover .moin-select-item{visibility:visible}
+.moin-item-index div.selected-item .moin-select-item{background-image:url("../img/moin-checkbox-on.png")}
+#lightbox{background:#f4f4f4;opacity:.7;filter:alpha;position:absolute;left:0;top:0;width:100%;height:100%;z-index:9;margin:0;display:none}
+.filter-toggle{margin:0 .2em;font-size:.9em}
+.moin-more-index{background:transparent url("../img/moin-expand.png") no-repeat;display:inline-block;width:20px;}
+.moin-more-index:hover{text-decoration:none}
+.moin-path-separator{font-size:1.2em;color:#1e90ff}
+.moin-index-separator{clear:both;border-top:1px dashed #ccc;width:80%;display:none}
+.moin-select-all span{cursor:pointer;font-size:.84em}
+.moin-select-actions span{cursor:pointer;font-size:.84em}
+.moin-select-actions ul li{cursor:pointer}
+.moin-contenttypes-wrapper div{cursor:pointer;font-size:.84em}
+.moin-contenttypes-wrapper form{display:none;}
+.moin-contenttypes-wrapper form li label{cursor:pointer;display:inline;vertical-align:middle;line-height:2em}
+.moin-contenttypes-wrapper form li span{display:none}
+.moin-contenttypes-wrapper form li:hover{background:#d6d5d0;}
+.moin-contenttypes-wrapper form li:hover span{display:block;font-size:.8em}
+#f_contenttype_filter_submit{padding-left:3em;padding-right:3em;margin-left:3em;cursor:pointer;box-shadow:1px 1px 2px #000;}
+#f_contenttype_filter_submit:hover{box-shadow:1px 1px 2px #9d9d9b}
+.ct-hide:after{content:url("../img/moin-moveup.png");margin:0 .2em;float:right;vertical-align:middle}
+.ct-shown:after{content:url("../img/moin-movedown.png");margin:0 .2em;float:right;vertical-align:middle}
+#popup{background:transparent url("../img/moin-transparent-bg.png") repeat;padding:5px;width:40%;position:absolute;top:10%;left:30%;display:none;z-index:10}
+.popup-header{background-color:#2d2d2d;color:#fff;padding:10px;margin:0}
+input[value="X"]{padding:0 1px;margin:-.2em;width:19px;border-radius:2em;float:right;}
+input[value="X"]:hover{background:#f4f4f4}
+.popup-body{clear:both;background-color:#f4f4f4;color:#000;padding:10px;margin:0;}
+.popup-body label{margin:5px}
+.popup-body input{margin:8px 5px}
+.popup-container{margin:0;border:5px solid #2d2d2d;border-radius:6px 6px 0 0}
+#moin-upload-cont{min-height:10px}
+#file_upload{margin-top:2em}
+form.upload_file{background-color:#d6d5d0;border:1px solid #ccc;cursor:pointer;direction:ltr;font-weight:bold;height:2.5em;line-height:2.5em;overflow:hidden;position:relative;text-align:center;width:15em;box-shadow:0 0 5px #9d9d9b;}
+form.upload_file:hover{box-shadow:0 0 5px #000}
+form.upload_file input{border:300px solid transparent;cursor:pointer;opacity:0;position:absolute}
+form.upload_file button{display:none}
+form.upload_file{display:block}
+.file_upload_template .file_upload_start{visibility:hidden;border-width:0;padding:0}
+.file_upload_template .file_upload_start button{width:0}
+.upload-form{display:none}
+.moin-drag{font-size:.7em;color:#9d9d9b}
+a.moin-conflict:before{content:url("../img/moin-conflict.png");margin:0 .2em}
+.moin-tab-titles{margin:-.5em;list-style:none;}
+.moin-tab-titles span{display:none}
+#moin-usersetting-title li a{font-size:.84em;color:#696969}
+#moin-global-history,#moin-page-history{font-size:.75em}
+#moin-page-history table{border:1px solid #ccc;border-radius:5px;}
+#moin-page-history table thead{border-top-left-radius:5px;border-top-right-radius:5px;}
+#moin-page-history table thead tr th{text-align:center;}
+#moin-page-history table thead tr th input[type="Submit"]{padding:4px 10px;box-shadow:1px 1px 2px #9d9d9b;cursor:pointer;font-size:1em;}
+#moin-page-history table thead tr th input[type="Submit"]:hover{box-shadow:1px 1px 2px #000}
+.moin-hist-rev{margin:0;}
+.moin-hist-rev input{float:left}
+.moin-wordbreak{word-break:break-all;word-wrap:break-word}
+.moin-history-time{width:10%}
+.moin-history-contenttype{width:18%}
+.moin-history-editorinfo{width:17%}
+.moin-history-comment{width:30%}
+.moin-action{width:2%;}
+.moin-action a:hover{text-decoration:none}
+.moin-history-container{border:1px solid #ccc;margin:2em 2em;border-top-left-radius:5px;border-top-right-radius:5px}
+.moin-history-container-header{background:#808080;margin:0;padding:4px;color:#fff;border-bottom:1px solid #ccc;border-top-left-radius:5px;border-top-right-radius:5px;}
+.moin-history-container-header h2{display:inline;border:none}
+.moin-history-container-header a.bookmark-link{margin-left:10px;color:#fff}
+.moin-history-container-body{margin:0;padding:0;font-size:1.2em;}
+.moin-history-container-body table{margin:0;width:100%}
+.moin-history-save:before{content:url("../img/moin-edit.png")}
+.moin-history-trash:before{content:url("../img/moin-deleted.png")}
+.moin-history-rename:before{content:url("../img/moin-renamed.png")}
+.moin-history-copy:before{content:url("../img/moin-new.png")}
+.moin-integer{width:2%}
+.moin-history-links{width:5%;}
+.moin-history-links a{display:block}
+.moin-history-editortext,.moin-history-links span,.moin-history-comment span{color:#d6d5d0;display:block;margin-bottom:5px}
+.moin-offset-links{float:right;margin-right:20px;}
+.moin-offset-links a{margin-right:10px;padding:3px 7px;font-size:1.6em;background:#f4f4f4;border:1px groove #ccc;border-radius:5px;}
+.moin-offset-links a:hover{box-shadow:0 0 12px #9d9d9b}
 a{text-decoration:none;}
-a:link{color:#47f}
-a:visited{color:#04a}
-a:hover{color:#f00;text-decoration:underline}
-a:active{color:#008000;text-decoration:underline}
-a.moin-nonexistent:link{color:#666}
+a:link{color:#1e90ff}
+a:visited{color:#5f9ea0}
+a:hover{color:#007cef;text-decoration:underline}
+a:active{color:#51d443;text-decoration:underline}
+a.moin-nonexistent:link{color:#808080}
 a.moin-nonexistent:visited{color:#808080}
-a.moin-nonexistent:hover{color:#000}
-a.moin-nonexistent:active{color:#000}
+a.moin-nonexistent:hover{color:#ff2727}
+a.moin-nonexistent:active{color:#ff2727}
+.moin-flash{margin:0;padding:6px 6px 6px 38px;background-color:#fff;border-bottom:border style;background-repeat:no-repeat;background-position:16px center}
+.moin-flash-hint{background-image:url("../img/smileys/idea.png");color:#007cef}
+.moin-flash-info{background-image:url("../img/smileys/icon-info.png");color:#007cef}
+.moin-flash-warning{background-image:url("../img/smileys/alert.png");color:#ff2727}
+.moin-flash-error{background-image:url("../img/smileys/icon-error.png");color:#ff2727}
+.moin-error{color:#ff2727;background:#d6d5d0;padding:4px;margin:1em;text-align:centre;list-style-type:none;border-radius:5px}
+#moin-searchform{padding:0;font-size:.82em;float:right;text-align:right;}
+#moin-searchform input{font-size:1em;vertical-align:middle;background-color:#f4f4f4;border:1px solid #ccc}
+#moin-searchform button{box-shadow:none}
+#moin-searchform #moin-search-submit{text-indent:-9000%;margin-left:-24px;padding:0;width:20px;height:16px;background:url("../img/moin-search.png") center center no-repeat;background-size:16px 16px;border:none;overflow:hidden;vertical-align:middle;cursor:pointer}
+#moin-searchform #moin-search-query{padding-right:20px}
+#moin-searchform div{margin:0}
+#moin-long-searchform{padding:0;font-size:.82em;text-align:left;}
+#moin-long-searchform div{margin:0}
+#moin-long-searchform label{display:inline}
+#moin-search-query{width:50%}
+.searchresults dt{margin-top:1em;font-weight:normal}
+.searchresults dd,.searchresults p{font-size:.85em}
+.searchresults td{border-width:0}
+.searchresults p.info{margin-left:2%}
+.searchresults .searchhitinfobar{color:#51d443;margin-left:15px;margin-top:0}
+.searchresults .foundtext{margin-left:15px;margin-top:0}
+p.searchstats{font-size:.8em;text-align:right;width:100%;padding:2px}
+p.searchhint{background-color:#f4f4f4;border:1px solid #9d9d9b;padding:2px}
+.searchpages{margin-left:auto;margin-right:auto;}
+.searchpages tr,.searchpages td{border:0;padding:5px;margin:0;text-align:center;vertical-align:middle;color:#000;font-weight:bold;font-size:1.05em}
+.searchpages td a,.searchpages td a:link{text-decoration:underline}
 ul,dl{margin-left:1.5em}
 ol{margin-left:3em;}
 ol ol{margin-left:1.5em}
-li,dt{padding:.1em}
-dt{font-weight:bold}
+li{padding:.2em}
+dt{font-weight:bold;padding:.1em}
 dd{margin-left:1.5em}
 ul.moin-nobullet-list{list-style-type:none}
 ol.moin-upperalpha-list{list-style-type:upper-alpha}
@@ -190,26 +360,26 @@
 ol.moin-lowerroman-list{list-style-type:lower-roman}
 ul.moin-tags{list-style:none;}
 ul.moin-tags li{display:inline;}
-ul.moin-tags li.weight0{font-size:48.22530864197532%}
-ul.moin-tags li.weight1{font-size:57.870370370370374%}
-ul.moin-tags li.weight2{font-size:69.44444444444446%}
-ul.moin-tags li.weight3{font-size:83.33333333333334%}
-ul.moin-tags li.weight4{font-size:100%}
-ul.moin-tags li.weight5{font-size:120%}
-ul.moin-tags li.weight6{font-size:144%}
-ul.moin-tags li.weight7{font-size:172.79999999999998%}
-ul.moin-tags li.weight8{font-size:207.35999999999999%}
-ul.moin-tags li.weight9{font-size:248.83199999999994%}
-h1{font-size:1.7279999999999998em;margin:.5787037037037038em 0;border-bottom:3px solid #4d7da9;padding-bottom:3px}
-h2{font-size:1.44em;margin:.6944444444444444em 0;border-bottom:3px solid #4d7da9;padding-bottom:3px}
-h3{font-size:1.2em;margin:.8333333333333334em 0;border-bottom:2px solid #4d7da9;padding-bottom:2px}
-h4{font-size:1em;margin:1em 0;border-bottom:2px solid #4d7da9;padding-bottom:2px}
-h5{font-size:.8333333333333334em;margin:1.2em 0;border-bottom:1px solid #4d7da9;padding-bottom:1px}
-h6{font-size:.6944444444444445em;margin:1.4399999999999997em 0;border-bottom:1px solid #4d7da9;padding-bottom:1px}
-a.permalink{display:none;cursor:pointer;margin-left:.1em;color:#888;}
-a.permalink:hover{color:#444}
+ul.moin-tags li.weight0{font-size:.4822530864197532em}
+ul.moin-tags li.weight1{font-size:.5787037037037037em}
+ul.moin-tags li.weight2{font-size:.6944444444444445em}
+ul.moin-tags li.weight3{font-size:.8333333333333334em}
+ul.moin-tags li.weight4{font-size:1em}
+ul.moin-tags li.weight5{font-size:1.2em}
+ul.moin-tags li.weight6{font-size:1.44em}
+ul.moin-tags li.weight7{font-size:1.7279999999999998em}
+ul.moin-tags li.weight8{font-size:2.0736em}
+ul.moin-tags li.weight9{font-size:2.4883199999999994em}
+h1{font-size:1.7279999999999998em;margin:.5787037037037038em 0;border-bottom:3px solid #ccc;padding-bottom:3px}
+h2{font-size:1.44em;margin:.6944444444444444em 0;border-bottom:3px solid #ccc;padding-bottom:3px}
+h3{font-size:1.2em;margin:.8333333333333334em 0;border-bottom:2px solid #ccc;padding-bottom:2px}
+h4{font-size:1em;margin:1em 0;border-bottom:2px solid #ccc;padding-bottom:2px}
+h5{font-size:.8333333333333334em;margin:1.2em 0;border-bottom:1px solid #ccc;padding-bottom:1px}
+h6{font-size:.6944444444444445em;margin:1.4399999999999997em 0;border-bottom:1px solid #ccc;padding-bottom:1px}
+a.permalink{display:none;cursor:pointer;margin-left:.1em;color:#616161;}
+a.permalink:hover{color:#000}
 h1:hover .permalink,h2:hover .permalink,h3:hover .permalink,h4:hover .permalink,h5:hover .permalink,h6:hover .permalink{display:inline;text-decoration:none}
-hr{background-color:#444;border:0;margin:.9em 0;height:1px;}
+hr{background-color:#000;border:0;margin:.9em 0;height:1px;}
 hr.moin-hr1{height:2px}
 hr.moin-hr2{height:3px}
 hr.moin-hr3{height:5px}
@@ -218,19 +388,18 @@
 hr.moin-hr6{height:12px}
 table{margin:.5em;border-collapse:collapse;}
 table th,table td{padding:.3em .4em;vertical-align:middle;text-align:left}
-table th{border:1px solid #4d7da9;background-color:#81bbf2}
-table td{border:1px solid #adb9cc}
+table th{border:1px solid #ccc;background-color:#808080;color:#fff}
+table td{border:1px solid #ccc}
 table.zebra{border:none;border-collapse:separate;border-spacing:1px;}
-table.zebra thead{background-color:#81bbf2}
-table.zebra tfoot{background-color:#c4d9ff}
-table.zebra tbody tr,table.zebra > tr{background-color:#eef1f5}
-table.zebra tbody tr:nth-child(odd),table.zebra > tr:nth-child(odd){background-color:#d9dfe8}
+table.zebra thead{background-color:#808080;color:#fff}
+table.zebra tfoot{background-color:#d6d5d0}
+table.zebra tbody tr,table.zebra > tr{background-color:#d9d9d9}
 table.zebra th,table.zebra td{border:none}
-pre{font-family:monospace;white-space:pre-wrap;word-wrap:break-word;border:1px solid #aebdcc;background-color:#f3f5f7;margin:.33em 0;padding:5px;clear:both;}
-pre.comment{background-color:#ccc;color:#f00;margin:0;padding:0;border:0;}
+pre{font-family:monospace;white-space:pre-wrap;word-wrap:break-word;border:1px solid #ccc;background-color:#d6d5d0;margin:.5em;padding:5px;clear:both;}
+pre.comment{background-color:#2d2d2d;color:#fff;margin:0;padding:0;border:0;}
 pre.comment:before{content:url("../img/attention.png")}
-textarea{font-family:monospace;width:100%;border:1px solid #ccc}
-input#f_comment{width:100%;border:1px solid #ccc;margin:.3em 0}
+textarea{font-family:monospace;width:98%;border:1px solid #ccc;margin-left:.5em}
+input#f_comment{width:96%;border:1px solid #ccc;margin:.3em 0}
 sub{vertical-align:sub}
 sup{vertical-align:super}
 .moin-big{font-size:1.17em}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/themes/foobar/static/css/stylus/color_palette.styl	Wed Jul 11 01:32:16 2012 +0530
@@ -0,0 +1,22 @@
+//color palette - color variables in main.styl use these definitons
+
+font_color = #000000
+base_color = #d6d5d0
+page_color = #f4f4f4
+border_style = 1px solid border_color
+header_bg_color = #2d2d2d
+footer_color = #616161
+heading_color = #ffffff
+panel_color = #f1f1f1
+panel_heading_color = #696969
+border_color = #cccccc
+shadow_color = #9d9d9b
+table_bg_color = #d9d9d9
+table_header_color = #808080
+link_color = #1E90FF
+hover_color = #007cef
+active_color = #51d443
+visited_color = #5F9EA0
+nonexistent_link_color = #808080
+nonexistent_hover_color = #ff2727
+error_color = #ff2727
\ No newline at end of file
--- a/MoinMoin/themes/foobar/static/css/stylus/main.styl	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/themes/foobar/static/css/stylus/main.styl	Wed Jul 11 01:32:16 2012 +0530
@@ -18,18 +18,16 @@
 // user styles used by moin wiki parser (and maybe others) like red/green/solid/dashed/comment...
 @import "userstyles.css"
 
-body_color = #444444
-body_bg_color = #eeeeee
-main_bg_color = #ffffff
-border_style = 1px solid #cccccc
-header_bg_color = #eeffee
-footer_color = #888888
-panel_titles_color = #000088
-panel_items_color = #000000
-heading_underline_color = #4D7DA9
-shadow_color = #444444
+// color have been used from the color palette 
+@import "color_palette"
 
-font_family = sans-serif
+// mime type icons
+@import "mime_type_icons"
+
+// moin diff styling
+@import "moin_diff"
+
+font_family = verdana, sans-serif
 main_font_size = 1em
 small_font_size = main_font_size * 0.8
 heading_scale = 1.2  // font size factor for h1 .. h6
@@ -48,9 +46,16 @@
 content_width_no_panel = 99.8% - (2 * local_padding_width)
 
 body
-    color body_color
-    background-color body_bg_color
+    color font_color
+    background-color base_color
     font-family font_family
+    background-image url(../img/base.png)
+
+div p
+    margin .5em .2em
+    font-size .9em
+    line-height 1.2em
+    text-align justify
 
 // the main elements - just the big picture first: panels, header, content, footer
 
@@ -67,7 +72,7 @@
 
 // contains header and content, but not footer
 #moin-main-box
-    background-color main_bg_color
+    background-color page_color
     border border_style
     border-radius 6px
     box-shadow 2px 2px 4px shadow_color
@@ -75,9 +80,12 @@
 
 #moin-header
     background-color header_bg_color
+    color heading_color
     border-bottom border_style
     padding 0.2% 0.5%
     overflow auto
+    a
+        color heading_color
 
 #moin-content-no-panel
     float dir
@@ -104,6 +112,7 @@
     color footer_color
     padding 0.5% 0.5%
     overflow auto
+    
 
 // now the stuff inside the main elements
 
@@ -113,10 +122,19 @@
     padding 0.3em 0.5em 0.2em 0.5em
     font-weight bold
 
+#moin-pagelocation
+    vertical-align middle
+
+.moin-pagepath
+    vertical-align middle
+
 #moin-search
     float opposite-position(dir)
     padding 0.3em 0.5em 0.2em 0.5em
 
+#moin-search-submit
+    vertical-align middle
+
 // panels, footer
 #moin-logo
     width 100%
@@ -133,8 +151,9 @@
     list-style-type none 
     margin 0
     li
+        background-color panel_color
         font-size main_font_size
-        color panel_titles_color
+        color panel_heading_color
         font-weight bold
         padding 0.5em
         border border_style
@@ -148,7 +167,7 @@
             padding 0.2em 0.1em
             li
                 font-size small_font_size
-                color panel_items_color
+                color nonexistent_link_color
                 font-weight normal
                 padding 0.1em 0.1em 0.1em 0.1em
                 border none
@@ -161,37 +180,642 @@
     list-style-type none 
     li
         padding 0.1em
+    a
+        color footer_color
 
 #moin-footer-logos
     float opposite-position(dir)
     ul li
         display inline
 
+.moin-itemviews,
+#moin-trail,
+#moin-user
+    a
+        &:visited
+            color link_color
+        &:hover
+            color hover_color
 
+// form
+label
+    display block
+    font-weight bold
+
+input[type="submit"],
+input[type="button"],
+button
+    font-weight bold
+    font-size .75em
+    background base_color
+    padding 4px 15px
+    border border_style
+    border-radius 6px
+    box-shadow 1px 1px 2px shadow_color
+    cursor pointer
+    &:hover
+        box-shadow 1px 1px 2px font_color
+    &:active
+        position relative
+        top 1px
+    
+input,
+select
+    padding 3px
+    background page_color
+    border border_style
+    border-radius 2px
+input[type="text"]
+    width 96%
+input.blank
+    border-color border_color
+    border-width 2px
+    
+.moin-form 
+    dd
+        float left
+        width 65%
+        margin-bottom 1em
+        margin-left 0
+        input
+            width 70%
+    dt
+        clear both
+        float left
+        width 30%
+        text-align right
+        margin-top .3em
+        padding-right 1%
+        label
+            &.required:after
+                content '*'
+                color font_color
+    button,
+    input[type="submit"]
+        margin-left 48%
+    
+#moin-modify
+    dd
+        margin-left 0.9em
+        width 100%
+        float none
+    dt
+        float none
+        text-align left
+        width auto
+    input[type="submit"]
+        margin-left 0
+
+#moin-options
+    dd
+        float none
+        width 38%
+        display table-cell
+        padding 1.2em
+    dt
+        margin-left 10%
+        text-align left
+        width 61%
+        margin-top 1.3em
+        
+// create table
+#moin-create-table
+    width 95%
+    margin-left auto
+    margin-right auto
+    tbody tr 
+            th
+                text-align center
+                background table_bg_color
+                margin 2px
+            td
+                text-align center
+                background page_color
+                a
+                    color font_color
+
+// index page
+.moin-clr
+    clear both
+    
+.moin-index-message
+    width 50%
+    margin 1em auto
+    text-align center
+    display none
+    span
+        padding 4px
+        background-color hover_color
+        color heading_color
+        border border_style
+        border-radius 5px
+
+.moin-download-link
+  display none
+
+.moin-index-path
+    margin-left 0.5em
+    &:before
+        content url("../img/moin-parent.png")
+        margin 0 0.3em
+
+#moin-initials
+    width 90%
+    margin 5px auto
+    text-align center
+    a
+        display inline-block
+        margin 0
+        padding 4px 5px
+        &:hover,
+        &.selected
+            background link_color
+            border-radius 5px
+            color heading_color
+            text-decoration none
+
+.moin-item-index
+    width: 100%
+    margin-left: 0.5em
+    div
+        float left
+        width 13em
+        line-height 2em
+        .moin-select-item
+            visibility hidden
+            display inline-block
+            vertical-align middle
+            width 17px
+            cursor default
+            background transparent url("../img/moin-checkbox-off.png") no-repeat
+            margin-top 1em
+        &.selected-item .moin-select-item,
+        &:hover .moin-select-item
+            visibility visible
+        &.selected-item .moin-select-item
+            background-image url("../img/moin-checkbox-on.png")
+
+#lightbox
+    background page_color
+    opacity 0.7
+    filter alpha
+    position absolute
+    left 0
+    top 0
+    width 100%
+    height 100%
+    z-index 9
+    margin 0
+    display none
+  
+.filter-toggle
+    margin 0 0.2em
+    font-size .9em
+
+.moin-more-index
+    background transparent url("../img/moin-expand.png") no-repeat
+    display inline-block
+    width 20px
+    &:hover
+        text-decoration none
+
+.moin-path-separator
+    font-size 1.2em
+    color link_color
+
+.moin-index-separator
+    clear both
+    border-top 1px dashed border_color
+    width 80%
+    display none
+
+// index local panel
+.moin-select-all
+    span
+        cursor pointer
+        font-size .84em
+.moin-select-actions
+    span
+        cursor pointer
+        font-size .84em
+    ul
+        li
+            cursor pointer
+.moin-contenttypes-wrapper
+    div
+        cursor pointer
+        font-size .84em
+    form 
+        display none
+        li
+            label
+                cursor pointer
+                display inline
+                vertical-align middle
+                line-height 2em
+            span
+                display none
+            &:hover
+                background base_color
+                span
+                    display block
+                    font-size 0.8em
+            
+#f_contenttype_filter_submit
+    padding-left 3em
+    padding-right 3em
+    margin-left 3em
+    cursor pointer
+    box-shadow 1px 1px 2px font_color
+    &:hover
+        box-shadow 1px 1px 2px shadow_color                
+
+.ct-hide:after
+  content url("../img/moin-moveup.png")
+  margin 0 0.2em
+  float right
+  vertical-align middle
+
+.ct-shown:after
+  content url("../img/moin-movedown.png")
+  margin 0 0.2em
+  float right
+  vertical-align middle
+                
+// popups
+#popup
+    background: transparent url("../img/moin-transparent-bg.png") repeat
+    padding 5px
+    width 40%
+    position absolute
+    top 10%
+    left 30%
+    display none
+    z-index 10
+
+.popup-header
+    background-color header_bg_color
+    color heading_color
+    padding 10px
+    margin 0
+
+input[value="X"]
+    padding 0px 1px
+    margin -0.2em
+    width 19px
+    border-radius 2em
+    float right
+    &:hover
+        background page_color
+
+.popup-body
+    clear both
+    background-color page_color
+    color font_color
+    padding 10px
+    margin 0
+    label
+        margin 5px
+    input
+        margin 8px 5px
+
+.popup-container
+    margin 0
+    border 5px solid header_bg_color
+    border-radius 6px 6px 0px 0px 
+
+// upload content
+#moin-upload-cont
+    min-height 10px
+
+#file_upload
+    margin-top 2em
+
+form.upload_file
+    background-color base_color
+    border border_style
+    cursor pointer
+    direction ltr
+    font-weight bold
+    height 2.5em
+    line-height 2.5em
+    overflow hidden
+    position relative
+    text-align center
+    width 15em
+    box-shadow 0px 0px 5px shadow_color
+    &:hover
+        box-shadow 0px 0px 5px font_color
+    input
+        border 300px solid transparent
+        cursor pointer
+        opacity 0
+        position absolute
+     
+
+form.upload_file button
+    display none
+
+form.upload_file
+    display block
+
+.file_upload_template .file_upload_start
+    visibility hidden
+    border-width 0px
+    padding 0px
+
+.file_upload_template .file_upload_start button
+    width 0px
+
+.upload-form
+    display none
+
+.moin-drag
+    font-size 0.7em
+    color shadow_color
+
+a.moin-conflict:before
+    content url(../img/moin-conflict.png)
+    margin 0 0.2em
+
+// tabs
+.moin-tab-titles
+    margin -.5em 
+    list-style none
+    span
+        display none
+
+#moin-usersetting-title
+    li a
+        font-size .84em
+        color panel_heading_color
+
+// history page
+#moin-global-history,
+#moin-page-history
+    font-size .75em
+
+#moin-page-history
+    table
+        border border_style
+        border-radius 5px
+        thead 
+            border-top-left-radius 5px
+            border-top-right-radius 5px
+            tr th
+                    text-align center
+                    input[type="Submit"]
+                        padding 4px 10px
+                        box-shadow 1px 1px 2px shadow_color
+                        cursor pointer
+                        font-size 1em
+                        &:hover
+                            box-shadow 1px 1px 2px font_color
+
+.moin-hist-rev
+    margin 0
+    input
+        float left
+
+.moin-wordbreak
+    word-break break-all
+    word-wrap break-word
+
+.moin-history-time
+    width 10%
+
+.moin-history-contenttype
+    width 18%
+
+.moin-history-editorinfo
+    width 17%
+
+.moin-history-comment
+    width 30%
+
+.moin-action
+    width 2%
+    a:hover
+        text-decoration none
+
+.moin-history-container
+    border border_style
+    margin 2em 2em
+    border-top-left-radius 5px
+    border-top-right-radius 5px
+
+.moin-history-container-header
+    background table_header_color
+    margin 0px
+    padding 4px
+    color heading_color
+    border-bottom border_style
+    border-top-left-radius 5px
+    border-top-right-radius 5px
+    h2
+        display inline
+        border none
+    a.bookmark-link
+        margin-left 10px
+        color heading_color
+
+.moin-history-container-body
+    margin 0
+    padding 0
+    font-size 1.2em
+    table
+        margin 0
+        width 100%
+
+.moin-history-save:before
+    content url('../img/moin-edit.png')
+
+.moin-history-trash:before
+    content url('../img/moin-deleted.png')
+
+.moin-history-rename:before
+    content url('../img/moin-renamed.png')
+
+.moin-history-copy:before
+    content url('../img/moin-new.png')
+
+.moin-integer
+    width 2%
+
+.moin-history-links
+    width 5%
+    a
+        display block
+
+.moin-history-editortext,
+.moin-history-links span,
+.moin-history-comment span
+    color base_color
+    display block
+    margin-bottom 5px
+
+.moin-offset-links
+    float right
+    margin-right 20px
+    a
+        margin-right 10px
+        padding 3px 7px
+        font-size 1.6em
+        background page_color
+        border 1px groove border_color
+        border-radius 5px
+        &:hover
+            box-shadow 0px 0px 12px shadow_color
+    
 // links
 a
     text-decoration none
     // order must be: link, visited, hover, active
     &:link
-        color #47F
+        color link_color
     &:visited
-        color #04A
+        color visited_color
     &:hover
-        color red
+        color hover_color
         text-decoration underline
     &:active
-        color green
+        color active_color
         text-decoration underline
     &.moin-nonexistent:link
-        color #666
+        color nonexistent_link_color
     &.moin-nonexistent:visited
-        color grey
+        color nonexistent_link_color
     &.moin-nonexistent:hover
-        color black
+        color nonexistent_hover_color
     &.moin-nonexistent:active
-        color black
+        color nonexistent_hover_color
 
+// moin-flash & error
+.moin-flash
+    margin 0
+    padding 6px 6px 6px 38px
+    background-color heading_color
+    border-bottom border style
+    background-repeat no-repeat
+    background-position 16px center
 
+.moin-flash-hint
+    background-image url(../img/smileys/idea.png)
+    color hover_color
+
+.moin-flash-info
+    background-image url(../img/smileys/icon-info.png)
+    color hover_color
+
+.moin-flash-warning
+    background-image url(../img/smileys/alert.png)
+    color error_color
+
+.moin-flash-error
+    background-image url(../img/smileys/icon-error.png)
+    color error_color
+  
+.moin-error
+    color error_color
+    background base_color
+    padding 4px
+    margin 1em
+    text-align centre
+    list-style-type none
+    border-radius 5px
+
+// search
+#moin-searchform
+    padding 0
+    font-size 0.82em
+    float right
+    text-align right
+    input
+        font-size 1em
+        vertical-align middle
+        background-color page_color
+        border border_style
+    button
+        box-shadow none
+
+#moin-searchform #moin-search-submit
+    text-indent -9000%
+    margin-left -24px
+    padding 0px
+    width 20px
+    height 16px
+    background url(../img/moin-search.png) center center no-repeat
+    background-size 16px 16px
+    border none
+    overflow hidden
+    vertical-align middle
+    cursor pointer
+
+#moin-searchform #moin-search-query
+    padding-right 20px
+
+#moin-searchform div
+    margin 0
+
+#moin-long-searchform
+    padding 0
+    font-size 0.82em
+    text-align left
+    div
+        margin 0
+    label
+        display inline
+
+#moin-search-query
+    width 50%
+
+.searchresults 
+    dt
+        margin-top 1em
+        font-weight normal
+    dd, p
+        font-size 0.85em
+    td
+        border-width 0
+    p.info
+        margin-left 2%
+
+.searchresults .searchhitinfobar
+    color active_color
+    margin-left 15px
+    margin-top 0
+
+.searchresults .foundtext
+    margin-left 15px
+    margin-top 0
+
+p.searchstats
+    font-size 0.8em
+    text-align right
+    width 100%
+    padding 2px
+
+p.searchhint
+    background-color page_color
+    border 1px solid shadow_color
+    padding 2px
+
+.searchpages
+    margin-left auto
+    margin-right auto
+    tr, td
+        border 0
+        padding 5px
+        margin 0
+        text-align center
+        vertical-align middle
+        color font_color
+        font-weight bold
+        font-size 1.05em
+    td
+        a, a:link
+            text-decoration underline    
+    
 // lists
 ul, dl
     margin-left 1.5em
@@ -202,11 +826,12 @@
         // for >= second level we need less
         margin-left 1.5em
 
-li, dt
-    padding 0.1em
+li
+    padding 0.2em
 
 dt
     font-weight bold
+    padding 0.1em
 dd
     margin-left 1.5em
 
@@ -226,7 +851,7 @@
 
 // tags list / tag cloud
 tag_scale = 1.2
-tag_font_size = 100%
+tag_font_size = 1em
 
 ul.moin-tags
     list-style none
@@ -244,7 +869,7 @@
         font-size main_font_size * scale_font
         margin (1em / scale_font) 0
         heading_underline_thickness = floor(4px - n / 2)
-        border-bottom heading_underline_thickness solid heading_underline_color
+        border-bottom heading_underline_thickness solid border_color
         padding-bottom heading_underline_thickness
 
 // special style for heading with mouseover permalinks
@@ -254,7 +879,7 @@
     margin-left 0.1em
     color footer_color
     &:hover
-        color body_color
+        color font_color
 
 h1:hover .permalink,
 h2:hover .permalink,
@@ -267,7 +892,7 @@
 
 // horizontal rule ---- and custom rules ----- to ----------
 hr
-    background-color body_color
+    background-color font_color
     border 0
     margin .9em 0
     height 1px
@@ -293,25 +918,24 @@
         vertical-align middle
         text-align left
     th
-        border 1px solid #4D7DA9
-        background-color #81BBF2
+        border border_style
+        background-color table_header_color
+        color heading_color
     td
-        border 1px solid #ADB9CC
+        border border_style
 
 table.zebra
     border none
     border-collapse separate
     border-spacing 1px
     thead
-        background-color #81BBF2
+        background-color table_header_color
+        color heading_color
     tfoot
-        background-color #C4D9FF
+        background-color base_color
     tbody tr,
     > tr
-        background-color #EEF1F5
-    tbody tr:nth-child(odd),
-    > tr:nth-child(odd)
-        background-color #D9DFE8
+        background-color table_bg_color
     th,
     td
         border none
@@ -320,14 +944,14 @@
     font-family monospace
     white-space pre-wrap
     word-wrap break-word
-    border 1px solid #AEBDCC
-    background-color #F3F5F7
-    margin .33em 0
+    border border_style
+    background-color base_color
+    margin .5em
     padding 5px
     clear both
     &.comment
-        background-color #CCC
-        color red
+        background-color header_bg_color
+        color heading_color
         margin 0
         padding 0
         border 0
@@ -336,11 +960,12 @@
 
 textarea
     font-family monospace
-    width 100%
+    width 98%
     border border_style
+    margin-left .5em
 
 input#f_comment
-    width 100%
+    width 96%
     border border_style
     margin .3em 0
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/themes/foobar/static/css/stylus/mime_type_icons.styl	Wed Jul 11 01:32:16 2012 +0530
@@ -0,0 +1,88 @@
+// mime type icons added before respective mime types
+
+a.moin-www:before,
+a.moin-http:before,
+a.moin-https:before
+  content: url(../img/moin-www.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-file:before,
+a.moin-ftp:before
+  content: url(../img/moin-ftp.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-nntp:before,
+a.moin-news:before
+  content: url(../img/moin-news.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-telnet:before,
+a.moin-ssh:before,
+a.moin-irc:before,
+a.moin-ircs:before
+  content: url(../img/moin-telnet.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-mailto:before
+  content: url(../img/moin-email.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-attachment:before
+  content: url(../img/moin-attach.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-interwiki:before
+  content: url(../img/moin-inter.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-action:before
+  content: url(../img/moin-action.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-mime-text:before
+  content: url(../img/moin-text.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-mime-image:before
+  content: url(../img/moin-image.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-mime-audio:before
+  content: url(../img/moin-audio.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-mime-video:before
+  content: url(../img/moin-video.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-mime-application:before
+  content: url(../img/moin-application.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-mime-pdf:before
+  content: url(../img/moin-pdf.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-mime-package:before
+  content: url(../img/moin-package.png)
+  margin: 0 0.2em
+  vertical-align: middle
+
+a.moin-mime-drawing:before
+  content: url(../img/moin-drawing.png)
+  margin: 0 0.2em
+  vertical-align: middle
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/themes/foobar/static/css/stylus/moin_diff.styl	Wed Jul 11 01:32:16 2012 +0530
@@ -0,0 +1,44 @@
+// shows changes made as a side by side difference.
+
+.moin-diff
+    width 99%
+    table-layout fixed
+    margin .3em
+
+.moin-diff-header
+    vertical-align top
+    font-size 92%
+
+.moin-diff-info
+    margin .33em .25em
+
+.moin-diff-info-value
+    white-space normal
+
+.moin-diff-info-caption
+    display inline-block
+    min-width 5em
+
+.moin-diff-line-number
+    background-color #ffe6e6
+
+.moin-diff-added
+    background-color #E0FFE0
+    vertical-align top
+    width 50%
+    white-space pre-wrap
+    word-wrap break-word
+    font-family monospace
+    span
+        background-color #80FF80
+
+.moin-diff-removed
+    background-color #FFFFE0
+    vertical-align top
+    width 50%
+    white-space pre-wrap
+    word-wrap break-word
+    font-family monospace
+    span
+        background-color #FFFF80
+    
\ No newline at end of file
Binary file MoinMoin/themes/foobar/static/img/attach.png has changed
Binary file MoinMoin/themes/foobar/static/img/base.png has changed
Binary file MoinMoin/themes/foobar/static/img/draft.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-action.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-application.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-attach.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-audio.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-bottom.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-checkbox-off.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-checkbox-on.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-conflict.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-deleted.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-diff.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-download.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-drawing.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-edit.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-email.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-expand.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-ftp.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-help.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-home.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-icon.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-image.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-info.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-inter.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-jabber.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-link.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-movedown.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-moveup.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-new.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-news.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-package.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-parent.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-pdf.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-print.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-raw.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-readonly.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-renamed.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-rss.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-search.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-show.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-subscribe.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-telnet.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-text.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-top.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-transclusion.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-transparent-bg.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-unsubscribe.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-up.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-updated.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-video.png has changed
Binary file MoinMoin/themes/foobar/static/img/moin-www.png has changed
--- a/MoinMoin/themes/foobar/templates/history.html	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/themes/foobar/templates/history.html	Wed Jul 11 01:32:16 2012 +0530
@@ -1,4 +1,4 @@
-{% extends theme("local.html") %}
+{% extends theme("global.html") %}
 {% import "utils.html" as utils %}
 {% block content %}
     {% set (history, next_offset, previous_offset) = history_page %}
--- a/MoinMoin/themes/foobar/templates/index.html	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/themes/foobar/templates/index.html	Wed Jul 11 01:32:16 2012 +0530
@@ -1,4 +1,4 @@
-{% extends theme("global.html") %}
+{% extends theme("local.html") %}
 {% import "forms.html" as forms %}
 {% block head_scripts %}
 {{ super() }}
@@ -6,64 +6,65 @@
     <script src="{{ url_for('static', filename='js/index_action.js') }}"></script>
 {% endblock %}
 
+{% block local %}
+    <ul>
+        {% if index %}
+        <li class="action-bar"> 
+        <div class="moin-select-all">
+            <span class="moin-select-allitem allitem-toselect" title="{{ _("Select All") }}">{{ _("Select All") }}</span>
+        </div>
+        </li>
+        {% endif %}
+        <li class="action-bar">
+        <div class="moin-select-actions">
+            <div>
+                <span>Actions</span> 
+            </div>
+            <ul>
+                <li id="moin-create-newitem">{{ _("New item") }}</li>
+                <li id="moin-download-trigger">{{ _("Download") }}</li>
+                <li class="moin-action-tab" 
+                    id="moin-delete-trigger" 
+                    actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}">
+                    {{ _("Delete") }}
+                </li>
+                <li class="moin-action-tab" 
+                    id="moin-destroy-trigger" 
+                    actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}">
+                    {{ _("Destroy") }}
+                </li>
+            </ul>
+        </div>
+        </li>
+        {% if index %}
+        <li class="action-bar">
+        <div class="moin-contenttypes-wrapper">
+            <div class="ct-hide">{{ _("Filter by content type") }}</div>
+            {% set unknown_items_label = _("items having unknown mime types") %}
+            {{ gen.form.open(form, method="post", action=url_for('frontend.index', item_name=item_name)) }}
+            <ul>
+                <li>
+                    <a href="#" class="filter-toggle">&raquo; {{ _("Toggle") }}</a>
+                    <a href="#" class="filter-more">&raquo; {{ _("More") }}</a>
+                </li>
+                {{ forms.render_filter_field(gen, form['markup_text_items'], 'checkbox', contenttype_groups['markup text items']) }}
+                {{ forms.render_filter_field(gen, form['other_text_items'], 'checkbox', contenttype_groups['other text items']) }}
+                {{ forms.render_filter_field(gen, form['image_items'], 'checkbox', contenttype_groups['image items']) }}
+                {{ forms.render_filter_field(gen, form['audio_items'], 'checkbox', contenttype_groups['audio items']) }}
+                {{ forms.render_filter_field(gen, form['video_items'], 'checkbox', contenttype_groups['video items']) }}
+                {{ forms.render_filter_field(gen, form['other_items'], 'checkbox', contenttype_groups['other items']) }}
+                {{ forms.render_filter_field(gen, form['unknown_items'], 'checkbox', unknown_items_label) }}
+                {{ gen.input(form['submit'], type='submit') }}
+            </ul>
+            {{ gen.form.close() }}
+        </div>
+        </li>
+        {% endif %}
+    </ul>
+{% endblock %}
+
 {% block content %}
     <div class="moin-index-message"><span></span></div>
-    <div class="moin-align-right">
-        <ul>
-            {% if index %}
-            <li class="action-bar">
-            <div class="moin-select-all">
-                <span class="moin-select-allitem allitem-toselect" title="{{ _("Select All") }}">{{ _("Select All") }}</span>
-            </div>
-            </li>
-            {% endif %}
-            <li class="action-bar">
-            <div class="moin-select-actions">
-                <div>
-                    <span class="show-action">Actions</span>
-                </div>
-                <ul>
-                    <li id="moin-create-newitem">{{ _("New item") }}</li>
-                    <li id="moin-download-trigger">{{ _("Download") }}</li>
-                    <li class="moin-action-tab"
-                        id="moin-delete-trigger"
-                        data-actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}">
-                        {{ _("Delete") }}
-                    </li>
-                    <li class="moin-action-tab"
-                        id="moin-destroy-trigger"
-                        data-actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}">
-                        {{ _("Destroy") }}
-                    </li>
-                </ul>
-            </div>
-            </li>
-            {% if index %}
-            <li class="action-bar">
-            <div class="moin-contenttypes-wrapper">
-                <div class="ct-hide">{{ _("Filter by content type") }}</div>
-                {% set unknown_items_label = _("items having unknown mime types") %}
-                {{ gen.form.open(form, method="post", action=url_for('frontend.index', item_name=item_name)) }}
-                <ul>
-                    <li>
-                        <a href="#" class="filter-toggle">&raquo; {{ _("Toggle") }}</a>
-                        <a href="#" class="filter-more">&raquo; {{ _("More") }}</a>
-                    </li>
-                    {{ forms.render_filter_field(gen, form['markup_text_items'], 'checkbox', contenttype_groups['markup text items']) }}
-                    {{ forms.render_filter_field(gen, form['other_text_items'], 'checkbox', contenttype_groups['other text items']) }}
-                    {{ forms.render_filter_field(gen, form['image_items'], 'checkbox', contenttype_groups['image items']) }}
-                    {{ forms.render_filter_field(gen, form['audio_items'], 'checkbox', contenttype_groups['audio items']) }}
-                    {{ forms.render_filter_field(gen, form['video_items'], 'checkbox', contenttype_groups['video items']) }}
-                    {{ forms.render_filter_field(gen, form['other_items'], 'checkbox', contenttype_groups['other items']) }}
-                    {{ forms.render_filter_field(gen, form['unknown_items'], 'checkbox', unknown_items_label) }}
-                </ul>
-                {{ gen.input(form['submit'], type='submit') }}
-                {{ gen.form.close() }}
-            </div>
-            </li>
-            {% endif %}
-        </ul>
-    </div>
     <div>
     {% if item_name: %}
         <h1>{{ _("Index of subitems of '%(item_name)s'", item_name=item_name) }}</h1>
@@ -113,13 +114,13 @@
                 <a href="about:blank" title="{{ url_for('.download_item', item_name=fullname, mimetype=mimetype) }}"
                    class="moin-download-link">
                 </a>
-                <a href="{{ url_for('.show_item', item_name=fullname) }}"
+                <a href="{{ url_for('.show_item', item_name=fullname) }}" 
                    class="{{ contenttype|contenttype_to_class }} moin-item"
                    title="{{ relname }}">
                    {{ relname|truncate(maxchars, true, '..') }}
                 </a>
                 {% if hassubitem %}
-                    <a href="{{ url_for('frontend.index', item_name=fullname) }}"
+                    <a href="{{ url_for('frontend.index', item_name=fullname) }}" 
                        title="{{ _("More") }}"
                        class="moin-more-index">&nbsp;
                 </a>
@@ -132,7 +133,7 @@
     <div id="popup">
         <div id="popup-for-action" class="popup-container">
             <div class="popup-header">
-                <div class="popup-closer popup-cancel" title="{{ _("Close") }}">x</div>
+                <input type="button" class="popup-closer popup-cancel" value="{{ _("X") }}" title="{{ _("Close") }}"/>
                 <span>{{ _("Please provide comment for this action") }}</span>
             </div>
             <div class="popup-body">
@@ -145,7 +146,7 @@
         </div>
         <div id="popup-for-newitem" class="popup-container">
             <div class="popup-header">
-                <div class="popup-closer popup-cancel" title="{{ _("Close") }}">x</div>
+                <input type="button" class="popup-closer popup-cancel" value="{{ _("X") }}" title="{{ _("Close") }}"/>
                 <span>{{ _("Create new item") }}</span>
             </div>
             <div class="popup-body">
@@ -171,4 +172,4 @@
     <span class="moin-drag">{{ _("(Drag and drop multiple files to this white area to upload them.)") }}</span>
     <script src="{{ url_for('static', filename='js/jfu.js') }}"></script>
     <div id="lightbox">&nbsp;</div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
--- a/MoinMoin/themes/foobar/templates/itemviews.html	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/themes/foobar/templates/itemviews.html	Wed Jul 11 01:32:16 2012 +0530
@@ -35,7 +35,7 @@
 
             {%- if endpoint in [
                 'frontend.global_history', 'frontend.global_index', 'frontend.global_tags',
-                'admin.index',
+                'admin.index', 'admin.index_user',
             ] %}
                 <li>
                     <a href="{{ url_for(endpoint) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
--- a/MoinMoin/themes/foobar/templates/layout.html	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/themes/foobar/templates/layout.html	Wed Jul 11 01:32:16 2012 +0530
@@ -35,7 +35,7 @@
 
         {% set trail_items = theme_supp.path_breadcrumbs() %}
         {% if trail_items %}
-        <li>Trail
+        <li id="moin-trail">Trail
             <ul>
             {% for wiki_name, item_name, item_href, exists, err in trail_items %}
                 <li>
@@ -56,7 +56,7 @@
             </ul>
         </li>
         {% endif %}
-        <li>User
+        <li id="moin-user">User
         <ul>
         {% if user.valid -%}
 	    {% set avatar = user.avatar(20) %}
@@ -147,6 +147,10 @@
 </div>
 
 {% block content_container %}
+    <div id="moin-content-no-panel" lang="{{ theme_supp.content_lang }}" dir="{{ theme_supp.content_dir }}">
+    {% block content %}
+    {% endblock %}
+    </div>
 {% endblock %}
 </div>
 
--- a/MoinMoin/themes/foobar/templates/local.html	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/themes/foobar/templates/local.html	Wed Jul 11 01:32:16 2012 +0530
@@ -12,6 +12,7 @@
 </div>
 
 <div id="moin-local-panel">
+{% block local %}
 <ul>
     <li>Views
         {% set exists = storage.has_item(item_name) %}
@@ -51,7 +52,7 @@
 
                     {%- if endpoint in [
                         'frontend.global_history', 'frontend.global_index', 'frontend.global_tags',
-                        'admin.index',
+                        'admin.index', 'admin.index_user',
                     ] %}
                         <li>
                             <a href="{{ url_for(endpoint) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
@@ -128,5 +129,6 @@
         {{ utils.render_subitem_navigation(item_name, False) }}
     </li>
 </ul>
+{% endblock %}
 </div>
 {% endblock %}
--- a/MoinMoin/themes/foobar/templates/modify_applet.html	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/themes/foobar/templates/modify_applet.html	Wed Jul 11 01:32:16 2012 +0530
@@ -2,7 +2,7 @@
 {% extends theme("local.html") %}
 {% block content %}
 <h1>{{ _("Modifying %(item_name)s", item_name=item_name) }}</h1>
-<div class="moin-form">
+<div id="moin-modify" class="moin-form">
 {{ gen.form.open(form, method='post', action='', enctype='multipart/form-data') }}
 {{ forms.render_errors(form) }}
 {% block extra_form %}{% endblock %}
--- a/MoinMoin/themes/foobar/templates/modify_show_type_selection.html	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/themes/foobar/templates/modify_show_type_selection.html	Wed Jul 11 01:32:16 2012 +0530
@@ -4,15 +4,15 @@
 <p>
 {{ _("This item does not exist (yet), but you can try creating it now. Please select the type of the item you want to create.") }}
 </p>
-<table class="zebra">
+<table id="moin-create-table" class="zebra">
     {% for gname, contenttypes in contenttype_groups %}
     <tr>
         <th>{{ gname }}</th>
     </tr>
     <tr>
-        <td>
+        <td> |&nbsp
         {% for ctname, ctlabel in contenttypes %}
-            <a href="{{ url_for('frontend.modify_item', item_name=item_name, contenttype=ctname) }}">{{ ctlabel }}</a> -
+            <a href="{{ url_for('frontend.modify_item', item_name=item_name, contenttype=ctname) }}">{{ ctlabel }}</a> &nbsp|&nbsp 
         {% endfor %}
         </td>
     </tr>
--- a/MoinMoin/themes/foobar/templates/modify_text_html.html	Mon Jul 09 12:15:16 2012 +0200
+++ b/MoinMoin/themes/foobar/templates/modify_text_html.html	Wed Jul 11 01:32:16 2012 +0530
@@ -3,7 +3,6 @@
 {% block head %}
 {{ super() }}
 <script type="text/javascript" src="{{ url_for('serve.files', name='ckeditor', filename='ckeditor.js') }}"></script>
-<link rel="stylesheet" href="{{ url_for('serve.files', name='ckeditor', filename='contents.css') }}" />
 {% endblock %}
 
 {% block data_editor %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/themes/foobar/templates/usersettings.html	Wed Jul 11 01:32:16 2012 +0530
@@ -0,0 +1,55 @@
+{% extends theme("local.html") %}
+{% import "usersettings_forms.html" as user_forms %}
+
+{% block local %}
+<ul id="moin-usersetting-title">
+<li class="moin-tab-title"><a href="#moin-personal">{{ _("Personal Settings") }}</a></li>
+<li class="moin-tab-title"><a href="#moin-password">{{ _("Change Password") }}</a></li>
+<li class="moin-tab-title"><a href="#moin-notification">{{ _("Notification Settings") }}</a></li>
+<li class="moin-tab-title"><a href="#moin-ui">{{ _("Wiki Appearance Settings") }}</a></li>
+<li class="moin-tab-title"><a href="#moin-navigation">{{ _("Navigation Settings") }}</a></li>
+<li class="moin-tab-title"><a href="#moin-options">{{ _("Options") }}</a></li>
+</ul>
+{% endblock %}
+
+{% block content %}
+<div id="moin-usersettings" class="moin-tabs">
+    <div class="moin-tab-title"><a href="#moin-personal"></a></div>
+    <div id="moin-personal" class="moin-tab-body moin-form">
+        <h2>{{ _("Personal Settings") }}</h2>
+        {{ user_forms.personal(form_objs.personal) }}
+    </div>
+
+    
+    <div id="moin-password" class="moin-tab-body moin-form">
+        <h2>{{ _("Change Password") }}</h2>
+        {{ user_forms.password(form_objs.password) }}
+    </div>
+
+    
+    <div id="moin-notification" class="moin-tab-body moin-form">
+        <h2>{{ _("Notification Settings") }}</h2>
+        {{ user_forms.notification(form_objs.notification) }}
+    </div>
+
+    
+    <div id="moin-ui" class="moin-tab-body moin-form">
+        <h2>{{ _("Wiki Appearance Settings") }}</h2>
+        {{ user_forms.ui(form_objs.ui) }}
+    </div>
+
+    
+    <div id="moin-navigation" class="moin-tab-body moin-form">
+        <h2>{{ _("Navigation Settings") }}</h2>
+        {{ user_forms.navigation(form_objs.navigation) }}
+    </div>
+
+    
+    <div id="moin-options" class="moin-tab-body moin-form">
+        <h2>{{ _("Options") }}</h2>
+        {{ user_forms.options(form_objs.options) }}
+    </div>
+</div>
+
+{% endblock %}
+