changeset 771:e5b51d4304c8 pytest2

global history: render the bookmark in same way as the day headers
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 25 Aug 2011 23:11:56 +0200
parents a4ec2c6f0bb7
children baf55847914b
files MoinMoin/templates/global_history.html
diffstat 1 files changed, 10 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/global_history.html	Thu Aug 25 23:09:06 2011 +0200
+++ b/MoinMoin/templates/global_history.html	Thu Aug 25 23:11:56 2011 +0200
@@ -17,16 +17,6 @@
 </div>
 <h1>{{ _("Global History") }}</h1>
 <div class='moin-clr'></div>
-    {% if user.valid  %}
-    <div id="moin-set-bookmark">
-        {% if bookmark_time %}
-            {{ _("Bookmark (currently set to %(bookmark)s). ", bookmark=bookmark_time|datetimeformat) }} 
-            <a href="{{ url_for('frontend.bookmark', time='del') }}">{{ _("Delete bookmark") }}</a>
-        {% else %}
-            {{ _("Bookmark (not set). ") }}<a href="{{ url_for('frontend.bookmark', time=current_timestamp) }}">{{ _("Set bookmark") }}</a> 
-        {% endif %}
-    </div>
-    {% endif %}
     <div id="moin-global-history">
         {% for rev_date, revs in history %}
            {% set  latest_rev = revs[0] %}
@@ -78,8 +68,15 @@
                 </div>
             </div>
         {% endfor %}
+        {% if user.valid and bookmark_time %}
+        <div class="moin-history-container"> 
+            <div class="moin-history-container-header">
+                <span>
+                    <h2>{{ bookmark_time|datetimeformat }}</h2>
+                    <a href="{{ url_for('frontend.bookmark', time='del') }}">{{ _("Delete bookmark") }}</a>
+               </span>
+            </div>
+        </div>
+        {% endif %}
     </div>
-   {% if bookmark_time and not offset %}
-       <div id="moin-bookmark-reached">{{ _("Bookmark reached") }}</div>
-   {% endif %}
 {% endblock %}