changeset 2469:a723ec19254b

Fixes #23, combines breadcrumbs
author sharky93 <rishabhr123@gmail.com>
date Thu, 12 Sep 2013 16:29:49 +0530
parents fdb156e28049
children 9c21d0f23521
files MoinMoin/themes/basic/static/css/basic.css MoinMoin/themes/basic/static/custom-less/basic.less MoinMoin/themes/basic/templates/layout.html
diffstat 3 files changed, 30 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/themes/basic/static/css/basic.css	Thu Sep 12 04:32:03 2013 +0530
+++ b/MoinMoin/themes/basic/static/css/basic.css	Thu Sep 12 16:29:49 2013 +0530
@@ -4354,9 +4354,6 @@
 .moin-breadcrumb > .active {
   color: #999999;
 }
-.moin-breadcrumb > li + li:before {
-  content: "»";
-}
 .moin-nav {
   margin-bottom: 0;
   padding-left: 0;
@@ -4440,7 +4437,7 @@
   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;
+  display: inline;
 }
 .moin-nonexistent {
   color: #e7908e;
--- a/MoinMoin/themes/basic/static/custom-less/basic.less	Thu Sep 12 04:32:03 2013 +0530
+++ b/MoinMoin/themes/basic/static/custom-less/basic.less	Thu Sep 12 16:29:49 2013 +0530
@@ -64,11 +64,6 @@
 
 .moin-breadcrumb {
   .breadcrumb;
-  > li {
-    &+li:before {
-      content: "»"; // right angular brackets, custom separator
-    }
-  }
 }
 
 .moin-nav {
@@ -85,7 +80,7 @@
 }
 
 .moin-location-breadcrumb {
-  padding-top: 12px;
+  display: inline;
 }
 
 .moin-nonexistent {
--- a/MoinMoin/themes/basic/templates/layout.html	Thu Sep 12 04:32:03 2013 +0530
+++ b/MoinMoin/themes/basic/templates/layout.html	Thu Sep 12 16:29:49 2013 +0530
@@ -106,6 +106,7 @@
                         {% set trail_items = theme_supp.path_breadcrumbs() %}
                         {% if trail_items %}
                             {% for wiki_name, item_name, item_href, exists, err in trail_items %}
+                            {% if not loop.last %}
                               <li>
                                 {%- if wiki_name -%}
                                     <a href="{{ item_href }}"{{ " " }}
@@ -120,31 +121,36 @@
                                     </a>
                                 {%- endif %}
                               </li>
+                              <i class="icon-double-angle-right icon-fixed-width"></i>
+                            {% endif %}
                             {% 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>
+                            <li>
+                                <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>
+                            </li>
+
+                        </ul><!-- complete list of breadcrumbs -->
                     </div>
                 </div>
             </div> <!-- col-lg-10 -->