changeset 2701:8d8a01710ca8

Improved Global History view in basic theme Added bootstrap tables, buttons and icons in the Global History view in order to make it look better
author Ajitesh Gupta <ajgupta93@gmail.com>
date Thu, 07 Aug 2014 21:46:46 +0530
parents 842fc45e8060
children e893ac118592
files MoinMoin/templates/global_history.html MoinMoin/themes/basic/static/css/theme.css MoinMoin/themes/basic/static/custom-less/theme.less MoinMoin/themes/basic/static/img/moin-copy.png MoinMoin/themes/basic/static/img/moin-rename.png MoinMoin/themes/basic/static/img/moin-revert.png MoinMoin/themes/basic/static/img/moin-save.png MoinMoin/themes/basic/static/img/moin-trash.png
diffstat 8 files changed, 56 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/global_history.html	Thu Aug 07 20:44:15 2014 +0530
+++ b/MoinMoin/templates/global_history.html	Thu Aug 07 21:46:46 2014 +0530
@@ -16,25 +16,25 @@
                 <div class="moin-history-container-header">
                     <h2>{{ day }}</h2>
                     {% if user.valid %}
-                    <a class="bookmark-link" href="{{ url_for('frontend.bookmark', time=latest_timestamp+1) }}">{{ _("Set bookmark") }}</a>
+                    <a class="bookmark-link btn btn-primary" href="{{ url_for('frontend.bookmark', time=latest_timestamp+1) }}">{{ _("Set bookmark") }}</a>
                     {% endif %}
                 </div>
                 <div class="moin-history-container-body">
-                    <table class="zebra">
+                    <table class="zebra table table-hover">
                     {% for rev in revs %}
                         {% set meta = rev.meta %}
                         <tr>
-                            <td class="moin-action">
+                            <td class="moin-action col-md-1">
                                 <span class="moin-history-{{ meta.action|lower }}"></span>
                             </td>
-                            <td class="moin-history-links">
+                            <td class="moin-history-links col-md-1">
                                 <a href="{{ url_for('frontend.history', item_name=rev.fqname, bookmark=bookmark_time) }}">HIST</a>
                                 {% if bookmark_time -%}
                                     <a href="{{ url_for('frontend.diff', item_name=rev.fqname, bookmark=bookmark_time) }}">DIFF</a>
                                 {%- endif %}
                             </td>
-                            <td class="moin-history-time">{{ meta.mtime|timeformat }}</td>
-                            <td class="moin-history-item">
+                            <td class="moin-history-time col-md-1">{{ meta.mtime|timeformat }}</td>
+                            <td class="moin-history-item col-md-7">
                                 <a class="{{ meta.contenttype|contenttype_to_class }}" href="{{ url_for('frontend.show_item', item_name=rev.fqname) }}" title="{{ meta.contenttype }}">
                                     {% if meta.name %}
                                         {{ meta.name|join(' | ') }}
--- a/MoinMoin/themes/basic/static/css/theme.css	Thu Aug 07 20:44:15 2014 +0530
+++ b/MoinMoin/themes/basic/static/css/theme.css	Thu Aug 07 21:46:46 2014 +0530
@@ -7049,3 +7049,27 @@
 #editor > textarea {
   width: 100%;
 }
+.moin-history-save:before {
+  content: url("../img/moin-save.png");
+}
+.moin-history-trash:before {
+  content: url("../img/moin-trash.png");
+}
+.moin-history-rename:before {
+  content: url("../img/moin-rename.png");
+}
+.moin-history-copy:before {
+  content: url("../img/moin-copy.png");
+}
+.moin-history-revert:before {
+  content: url("../img/moin-revert.png");
+}
+.moin-history-container-header > h2 {
+  display: inline;
+}
+.moin-history-container-header > .bookmark-link {
+  margin-bottom: 15px;
+  margin-left: 20px;
+  height: 2em;
+  line-height: 1em;
+}
--- a/MoinMoin/themes/basic/static/custom-less/theme.less	Thu Aug 07 20:44:15 2014 +0530
+++ b/MoinMoin/themes/basic/static/custom-less/theme.less	Thu Aug 07 21:46:46 2014 +0530
@@ -772,4 +772,30 @@
 #editor > textarea {
   width: 100%;
 }
+.moin-history-save:before {
+  content: url("../img/moin-save.png");
+}
+.moin-history-trash:before {
+  content: url("../img/moin-trash.png");
+}
+.moin-history-rename:before {
+  content: url("../img/moin-rename.png");
+}
+.moin-history-copy:before {
+  content: url("../img/moin-copy.png");
+}
+.moin-history-revert:before {
+  content: url("../img/moin-revert.png");
+}
+.moin-history-container-header {
+  > h2 {
+    display: inline;
+  }
+  > .bookmark-link {
+    margin-bottom: 15px;
+    margin-left: 20px;
+    height: 2em;
+    line-height: 1em;
+  }
+}
 
Binary file MoinMoin/themes/basic/static/img/moin-copy.png has changed
Binary file MoinMoin/themes/basic/static/img/moin-rename.png has changed
Binary file MoinMoin/themes/basic/static/img/moin-revert.png has changed
Binary file MoinMoin/themes/basic/static/img/moin-save.png has changed
Binary file MoinMoin/themes/basic/static/img/moin-trash.png has changed