Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

simplify form-inline markup

Browse source
This commit is contained in:
Felix Niklas 2014-08-07 01:17:13 +02:00
parent 1a058f5bcb
commit e7c34179fd
2 changed files with 66 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco
View file

@ -1,60 +1,52 @@
<form class="form-inline update-box bulk-action-form" role="form"> <form class="form-inline update-box bulk-action-form" role="form">
<div id="form-ticket-bulk" class="horizontal"> <div id="form-ticket-bulk" class="horizontal">
<div class="form-group"> <div class="form-group">
<div class="input-group"> <label for="create_state_id" class="input-group-addon">Status</label>
<label for="create_state_id" class="input-group-addon">Status</label> <select id="create_state_id" class="form-control" name="state_id">
<select id="create_state_id" class="form-control" name="state_id"> <option value="" selected="">-</option>
<option value="" selected="">-</option> <option value="4">geschlossen</option>
<option value="4">geschlossen</option> <option value="5">zusammengefügt</optin>
<option value="5">zusammengefügt</optin> <option value="1">neu</option>
<option value="1">neu</option> <option value="2">offen</option>
<option value="2">offen</option> <option value="3">warten</option>
<option value="3">warten</option> <option value="6">zurück gezogen</option>
<option value="6">zurück gezogen</option> </select>
</select>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="input-group"> <label for="create_priority_id" class="input-group-addon">Priorität</label>
<label for="create_priority_id" class="input-group-addon">Priorität</label> <select id="create_priority_id" class="form-control" name="priority_id">
<select id="create_priority_id" class="form-control" name="priority_id"> <option value="" selected="">-</option>
<option value="" selected="">-</option> <option value="1">1 niedrig</option>
<option value="1">1 niedrig</option> <option value="2">2 normal</option>
<option value="2">2 normal</option> <option value="3">3 hoch</option>
<option value="3">3 hoch</option> </select>
</select> <!--
<!-- there can't be any other elements in .input-group
there can't be any other elements in .input-group -->
--> <!--
<!-- <span class="help-inline"></span>
<span class="help-inline"></span> <span class="help-block"></span>
<span class="help-block"></span> -->
-->
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="input-group"> <label for="create_group_id" class="input-group-addon">Gruppe</label>
<label for="create_group_id" class="input-group-addon">Gruppe</label> <select id="create_group_id" class="form-control" name="group_id">
<select id="create_group_id" class="form-control" name="group_id"> <option value="">-</option>
<option value="">-</option> <option value="4">FillGroup:450863</option>
<option value="4">FillGroup:450863</option> <option value="3">FillGroup::918672</option>
<option value="3">FillGroup::918672</option> <option value="2">Twitter</option>
<option value="2">Twitter</option> <option value="1">Users</option>
<option value="1">Users</option> </select>
</select>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="input-group"> <label for="create_owner_id" class="input-group-addon">Besitzer</label>
<label for="create_owner_id" class="input-group-addon">Besitzer</label> <select id="create_owner_id" class="form-control" name="owner_id">
<select id="create_owner_id" class="form-control" name="owner_id"> <option value="">-</option>
<option value="">-</option> <option value="5">customer 838 customer 1838</option>
<option value="5">customer 838 customer 1838</option> <option value="3">Felix Niklas</option>
<option value="3">Felix Niklas</option> <option value="2">Nicole Braun</option>
<option value="2">Nicole Braun</option> <option value="4">Robert Zammad</option>
<option value="4">Robert Zammad</option> </select>
</select>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="submit" class="btn primary submit" value="update"> <input type="submit" class="btn primary submit" value="update">

60
app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
View file

@ -2,7 +2,7 @@
<div class="avatar user-popover" data-id="<%= @S('id') %>" style="background-image: url(<%- @S('image') %>)"></div> <div class="avatar user-popover" data-id="<%= @S('id') %>" style="background-image: url(<%- @S('image') %>)"></div>
<div class="flex text-bubble"> <div class="flex text-bubble">
<div class="bubble-arrow"></div> <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> <span class="bubble-placeholder">Antwort eingeben oder <span class="highlight">Dateien wählen</span></span>
</div> </div>
</div> </div>
@ -10,45 +10,37 @@
<form class="edit-ticket-properties form-inline" role="form"> <form class="edit-ticket-properties form-inline" role="form">
<div class="horizontal"> <div class="horizontal">
<div class="form-group"> <div class="form-group">
<div class="input-group"> <label for="update_ticket_1_state_id" class="input-group-addon">State</label>
<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">
<select id="update_ticket_1_state_id" class="form-control" name="state_id"> <option value="4">closed</option>
<option value="4">closed</option> <option value="1" selected="">new</option>
<option value="1" selected="">new</option> <option value="2">open</option>
<option value="2">open</option> <option value="3">pending</option>
<option value="3">pending</option> </select>
</select>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="input-group"> <label for="update_ticket_1_priority_id" class="input-group-addon">Priority</label>
<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">
<select id="update_ticket_1_priority_id" class="form-control" name="priority_id"> <option value="1">1 low</option>
<option value="1">1 low</option> <option value="2" selected="">2 normal</option>
<option value="2" selected="">2 normal</option> <option value="3">3 high</option>
<option value="3">3 high</option> </select>
</select>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="input-group"> <label for="update_ticket_1_group_id" class="input-group-addon">Group</label>
<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">
<select id="update_ticket_1_group_id" class="form-control" name="group_id"> <option value="4">FillGroup::450863</option>
<option value="4">FillGroup::450863</option> <option value="3">FillGroup::918672</option>
<option value="3">FillGroup::918672</option> <option value="2">Twitter</option>
<option value="2">Twitter</option> <option value="1" selected="">Users</option>
<option value="1" selected="">Users</option> </select>
</select>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="input-group"> <label for="update_ticket_1_owner_id" class="input-group-addon">Owner</label>
<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">
<select id="update_ticket_1_owner_id" class="form-control" name="owner_id"> <option value="">-</option>
<option value="">-</option> <option value="3">Felix Niklas</option>
<option value="3">Felix Niklas</option> </select>
</select>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="submit" class="btn primary submit" value="update"> <input type="submit" class="btn primary submit" value="update">