changeset 2835:f5b310b4dcd1

merge
author RogerHaase <haaserd@gmail.com>
date Sun, 19 Oct 2014 08:08:00 -0700
parents caf95e12acbb (current diff) 444633f11059 (diff)
children 796a977ac521
files MoinMoin/templates/global_history.html MoinMoin/themes/basic/templates/layout.html
diffstat 5 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/global_history.html	Sat Oct 18 14:05:52 2014 -0700
+++ b/MoinMoin/templates/global_history.html	Sun Oct 19 08:08:00 2014 -0700
@@ -63,7 +63,7 @@
             <div class="moin-history-container">
                 <div class="moin-history-container-header">
                     <h2>{{ bookmark_time|datetimeformat }}</h2>
-                    <a class="bookmark-link" href="{{ url_for('frontend.bookmark', time='del') }}">{{ _("Delete bookmark") }}</a>
+                    <a class="bookmark-link btn btn-danger" href="{{ url_for('frontend.bookmark', time='del') }}">{{ _("Delete bookmark") }}</a>
                 </div>
             </div>
         {% endif %}
--- a/MoinMoin/templates/history.html	Sat Oct 18 14:05:52 2014 -0700
+++ b/MoinMoin/templates/history.html	Sun Oct 19 08:08:00 2014 -0700
@@ -1,7 +1,7 @@
 {% extends theme("layout.html") %}
 {% import "utils.html" as utils %}
 
-{% set title = _("History of '%(fqname)s'", fqname=fqname|shorten_fqname) %}
+{% set title = _("History of '%(fqname)s'", fqname=fqname) %}
 
 {% block content %}
     {% set (history, next_offset, previous_offset) = history_page %}
--- a/MoinMoin/templates/layout.html	Sat Oct 18 14:05:52 2014 -0700
+++ b/MoinMoin/templates/layout.html	Sun Oct 19 08:08:00 2014 -0700
@@ -89,7 +89,7 @@
                                     {% else %}
                                         <ul class="moin-bcs-item">
                                             <li><a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>
-                                                {{ segment_name|shorten_fqname }}</a>
+                                                {{ segment_name }}</a>
                                                 <ul class="moin-bcs-subitems">
                                                     {% for fq_name in theme_supp.get_fqnames(segment_name) -%}
                                                         <li><a href="{{ url_for('frontend.show_item', item_name=fq_name) }}">{{ fq_name|shorten_fqname(length=25) }}</a></li>
--- a/MoinMoin/themes/basic/templates/history.html	Sat Oct 18 14:05:52 2014 -0700
+++ b/MoinMoin/themes/basic/templates/history.html	Sun Oct 19 08:08:00 2014 -0700
@@ -2,7 +2,7 @@
 {% import "utils.html" as utils %}
 {% import theme("itemviews.html") as itemviews with context %}
 
-{% set title = _("History of '%(fqname)s'", fqname=fqname|shorten_fqname) %}
+{% set title = _("History of '%(fqname)s'", fqname=fqname) %}
 
 {% block views %}
     {{ itemviews }}
--- a/MoinMoin/themes/basic/templates/layout.html	Sat Oct 18 14:05:52 2014 -0700
+++ b/MoinMoin/themes/basic/templates/layout.html	Sun Oct 19 08:08:00 2014 -0700
@@ -227,7 +227,7 @@
                                                     {{ title_name }}
                                                 {% else %}
                                                     <a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>
-                                                        {{ segment_name|shorten_fqname }}
+                                                        {{ segment_name }}
                                                     </a>
                                                 {%- endif %}
                                             {%- endif %}