changeset 2373:bc51dd4c686a

Improves location breadcrumbs, including location above tabs
author sharky93 <rishabhr123@gmail.com>
date Fri, 09 Aug 2013 03:36:03 +0530
parents 8c42ddfa2581
children 39cf5ec23aea
files MoinMoin/themes/basic/static/css/basic.css MoinMoin/themes/basic/static/custom-less/basic.less MoinMoin/themes/basic/templates/layout.html MoinMoin/themes/basic/templates/show.html
diffstat 4 files changed, 29 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/themes/basic/static/css/basic.css	Thu Aug 08 19:30:00 2013 +0530
+++ b/MoinMoin/themes/basic/static/css/basic.css	Fri Aug 09 03:36:03 2013 +0530
@@ -4311,3 +4311,6 @@
   -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
   box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
 }
+.moin-location-breadcrumb {
+  padding-top: 12px;
+}
--- a/MoinMoin/themes/basic/static/custom-less/basic.less	Thu Aug 08 19:30:00 2013 +0530
+++ b/MoinMoin/themes/basic/static/custom-less/basic.less	Fri Aug 09 03:36:03 2013 +0530
@@ -20,4 +20,8 @@
       .form-control-focus(); // adds shadow onfocus
     }
   }
+}
+
+.moin-location-breadcrumb {
+  padding-top: 12px;
 }
\ No newline at end of file
--- a/MoinMoin/themes/basic/templates/layout.html	Thu Aug 08 19:30:00 2013 +0530
+++ b/MoinMoin/themes/basic/templates/layout.html	Fri Aug 09 03:36:03 2013 +0530
@@ -115,6 +115,28 @@
                           </li>
                         {% endfor %}
                     {% endif %}
+
+                    <h4 class="moin-location-breadcrumb">
+                    {% for segment_name, segment_path, exists in theme_supp.location_breadcrumbs(item_name) -%}
+                    {% set url = url_for('frontend.show_item', item_name=segment_path) %}
+                        {% if not loop.first %}
+                        <small>/</small>
+                        {% endif %}
+                        {% if url != current_url %}
+                            <small>
+                        {% endif %}
+                        {% if title_name %}
+                            {{ title_name }}
+                        {% else %}
+                            <a href="{{ url }}" {% if not exists %}class="moin-nonexistent"{% endif %}>
+                                {{ segment_name|shorten_item_name }}
+                            </a>
+                        {% endif %}
+                        {% if url != current_url %}
+                           </small>
+                        {% endif %}
+                    {% endfor %}
+                    </h4>
                 </ul>
 
                 {% block views %}
--- a/MoinMoin/themes/basic/templates/show.html	Thu Aug 08 19:30:00 2013 +0530
+++ b/MoinMoin/themes/basic/templates/show.html	Fri Aug 09 03:36:03 2013 +0530
@@ -8,39 +8,6 @@
 {% endblock %}
 
 {% block content %}
-    {% block location_breadcrumbs %}
-       {% for segment_name, segment_path, exists in theme_supp.location_breadcrumbs(item_name) -%}
-        {% set url = url_for('frontend.show_item', item_name=segment_path) %}
-        {% if loop.first -%}
-        <h4>
-            {% if url != current_url %}
-                <small>
-            {% endif %}
-            <a href="{{ url }}" {% if not exists %}class="moin-nonexistent"{% endif %}>
-                {{ segment_name|shorten_item_name }}
-            </a>
-            {% if url != current_url %}
-               </small>
-            {% endif %}
-        {% else %}
-            <span class="sep">/</span>
-            {% if title_name %}
-                {{ title_name }}
-            {% else %}
-                {% if url != current_url %}
-                    <small>
-                {% endif %}
-                <a href="{{ url }}" {% if not exists %}class="moin-nonexistent"{% endif %}>
-                    {{ segment_name|shorten_item_name }}
-                </a>
-                {% if url != current_url %}
-                    </small>
-                {% endif %}                
-            {%- endif %}
-        {%- endif %}
-       {% endfor %}
-        </h4>
-    {% endblock %}
 
     {% block content_data %}
         {% if data_rendered %}