diff --git a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee index 826bd95e3..35728f3cc 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee @@ -49,6 +49,9 @@ class App.ControllerForm extends App.Controller item = @formGenItem( attribute, @model.className, fieldset ) item.appendTo(fieldset) + if @no_fieldset + fieldset = fieldset.children() + if @fullForm if !@formClass @formClass = '' diff --git a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee index 6704c498e..343afb69a 100644 --- a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee @@ -299,22 +299,23 @@ class Table extends App.ControllerContent bulk_form: => @configure_attributes_ticket = [ - { name: 'state_id', display: 'State', tag: 'select', multiple: false, null: true, relation: 'TicketState', filter: @bulk, translate: true, nulloption: true, default: '', class: 'span2', item_class: 'pull-left' }, - { name: 'priority_id', display: 'Priority', tag: 'select', multiple: false, null: true, relation: 'TicketPriority', filter: @bulk, translate: true, nulloption: true, default: '', class: 'span2', item_class: 'pull-left' }, - { name: 'group_id', display: 'Group', tag: 'select', multiple: false, null: true, relation: 'Group', filter: @bulk, nulloption: true, class: 'span2', item_class: 'pull-left' }, - { name: 'owner_id', display: 'Owner', tag: 'select', multiple: false, null: true, relation: 'User', filter: @bulk, nulloption: true, class: 'span2', item_class: 'pull-left' }, + { 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: '' }, ] # render init page html = $( App.view('agent_ticket_view/bulk')() ) - new App.ControllerForm( - el: html.find('#form-ticket-bulk'), - model: { - configure_attributes: @configure_attributes_ticket, - className: 'create', - }, - form_data: @bulk, - ) + # new App.ControllerForm( + # el: html.find('#form-ticket-bulk'), + # model: { + # configure_attributes: @configure_attributes_ticket, + # className: 'create' + # }, + # form_data: @bulk, + # no_fieldset: true + # ) # html.delegate('.bulk-action-form', 'submit', (e) => html.bind('submit', (e) => e.preventDefault() 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 888557834..4e1aa6a2c 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,4 +1,66 @@ -
-
- + +
+
+
+ + + +
+
+
+
+ + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/agent_ticket_view/content.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/content.jst.eco index c55584211..47b5236fd 100644 --- a/app/assets/javascripts/app/views/agent_ticket_view/content.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_view/content.jst.eco @@ -1,35 +1,22 @@ -
-
-

<%- @T( @overview.name ) %> <% if @edit: %><% end %>

-
-
- -
-
- +
+
+
+
+

<%- @T( @overview.name ) %> <% if @edit: %><% end %>

+
+
+ +
+
-
+
+
-
+
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco index 91cb33b69..e96945bdf 100644 --- a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco +++ b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco @@ -1,7 +1,7 @@
-

<%- @T( @overview.name ) %>

+

<%- @T( @overview.name ) %>

diff --git a/app/assets/stylesheets/layout.css b/app/assets/stylesheets/layout.css index 05db3f68f..a710111bd 100755 --- a/app/assets/stylesheets/layout.css +++ b/app/assets/stylesheets/layout.css @@ -67,6 +67,10 @@ body.fit { margin: 0; } +.scrollable { + overflow: auto; +} + .flex { -webkit-box-flex: 1; -ms-flex: 1; @@ -186,7 +190,8 @@ body.fit { } .two-columns, -.three-columns { +.three-columns, +.wrap { -ms-box-lines: multiple; -moz-flex-wrap: wrap; -webkit-flex-wrap: wrap; diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 98a7d650f..d4093df84 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -435,7 +435,7 @@ h1 { h2, h2.popover-title { - font-size: 22px; + font-size: 19px; line-height: 25px; color: rgba(0,8,14,.73); } @@ -576,12 +576,16 @@ label { margin-bottom: 15px; } -.page-header-title h2 { - margin-top: 10px; +.page-header-title h1 { + margin-top: 13px; } .page-header-meta { - margin-top: 5px; + margin-top: 10px; + margin-left: auto; +} + +.page-header-meta.horizontal .pagination { margin-left: auto; } @@ -1338,9 +1342,17 @@ footer { border-color: #eee; } +.overview { + padding: 10px 20px; +} + .bulk-action { - position: absolute; - width: 100%; + background: white; + z-index: 1; + box-shadow: + 0 -1px rgba(0,0,0,.05), + 0 -2px rgba(0,0,0,.03), + 0 -3px rgba(0,0,0,.01); } .sidebar .action { @@ -1537,7 +1549,9 @@ footer { padding: 9px 14px; } +.btn.primary, .btn-primary { + color: white; background: #419ed7; border-color: #419ed7; } @@ -2041,6 +2055,7 @@ footer { padding: 10px 20px; background: #f8f9fa; overflow: auto; + position: relative; } .popover { @@ -2261,6 +2276,44 @@ footer { background: white; } +.form-inline .input-group-addon, +.form-inline .form-control { + background: white; + border: none; + line-height: 1; +} + + .form-inline .form-group { + padding: 10px; + overflow: hidden; + } + + .form-inline .form-group:not(:last-child) { + border-right: 1px solid #f0f0f0; + } + + .form-inline .input-group-addon { + padding: 0 10px 2px; + font-size: 13px; + text-align: left; + letter-spacing: 0.05em; + color: #ccc; + display: block; + } + + .form-inline .form-control { + margin: 0 10px; + display: block; + padding: 0 0 2px; + float: none; + height: auto; + border-radius: 0; + -webkit-appearance: none; + -moz-appearance: none; + -ms-appearance: none; + appearance: none; + } + /* ----------------