changeset 2866:c9a8ff6d00cc

make button styling more consistent for User, Admin, settings, and Ticket pages
author RogerHaase <haaserd@gmail.com>
date Sun, 14 Dec 2014 12:37:37 -0700
parents 701db2cbfa67
children 1259233ad807
files MoinMoin/apps/admin/templates/admin/groupbrowser.html MoinMoin/apps/admin/templates/admin/item_acl_report.html MoinMoin/apps/admin/templates/admin/userbrowser.html MoinMoin/static/css/common.css MoinMoin/templates/forms.html MoinMoin/templates/mychanges.html MoinMoin/templates/tickets.html MoinMoin/themes/basic/static/css/theme.css MoinMoin/themes/basic/static/custom-less/theme.less MoinMoin/themes/modernized/static/css/stylus/theme.styl MoinMoin/themes/modernized/static/css/theme.css
diffstat 11 files changed, 33 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/admin/templates/admin/groupbrowser.html	Fri Dec 12 14:19:36 2014 -0700
+++ b/MoinMoin/apps/admin/templates/admin/groupbrowser.html	Sun Dec 14 12:37:37 2014 -0700
@@ -2,7 +2,7 @@
 {% import "utils.html" as utils %}
 {% block content %}
     <h1>{{ _("Groups") }}</h1>
-    <table class="zebra table table-hover tablesorter tablesorter-default moin-sortable" data-sortlist="[[0,0]]">
+    <table id="moin-group-browser" class="zebra moin-sortable" data-sortlist="[[0,0]]">
         <thead>
             <tr>
                 <th>{{ _("Group Names") }}</th>
@@ -17,7 +17,7 @@
                     <td>{% if group['grouptype'] == 'WikiGroup' %}<a href="{{ url_for('frontend.modify_item', item_name=group['name']) }}">{% endif %}{{ group['name'] }}</a></td>
                     <td>{{ group['member_users']|sort|join(', ') }}</td>
                     <td>{{ group['member_groups']|sort|join(', ') }}</td>
-                    <td><a href="{{ url_for('admin.group_acl_report', group_name=group['name']) }}">{{ _("ACL Report") }}</a></td>
+                    <td><a class="moin-button" href="{{ url_for('admin.group_acl_report', group_name=group['name']) }}">{{ _("ACL Report") }}</a></td>
                 </tr>
             {% endfor %}
         </tbody>
--- a/MoinMoin/apps/admin/templates/admin/item_acl_report.html	Fri Dec 12 14:19:36 2014 -0700
+++ b/MoinMoin/apps/admin/templates/admin/item_acl_report.html	Sun Dec 14 12:37:37 2014 -0700
@@ -25,7 +25,7 @@
                         {% if user.may.admin(item['fqname']) %}
                             <form id="moin-acl-form" action="{{ url_for('admin.modify_acl', item_name=item['fqname']) }}" method="POST">
                                 <input type="text" class="moin-acl-string" {% if item['acl_default'] %}style="color:green;"{% endif %} name="{{ item['itemid'] }}" value="{{ item['acl'] }}"/>
-                                <input type="submit" value="{{ _("Modify ACL") }}"/>
+                                <input class="moin-button" type="submit" value="{{ _("Modify ACL") }}"/>
                             </form>
                         {% else %}
                             {{ item['acl'] }}
--- a/MoinMoin/apps/admin/templates/admin/userbrowser.html	Fri Dec 12 14:19:36 2014 -0700
+++ b/MoinMoin/apps/admin/templates/admin/userbrowser.html	Sun Dec 14 12:37:37 2014 -0700
@@ -24,19 +24,19 @@
                         <form action="{{ url_for('admin.userprofile', user_name=u.name[0]) }}" method="POST">
                             <input type="hidden" name="key" value="disabled" />
                             <input type="hidden" name="val" value="{{ u.disabled and "0" or "1" }}" />
-                            <input type="submit" name="userprofile" value="{{ u.disabled and _("Enable user") or _("Disable user") }}" />
+                            <input class="moin-button" type="submit" name="userprofile" value="{{ u.disabled and _("Enable user") or _("Disable user") }}" />
                         </form>
                     </td>
                     <td>
                         <form action="{{ url_for('admin.mail_recovery_token') }}" method="GET">
                             <input type="hidden" name="email" value="{{ u.email }}" />
                             <input type="hidden" name="account_sendmail" value="1" />
-                            <input type="submit" name="recoverpass" value="{{ _("Mail account data") }}" />
+                            <input class="moin-button" type="submit" name="recoverpass" value="{{ _("Mail account data") }}" />
                         </form>
                     </td>
                     <td>
                         <form action="{{ url_for('admin.user_acl_report', uid=u.uid) }}" method="GET">
-                            <input type="submit" value="{{ _("User ACL Info") }}" />
+                            <input class="moin-button" type="submit" value="{{ _("User ACL Info") }}" />
                         </form>
                     </td>
                 </tr>
--- a/MoinMoin/static/css/common.css	Fri Dec 12 14:19:36 2014 -0700
+++ b/MoinMoin/static/css/common.css	Sun Dec 14 12:37:37 2014 -0700
@@ -176,11 +176,6 @@
 #ticket-list thead th:hover { background-color: #e8e8e8; cursor: pointer; }
 #ticket-list tbody tr:hover { background-color: #e8e8e8; }
 #ticket-list tr td:first-child a { font-family: monospace; }
-.ticket-query-button { background: #aed4fa; padding: 1px 7px; text-shadow: 0 1px 0 #fff; border: 1px solid transparent; }
-.ticket-query-button.active,
-.ticket-tags-button.active,
-.ticket-tags-button:hover,
-.ticket-query-button:hover { background-color:#008b8b; color: #333; box-sizing: border-box; border: 1px solid transparent; border-radius: 3px; }
 
 /* tags tab */
 ul.moin-tags { display: block; margin-left: 0; }
@@ -264,6 +259,16 @@
 h5,
 h6 { border-bottom: 3px solid #4e7da9; }
 
+/* buttons */
+#moin-group-browser a.moin-button,
+form > input.moin-button { background: #aed4fa; border: 1px solid #00417F; border-radius: 6px; cursor: pointer;
+    color: #000; font-size: 0.75em; font-weight: bold; padding: 4px 15px; }
+#moin-group-browser a.moin-button:hover,
+#moin-group-browser a.moin-button:focus,
+form > input.moin-button:hover,
+form > input.moin-button:focus { box-shadow: 2px 2px 1px #000; color: #000; text-decoration: none; }
+form > input.moin-button.active {background: #00417f; color: #fff; }
+
 /* table of contents (div.toc is for markdown parser) */
 div.moin-table-of-contents,
 div.toc { border: 1px solid #4e7da9; color: #000; background: #fff; font-size: 80%; margin: .5em 0 .75em 1em;
--- a/MoinMoin/templates/forms.html	Fri Dec 12 14:19:36 2014 -0700
+++ b/MoinMoin/templates/forms.html	Sun Dec 14 12:37:37 2014 -0700
@@ -20,7 +20,7 @@
 {% endmacro %}
 
 {% macro render_submit(form) %}
-  {{ gen.input(type='submit', value=form.submit_label, class='button', **kwargs) }}
+  {{ gen.input(type='submit', value=form.submit_label, class='moin-button', **kwargs) }}
 {% endmacro %}
 
 {% macro render_textcha(gen, form) %}
--- a/MoinMoin/templates/mychanges.html	Fri Dec 12 14:19:36 2014 -0700
+++ b/MoinMoin/templates/mychanges.html	Sun Dec 14 12:37:37 2014 -0700
@@ -44,7 +44,7 @@
                                     <form action="{{ url_for('frontend.diff', item_name=doc.fqname) }}" method="GET">
                                         <input type="hidden" name="rev1" value="{{ doc.parentid }}" />
                                         <input type="hidden" name="rev2" value="{{ doc.revid }}" />
-                                        <input type="submit" class="btn btn-sm btn-primary" value="Diff" />
+                                        <input type="submit" class="moin-button" value="Diff" />
                                     </form>
                                 </div>
                             </td>
--- a/MoinMoin/templates/tickets.html	Fri Dec 12 14:19:36 2014 -0700
+++ b/MoinMoin/templates/tickets.html	Sun Dec 14 12:37:37 2014 -0700
@@ -11,11 +11,11 @@
         <form action="{{ url_for('frontend.tickets', selected_tags=list()) }}" method="post" class='moin-ticketsearch-form'>
             <input type="hidden" name="q" value="" >
             <input type="hidden" name="status" value="{{ status_value }}">
-            <input type="submit" value="{{ status_value.capitalize() }}" title="{{ _('Show %(status)s tickets', status=status_value) }}" class="{{ 'ticket-query-button active' if status == status_value  else 'ticket-query-button' }}">
+            <input type="submit" value="{{ status_value.capitalize() }}" title="{{ _('Show %(status)s tickets', status=status_value) }}" class="{{ 'moin-button active' if status == status_value  else 'moin-button' }}">
         </form>
     {% endfor %}
 
-    <input type="button" class="ticket-tags-button ticket-tags-toggle" title="{{ _("Show all tags") }}" value="{{ _("Tags") }}">
+    <input type="button" class="moin-button ticket-tags-toggle" title="{{ _("Show all tags") }}" value="{{ _("Tags") }}">
 
     <form class="moin-ticket-search" action="{{ url_for('frontend.tickets',selected_tags=list(selected_tags)) }}" method="post">
         <input type="hidden" name="status" value="{{ status }}">
@@ -24,7 +24,7 @@
 
     {# TODO: This is a workaround that creates named tickets, rework when there is a means of creating unnamed tickets #}
     <form method="get" class="moin-ticket-create-link" action="{{ url_for('frontend.modify_item', item_name='ticket_'+current_timestamp ) }}">
-        <input type="submit" value="{{ _('Create ticket') }}">
+        <input class="moin-button" type="submit" value="{{ _('Create ticket') }}">
         <input type="hidden" name="itemtype" value="ticket">
     </form>
 
@@ -37,7 +37,7 @@
             <form class="moin-existing-tags" action="{{ url_for('frontend.tickets', selected_tags=selected_tags_value) }}" method="post">
                 <input type="hidden" name="q" value="{{ query if query }}" >
                 <input type="hidden" name="status" value="{{ status }}">
-                <input type="submit" value="{{ tag }}" class="{{ 'ticket-tags-button active btn btn-primary' if tag in selected_tags else 'ticket-tags-button' }}">
+                <input type="submit" value="{{ tag }}" class="{{ 'moin-button active' if tag in selected_tags else 'moin-button' }}">
             </form>
         {% endfor %}
     </div>
--- a/MoinMoin/themes/basic/static/css/theme.css	Fri Dec 12 14:19:36 2014 -0700
+++ b/MoinMoin/themes/basic/static/css/theme.css	Sun Dec 14 12:37:37 2014 -0700
@@ -6873,15 +6873,15 @@
 input button {
   font-weight: bold;
   font-size: .75em;
-  background: #d6d5d0;
+  background: #aed4fa;
   padding: 4px 15px;
-  border: 1px solid #ccc;
+  border: 1px solid #00417f;
+  color: #000;
   border-radius: 6px;
-  box-shadow: 1px 1px 2px #9d9d9b;
   cursor: pointer;
 }
 input:hover {
-  box-shadow: 1px 1px 2px #000;
+  box-shadow: 2px 2px 1px #000;
 }
 input:active {
   position: relative;
--- a/MoinMoin/themes/basic/static/custom-less/theme.less	Fri Dec 12 14:19:36 2014 -0700
+++ b/MoinMoin/themes/basic/static/custom-less/theme.less	Sun Dec 14 12:37:37 2014 -0700
@@ -476,16 +476,16 @@
   &[type="submit"],&[type="button"],button {
     font-weight: bold;
     font-size: .75em;
-    background: #d6d5d0;
+    background: #aed4fa;
     padding: 4px 15px;
-    border: 1px solid #ccc;
+    border: 1px solid #00417f;
+    color: #000;
     border-radius: 6px;
-    box-shadow: 1px 1px 2px #9d9d9b;
     cursor: pointer;
   }
 
   &:hover {
-    box-shadow: 1px 1px 2px #000;
+    box-shadow: 2px 2px 1px #000;
   }
 
   &:active {
--- a/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Fri Dec 12 14:19:36 2014 -0700
+++ b/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Sun Dec 14 12:37:37 2014 -0700
@@ -133,10 +133,9 @@
     padding 4px 15px
     border border_style
     border-radius 6px
-    box-shadow 1px 1px 2px shadow_color
     cursor pointer
     &:hover
-        box-shadow 1px 1px 2px font_color
+        box-shadow 2px 2px 1px font_color
     &:active
         position relative
         top 1px
--- a/MoinMoin/themes/modernized/static/css/theme.css	Fri Dec 12 14:19:36 2014 -0700
+++ b/MoinMoin/themes/modernized/static/css/theme.css	Sun Dec 14 12:37:37 2014 -0700
@@ -313,8 +313,8 @@
 #moin-create-table tbody tr td{text-align:center;background:#fff;}
 #moin-create-table tbody tr td a{color:#00008b}
 label{display:block;font-weight:bold}
-input[type="submit"],input[type="button"],button{font-weight:bold;font-size:.75em;background:#aed4fa;padding:4px 15px;border:1px solid #4e7da9;border-radius:6px;box-shadow:1px 1px 2px #9d9d9b;cursor:pointer;}
-input[type="submit"]:hover,input[type="button"]:hover,button:hover{box-shadow:1px 1px 2px #000}
+input[type="submit"],input[type="button"],button{font-weight:bold;font-size:.75em;background:#aed4fa;padding:4px 15px;border:1px solid #4e7da9;border-radius:6px;cursor:pointer;}
+input[type="submit"]:hover,input[type="button"]:hover,button:hover{box-shadow:2px 2px 1px #000}
 input[type="submit"]:active,input[type="button"]:active,button:active{position:relative;top:1px}
 input,select{padding:3px;background:#fff;border:1px solid #4e7da9;border-radius:2px}
 input[type="text"]{width:96%}