Mercurial > moin-2.0-moinboot

changeset 2131:a51ae8097fec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove <ul> nesting from itemviews.
author Andreas Kloeckner <inform@tiker.net>
date Tue, 02 Apr 2013 00:57:10 -0400
parents e71b23c993c8
children fdef82ba6ebe
files MoinMoin/templates/itemviews.html MoinMoin/templates/show.html MoinMoin/themes/foobar/templates/show.html
diffstat 3 files changed, 93 insertions(+), 89 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/itemviews.html	Tue Apr 02 00:54:53 2013 -0400
+++ b/MoinMoin/templates/itemviews.html	Tue Apr 02 00:57:10 2013 -0400
@@ -1,96 +1,94 @@
 {% set exists = storage.has_item(item_name) %}
-<ul class="moin-itemviews panel">
-    {%- for endpoint, label, title, check_exists in cfg.item_views if not endpoint in cfg.endpoints_excluded %}
-        {%- if not check_exists or check_exists and exists %}
-            {%- if endpoint in [
-                'frontend.show_item', 'frontend.index', 'frontend.highlight_item',
-                'frontend.show_item_meta', 'frontend.download_item',
-                'frontend.history', 'frontend.backrefs', 'frontend.sitemap',
-                'frontend.similar_names', 'frontend.copy_item',
-            ] %}
-                <li>
-                    <a href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
-                </li>
-            {%- endif %}
+{%- for endpoint, label, title, check_exists in cfg.item_views if not endpoint in cfg.endpoints_excluded %}
+    {%- if not check_exists or check_exists and exists %}
+        {%- if endpoint in [
+            'frontend.show_item', 'frontend.index', 'frontend.highlight_item',
+            'frontend.show_item_meta', 'frontend.download_item',
+            'frontend.history', 'frontend.backrefs', 'frontend.sitemap',
+            'frontend.similar_names', 'frontend.copy_item',
+        ] %}
+            <li>
+                <a href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
+            </li>
+        {%- endif %}
 
-            {%- if endpoint == 'frontend.modify_item' and user.may.write(item_name) %}
-                <li>
-                    <a class="moin-modify-button" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
-                </li>
-            {%- endif %}
-
-            {%- if endpoint in [
-                'frontend.rename_item', 'frontend.delete_item',
-            ] and user.may.write(item_name) %}
-                <li>
-                    <a href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
-                </li>
-            {%- endif %}
-
-            {%- if endpoint == 'frontend.destroy_item' and user.may.destroy(item_name) %}
-                <li>
-                    <a href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
-                </li>
-            {%- endif %}
+        {%- if endpoint == 'frontend.modify_item' and user.may.write(item_name) %}
+            <li>
+                <a class="moin-modify-button" href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
+            </li>
+        {%- endif %}
 
-            {%- if endpoint in [
-                'frontend.global_history', 'frontend.global_index', 'frontend.global_tags',
-                'admin.index', 'admin.index_user',
-            ] %}
-                <li>
-                    <a href="{{ url_for(endpoint) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
-                </li>
-            {%- endif %}
-
-            {%- if endpoint == 'frontend.quicklink_item' and user.valid %}
-                <li>
-                    <a href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                        {%- if user.is_quicklinked_to([item_name]) %}
-                            {{ _('Remove Link') }}
-                        {%- else %}
-                            {{ _('Add Link') }}
-                        {%- endif %}
-                    </a>
-                </li>
-            {%- endif %}
+        {%- if endpoint in [
+            'frontend.rename_item', 'frontend.delete_item',
+        ] and user.may.write(item_name) %}
+            <li>
+                <a href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
+            </li>
+        {%- endif %}
 
-            {%- if endpoint == 'frontend.subscribe_item' and user.valid %}
-                <li>
-                    <a href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
-                        {%- if user.is_subscribed_to([item_name]) %}
-                            {{ _('Unsubscribe') }}
-                        {%- else %}
-                            {{ _('Subscribe') }}
-                        {%- endif %}
-                    </a>
-                </li>
-            {%- endif %}
+        {%- if endpoint == 'frontend.destroy_item' and user.may.destroy(item_name) %}
+            <li>
+                <a href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
+            </li>
+        {%- endif %}
 
-            {%- if endpoint == 'special.comments' %}
-                <li class="moin-toggle-comments-button" style="display:none;">
-                    <a href="#" onClick="toggleComments();return false;" title="{{ title }}">{{ label }}</a>
-                </li>
-            {%- endif %}
-
-        {% if endpoint == 'special.transclusions' -%}
-            <li class="moin-transclusions-button" style="display:none;">
-            <a href="#" onClick="toggleTransclusionOverlays();return false;" title="{{ title }}">{{ label }}</a>
+        {%- if endpoint in [
+            'frontend.global_history', 'frontend.global_index', 'frontend.global_tags',
+            'admin.index', 'admin.index_user',
+        ] %}
+            <li>
+                <a href="{{ url_for(endpoint) }}" title="{{ title }}" rel="nofollow">{{ label }}</a>
             </li>
         {%- endif %}
 
-            {%- if endpoint == 'special.supplementation' %}
-                {%- for sub_item_name in cfg.supplementation_item_names %}
-                    {%- set current_sub = item_name.rsplit('/', 1)[-1] %}
-                    {%- if not current_sub in cfg.supplementation_item_names %}
-                        {%- set supp_name = '%s/%s' % (item_name, sub_item_name) %}
-                        {%- if storage.has_item(supp_name) or user.may.write(supp_name) %}
-                            <li>
-                                <a href="{{ url_for('frontend.show_item', item_name=supp_name) }}" rel="nofollow">{{ _(sub_item_name) }}</a>
-                            </li>
-                        {%- endif %}
+        {%- if endpoint == 'frontend.quicklink_item' and user.valid %}
+            <li>
+                <a href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
+                    {%- if user.is_quicklinked_to([item_name]) %}
+                        {{ _('Remove Link') }}
+                    {%- else %}
+                        {{ _('Add Link') }}
+                    {%- endif %}
+                </a>
+            </li>
+        {%- endif %}
+
+        {%- if endpoint == 'frontend.subscribe_item' and user.valid %}
+            <li>
+                <a href="{{ url_for(endpoint, item_name=item_name) }}" title="{{ title }}" rel="nofollow">
+                    {%- if user.is_subscribed_to([item_name]) %}
+                        {{ _('Unsubscribe') }}
+                    {%- else %}
+                        {{ _('Subscribe') }}
                     {%- endif %}
-                {%- endfor %}
-            {%- endif %}
+                </a>
+            </li>
+        {%- endif %}
+
+        {%- if endpoint == 'special.comments' %}
+            <li class="moin-toggle-comments-button" style="display:none;">
+                <a href="#" onClick="toggleComments();return false;" title="{{ title }}">{{ label }}</a>
+            </li>
         {%- endif %}
-    {%- endfor %}
-</ul>
+
+    {% if endpoint == 'special.transclusions' -%}
+        <li class="moin-transclusions-button" style="display:none;">
+        <a href="#" onClick="toggleTransclusionOverlays();return false;" title="{{ title }}">{{ label }}</a>
+        </li>
+    {%- endif %}
+
+        {%- if endpoint == 'special.supplementation' %}
+            {%- for sub_item_name in cfg.supplementation_item_names %}
+                {%- set current_sub = item_name.rsplit('/', 1)[-1] %}
+                {%- if not current_sub in cfg.supplementation_item_names %}
+                    {%- set supp_name = '%s/%s' % (item_name, sub_item_name) %}
+                    {%- if storage.has_item(supp_name) or user.may.write(supp_name) %}
+                        <li>
+                            <a href="{{ url_for('frontend.show_item', item_name=supp_name) }}" rel="nofollow">{{ _(sub_item_name) }}</a>
+                        </li>
+                    {%- endif %}
+                {%- endif %}
+            {%- endfor %}
+        {%- endif %}
+    {%- endif %}
+{%- endfor %}
--- a/MoinMoin/templates/show.html	Tue Apr 02 00:54:53 2013 -0400
+++ b/MoinMoin/templates/show.html	Tue Apr 02 00:57:10 2013 -0400
@@ -13,7 +13,9 @@
 {% import "itemviews.html" as itemviews with context %}
 
 {% block header_itemviews %}
-    {{ itemviews }}
+    <ul class="moin-itemviews panel">
+        {{ itemviews }}
+    </ul>
 {% endblock %}
 
 {% macro rev_navigation(view='frontend.show_item') %}
@@ -67,7 +69,9 @@
 {% block footer_hr %}{% endblock %}
 
 {% block footer_itemviews %}
-    {{ itemviews }}
+    <ul class="moin-itemviews panel">
+        {{ itemviews }}
+    </ul>
 {% endblock %}
 
 {% block footer_meta %}
--- a/MoinMoin/themes/foobar/templates/show.html	Tue Apr 02 00:54:53 2013 -0400
+++ b/MoinMoin/themes/foobar/templates/show.html	Tue Apr 02 00:57:10 2013 -0400
@@ -22,7 +22,9 @@
 {% block local_panel %}
     <ul>
         <li class="panel">Views
-            {{ itemviews }}
+            <ul class="moin-itemviews panel">
+                {{ itemviews }}
+            </ul>
         </li>
         {% if rev %}
         <li id="moin-metadata">Metadata