changeset 2869:e19c733eb108

fix #470 rework global index, subitem index; merge basic and modernized versions
author RogerHaase <haaserd@gmail.com>
date Sun, 04 Jan 2015 09:18:55 -0700
parents ec34b7876eeb
children 1874775f8903
files MoinMoin/static/css/common.css MoinMoin/static/js/index_action.js MoinMoin/templates/dictionary.js MoinMoin/templates/forms.html MoinMoin/templates/index.html MoinMoin/themes/basic/static/css/theme.css MoinMoin/themes/basic/static/custom-less/theme.less MoinMoin/themes/basic/templates/index.html MoinMoin/themes/modernized/static/css/stylus/theme.styl MoinMoin/themes/modernized/static/css/theme.css
diffstat 10 files changed, 223 insertions(+), 1402 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/static/css/common.css	Fri Jan 02 10:06:48 2015 -0700
+++ b/MoinMoin/static/css/common.css	Sun Jan 04 09:18:55 2015 -0700
@@ -258,14 +258,16 @@
 h6 { border-bottom: 3px solid #4e7da9; }
 
 /* buttons */
-#moin-group-browser a.moin-button,
-form > input.moin-button { background: #aed4fa; border: 1px solid #00417F; border-radius: 6px; cursor: pointer;
-    color: #000; font-size: 0.75em; font-weight: bold; padding: 4px 15px; }
-#moin-group-browser a.moin-button:hover,
-#moin-group-browser a.moin-button:focus,
-form > input.moin-button:hover,
-form > input.moin-button:focus { box-shadow: 2px 2px 1px #000; color: #000; text-decoration: none; }
-form > input.moin-button.active {background: #00417f; color: #fff; }
+
+a.moin-button:link,
+a.moin-button:visited,
+a.moin-button:hover,
+a.moin-button:active { color: #000; text-decoration: none; }
+.moin-button { background: #aed4fa; border: 1px solid #00417F; border-radius: 6px; cursor: pointer;
+    font-size: 0.75em; font-weight: bold; padding: 4px 15px; margin: .3em; }
+.moin-button:hover,
+.moin-button:focus { box-shadow: 2px 2px 1px #000; outline: none; }
+.moin-button.active {background: #00417f; color: #fff; }
 
 /* table of contents (div.toc is for markdown parser) */
 div.moin-table-of-contents,
@@ -277,3 +279,72 @@
 div.moin-table-of-contents li,
 div.toc li { margin: .12em 0 0 0; padding: 0; list-style: none; }
 div.moin-table-of-contents-heading { font-weight: bold; padding: 0; margin: 0 0 .5em 1em; letter-spacing: .075em; }
+
+/* Global Index */
+
+.moin-clr { clear: both; }
+.moin-index-menu li { display: inline-block; }
+#moin-create-new-item { float: right; }
+.moin-show-action: after { content: url("../img/moin-moveup.png"); margin: 0 .2em; }
+.moin-action-visible .moin-show-action: after { content: url("../img/moin-movedown.png"); margin: 0 .2em; }
+.moin-select-allitem { display: inline-block; cursor: default; text-align: left; }
+.moin-select-all { padding: .5em; color: #00008b; background: #eef1f6; border: 1px solid #4e7da9; text-align: left; }
+.moin-index-message { width: 50%; margin: 1em auto; text-align: center; display: none; }
+.moin-index-message span { padding: 4px; background-color: #d8dfe9; color: #000; }
+.moin-download-link { display: none; }
+.moin-contenttypes-wrapper { margin: .5em 0; }
+.moin-contenttypes-wrapper div { cursor: pointer; margin: .1em; padding: .5em 1.2em .5em .5em; height: 1em; }
+div.moin-ct-shown { background: #d8dfe9 url("../img/moin-movedown.png") no-repeat center right; color: #000; }
+div.ct-hide { background: transparent url("../img/moin-moveup.png") no-repeat center right; }
+.moin-contenttypes-wrapper form { border-top: 1px solid #4e7da9; z-index: 2; background: #fff; border: 1px solid #4e7da9; padding: .2em; display: none; }
+.moin-contenttypes-wrapper ul li { list-style-type: none; }
+.moin-contenttypes-wrapper ul li label { display: inline; vertical-align: middle; }
+.moin-contenttypes-wrapper ul li .helper-text { font-size: .7em; color: #737373; }
+.moin-contenttypes-wrapper ul li a { font-size: 80%; }
+.moin-contenttypes-wrapper form input[type="submit"] { margin-left: 22%; padding-left: 20%; padding-right: 20%; }
+.moin-contenttypes-wrapper: hover div { background-color: #d8dfe9; color: #1f9ae0; }
+.moin-filter-toggle { margin: 0 .2em; font-size: 90%; }
+.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-index-path { margin-left: .5em; }
+.moin-index-path: before { content: url("../img/moin-parent.png"); margin: 0 .3em; }
+.moin-path-separator { font-size: 120%; color: #00008b; }
+.moin-index-separator { clear: both; border-top: 1px solid #4e7da9; width: 99%; margin-left: .5%; display: none; }
+
+#moin-initials { width: 90%; margin: 5px auto; text-align: center; }
+#moin-initials a { display: inline-block; margin: 2px 1px; padding: 4px 5px; }
+#moin-initials a.selected { background: #00008b; border-radius: 5px; color: #fff; text-decoration: none; }
+.moin-item-index { width: 99%; margin-left: .5%; }
+.moin-item-index div { float: left; width: 15em; }
+.moin-item-index div .moin-select-item { display: inline-block; width: 17px; cursor: default; }
+.moin-align-right { text-align: right; float: right; }
+.moin-align-right ul { margin: 0; padding: 0; }
+.moin-align-right ul li.action-bar { list-style-type: none; display: inline-block; *display: inline; zoom: 1; }
+
+#popup { padding: 0; width: 80%; position: absolute; top: 10%; left: 10%; display: none; z-index: 10; border: 3px solid #00417f; }
+.popup-header { background-color: #00417f; color: #fff; font-size: 1em; padding: 10px; margin: 0; }
+.popup-closer.popup-cancel { background-color: red; color: #fff; font-size: 1em; padding: 1px 4px; margin: 0; float: right; cursor: pointer; border: none; border-radius: 0; }
+.popup-closer: hover { background-color: #1f9ae0; color: #cfcfcf; }
+.popup-body { clear: both; background-color: #fff; color: #000; padding: 10px; margin: 0; }
+.popup-body label { margin: 5px; display: block; font-weight: bold; }
+
+.popup-body input[type="text"] { width: 96%; }
+.popup-body input.blank { border-color: #4e7da9; border-width: 2px; }
+.popup-container { margin: 0; }
+#lightbox { background: #fff; opacity: .7; position: absolute; left: 0; top: 0; width: 100%; height: 100%; z-index: 9; margin: 0; display: none; }
+
+/* file upload on global index, class names required by jquery fileupload */
+
+#moin-upload-cont { min-height: 10px; }
+#file_upload { margin-top: 2em; }
+form.upload_file { cursor: pointer; font-weight: bold; height: 2.5em; line-height: 2.5em; overflow: hidden; position: relative; text-align: center; width: 15em; }
+form.upload_file { display: block; }
+form.upload_file: hover { color: #fff; }
+form.upload_file input { cursor: pointer; height: 100%; margin: 0; opacity: 0; position: absolute; right: 0; top: 0; }
+form.upload_file button { display: none; }
+
+.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: #737373; }
+.file_name { word-break:  break-all; word-wrap:  break-word; max-width:  10em; }
--- a/MoinMoin/static/js/index_action.js	Fri Jan 02 10:06:48 2015 -0700
+++ b/MoinMoin/static/js/index_action.js	Sun Jan 04 09:18:55 2015 -0700
@@ -126,12 +126,16 @@
         if ($(this).hasClass("allitem-toselect")) {
             $(".moin-item-index div").removeClass().addClass("selected-item");
             $(this).removeClass("allitem-toselect").addClass("allitem-selected");
+            $(this).children("i").removeClass("fa-square-o").addClass("fa fa-check-square-o");
+            $(".moin-select-button-text").text(_("Deselect All"));
             $(".moin-select-item > input[type='checkbox']").each(function () {
                 $(this).prop('checked', true);
             });
         } else {
             $(this).removeClass("allitem-selected").addClass("allitem-toselect");
             $(".moin-item-index div").removeClass();
+            $(this).children("i").removeClass("fa-check-square-o").addClass("fa-square-o");
+            $(".moin-select-button-text").text(_("Select All"));
             $(".moin-select-item > input[type='checkbox']").each(function () {
                 $(this).prop('checked', false);
             });
@@ -142,23 +146,23 @@
 
     // add click handler to "Actions" drop down list
     // also executed via .click call when user clicks on an action (new, download, delete, destroy)
-    $(".show-action").click(function () {
+    $(".moin-show-action").click(function () {
         // show/hide actions drop down list
         var actionsDiv = $(this).parent().parent();
         if (actionsDiv.find("ul:first").is(":visible")) {
             actionsDiv.find("ul:first").fadeOut(POPUP_FADE_TIME);
-            actionsDiv.removeClass("action-visible");
+            actionsDiv.removeClass("moin-action-visible");
         } else {
             actionsDiv.find("ul:first").fadeIn(POPUP_FADE_TIME);
-            actionsDiv.addClass("action-visible");
+            actionsDiv.addClass("moin-action-visible");
         }
     });
 
     // add click handler to "New Item" action tab entry
-    $("#moin-create-newitem").click(function () {
+    $("#moin-create-new-item").click(function () {
         // show new item popup and hide actions dropdown
         showpop("newitem");
-        $(".show-action").trigger("click");
+        $(".moin-show-action").trigger("click");
     });
 
     // add click handler to close button "X" on new item popup
@@ -203,7 +207,7 @@
             });
         }
         // hide the list of actions
-        $(".show-action").trigger("click");
+        $(".moin-show-action").trigger("click");
     });
 
     // add click handler to "Delete" and "Destroy" buttons of Actions dropdown
@@ -222,7 +226,7 @@
                 showpop("destroy");
             }
         }
-        $(".show-action").trigger("click");
+        $(".moin-show-action").trigger("click");
     });
 
     // add click handler to "Submit" button on "Please provide comment..." popup
@@ -238,20 +242,20 @@
     // -- Filter by content type handlers start here
 
     // add click handler to "Filter by content type" button
-    $(".moin-contenttypes-wrapper").children("div").click(function () {
+    $(".moin-contenttypes-wrapper").children("span").click(function () {
         // show/hide content type dropdown
         var wrapper = $(this).parent();
         if (wrapper.find("form:visible").length) {
             $(".moin-contenttypes-wrapper").find("form").fadeOut(POPUP_FADE_TIME);
-            $(this).removeClass().addClass("ct-hide");
+            $(this).removeClass("moin-ct-shown").addClass("moin-ct-hide");
         } else {
             $(".moin-contenttypes-wrapper").find("form").fadeIn(POPUP_FADE_TIME);
-            $(this).removeClass().addClass("ct-shown");
+            $(this).removeClass("moin-ct-hide").addClass("moin-ct-shown");
         }
     });
 
     // add click handler to "Toggle" button on "Filter by content type" dropdown
-    $(".filter-toggle").click(function () {
+    $(".moin-filter-toggle").click(function () {
         // reverse checked/unchecked for each content type
         $(".moin-contenttypes-wrapper form").find("input[type='checkbox']").each(function () {
             $(this).prop('checked', !$(this).is(':checked'));
@@ -259,20 +263,6 @@
         return false;
     });
 
-    // add click handler to "More" button on "Filter by content type" dropdown
-    $(".filter-more").click(function () {
-        // show/hide help text describing each content type
-        var helper_texts = $(".moin-contenttypes-wrapper form").find(".helper-text:visible");
-        if (helper_texts.length) {
-            helper_texts.fadeOut();
-        } else {
-            helper_texts = $(".moin-contenttypes-wrapper form").find(".helper-text");
-            helper_texts.fadeIn();
-        }
-
-        return false;
-    });
-
     // -- individual item handlers start here
 
     // add click handlers to all items shown on global index page
--- a/MoinMoin/templates/dictionary.js	Fri Jan 02 10:06:48 2015 -0700
+++ b/MoinMoin/templates/dictionary.js	Sun Jan 04 09:18:55 2015 -0700
@@ -8,6 +8,8 @@
         "Show comments"  : "{{  _("Show comments") }}",
         "Hide transclusions"  : "{{  _("Hide transclusions") }}",
         "Show transclusions"  : "{{  _("Show transclusions") }}",
+        "Select All"  : "{{  _("Select All") }}",
+        "Deselect All"  : "{{  _("Deselect All") }}",
         "Your changes will be discarded if you leave this page without saving." : "{{ _("Your changes will be discarded if you leave this page without saving.") }}",
         "You missed! Double-click on text or to the right of text to auto-scroll text editor."  : "{{ _("You missed! Double-click on text or to the right of text to auto-scroll text editor.") }}",
         "Your browser is obsolete. Upgrade to gain auto-scroll text editor feature."  : "{{ _("Your browser is obsolete. Upgrade to gain auto-scroll text editor feature.") }}",
--- a/MoinMoin/templates/forms.html	Fri Jan 02 10:06:48 2015 -0700
+++ b/MoinMoin/templates/forms.html	Sun Jan 04 09:18:55 2015 -0700
@@ -215,19 +215,19 @@
         <div class="upload-form">
             <form action="{{ submit_url }}" method="POST" enctype="multipart/form-data" class="upload_file">
                 <input type="file" name="data_file" multiple>
-                <button type="submit">{{ _("Upload") }}</button>
-                <div class="file_upload_label" style="margin: 0;">{{ _("Upload files") }}</div>
+                <button class="moin-button" type="submit">{{ _("Upload") }}</button>
+                <div class="file_upload_label moin-button">{{ _("Upload files") }}</div>
             </form>
         </div>
         <div class="file_upload_overall_progress"><div style="display:none;"></div></div>
         <div class="file_upload_buttons">
-            <button class="file_upload_start" type="button" style="display:none;">{{ _("Start All") }}</button>
-            <button class="file_upload_cancel" type="button" style="display:none;">{{ _("Cancel All") }}</button>
+            <button class="moin-button file_upload_start" type="button" style="display:none;">{{ _("Start All") }}</button>
+            <button class="moin-button file_upload_cancel" type="button" style="display:none;">{{ _("Cancel All") }}</button>
         </div>
         <table class="files">
             <tr class="file_upload_template" style="display:none;">
-                <td class="file_upload_start"><button type="button">{{ _("Start") }}</button></td>
-                <td class="file_upload_cancel"><button type="button">{{ _("Cancel") }}</button></td>
+                <td class="file_upload_start"><button class="moin-button" type="button">{{ _("Start") }}</button></td>
+                <td class="file_upload_cancel"><button class="moin-button" type="button">{{ _("Cancel") }}</button></td>
                 <td class="file_name"></td>
                 <td class="file_upload_progress"><div></div></td>
             </tr>
--- a/MoinMoin/templates/index.html	Fri Jan 02 10:06:48 2015 -0700
+++ b/MoinMoin/templates/index.html	Sun Jan 04 09:18:55 2015 -0700
@@ -1,67 +1,71 @@
 {% extends theme("layout.html") %}
 {% import "forms.html" as forms with context %}
+{% import theme("itemviews.html") as itemviews with context %}
 
-{% if item_name %}
-    {% set title = _("Index of subitems of '%(item_name)s'", item_name=item_name) %}
-{% else %}
-    {% set title = _("Global Index") %}
-{% endif %}
+{% block views %}
+    {{ itemviews }}
+{% endblock %}
 
 {% block action_bars_inner %}
-    <ul>
+    {% if item_name %}
+        {% set title = _("Index of subitems of '%(item_name)s'", item_name=item_name) %}
+    {% else %}
+        {% set title = _("Global Index ") %}
+    {% endif %}
+    <h1>{{ title }}</h1>
+
+    <div class="moin-index-menu">
         {% if dirs or files %}
-            <li class="action-bar">
-                <div class="moin-select-all">
-                    <span class="moin-select-allitem allitem-toselect" title="{{ _("Select All") }}">{{ _("Select All") }}</span>
-                </div>
-            </li>
+            <a href="#" class="moin-select-allitem allitem-toselect moin-button">
+               <i class="fa fa-square-o fa-lg"></i>
+               <span class="moin-select-button-text">{{ _("Select All") }}</span>
+            </a>
+            <a class="moin-button" id="moin-download-trigger" href="#">
+               <i class="fa fa-download fa-lg"></i>
+               {{ _("Download") }}
+            </a>
+            <a class="moin-action-tab moin-button" id="moin-delete-trigger"
+               data-actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}" href="#">
+               <i class="fa fa-minus-circle fa-lg"></i>
+               {{ _("Delete") }}
+            </a>
+            <a class="moin-action-tab moin-button"
+               id="moin-destroy-trigger"
+               data-actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}" href="#">
+               <i class="fa fa-times-circle fa-lg"></i>
+               {{ _("Destroy") }}
+            </a>
         {% 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>
-                    {% if dirs or files %}
-                        <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>
-                    {% endif %}
-                </ul>
-            </div>
-        </li>
-        <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="get", 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(form['contenttype']) }}
-                    </ul>
-                    {{ forms.render_submit(form) }}
-                {{ gen.form.close() }}
-            </div>
-        </li>
-    </ul>
+        <a class="moin-button" id="moin-create-new-item" href="#">
+           <i class="fa fa-file-o fa-lg"></i>
+           {{ _("New Item") }}
+        </a>
+    </div>
+
+    <div class="moin-contenttypes-wrapper">
+        <span class="moin-ct-hide moin-button">
+
+            <i class="fa fa-filter"></i>
+            {{ _("Filter by content type") }}
+        </span>
+        {% set unknown_items_label = _("items having unknown mime types") %}
+        {{ gen.form.open(form, method="get", action=url_for('frontend.index', item_name=item_name)) }}
+            <ul>
+                {{ forms.render(form['contenttype']) }}
+            </ul>
+
+
+            <a href="#" class="moin-filter-toggle moin-button">
+                <i class="fa fa-refresh"></i>
+                {{ _("Toggle") }}
+            </a>
+            {{ forms.render_submit(form) }}
+        {{ gen.form.close() }}
+    </div>
 {% endblock %}
 
 {% block action_bars %}
-    <div class="moin-align-right">
         {{ self.action_bars_inner() }}
-    </div>
 {% endblock %}
 
 {% macro entry_anchor(type, e) -%}
@@ -70,22 +74,6 @@
 
 {% set maxchars = 16 %}
 
-{% macro render_dir_entry(e) %}
-    <div>
-        <a href="{{ url_for('.index', item_name=e.fullname) }}"
-           name="{{ entry_anchor('dir', e) }}"
-           class="moin-dir-item"
-           title="{{ e.relname }}">
-           {{ e.relname|truncate(maxchars, true, '..') }}
-        </a>
-        {% if e in files %}
-            <a href="#{{ entry_anchor('file', e) }}"
-               title="{{ _("This item itself also matches your filter.") }}">↓
-            </a>
-        {% endif %}
-    </div>
-{% endmacro %}
-
 {% macro render_file_entry(e) %}
     <div>
         <span class="moin-select-item">
@@ -101,7 +89,7 @@
         </a>
         {% if e in dirs %}
             <a href="#{{ entry_anchor('dir', e) }}"
-               title="{{ _("This item also has subitems that match your filter.") }}">↑
+               title="{{ _("This item also has subitems that match your filter.") }}">↓
             </a>
         {% endif %}
     </div>
@@ -112,101 +100,91 @@
     {{ self.action_bars() }}
     <div>
         {% if item_name: %}
-            <h1>{{ title }}</h1>
             <div class="moin-index-path">
+                <i class="fa fa-folder-o"></i>
                 <a href="{{ url_for('frontend.index') }}" title="{{ _("Global Index") }}">{{ ("..") }}</a>
                 <span class="moin-path-separator">{{ ("/") }}</span>
                 {% for i in range(0, item_names|count) %}
                     {% set fullname = item_names[:i+1]|join('/') %}
                     {% set relname = item_names[i] %}
-                    {% if relname.startswith('@') %}
-                        {{ relname }}
-                    {% else %}
-                        <a href="{{ url_for('frontend.index', item_name=fullname) }}" title="{{ relname }}">{{ relname }}</a>
-                    {% endif %}
+                    <a href="{{ url_for('frontend.index', item_name=fullname) }}" title="{{ relname }}">{{ relname }}</a>
                     <span class="moin-path-separator">{{ ("/") }}</span>
                 {% endfor %}
             </div>
-        {% else %}
-            <h1>{{ title }}</h1>
         {% endif %}
     </div>
     <div class='moin-clr'></div>
-    <div id="moin-new-index" class="moin-item-index">
-        <h3 style="display: none;">{{ _("Recently uploaded items") }}</h3>
-        <div class="file_download_template" style="display: none;">
-            <a></a>
+        <div id="moin-new-index" class="moin-item-index">
+            <h3 style="display: none;">{{ _("Recently uploaded items") }}</h3>
+            <div class="file_download_template" style="display: none;">
+                <a></a>
+            </div>
         </div>
-    </div>
     <div class="moin-index-separator"></div>
-    {% if files or dirs %}
-        <div id="moin-initials">
-            {% if not startswith %}
-                <a class="selected" href="{{ url_for('frontend.index', item_name=item_name) }}">{{ _("All") }}</a>
-            {% else %}
-                <a href="{{ url_for('frontend.index', item_name=item_name) }}">{{ _("All") }}</a>
-            {% endif %}
-            {% for initial in initials %}
-                {% if startswith == initial %}
-                    <a class="selected" href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
+        {% if files or dirs %}
+            <div id="moin-initials">
+                {% if not startswith %}
+                    <a class="selected moin-button" href="{{ url_for('frontend.index', item_name=item_name) }}">
+                        <i class="fa fa-th"></i>
+                        {{ _("Show All") }}
+                    </a>
                 {% else %}
-                    <a href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
+                    <a class="moin-button" href="{{ url_for('frontend.index', item_name=item_name) }}">
+                        <i class="fa fa-th"></i>
+                        {{ _("Show All") }}
+                    </a>
                 {% endif %}
-            {% endfor %}
-        </div>
-        {% if dirs %}
-            <div class="moin-item-index">
-                <p>{{ _("These items have subitems that match your filter:") }}</p>
-                {% for e in dirs %}
-                    {{ render_dir_entry(e) }}
+                {% for initial in initials %}
+                    {% if startswith == initial %}
+                        <a class="selected moin-button" href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
+                    {% else %}
+                        <a class="moin-button" href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
+                    {% endif %}
                 {% endfor %}
             </div>
-            <div class="moin-clr"></div>
-            <hr />
-        {% endif %}
-        {% if files %}
-            <div class="moin-item-index">
-                {% for e in files %}
-                    {{ render_file_entry(e) }}
-                {% endfor %}
-            </div>
-            <div class="moin-clr"></div>
+            {% if files %}
+                <div class="moin-item-index">
+                    {% for e in files %}
+                        {{ render_file_entry(e) }}
+                    {% endfor %}
+                </div>
+                <div class="moin-clr"></div>
+            {% endif %}
         {% endif %}
-    {% endif %}
-    <div id="popup">
-        <div id="popup-for-action" class="popup-container">
-            <div class="popup-header">
-                <input type="button" class="popup-closer popup-cancel" value="{{ _("X") }}" title="{{ _("Close") }}"/>
-                <span>{{ _("Please provide comment for this action") }}</span>
+        <div id="popup">
+            <div id="popup-for-action" class="popup-container">
+                <div class="popup-header">
+                    <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">
+                    <input type="text" class="popup-comment" placeholder="{{ _("Enter your comment") }}"/>
+                    <input type="hidden" class="popup-action" value=""/>
+                    <br/>
+                    <input type="button" class="popup-submit" value="{{ _("Submit") }}"/>
+                    <input type="button" class="popup-cancel" value="{{ _("Cancel") }}"/>
+                </div>
             </div>
-            <div class="popup-body">
-                <input type="text" class="popup-comment" placeholder="{{ _("Enter your comment") }}"/>
-                <input type="hidden" class="popup-action" value=""/>
-                <br/>
-                <input type="button" class="popup-submit" value="{{ _("Submit") }}"/>
-                <input type="button" class="popup-cancel" value="{{ _("Cancel") }}"/>
+            <div id="popup-for-newitem" class="popup-container">
+                <div class="popup-header">
+                    <input type="button" class="popup-closer popup-cancel" value="{{ _("X") }}" title="{{ _("Close") }}"/>
+                    <span>{{ _("Create new item") }}</span>
+                </div>
+                <div class="popup-body">
+                    <form action={{ url_for('.ajaxmodify') }} method="post">
+                        <label for="moin-newitem">{{ _("Item name") }}</label>
+                        {% if item_name %}
+                            <input type="text" id="moin-newitem" name="newitem" placeholder="{{ _("Enter item name here") }}" value="{{ item_name }}/" required="required"/>
+                        {% else %}
+                            <input type="text" id="moin-newitem" name="newitem" placeholder="{{ _("Enter item name here") }}" required="required"/>
+                        {% endif %}
+                        <br/>
+                        <input class="moin-button" type="submit" value="{{ _("Create") }}"/>
+                        <input type="button" class="popup-cancel moin-button" value="{{ _("Cancel") }}"/>
+                    </form>
+                </div>
             </div>
         </div>
-        <div id="popup-for-newitem" class="popup-container">
-            <div class="popup-header">
-                <input type="button" class="popup-closer popup-cancel" value="{{ _("X") }}" title="{{ _("Close") }}"/>
-                <span>{{ _("Create new item") }}</span>
-            </div>
-            <div class="popup-body">
-                <form action={{ url_for('.ajaxmodify') }} method="post">
-                    <label for="moin-newitem">{{ _("Item name") }}</label>
-                    {% if item_name %}
-                        <input type="text" id="moin-newitem" name="newitem" placeholder="{{ _("Enter item name here") }}" value="{{ item_name }}/" required="required"/>
-                    {% else %}
-                        <input type="text" id="moin-newitem" name="newitem" placeholder="{{ _("Enter item name here") }}" required="required"/>
-                    {% endif %}
-                    <br/>
-                    <input type="submit" value="{{ _("Create") }}"/>
-                    <input type="button" class="popup-cancel" value="{{ _("Cancel") }}"/>
-                </form>
-            </div>
-        </div>
-    </div>
 
     <div id="moin-upload-cont">
         {% set submit_url = url_for('.jfu_server', item_name=item_name) %}
--- a/MoinMoin/themes/basic/static/css/theme.css	Fri Jan 02 10:06:48 2015 -0700
+++ b/MoinMoin/themes/basic/static/css/theme.css	Sun Jan 04 09:18:55 2015 -0700
@@ -6739,201 +6739,6 @@
 body {
   height: 100%;
 }
-#filter-btn {
-  background-color: #428bca;
-  border-radius: 3px;
-  display: inline;
-  padding: 10px;
-  color: #ffffff;
-  margin-bottom: 10px;
-}
-.moin-contenttypes-wrapper div {
-  cursor: pointer;
-  display: block;
-}
-.moin-contenttypes-wrapper form {
-  display: none;
-}
-.moin-contenttypes-wrapper form ul {
-  -webkit-padding-start: 0px;
-  -moz-padding-start: 0px;
-  overflow: hidden;
-}
-.moin-contenttypes-wrapper form li {
-  list-style-type: none;
-  float: left;
-  width: 50%;
-  border-radius: 5px;
-  display: inline;
-  padding: 5px;
-  margin-top: 5px;
-}
-.moin-contenttypes-wrapper form li label {
-  cursor: pointer;
-  display: inline;
-  line-height: 1.5em;
-  vertical-align: middle;
-  color: #1e90ff;
-}
-.moin-contenttypes-wrapper form li span {
-  font-size: .8em;
-  display: block;
-}
-.moin-contenttypes-wrapper form .filters {
-  background-color: white;
-  border: none;
-  margin-top: 1em;
-  float: none;
-  display: block;
-}
-.moin-contenttypes-wrapper form .filters .filter-toggle,
-.moin-contenttypes-wrapper form .filters .filter-more {
-  font-size: 1em;
-  background-color: #eeeeee;
-  border: 1px solid #dddddd;
-  padding: 0.5em;
-  border-radius: 0.5em;
-  margin: 0.2em;
-  text-decoration: none;
-}
-.moin-item-index div .moin-select-item {
-  display: inline-block;
-  width: 17px;
-  cursor: default;
-  margin-top: 1em;
-}
-.moin-download-link {
-  display: none;
-}
-.moin-index-message {
-  width: 50%;
-  margin: 1em auto;
-  text-align: center;
-  display: none;
-}
-.moin-index-message span {
-  padding: 4px;
-  background-color: #007cef;
-  color: #ffffff;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-}
-.moin-index-path {
-  margin-left: .5em;
-}
-.moin-index-path:before {
-  content: icon-folder-close;
-  margin: 0.3em;
-}
-.moin-clr {
-  clear: both;
-}
-.moin-item-index {
-  width: 100%;
-  margin-left: 0.5em;
-}
-.moin-item-index div {
-  float: left;
-  width: 16.5em;
-}
-.moin-item-index div .moin-select-item {
-  display: inline-block;
-  width: 17px;
-  cursor: default;
-  margin-top: 1em;
-}
-.moin-index-separator {
-  clear: both;
-  border-top: 1px dashed #ccc;
-  display: none;
-}
-.popup-container {
-  margin: 0;
-  border: 5px solid #428bca;
-  border-radius: 6px 6px 0 0;
-}
-.popup-header {
-  background-color: #428bca;
-  color: #ffffff;
-  padding: 10px;
-  margin: 0;
-}
-input[value="X"] {
-  padding: 0.1px;
-  margin: -0.2em;
-  width: 19px;
-  border-radius: 2em;
-  float: right;
-}
-input[value="X"]:hover {
-  background: #f4f4f4;
-}
-input[type="submit"],
-input[type="button"],
-input button {
-  font-weight: bold;
-  font-size: .75em;
-  background: #aed4fa;
-  padding: 4px 15px;
-  border: 1px solid #00417f;
-  color: #000;
-  border-radius: 6px;
-  cursor: pointer;
-}
-input:hover {
-  box-shadow: 2px 2px 1px #000;
-}
-input:active {
-  position: relative;
-  top: 1px;
-}
-input,
-select {
-  padding: 3px;
-  background: #f4f4f4;
-  border: 1px solid #ccc;
-  border-radius: 2px;
-}
-.popup-body {
-  clear: both;
-  background-color: #f4f4f4;
-  color: #000000;
-  padding: 10px;
-  margin: 0;
-}
-.popup-body label {
-  margin: 5px;
-}
-.popup-body input {
-  margin: 8px 5px;
-}
-#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: #428bca;
-  border-radius: 5px;
-  color: #ffffff;
-  text-decoration: none;
-}
-#popup {
-  background: transparent;
-  padding: 5px;
-  width: 40%;
-  position: absolute;
-  top: 10%;
-  left: 30%;
-  display: none;
-  z-index: 10;
-}
 .moin-error {
   color: #ff2727;
   background: #d6d5d0;
@@ -6946,72 +6751,6 @@
 .moin-textcha {
   padding-top: .2em;
 }
-#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;
-  display: block;
-  box-shadow: 0 0 5px #9d9d9b;
-}
-form.upload_file:hover {
-  box-shadow: 0 0 5px #000;
-}
-form.upload_file input {
-  cursor: pointer;
-  height: 100%;
-  margin: 0;
-  opacity: 0;
-  position: absolute;
-}
-form.upload_file button {
-  display: none;
-}
-.file_upload_template .file_upload_start {
-  visibility: hidden;
-  border-width: 0;
-  padding: 0;
-}
-.file_upload_template .file_upload_start button {
-  width: 0;
-}
-.file_name {
-  word-break: break-all;
-  word-wrap: break-word;
-  max-width: 10em;
-}
-.upload-form {
-  display: none;
-}
-.moin-drag {
-  font-size: .7em;
-  color: #9d9d9b;
-}
-#lightbox {
-  background: #f4f4f4;
-  opacity: .7;
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 9;
-  margin: 0;
-  display: none;
-}
 .moin-content {
   padding-bottom: 10%;
 }
--- a/MoinMoin/themes/basic/static/custom-less/theme.less	Fri Jan 02 10:06:48 2015 -0700
+++ b/MoinMoin/themes/basic/static/custom-less/theme.less	Sun Jan 04 09:18:55 2015 -0700
@@ -321,227 +321,6 @@
 html, body {
   height: 100%;
 }
-// CSS definitions for Index UI borrowed from foobar and modernized theme
-#filter-btn {
-  background-color: @bootstrap_default_blue;
-  border-radius: 3px;
-  display: inline;
-  padding: 10px;
-  color: @white;
-  margin-bottom: 10px;
-}
-.moin-contenttypes-wrapper {
-
-  div {
-    cursor: pointer;
-    display: block;
-  }
-
-  form {
-    display: none;
-
-    ul {
-      -webkit-padding-start: 0px;
-      -moz-padding-start: 0px;
-      overflow: hidden;
-    }
-
-    li {
-
-      list-style-type: none;
-      float: left;
-      width: 50%;
-      border-radius: 5px;
-      display: inline;
-      padding: 5px;
-      margin-top: 5px;
-
-      label {
-        cursor:  pointer;
-        display: inline;
-        line-height: 1.5em;
-        vertical-align: middle;
-        color: #1e90ff;
-      }
-
-      span {
-        font-size: .8em;
-        display: block;
-      }
-
-    }
-
-    .filters {
-      background-color: white;
-      border: none;
-      margin-top: 1em;
-      float: none;
-      display: block;
-
-      .filter-toggle, .filter-more {
-        font-size: 1em;
-        background-color: #eeeeee;
-        border: 1px solid #dddddd;
-        padding: 0.5em;
-        border-radius: 0.5em;
-        margin: 0.2em;
-        text-decoration: none;
-      }
-    }
-  }
-}
-.moin-item-index div {
-
-  .moin-select-item {
-    display: inline-block;
-    width: 17px;
-    cursor: default;
-    margin-top: 1em;
-  }
-}
-.moin-download-link {
-  display: none;
-}
-.moin-index-message {
-  width: 50%;
-  margin: 1em auto;
-  text-align: center;
-  display: none;
-
-  span {
-    padding: 4px;
-    background-color: #007cef;
-    color: @white;
-    border: 1px solid #ccc;
-    border-radius: 5px;
-  }
-}
-.moin-index-path {
-  margin-left: .5em;
-
-  &:before {
-    content: icon-folder-close;
-    margin: 0.3em
-  }
-}
-.moin-clr {
-  clear: both;
-}
-.moin-item-index {
-  width: 100%;
-  margin-left: 0.5em;
-
-  div {
-    float: left;
-    width: 16.5em;
-
-    .moin-select-item {
-      display: inline-block;
-      width: 17px;
-      cursor: default;
-      margin-top: 1em;
-    }
-  }
-}
-.moin-index-separator {
-  clear: both;
-  border-top: 1px dashed #ccc;
-  display: none;
-}
-.popup-container {
-  margin: 0;
-  border: 5px solid @bootstrap_default_blue;
-  border-radius: 6px 6px 0 0;
-}
-.popup-header {
-  background-color: @bootstrap_default_blue;
-  color: @white;
-  padding: 10px;
-  margin: 0;
-}
-input {
-
-  &[value="X"] {
-    padding: 0.1px;
-    margin: -.2em;
-    width: 19px;
-    border-radius: 2em;
-    float: right;
-
-    &:hover {
-      background: #f4f4f4;
-    }
-  }
-
-  &[type="submit"],&[type="button"],button {
-    font-weight: bold;
-    font-size: .75em;
-    background: #aed4fa;
-    padding: 4px 15px;
-    border: 1px solid #00417f;
-    color: #000;
-    border-radius: 6px;
-    cursor: pointer;
-  }
-
-  &:hover {
-    box-shadow: 2px 2px 1px #000;
-  }
-
-  &:active {
-    position: relative;
-    top: 1px;
-  }
-}
-input,select {
-  padding: 3px;
-  background: #f4f4f4;
-  border: 1px solid #ccc;
-  border-radius: 2px;
-}
-.popup-body {
-  clear: both;
-  background-color: #f4f4f4;
-  color: #000000;
-  padding: 10px;
-  margin: 0;
-
-  label {
-    margin: 5px;
-  }
-
-  input {
-    margin: 8px 5px;
-  }
-}
-#moin-initials {
-  width: 90%;
-  margin: 5px auto;
-  text-align: center;
-
-  a {
-    display: inline-block;
-    margin: 0;
-    padding: 4px 5px;
-
-    &:hover,&.selected {
-      background: @bootstrap_default_blue;
-      border-radius: 5px;
-      color: @white;
-      text-decoration: none
-    }
-  }
-}
-#popup {
-  background: transparent;
-  padding: 5px;
-  width: 40%;
-  position: absolute;
-  top: 10%;
-  left: 30%;
-  display: none;
-  z-index: 10;
-}
 .moin-error {
   color: #ff2727;
   background: #d6d5d0;
@@ -554,76 +333,6 @@
 .moin-textcha {
   padding-top: .2em;
 }
-#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;
-  display: block;
-  box-shadow: 0 0 5px #9d9d9b;
-
-  &:hover {
-    box-shadow: 0 0 5px #000;
-  }
-
-  input {
-    cursor: pointer;
-    height: 100%;
-    margin: 0;
-    opacity: 0;
-    position: absolute;
-  }
-
-  button {
-    display: none
-  }
-}
-.file_upload_template .file_upload_start {
-  visibility: hidden;
-  border-width: 0;
-  padding: 0;
-
-  button {
-    width: 0;
-  }
-}
-.file_name {
-  word-break: break-all;
-  word-wrap: break-word;
-  max-width: 10em;
-}
-.upload-form {
-  display: none;
-}
-.moin-drag {
-  font-size: .7em;
-  color: #9d9d9b;
-}
-#lightbox {
-  background: #f4f4f4;
-  opacity: .7;
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 9;
-  margin: 0;
-  display: none
-}
 .moin-content {
   padding-bottom: 10%;
 }
--- a/MoinMoin/themes/basic/templates/index.html	Fri Jan 02 10:06:48 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,244 +0,0 @@
-{% extends theme("layout.html") %}
-{% import "forms.html" as forms with context %}
-{% import theme("itemviews.html") as itemviews with context %}
-
-{% block views %}
-    {{ itemviews }}
-{% endblock %}
-
-{% block action_bars_inner %}
-    {% if item_name %}
-        {% set title = _("Index of subitems of '%(item_name)s'", item_name=item_name) %}
-    {% else %}
-        {% set title = _("Global Index ") %}
-    {% endif %}
-    <h1>{{ title }}</h1>
-    <nav class="navbar navbar-default" role="navigation">
-        <div class="container-fluid moin-index-actions">
-            <div class="collapse navbar-collapse">
-                <ul class="nav navbar-nav">
-                    {% if dirs or files %}
-                        <li class="moin-select-all"><a href="#" class="moin-select-allitem allitem-toselect">
-                           <span class="fa fa-check"></span>
-                           {{ _("Select All") }}</a>
-                        </li>
-                    {% endif %}
-                    <li class="moin-select-actions"><a id="moin-create-newitem" href="#">
-                           <span class="fa fa-file"></span>
-                           {{ _("New Item") }}</a>
-                    </li>
-                    {% if dirs or files %}
-                        <li><a id="moin-download-trigger" href="#">
-                               <span class="fa fa-download"></span>
-                               {{ _("Download") }}</a>
-                        </li>
-                        <li><a class="moin-action-tab"
-                               id="moin-delete-trigger"
-                               data-actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}" href="#">
-                               <span class="fa fa-minus-circle"></span>
-                               {{ _("Delete") }}</a>
-                        </li>
-                        <li><a class="moin-action-tab"
-                               id="moin-destroy-trigger"
-                               data-actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}" href="#">
-                               <span class="fa fa-times-circle"></span>
-                               {{ _("Destroy") }}</a>
-                        </li>
-                   {% endif %}
-                </ul>
-            </div>
-        </div>
-    </nav>
-    <div class="moin-contenttypes-wrapper">
-        <div class="ct-hide" id="filter-btn">
-            <span class="fa fa-filter"></span>
-            {{ _("Filter by content type") }}
-        </div>
-        {% set unknown_items_label = _("items having unknown mime types") %}
-        {{ gen.form.open(form, method="get", action=url_for('frontend.index', item_name=item_name)) }}
-            <ul>
-                <li class="filters">
-                    <a href="#" class="filter-toggle">
-                        <span class="fa fa-refresh" style="display:inline;"></span>
-                        {{ _("Toggle") }}
-                    </a>
-                    <a href="#" class="filter-more">
-                        <span class="fa fa-plus" style="display:inline;"></span>
-                        {{ _("More") }}
-                    </a>
-                </li>
-                {{ forms.render(form['contenttype']) }}
-            </ul>
-            {{ forms.render_submit(form) }}
-        {{ gen.form.close() }}
-    </div>
-{% endblock %}
-
-{% block action_bars %}
-    <div class="moin-align-right">
-        {{ self.action_bars_inner() }}
-    </div>
-{% endblock %}
-
-{% macro entry_anchor(type, e) -%}
-    index-{{ type }}-{{ e.meta['itemid'] }}
-{%- endmacro %}
-
-{% set maxchars = 16 %}
-
-{% macro render_dir_entry(e) %}
-    <div>
-        <a href="{{ url_for('.index', item_name=e.fullname) }}"
-           class="moin-dir-item"
-           title="{{ e.relname }}">
-           {{ e.relname|truncate(maxchars, true, '..') }}
-        </a>
-        {% if e in files %}
-            <a href="#{{ entry_anchor('file', e) }}"
-               title="{{ _("This item itself also matches your filter.") }}">↓
-            </a>
-        {% endif %}
-    </div>
-{% endmacro %}
-
-{% macro render_file_entry(e) %}
-    <div>
-        <span class="moin-select-item">
-            <input type="checkbox">
-        </span>
-        {% set mimetype = "application/x.moin.download" %}
-        <a href="{{ url_for('.download_item', item_name=e.fullname, mimetype=mimetype) }}" class="moin-download-link">
-        </a>
-        <a href="{{ url_for('.show_item', item_name=e.fullname) }}"
-           class="{{ e.meta['contenttype']|contenttype_to_class }} moin-itemtype-{{ e.meta['itemtype'] }} moin-item"
-           title="{{ e.relname }}">
-           {{ e.relname|truncate(maxchars, true, '..') }}
-        </a>
-        {% if e in dirs %}
-            <a href="#{{ entry_anchor('dir', e) }}"
-               title="{{ _("This item also has subitems that match your filter.") }}">↑
-            </a>
-        {% endif %}
-    </div>
-{% endmacro %}
-
-{% block content %}
-    <div class="moin-index-message"><span></span></div>
-    {{ self.action_bars() }}
-    <div>
-        {% if item_name: %}
-            <div class="moin-index-path">
-                <span class="fa fa-folder-o"></span>
-                <a href="{{ url_for('frontend.index') }}" title="{{ _("Global Index") }}">{{ ("..") }}</a>
-                <span class="moin-path-separator">{{ ("/") }}</span>
-                {% for i in range(0, item_names|count) %}
-                    {% set fullname = item_names[:i+1]|join('/') %}
-                    {% set relname = item_names[i] %}
-                    <a href="{{ url_for('frontend.index', item_name=fullname) }}" title="{{ relname }}">{{ relname }}</a>
-                    <span class="moin-path-separator">{{ ("/") }}</span>
-                {% endfor %}
-            </div>
-        {% endif %}
-    </div>
-    <div class='moin-clr'></div>
-        <div id="moin-new-index" class="moin-item-index">
-            <h3 style="display: none;">{{ _("Recently uploaded items") }}</h3>
-            <div class="file_download_template" style="display: none;">
-                <a></a>
-            </div>
-        </div>
-    <div class="moin-index-separator"></div>
-        {% if files or dirs %}
-            <div id="moin-initials">
-                {% if not startswith %}
-                    <a class="selected" href="{{ url_for('frontend.index', item_name=item_name) }}">
-                        <span class="fa fa-th"></span>
-                        {{ _("Show All") }}
-                    </a>
-                {% else %}
-                    <a href="{{ url_for('frontend.index', item_name=item_name) }}">
-                        <span class="fa fa-th"></span>
-                        {{ _("Show All") }}
-                    </a>
-                {% endif %}
-                {% for initial in initials %}
-                    {% if startswith == initial %}
-                        <a class="selected" href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
-                    {% else %}
-                        <a href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
-                    {% endif %}
-                {% endfor %}
-            </div>
-            {% if dirs %}
-                <div class="moin-item-index">
-                    <p>{{ _("These items have subitems that match your filter:") }}</p>
-                        {% for e in dirs %}
-                            {{ render_dir_entry(e) }}
-                        {% endfor %}
-                </div>
-                <div class="moin-clr"></div>
-                <hr />
-            {% endif %}
-            {% if files %}
-                <div class="moin-item-index">
-                    {% for e in files %}
-                        {{ render_file_entry(e) }}
-                    {% endfor %}
-                </div>
-                <div class="moin-clr"></div>
-            {% endif %}
-        {% endif %}
-        <div id="popup">
-            <div id="popup-for-action" class="popup-container">
-                <div class="popup-header">
-                    <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">
-                    <input type="text" class="popup-comment" placeholder="{{ _("Enter your comment") }}"/>
-                    <input type="hidden" class="popup-action" value=""/>
-                    <br/>
-                    <input type="button" class="popup-submit" value="{{ _("Submit") }}"/>
-                    <input type="button" class="popup-cancel" value="{{ _("Cancel") }}"/>
-                </div>
-            </div>
-            <div id="popup-for-newitem" class="popup-container">
-                <div class="popup-header">
-                    <input type="button" class="popup-closer popup-cancel" value="{{ _("X") }}" title="{{ _("Close") }}"/>
-                    <span>{{ _("Create new item") }}</span>
-                </div>
-                <div class="popup-body">
-                    <form action={{ url_for('.ajaxmodify') }} method="post">
-                        <label for="moin-newitem">{{ _("Item name") }}</label>
-                        {% if item_name %}
-                            <input type="text" id="moin-newitem" name="newitem" placeholder="{{ _("Enter item name here") }}" value="{{ item_name }}/" required="required"/>
-                        {% else %}
-                            <input type="text" id="moin-newitem" name="newitem" placeholder="{{ _("Enter item name here") }}" required="required"/>
-                        {% endif %}
-                        <br/>
-                        <input type="submit" value="{{ _("Create") }}"/>
-                        <input type="button" class="popup-cancel" value="{{ _("Cancel") }}"/>
-                    </form>
-                </div>
-            </div>
-        </div>
-
-    <div id="moin-upload-cont">
-        {% set submit_url = url_for('.jfu_server', item_name=item_name) %}
-        {{ forms.render_file_uploader(submit_url) }}
-    </div>
-    <span class="moin-drag">{{ _("(Drag and drop multiple files to this white area to upload them.)") }}</span>
-    <div id="lightbox">&nbsp;</div>
-{% endblock %}
-
-{% block body_scripts %}
-    {{ super() }}
-    <script src="{{ url_for('static', filename='js/index_action.js') }}"></script>
-    <script src="{{ url_for('static', filename='js/jfu.js') }}"></script>
-    {{ forms.file_uploader_scripts() }}
-{% endblock %}
-
-{% block head %}
-    {{ super() }}
-    {{ forms.file_uploader_styles() }}
-{% endblock %}
--- a/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Fri Jan 02 10:06:48 2015 -0700
+++ b/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Sun Jan 04 09:18:55 2015 -0700
@@ -440,367 +440,13 @@
 .moin-offset-links a:hover
     box-shadow 0px 0px 12px shadow_color
 
-.moin-clr
-    clear both
-
-.moin-select-all
-    padding 0.5em
-    color link_color
-    background table_bg_color
-    border border_style
-    text-align left
-
-.moin-select-actions
-    position relative
-    margin 0 1em
-    padding 0
-    background table_bg_color
-    z-index 2
-    white-space nowrap
-    color link_color
-    text-align left
-
-.moin-select-actions div
-    margin 0
-    padding 0.5em
-    border 1px groove border_color
-
-.moin-select-actions
-    &div:hover
-        background table_row_color
-        color hover_color
-    &.action-visible div
-        color font_color
-
-.moin-select-actions .show-action
-    cursor pointer
-    &:hover
-        color hover_color
-
-.show-action:after
-    content url("../img/moin-moveup.png")
-    margin 0 0.2em
-
-.action-visible .show-action:after
-    content url("../img/moin-movedown.png")
-    margin 0 0.2em
-
-.moin-select-allitem
-    display inline-block
-    cursor default
-    text-align left
-
-.allitem-selected:after
-    content url("../img/moin-checkbox-on.png")
-    margin 0 0.2em
-
-.allitem-toselect:after
-    content url("../img/moin-checkbox-off.png")
-    margin 0 0.2em
-
-.moin-select-actions ul
-    position absolute
-    float right
-    left 0
-    background page_color
-    border border_style
-    z-index 1
-    display none
-
-.moin-select-actions ul li
-    display list-item
-    list-style-type none
-    padding 0.5em
-    width 5em
-    cursor pointer
-
-.moin-select-actions ul li:hover
-    background-color table_bg_color
-    color link_color
-
-.moin-index-message
-    width 50%
-    margin 1em auto
-    text-align center
-    display none
-
-.moin-index-message span
-    padding 4px
-    background-color table_row_color
-    color font_color
-
-.moin-download-link
-    display none
-
-#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 link_color
-    border-radius 5px
-    color heading_color
-    text-decoration none
-
-.moin-item-index
-    width 99%
-    margin-left 0.5%
-
-.moin-item-index div
-    float left
-    width 15em
-
-.moin-item-index div .moin-select-item
-    display inline-block
-    width 17px
-    cursor default
-
-.moin-align-right
-    text-align right
-    float right
-
-.moin-align-right ul
-    margin 0
-    padding 0
-
-.moin-align-right ul li.action-bar
-    list-style-type none
-    display inline-block
-    *display: inline; // IE7 hack to display index action bar in a row ...
-    zoom: 1; // IE7 hack ... rather than a column
-
-.moin-contenttypes-wrapper
-    position relative
-    margin 0
-    color link_color
-    background table_bg_color
-    border border_style
-    min-width 12em
-    text-align left
-
-.moin-contenttypes-wrapper div
-    cursor pointer
-    margin 0.1em
-    padding 0.5em 1.2em 0.5em 0.5em
-    height 1em
-
-div.ct-shown
-    background table_row_color url("../img/moin-movedown.png") no-repeat center right
-    color font_color
-
-div.ct-hide
-    background transparent url("../img/moin-moveup.png") no-repeat center right
-
-.moin-contenttypes-wrapper form
-    position absolute
-    float right
-    max-width 12.5em
-    border-top border_style
-    z-index 2
-    background page_color
-    border border_style
-    padding .2em
-    display none
-
-.moin-contenttypes-wrapper ul li
-    list-style-type none
-    padding 0.3em
-    min-width 11.5em
-
-.moin-contenttypes-wrapper ul li label
-    display inline
-    vertical-align middle
-
-.moin-contenttypes-wrapper ul li .helper-text
-    font-size 0.7em
-    color footer_color
-    display block
-
-.moin-contenttypes-wrapper ul li:hover
-    background table_bg_color
-
-.moin-contenttypes-wrapper ul li:hover .helper-text
-    display block
-
-.moin-contenttypes-wrapper ul li a
-    font-size 80%
-
-.moin-contenttypes-wrapper form input[type="submit"]
-    margin-left 22%
-    padding-left 20%
-    padding-right 20%
-
-.moin-contenttypes-wrapper:hover div
-    background-color table_row_color
-    color hover_color
-
-.filter-toggle
-    margin 0 0.2em
-    font-size 90%
-
-.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-index-path
-    margin-left 0.5em
-
-.moin-index-path:before
-    content url("../img/moin-parent.png")
-    margin 0 0.3em
-
-.moin-path-separator
-    font-size 120%
-    color link_color
-
-.moin-index-separator
-    clear both
-    border-top border_style
-    width 99%
-    margin-left .5%
-    display none
-
 .moin-transclusion
     max-width 100%
 
-#moin-upload-cont
-    min-height 10px
-
-#file_upload
-    margin-top 2em
-
-form.upload_file
-    background-color header_bg_color
-    border 1px solid border_color
-    color panel_item_color
-    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 header_bg_color
-
-form.upload_file:hover
-    color heading_color
-
-form.upload_file input
-    cursor pointer
-    height 100%
-    margin 0
-    opacity 0
-    position absolute
-    right 0
-    top 0
-
-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 footer_color
-
 a.moin-conflict:before
     content url(../img/moin-conflict.png)
     margin 0 0.2em
 
-#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
-    font-size 1em
-    padding 10px
-    margin 0
-
-.popup-closer
-    color heading_color
-    font-size 1em
-    padding 1px 4px
-    margin 0
-    float right
-    cursor pointer
-    border border_style
-
-.popup-closer:hover
-    background-color hover_color
-    color panel_item_color
-
-.popup-body
-    clear both
-    background-color page_color
-    color font_color
-    padding 10px
-    margin 0
-
-.popup-body label
-    margin 5px
-    display block
-    font-weight bold
-
-.popup-body input
-    margin 8px 5px
-    padding 3px
-    border border_style
-
-.popup-body input[type="text"]
-    width 300px
-
-.popup-body input.blank
-    border-color border_color
-    border-width 2px
-
-.popup-container
-    margin 0
-
-#lightbox
-    background page_color
-    opacity 0.7
-    position absolute
-    left 0
-    top 0
-    width 100%
-    height 100%
-    z-index 9
-    margin 0
-    display none
-
 #moin-flash
     margin -2px -15px -2px -14px
 
--- a/MoinMoin/themes/modernized/static/css/theme.css	Fri Jan 02 10:06:48 2015 -0700
+++ b/MoinMoin/themes/modernized/static/css/theme.css	Sun Jan 04 09:18:55 2015 -0700
@@ -383,78 +383,8 @@
 .moin-offset-links{float:right;margin-right:20px}
 .moin-offset-links a{margin-right:10px;padding:3px 7px;font-size:20px;background:#fff;border:1px groove #4e7da9;border-radius:5px}
 .moin-offset-links a:hover{box-shadow:0 0 12px #9d9d9b}
-.moin-clr{clear:both}
-.moin-select-all{padding:.5em;color:#00008b;background:#eef1f6;border:1px solid #4e7da9;text-align:left}
-.moin-select-actions{position:relative;margin:0 1em;padding:0;background:#eef1f6;z-index:2;white-space:nowrap;color:#00008b;text-align:left}
-.moin-select-actions div{margin:0;padding:.5em;border:1px groove #4e7da9}
-.moin-select-actionsdiv:hover{background:#d8dfe9;color:#1f9ae0}
-.moin-select-actions.action-visible div{color:#000}
-.moin-select-actions .show-action{cursor:pointer;}
-.moin-select-actions .show-action:hover{color:#1f9ae0}
-.show-action:after{content:url("../img/moin-moveup.png");margin:0 .2em}
-.action-visible .show-action:after{content:url("../img/moin-movedown.png");margin:0 .2em}
-.moin-select-allitem{display:inline-block;cursor:default;text-align:left}
-.allitem-selected:after{content:url("../img/moin-checkbox-on.png");margin:0 .2em}
-.allitem-toselect:after{content:url("../img/moin-checkbox-off.png");margin:0 .2em}
-.moin-select-actions ul{position:absolute;float:right;left:0;background:#fff;border:1px solid #4e7da9;z-index:1;display:none}
-.moin-select-actions ul li{display:list-item;list-style-type:none;padding:.5em;width:5em;cursor:pointer}
-.moin-select-actions ul li:hover{background-color:#eef1f6;color:#00008b}
-.moin-index-message{width:50%;margin:1em auto;text-align:center;display:none}
-.moin-index-message span{padding:4px;background-color:#d8dfe9;color:#000}
-.moin-download-link{display:none}
-#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:#00008b;border-radius:5px;color:#fff;text-decoration:none}
-.moin-item-index{width:99%;margin-left:.5%}
-.moin-item-index div{float:left;width:15em}
-.moin-item-index div .moin-select-item{display:inline-block;width:17px;cursor:default}
-.moin-align-right{text-align:right;float:right}
-.moin-align-right ul{margin:0;padding:0}
-.moin-align-right ul li.action-bar{list-style-type:none;display:inline-block;*display:inline;zoom:1}
-.moin-contenttypes-wrapper{position:relative;margin:0;color:#00008b;background:#eef1f6;border:1px solid #4e7da9;min-width:12em;text-align:left}
-.moin-contenttypes-wrapper div{cursor:pointer;margin:.1em;padding:.5em 1.2em .5em .5em;height:1em}
-div.ct-shown{background:#d8dfe9 url("../img/moin-movedown.png") no-repeat center right;color:#000}
-div.ct-hide{background:transparent url("../img/moin-moveup.png") no-repeat center right}
-.moin-contenttypes-wrapper form{position:absolute;float:right;max-width:12.5em;border-top:1px solid #4e7da9;z-index:2;background:#fff;border:1px solid #4e7da9;padding:.2em;display:none}
-.moin-contenttypes-wrapper ul li{list-style-type:none;padding:.3em;min-width:11.5em}
-.moin-contenttypes-wrapper ul li label{display:inline;vertical-align:middle}
-.moin-contenttypes-wrapper ul li .helper-text{font-size:.7em;color:#737373;display:block}
-.moin-contenttypes-wrapper ul li:hover{background:#eef1f6}
-.moin-contenttypes-wrapper ul li:hover .helper-text{display:block}
-.moin-contenttypes-wrapper ul li a{font-size:80%}
-.moin-contenttypes-wrapper form input[type="submit"]{margin-left:22%;padding-left:20%;padding-right:20%}
-.moin-contenttypes-wrapper:hover div{background-color:#d8dfe9;color:#1f9ae0}
-.filter-toggle{margin:0 .2em;font-size:90%}
-.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-index-path{margin-left:.5em}
-.moin-index-path:before{content:url("../img/moin-parent.png");margin:0 .3em}
-.moin-path-separator{font-size:120%;color:#00008b}
-.moin-index-separator{clear:both;border-top:1px solid #4e7da9;width:99%;margin-left:.5%;display:none}
 .moin-transclusion{max-width:100%}
-#moin-upload-cont{min-height:10px}
-#file_upload{margin-top:2em}
-form.upload_file{background-color:#00417f;border:1px solid #4e7da9;color:#cfcfcf;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 #00417f}
-form.upload_file:hover{color:#fff}
-form.upload_file input{cursor:pointer;height:100%;margin:0;opacity:0;position:absolute;right:0;top:0}
-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:#737373}
 a.moin-conflict:before{content:url("../img/moin-conflict.png");margin:0 .2em}
-#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:#00417f;color:#fff;font-size:1em;padding:10px;margin:0}
-.popup-closer{color:#fff;font-size:1em;padding:1px 4px;margin:0;float:right;cursor:pointer;border:1px solid #4e7da9}
-.popup-closer:hover{background-color:#1f9ae0;color:#cfcfcf}
-.popup-body{clear:both;background-color:#fff;color:#000;padding:10px;margin:0}
-.popup-body label{margin:5px;display:block;font-weight:bold}
-.popup-body input{margin:8px 5px;padding:3px;border:1px solid #4e7da9}
-.popup-body input[type="text"]{width:300px}
-.popup-body input.blank{border-color:#4e7da9;border-width:2px}
-.popup-container{margin:0}
-#lightbox{background:#fff;opacity:.7;position:absolute;left:0;top:0;width:100%;height:100%;z-index:9;margin:0;display:none}
 #moin-flash{margin:-2px -15px -2px -14px}
 .moin-flash{margin:0;padding:6px 6px 6px 38px;background-color:#d8dfe9;border-bottom:1px solid #4e7da9;background-repeat:no-repeat;background-position:16px center;border-top-right-radius:9px;border-top-left-radius:9px;color:#000}
 .moin-flash-hint{background-image:url("../img/smileys/idea.png")}