Mercurial > moin > 2.0

changeset 2709:b41fae684e47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved comments to right and meta-data to left in modify/submit view of tickets and also removed the usage of name in ticket templates, used summary instead of name as heading in ticket modify template
author Saurabh Kathpalia <saurabh.kathpalia95@gmail.com>
date Thu, 07 Aug 2014 21:01:45 +0530
parents 3bc9fd6d054e
children 997df35ab5d1
files MoinMoin/static/css/stylus/ticket.styl MoinMoin/static/css/ticket.css MoinMoin/templates/ticket/base.html MoinMoin/templates/ticket/modify.html MoinMoin/templates/ticket/submit.html
diffstat 5 files changed, 55 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/static/css/stylus/ticket.styl	Thu Aug 07 16:38:02 2014 +0200
+++ b/MoinMoin/static/css/stylus/ticket.styl	Thu Aug 07 21:01:45 2014 +0530
@@ -98,3 +98,15 @@
     line-height 1.42857143
     border-radius 4px
     -webkit-user-select none
+
+.moin-ticket-comments
+    float right
+    width 60%
+
+.moin-ticket-metadata
+    float left
+    width 40%
+
+#f_message
+    width 100%
+    height 150px
--- a/MoinMoin/static/css/ticket.css	Thu Aug 07 16:38:02 2014 +0200
+++ b/MoinMoin/static/css/ticket.css	Thu Aug 07 21:01:45 2014 +0530
@@ -8,3 +8,6 @@
 #f_meta_tags:focus,#f_meta_summary:focus{box-shadow:0 0 5px #51cbee;margin-top:20px;margin-bottom:20px;height:25px;padding:3px 0 3px 3px;margin:5px 1px 3px 0;border:1px solid #51cbee}
 input[type=submit],#f_submit_update,#f_submit_update_negate_status{margin-top:10px;margin-bottom:20px;width:150px;background-color:#1b436d;height:40px;color:#fff;border:2px solid}
 select{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none}
+.moin-ticket-comments{float:right;width:60%}
+.moin-ticket-metadata{float:left;width:40%}
+#f_message{width:100%;height:150px}
--- a/MoinMoin/templates/ticket/base.html	Thu Aug 07 16:38:02 2014 +0200
+++ b/MoinMoin/templates/ticket/base.html	Thu Aug 07 21:01:45 2014 +0530
@@ -110,13 +110,15 @@
 <div class="moin-form" id="moin-ticket-form">
     {{ gen.form.open(form, method='post', enctype='multipart/form-data') }}
 
-    {% if data_rendered %}
-        <div id="moin-content-data">
+    <div id="moin-content-data" class="moin-ticket-comments">
+        {% if data_rendered %}
             {{ data_rendered }}
-        </div>
-    {% endif %}
+        {% endif %}
 
-    {% block form_controls %}
+        {% block form_controls %}
+        {% endblock %}
+    </div>
+    {% block ticket_metadata %}
     {% endblock %}
 
     {{ gen.form.close() }}
--- a/MoinMoin/templates/ticket/modify.html	Thu Aug 07 16:38:02 2014 +0200
+++ b/MoinMoin/templates/ticket/modify.html	Thu Aug 07 21:01:45 2014 +0530
@@ -1,32 +1,37 @@
 {% extends "ticket/base.html" %}
 
 {% block title_text %}
-    {{ _("Ticket: '%(item_name)s'", item_name=item_name) }}
+    {{ _("Ticket: %(summary)s", summary=item.meta['summary']) }}
 {% endblock %}
 
 {% block form_controls %}
     <h2>{{ _("Add comment") }}</h2>
-    <dl>
-    {{ forms.render(form['message']) }}
-    </dl>
+    <div class="form-group">
+        {{ gen.label(form['message']) }}
+        {{ gen.textarea(form['message'], class='form-control') }}
+    </div>
 
-    <h2>{{ _("Edit metadata") }}</h2>
-    <dl>
-    {{ forms.render_errors(form) }}
-    {{ render_meta() }}
-    </dl>
-    {{ _("Suggested Tags: ") }}
-    {% for suggested_tag in suggested_tags %}
-        {{ suggested_tag }}
-    {% endfor %}
-    <dl>
-    {{ render_selectlists() }}
-    </dl>
+{% endblock %}
 
-    {{ forms.render(form['submit']) }}
+{% block ticket_metadata %}
+    <div class="moin-ticket-metadata">
+        <h2>{{ _("Edit metadata") }}</h2>
+        <dl>
+            {{ forms.render_errors(form) }}
+            {{ render_meta() }}
+        </dl>
+            {{ _("Suggested Tags: ") }}
+            {% for suggested_tag in suggested_tags %}
+                {{ suggested_tag }}
+            {% endfor %}
+        <dl>
+            {{ render_selectlists() }}
+        </dl>
 
-    <h2>{{ _("Back references") }}</h2>
-    <dl>
-    {{ render_backref() }}
-    </dl>
+        {{ forms.render(form['submit']) }}
+        <h2>{{ _("Back references") }}</h2>
+        <dl>
+            {{ render_backref() }}
+        </dl>
+    </div>
 {% endblock %}
--- a/MoinMoin/templates/ticket/submit.html	Thu Aug 07 16:38:02 2014 +0200
+++ b/MoinMoin/templates/ticket/submit.html	Thu Aug 07 21:01:45 2014 +0530
@@ -1,15 +1,20 @@
 {% extends "ticket/base.html" %}
 
 {% block title_text %}
-    {{ _("Creating new ticket: '%(item_name)s'", item_name=item_name) }}
+    {{ _("Create new ticket") }}
 {% endblock %}
 
 {% block form_controls %}
     <h2>{{ _("Describe the ticket") }}</h2>
 
     <dl>
-    {{ forms.render(form['message']) }}
+        <div class="form-group">
+            {{ gen.label(form['message']) }}
+            {{ gen.textarea(form['message'], class='form-control') }}
+        </div>
     </dl>
+{% endblock %}
+{% block ticket_metadata %}
 
     <h2>{{ _("Provide metadata") }}</h2>
     <dl>