From e7c34179fd2ebcad417bfeb26fef6c94a24f74ae Mon Sep 17 00:00:00 2001
From: Felix Niklas <mail@felixniklas.de>
Date: Thu, 7 Aug 2014 01:17:13 +0200
Subject: [PATCH] simplify form-inline markup

---
 .../app/views/agent_ticket_view/bulk.jst.eco  | 88 +++++++++----------
 .../app/views/ticket_zoom/edit.jst.eco        | 60 ++++++-------
 2 files changed, 66 insertions(+), 82 deletions(-)

diff --git a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco
index dc3b7f2d0..241d8f3be 100644
--- a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco
@@ -1,60 +1,52 @@
 <form class="form-inline update-box bulk-action-form" role="form">
   <div id="form-ticket-bulk" class="horizontal">
     <div class="form-group">
-      <div class="input-group">
-        <label for="create_state_id" class="input-group-addon">Status</label>
-        <select id="create_state_id" class="form-control" name="state_id">
-          <option value="" selected="">-</option>
-          <option value="4">geschlossen</option>
-          <option value="5">zusammengefügt</optin>
-          <option value="1">neu</option>
-          <option value="2">offen</option>
-          <option value="3">warten</option>
-          <option value="6">zurück gezogen</option>
-        </select>
-      </div>
+      <label for="create_state_id" class="input-group-addon">Status</label>
+      <select id="create_state_id" class="form-control" name="state_id">
+        <option value="" selected="">-</option>
+        <option value="4">geschlossen</option>
+        <option value="5">zusammengefügt</optin>
+        <option value="1">neu</option>
+        <option value="2">offen</option>
+        <option value="3">warten</option>
+        <option value="6">zurück gezogen</option>
+      </select>
     </div>
     <div class="form-group">
-      <div class="input-group">
-        <label for="create_priority_id" class="input-group-addon">Priorität</label>
-        <select id="create_priority_id" class="form-control" name="priority_id">
-          <option value="" selected="">-</option>
-          <option value="1">1 niedrig</option>
-          <option value="2">2 normal</option>
-          <option value="3">3 hoch</option>
-        </select>        
-        <!-- 
-          there can't be any other elements in .input-group
-        -->
-        <!-- 
-          <span class="help-inline"></span>
-          <span class="help-block"></span> 
-        -->
-      </div>
+      <label for="create_priority_id" class="input-group-addon">Priorität</label>
+      <select id="create_priority_id" class="form-control" name="priority_id">
+        <option value="" selected="">-</option>
+        <option value="1">1 niedrig</option>
+        <option value="2">2 normal</option>
+        <option value="3">3 hoch</option>
+      </select>        
+      <!-- 
+        there can't be any other elements in .input-group
+      -->
+      <!-- 
+        <span class="help-inline"></span>
+        <span class="help-block"></span> 
+      -->
     </div>
     <div class="form-group">
-      <div class="input-group">
-        <label for="create_group_id" class="input-group-addon">Gruppe</label>
-        <select id="create_group_id" class="form-control" name="group_id">
-          <option value="">-</option>
-          <option value="4">FillGroup:450863</option>
-          <option value="3">FillGroup::918672</option>
-          <option value="2">Twitter</option>
-          <option value="1">Users</option>
-        </select>
-      </div>
+      <label for="create_group_id" class="input-group-addon">Gruppe</label>
+      <select id="create_group_id" class="form-control" name="group_id">
+        <option value="">-</option>
+        <option value="4">FillGroup:450863</option>
+        <option value="3">FillGroup::918672</option>
+        <option value="2">Twitter</option>
+        <option value="1">Users</option>
+      </select>
     </div>
     <div class="form-group">
-      <div class="input-group">
-        <label for="create_owner_id" class="input-group-addon">Besitzer</label>
-        <select id="create_owner_id" class="form-control" name="owner_id">
-          <option value="">-</option>
-          <option value="5">customer 838 customer 1838</option>
-          <option value="3">Felix Niklas</option>
-          <option value="2">Nicole Braun</option>
-          <option value="4">Robert Zammad</option>
-        </select>
-      </div>
+      <label for="create_owner_id" class="input-group-addon">Besitzer</label>
+      <select id="create_owner_id" class="form-control" name="owner_id">
+        <option value="">-</option>
+        <option value="5">customer 838 customer 1838</option>
+        <option value="3">Felix Niklas</option>
+        <option value="2">Nicole Braun</option>
+        <option value="4">Robert Zammad</option>
+      </select>
     </div>
     <div class="form-group">
       <input type="submit" class="btn primary submit" value="update">
diff --git a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
index 44a9ab6fd..097a0bc98 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
@@ -2,7 +2,7 @@
   <div class="avatar user-popover" data-id="<%= @S('id') %>" style="background-image: url(<%- @S('image') %>)"></div>
   <div class="flex text-bubble">
     <div class="bubble-arrow"></div>
-    <textarea class="fit"></textarea>
+    <textarea></textarea>
     <span class="bubble-placeholder">Antwort eingeben oder <span class="highlight">Dateien wählen</span></span>
   </div>
 </div>
@@ -10,45 +10,37 @@
 <form class="edit-ticket-properties form-inline" role="form">
   <div class="horizontal">
     <div class="form-group">
-      <div class="input-group">
-        <label for="update_ticket_1_state_id" class="input-group-addon">State</label>
-        <select id="update_ticket_1_state_id" class="form-control" name="state_id">
-          <option value="4">closed</option>
-          <option value="1" selected="">new</option>
-          <option value="2">open</option>
-          <option value="3">pending</option>
-        </select>
-      </div>
+      <label for="update_ticket_1_state_id" class="input-group-addon">State</label>
+      <select id="update_ticket_1_state_id" class="form-control" name="state_id">
+        <option value="4">closed</option>
+        <option value="1" selected="">new</option>
+        <option value="2">open</option>
+        <option value="3">pending</option>
+      </select>
     </div>
     <div class="form-group">
-      <div class="input-group">
-        <label for="update_ticket_1_priority_id" class="input-group-addon">Priority</label>
-        <select id="update_ticket_1_priority_id" class="form-control" name="priority_id">
-          <option value="1">1 low</option>
-          <option value="2" selected="">2 normal</option>
-          <option value="3">3 high</option>
-        </select>
-      </div>
+      <label for="update_ticket_1_priority_id" class="input-group-addon">Priority</label>
+      <select id="update_ticket_1_priority_id" class="form-control" name="priority_id">
+        <option value="1">1 low</option>
+        <option value="2" selected="">2 normal</option>
+        <option value="3">3 high</option>
+      </select>
     </div>
     <div class="form-group">
-      <div class="input-group">
-        <label for="update_ticket_1_group_id" class="input-group-addon">Group</label>
-        <select id="update_ticket_1_group_id" class="form-control" name="group_id">
-          <option value="4">FillGroup::450863</option>
-          <option value="3">FillGroup::918672</option>
-          <option value="2">Twitter</option>
-          <option value="1" selected="">Users</option>
-        </select>
-      </div>
+      <label for="update_ticket_1_group_id" class="input-group-addon">Group</label>
+      <select id="update_ticket_1_group_id" class="form-control" name="group_id">
+        <option value="4">FillGroup::450863</option>
+        <option value="3">FillGroup::918672</option>
+        <option value="2">Twitter</option>
+        <option value="1" selected="">Users</option>
+      </select>
     </div>
     <div class="form-group">
-      <div class="input-group">
-        <label for="update_ticket_1_owner_id" class="input-group-addon">Owner</label>
-        <select id="update_ticket_1_owner_id" class="form-control" name="owner_id">
-          <option value="">-</option>
-          <option value="3">Felix Niklas</option>
-        </select>
-      </div>
+      <label for="update_ticket_1_owner_id" class="input-group-addon">Owner</label>
+      <select id="update_ticket_1_owner_id" class="form-control" name="owner_id">
+        <option value="">-</option>
+        <option value="3">Felix Niklas</option>
+      </select>
     </div>
     <div class="form-group">
       <input type="submit" class="btn primary submit" value="update">