incubator-bloodhound-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rjol...@apache.org
Subject svn commit: r1448055 - in /incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates: bh_admin_components.html bh_admin_enums.html bh_admin_plugins.html bh_admin_versions.html
Date Wed, 20 Feb 2013 09:29:58 GMT
Author: rjollos
Date: Wed Feb 20 09:29:58 2013
New Revision: 1448055

URL: http://svn.apache.org/r1448055
Log:
Refs #381: Modified Admin Components, Enums and Versions panels to display the ''add'' form
above the table. The ''add'' form has an inline layout.

Modified:
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_components.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_enums.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_plugins.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_versions.html

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_components.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_components.html?rev=1448055&r1=1448054&r2=1448055&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_components.html
(original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_components.html
Wed Feb 20 09:29:58 2013
@@ -32,19 +32,19 @@
   <body>
     <h2>Manage Components</h2>
 
-    <py:def function="owner_field(default_owner='')">
-      <div class="control-group">
-        <label class="control-label" for="owner">Owner: </label>
-        <div class="controls" py:choose="">
-          <select class="input-medium"
-              py:when="owners" size="1" id="owner" name="owner">
+    <py:def function="owner_field(default_owner='', inline=False)">
+      <div py:strip="inline" class="control-group">
+        <label class="control-label" for="owner">Owner:</label>
+        <div class="controls" py:choose="" py:strip="inline">
+          <select py:when="owners" id="owner"
+                  class="input-medium" size="1" name="owner">
             <option py:for="owner in owners"
                     selected="${owner==default_owner or None}" value="$owner">$owner</option>
             <option py:if="default_owner and default_owner not in owners"
                     selected="selected" value="$default_owner">$default_owner</option>
           </select>
           <input py:otherwise="" class="input-medium" type="text" id="owner"
-              name="owner" value="$default_owner" />
+                 name="owner" value="$default_owner" />
         </div>
       </div>
     </py:def>
@@ -55,9 +55,9 @@
         <fieldset>
           <legend>Modify Component:</legend>
           <div class="control-group">
-            <label class="control-label" for="name">Name:</label>
+            <label class="control-label" for="name">Name: </label>
             <div class="controls">
-              <input type="text" id="name" name="name" value="$component.name"/>
+              <input class="input-medium" type="text" id="name" name="name" value="$component.name"/>
             </div>
           </div>
           ${owner_field(component.owner)}
@@ -90,9 +90,26 @@
 
       <py:otherwise>
         <div class="row">
-          <div class="span6">
+          <div class="span9">
+            <form id="addcomponent" class="well form-inline" method="post" action="">
+              <fieldset>
+                <legend>Add Component:</legend>
+                <div class="control-group">
+                  <input class="btn" type="submit" name="add"
+                         value="${_('Add')}"/>
+                  <label class="control-label" for="name">Name:</label>
+                  <input id="name" class="input-medium" type="text" name="name" />
+                  ${owner_field(inline=True)}
+                </div>
+              </fieldset>
+            </form>
+          </div>
+        </div>
+        <div class="row">
+          <div class="span9">
             <py:choose>
-              <form py:when="components" id="component_table" method="post" action="">
+              <form py:when="components" id="component_table"
+                    method="post" action="">
                 <table id="complist"
                     class="table table-striped table-condensed table-bordered">
                   <thead>
@@ -126,7 +143,7 @@
                   field from the user interface.
                 </p>
               </form>
-    
+
               <p py:otherwise="" class="help-block">
                 <span class="label label-warning">Warning</span>
                 As long as you don't add any items to the list, this field
@@ -134,18 +151,6 @@
               </p>
             </py:choose>
           </div>
-          <div class="span3">
-            <form class="well" id="addcomponent" method="post" action="">
-              <fieldset>
-                <legend>Add Component:</legend>
-                <label for="name">Name:</label>
-                <input class="input-medium" type="text" id="name" name="name" />
-                ${owner_field()}
-                <input class="btn" type="submit" name="add"
-                    value="${_('Add')}"/>
-              </fieldset>
-            </form>
-          </div>
         </div>
 
       </py:otherwise>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_enums.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_enums.html?rev=1448055&r1=1448054&r2=1448055&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_enums.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_enums.html Wed
Feb 20 09:29:58 2013
@@ -35,7 +35,7 @@
     <py:choose test="view">
       <form py:when="'detail'" class="well form-horizontal" id="modenum" method="post"
action="">
         <fieldset>
-          <legend i18n:msg="label_singular">Modify $label_singular</legend>
+          <legend i18n:msg="label_singular">Modify $label_singular:</legend>
           <div class="control-group">
             <label class="control-label" for="name">Name: </label>
             <div class="controls">
@@ -52,11 +52,25 @@
 
       <py:otherwise>
         <div class="row">
-          <div class="span6">
+          <div class="span9">
+            <form id="addenum" class="well form-inline" method="post" action="">
+              <fieldset>
+                <legend i18n:msg="label_singular">Add $label_singular:</legend>
+                <input class="btn" type="submit" name="add"
+                       value="${_('Add')}"/>
+                <label class="control-label" for="name">Name:</label>
+                <input class="input-medium" type="text"
+                       name="name" id="name"/>
+              </fieldset>
+            </form>
+          </div>
+        </div>
+        <div class="row">
+          <div class="span9">
             <py:choose>
-              <form py:when="enums" id="enumtable" method="post" action="">
+              <form py:when="enums" id="enumtable" class="form-inline" method="post" action="">
                 <table id="enumlist"
-                    class="table table-striped table-condensed table-bordered">
+                       class="table table-striped table-condensed table-bordered">
                   <thead>
                     <tr><th class="sel"><i class="icon-check"></i></th>
                       <th>Name</th><th>Default</th><th>Order</th>
@@ -81,12 +95,6 @@
                     </tr>
                   </tbody>
                 </table>
-                <p class="help-block" py:if="type=='priority'" i18n:msg="">
-                  <span class="label label-info">Note:</span>
-                  The order of priorities determines the
-                  coloring of entries in the ticket queries and reports.
-                </p>
-                <br/>
                 <div class="form-inline">
                   <input class="btn" type="submit" name="remove"
                       value="${_('Remove selected items')}" />
@@ -94,8 +102,13 @@
                       value="${_('Apply changes')}" />
                 </div>
                 <br/>
+                <p class="help-block" py:if="type=='priority'" i18n:msg="">
+                  <span class="label label-info">Note</span>
+                  The order of priorities determines the
+                  coloring of entries in the ticket queries and reports.
+                </p>
                 <p class="help-block">
-                  <span class="label label-info">Notice</span>
+                  <span class="label label-info">Note</span>
                   You can remove all items from this list to completely hide this
                   field from the user interface.
                 </p>
@@ -108,17 +121,6 @@
               </p>
             </py:choose>
           </div>
-          <div class="span3">
-            <form class="well" id="addenum" method="post" action="">
-              <fieldset>
-                <legend i18n:msg="label_singular">Add $label_singular:</legend>
-                <label class="control-label" for="name">Name:</label>
-                <input class="input-medium" type="text" name="name" id="name"/>
-                <input class="btn" type="submit" name="add"
-                      value="${_('Add')}"/>
-              </fieldset>
-            </form>
-          </div>
         </div>
 
       </py:otherwise>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_plugins.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_plugins.html?rev=1448055&r1=1448054&r2=1448055&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_plugins.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_plugins.html Wed
Feb 20 09:29:58 2013
@@ -72,7 +72,6 @@
                 enctype="multipart/form-data" action="" py:otherwise="">
             <fieldset>
               <legend>Install Plugin:</legend>
-
               <label i18n:msg="" for="plugin_file">File:</label>
               <input class="input-medium" type="file" id="plugin_file" size="10"
                      name="plugin_file" disabled="${readonly or None}" />

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_versions.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_versions.html?rev=1448055&r1=1448054&r2=1448055&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_versions.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_versions.html Wed
Feb 20 09:29:58 2013
@@ -84,7 +84,25 @@
 
       <py:otherwise>
         <div class="row">
-          <div class="span6">
+          <div class="span9">
+            <form class="well form-inline" id="addversion" method="post" action="">
+              <fieldset>
+                <legend>Add Version:</legend>
+                <input class="btn" type="submit" name="add"
+                       value="${_('Add')}" />
+                <label class="control-label" for="name">Name:</label>
+                <input class="input-medium" type="text" name="name"
+                       id="name" size="22" />
+                <label class="control-label" for="releaseddate">Released:</label>
+                <input type="text" id="releaseddate"
+                       name="time" size="${len(datetime_hint)}"
+                       value="${format_datetime()}" />
+              </fieldset>
+            </form>
+          </div>
+        </div>
+        <div class="row">
+          <div class="span9">
             <py:choose>
               <form py:when="versions" id="version_table" method="post" action="">
                 <table id="verlist"
@@ -114,7 +132,7 @@
                       value="${_('Apply changes')}" />
                 </div>
                 <p class="help-block">
-                  <span class="label label-info">Notice</span>
+                  <span class="label label-info">Note</span>
                   You can remove all items from this list to completely hide this
                   field from the user interface.
                 </p>
@@ -127,31 +145,7 @@
               </p>
             </py:choose>
           </div>
-          <div class="span3">
-            <form class="well" id="addversion" method="post" action="">
-              <fieldset>
-                <legend>Add Version:</legend>
-                <label for="name">Name:</label>
-                <input class="input-medium" type="text" name="name"
-                    id="name" size="22" />
-                <label for="releaseddate">Released:</label>
-                <input class="input-medium" type="text" id="releaseddate"
-                    name="time" size="${len(datetime_hint)}"
-                    placeholder="${_('Format: %(datehint)s', datehint=datetime_hint)}"
-                    value="${format_datetime()}" />
-                <p class="help-block">
-                  <span class="label label-info">Hint</span>
-                  <i18n:msg params="datehint">Format: $datetime_hint</i18n:msg>
-                </p>
-                <div class="control-group">
-                  <input class="btn" type="submit" name="add"
-                      value="${_('Add')}" />
-                </div>
-              </fieldset>
-            </form>
-          </div>
         </div>
-
       </py:otherwise>
     </py:choose>
   </body>



Mime
View raw message