changeset 2836:796a977ac521

merge
author RogerHaase <haaserd@gmail.com>
date Tue, 21 Oct 2014 09:04:50 -0700
parents f5b310b4dcd1 (current diff) 615599f53b07 (diff)
children 03e10af41cad
files
diffstat 5 files changed, 33 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/admin/views.py	Sun Oct 19 08:08:00 2014 -0700
+++ b/MoinMoin/apps/admin/views.py	Tue Oct 21 09:04:50 2014 -0700
@@ -254,7 +254,7 @@
 
 def _trashed(namespace):
     q = And([Term(WIKINAME, app.cfg.interwikiname), Term(TRASH, True)])
-    if not namespace == NAMESPACE_ALL:
+    if namespace != NAMESPACE_ALL:
         q = And([q, Term(NAMESPACE, namespace), ])
     trashedEntry = namedtuple('trashedEntry', 'fqname oldname revid mtime comment editor')
     results = []
--- a/MoinMoin/templates/search.html	Sun Oct 19 08:08:00 2014 -0700
+++ b/MoinMoin/templates/search.html	Tue Oct 21 09:04:50 2014 -0700
@@ -16,7 +16,7 @@
             {{ forms.render(medium_search_form['q']) }}
             {{ forms.render_submit(medium_search_form) }}
         </p>
-        <div class="moin-search-option-bar"><h4 style="display:inline-block">Search Options</h4><span class="icon-chevron-down"></span></div>
+        <div class="moin-search-option-bar"><h4 style="display:inline-block">Search Options</h4><span class="fa fa-chevron-down"></span></div>
         <div class="moin-searchoptions hidden">
             <table>
                 <tr colspan="4">
--- a/MoinMoin/themes/__init__.py	Sun Oct 19 08:08:00 2014 -0700
+++ b/MoinMoin/themes/__init__.py	Tue Oct 21 09:04:50 2014 -0700
@@ -203,25 +203,25 @@
         return user_actions, item_navigation, item_actions
 
     def get_endpoint_iconmap(self):
-        icon = {'frontend.quicklink_item': "icon-star-empty",
-                'frontend.subscribe_item': "icon-envelope",
-                'frontend.index': "icon-list-alt",
-                'frontend.sitemap': "icon-sitemap",
-                'frontend.rename_item': "icon-tag",
-                'frontend.delete_item': "icon-trash",
-                'frontend.destroy_item': "icon-fire",
-                'frontend.similar_names': "icon-search",
-                'frontend.download_item': "icon-download-alt",
-                'frontend.copy_item': "icon-comment",
-                'special.supplementation': "icon-comments",
-                'frontend.show_item': "icon-eye-open",
-                'frontend.modify_item': "icon-pencil",
-                'frontend.history': "icon-time",
-                'frontend.show_item_meta': "icon-wrench",
-                'frontend.highlight_item': "icon-code",
-                'frontend.backrefs': "icon-share",
-                'special.comments': "icon-comment",
-                'special.transclusions': "icon-edit", }
+        icon = {'frontend.quicklink_item': "fa fa-star-o",
+                'frontend.subscribe_item': "fa fa-envelope-o",
+                'frontend.index': "fa fa-list-alt",
+                'frontend.sitemap': "fa fa-sitemap",
+                'frontend.rename_item': "fa fa-tag",
+                'frontend.delete_item': "fa fa-trash-o",
+                'frontend.destroy_item': "fa fa-fire",
+                'frontend.similar_names': "fa fa-search",
+                'frontend.download_item': "fa fa-download",
+                'frontend.copy_item': "fa fa-comment-o",
+                'special.supplementation': "fa fa-comments-o",
+                'frontend.show_item': "fa fa-eye",
+                'frontend.modify_item': "fa fa-pencil",
+                'frontend.history': "fa fa-clock-o",
+                'frontend.show_item_meta': "fa fa-wrench",
+                'frontend.highlight_item': "fa fa-code",
+                'frontend.backrefs': "fa fa-share",
+                'special.comments': "fa fa-comment-o",
+                'special.transclusions': "fa fa-edit", }
         return icon
 
     def location_breadcrumbs(self, fqname):
--- a/MoinMoin/themes/basic/templates/index.html	Sun Oct 19 08:08:00 2014 -0700
+++ b/MoinMoin/themes/basic/templates/index.html	Tue Oct 21 09:04:50 2014 -0700
@@ -19,29 +19,29 @@
                 <ul class="nav navbar-nav">
                     {% if dirs or files %}
                         <li class="moin-select-all"><a href="#" class="moin-select-allitem allitem-toselect">
-                           <span class="icon-ok"></span>
+                           <span class="fa fa-check"></span>
                            {{ _("Select All") }}</a>
                         </li>
                     {% endif %}
                     <li class="moin-select-actions"><a id="moin-create-newitem" href="#">
-                           <span class="icon-file"></span>
+                           <span class="fa fa-file"></span>
                            {{ _("New Item") }}</a>
                     </li>
                     {% if dirs or files %}
                         <li><a id="moin-download-trigger" href="#">
-                               <span class="icon-download-alt"></span>
+                               <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="icon-minus-sign"></span>
+                               <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="icon-remove-sign"></span>
+                               <span class="fa fa-times-circle"></span>
                                {{ _("Destroy") }}</a>
                         </li>
                    {% endif %}
@@ -51,7 +51,7 @@
     </nav>
     <div class="moin-contenttypes-wrapper">
         <div class="ct-hide" id="filter-btn">
-            <span class="icon-filter"></span>
+            <span class="fa fa-filter"></span>
             {{ _("Filter by content type") }}
         </div>
         {% set unknown_items_label = _("items having unknown mime types") %}
@@ -59,11 +59,11 @@
             <ul>
                 <li class="filters">
                     <a href="#" class="filter-toggle">
-                        <span class="icon-refresh" style="display:inline;"></span>
+                        <span class="fa fa-refresh" style="display:inline;"></span>
                         {{ _("Toggle") }}
                     </a>
                     <a href="#" class="filter-more">
-                        <span class="icon-plus" style="display:inline;"></span>
+                        <span class="fa fa-plus" style="display:inline;"></span>
                         {{ _("More") }}
                     </a>
                 </li>
@@ -128,7 +128,7 @@
     <div>
         {% if item_name: %}
             <div class="moin-index-path">
-                <span class="icon icon-folder-close"></span>
+                <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) %}
@@ -152,12 +152,12 @@
             <div id="moin-initials">
                 {% if not startswith %}
                     <a class="selected" href="{{ url_for('frontend.index', item_name=item_name) }}">
-                        <span class="icon-th"></span>
+                        <span class="fa fa-th"></span>
                         {{ _("Show All") }}
                     </a>
                 {% else %}
                     <a href="{{ url_for('frontend.index', item_name=item_name) }}">
-                        <span class="icon-th"></span>
+                        <span class="fa fa-th"></span>
                         {{ _("Show All") }}
                     </a>
                 {% endif %}
--- a/MoinMoin/util/paramparser.py	Sun Oct 19 08:08:00 2014 -0700
+++ b/MoinMoin/util/paramparser.py	Tue Oct 21 09:04:50 2014 -0700
@@ -223,7 +223,7 @@
             if not bracketstack:
                 raise BracketUnexpectedCloseError(char)
             expected, oldresult = bracketstack[-1]
-            if not expected == char:
+            if expected != char:
                 raise BracketUnexpectedCloseError(char)
             del bracketstack[-1]
             oldresult.append(result)