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

bulkAction: move type and visibility to secondStep

Browse source
This commit is contained in:
Felix Niklas 2014-09-24 12:02:03 +02:00
parent 9be9d56d74
commit 95d7f7a0eb
5 changed files with 59 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/assets/javascripts/app/controllers/ticket_overview.js.coffee
View file

@ -200,9 +200,9 @@ class Table extends App.ControllerContent
value
callbackCheckbox = (id, checked, e) =>
if @el.find('table').find('input[name="bulk"]:checked').length == 0
@el.find('.bulk-action').addClass('hide')
@el.find('.bulkAction').addClass('hide')
else
@el.find('.bulk-action').removeClass('hide')
@el.find('.bulkAction').removeClass('hide')
callbackIconHeader = (header) ->
attribute =
name: 'icon'
@ -259,9 +259,9 @@ class Table extends App.ControllerContent
@frontendTimeUpdate()
# start bulk action observ
@el.find('.bulk-action').append( @bulk_form() )
@el.find('.bulkAction').append( @bulk_form() )
if @el.find('.table-overview').find('input[name="bulk"]:checked').length isnt 0
@el.find('.bulk-action').removeClass('hide')
@el.find('.bulkAction').removeClass('hide')
# show/hide bulk action
@el.find('.table-overview').delegate('input[name="bulk"], input[name="bulk_all"]', 'click', (e) =>
@ -269,13 +269,13 @@ class Table extends App.ControllerContent
if @el.find('.table-overview').find('input[name="bulk"]:checked').length == 0
# hide
@el.find('.bulk-action').addClass('hide')
@el.find('.bulkAction').addClass('hide')
@resetBulkForm()
else
# show
@el.find('.bulk-action').removeClass('hide')
@el.find('.bulkAction').removeClass('hide')
)
# deselect bulk_all if one item is uncheck observ
@ -325,9 +325,7 @@ class Table extends App.ControllerContent
{ name: 'state_id', display: 'State', tag: 'select', multiple: false, null: true, relation: 'TicketState', filter: @bulk, translate: true, nulloption: true, default: '', class: '', item_class: '' },
{ name: 'priority_id', display: 'Priority', tag: 'select', multiple: false, null: true, relation: 'TicketPriority', filter: @bulk, translate: true, nulloption: true, default: '', class: '', item_class: '' },
{ name: 'group_id', display: 'Group', tag: 'select', multiple: false, null: true, relation: 'Group', filter: @bulk, nulloption: true, class: '', item_class: '' },
{ name: 'owner_id', display: 'Owner', tag: 'select', multiple: false, null: true, relation: 'User', filter: @bulk, nulloption: true, class: '', item_class: '' },
{ name: 'type_id', display: 'Type', tag: 'select', multiple: false, null: true, relation: 'TicketArticleType', filter: articleTypeFilter, default: '9', translate: true, class: 'medium' },
{ name: 'internal', display: 'Visibility', tag: 'select', null: true, options: { true: 'internal', false: 'public' }, class: 'medium', item_class: '', default: false }
{ name: 'owner_id', display: 'Owner', tag: 'select', multiple: false, null: true, relation: 'User', filter: @bulk, nulloption: true, class: '', item_class: '' }
]
# render init page
@ -341,16 +339,32 @@ class Table extends App.ControllerContent
form_data: @bulk
noFieldset: true
)
new App.ControllerForm(
el: html.find('#form-ticket-bulk-text')
el: html.find('#form-ticket-bulk-comment')
model:
configure_attributes: [{ name: 'body', display: 'Comment', tag: 'textarea', rows: 1, null: true, upload: false, item_class: 'flex' }]
configure_attributes: [{ name: 'body', display: 'Comment', tag: 'textarea', rows: 4, null: true, upload: false, item_class: 'flex' }]
className: 'create'
labelClass: 'input-group-addon'
form_data: @bulk
noFieldset: true
)
#html.delegate('.bulk-action-form', 'submit', (e) =>
@confirm_attributes = [
{ name: 'type_id', display: 'Type', tag: 'select', multiple: false, null: true, relation: 'TicketArticleType', filter: articleTypeFilter, default: '9', translate: true, class: 'medium' }
{ name: 'internal', display: 'Visibility', tag: 'select', null: true, options: { true: 'internal', false: 'public' }, class: 'medium', item_class: '', default: false }
]
new App.ControllerForm(
el: html.find('#form-ticket-bulk-typeVisibility')
model:
configure_attributes: @confirm_attributes
className: 'create'
labelClass: 'input-group-addon'
form_data: @bulk
noFieldset: true
)
html.bind('submit', (e) =>
e.preventDefault()
@bulk_submit(e)

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

@ -1,71 +1,16 @@
<form class="update-box bulk-action-form" role="form">
<div class="horizontal center js-action-step">
<form class="update-box bulkAction-form" role="form">
<div class="horizontal center bulkAction-firstStep js-action-step">
<div id="form-ticket-bulk" class="form-inline form-inline--enclosed flex horizontal"></div>
<div class="btn btn--primary js-confirm"><%- @T('Confirm') %></div>
</div>
<div class="horizontal center hide js-confirm-step">
<div id="form-ticket-bulk-text" class="form-inline flex horizontal"></div>
<div class="bulkAction-labelOffset">
<a class="subtle-link standalone js-cancel"><%- @T( 'Cancel' ) %></a>
<input type="submit" class="btn btn--primary submit" value="<%- @T('Update') %>">
<div class="vertical hide bulkAction-secondStep js-confirm-step">
<div id="form-ticket-bulk-comment" class="form-inline horizontal"></div>
<div class="horizontal">
<div id="form-ticket-bulk-typeVisibility" class="form-inline"></div>
<div class="bulkAction-controls align-right">
<a class="subtle-link standalone js-cancel"><%- @T( 'Go Back' ) %></a>
<input type="submit" class="btn btn--primary submit" value="<%- @T('Update') %>">
</div>
</div>
</div>
</form>
<!--
<form class="form-inline update-box bulk-action-form">
<div id="form-ticket-bulk2" class="horizontal">
<div class="form-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>
<div class="form-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>
<div class="form-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>
<div class="form-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>
<div class="form-group">
<input type="submit" class="btn primary submit" value="update">
</div>
</div>
</form>
-->
</form>

2
app/assets/javascripts/app/views/agent_ticket_view/content.jst.eco
View file

@ -18,5 +18,5 @@
<div class="table-overview"></div>
</div>
<div class="bulk-action hide"></div>
<div class="bulkAction hide"></div>
</div>

2
app/assets/javascripts/app/views/ticket_zoom.jst.eco
View file

@ -31,7 +31,7 @@
<div class="tabsSidebar vertical"></div>
</div>
<form class="bottom-form form-inline horizontal" role="form">
<form class="ticket-attributes bottom-form form-inline horizontal" role="form">
<div class="form-group">
<label for="update_ticket_1_state_id123" class="input-group-addon u-clickable">State</label>
<select id="update_ticket_1_state_id123" class="form-control level-1" name="state_id">

32
app/assets/stylesheets/zzz.css.erb
View file

@ -1294,7 +1294,7 @@ footer {
padding: 10px 20px;
}
.bulk-action {
.bulkAction {
background: white;
z-index: 1;
box-shadow:
@ -1303,12 +1303,12 @@ footer {
0 -3px rgba(0,0,0,.01);
}
.bulk-action .btn {
.bulkAction .btn {
margin: 0 10px;
}
.bulkAction-labelOffset {
margin-top: 14px;
.bulkAction-controls {
margin-top: 10px;
}
.show_toogle {
@ -2219,7 +2219,7 @@ footer {
height: 60px;
}
.form-inline .form-group:last-child {
.ticket-attributes.form-inline .form-group:last-child {
flex-grow: 0;
}
@ -2270,12 +2270,13 @@ footer {
}
.form-inline .input-group-addon {
width: auto;
padding: 0;
margin: 10px 18px 0;
font-size: 13px;
letter-spacing: 0.05em;
color: #ccc;
display: block;
display: inline-block;
position: relative;
}
@ -2296,22 +2297,29 @@ footer {
appearance: none;
}
.form-inline .textarea.form-group {
padding: 0 18px;
.bulkAction-secondStep .form-group {
min-width: 100px;
}
.bulkAction-secondStep .form-inline .textarea.form-group {
padding: 0 10px;
height: auto;
flex-grow: 1;
}
.form-inline .textarea.form-group .input-group-addon {
margin-left: 0;
margin-right: 0;
.bulkAction-secondStep .form-inline .textarea.form-group .input-group-addon {
margin-left: 8px;
margin-right: 8px;
margin-bottom: 5px;
}
.form-inline textarea.form-control {
.bulkAction-secondStep .form-inline textarea.form-control {
display: block;
padding-left: 8px;
padding-right: 8px;
width: 100%;
resize: vertical;
border-color: #f0f0f0;
}
.ticketZoom {