From 135843ed858260184279523b837f2ed281e17898 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Sun, 22 Apr 2012 17:33:02 +0200 Subject: [PATCH] add .well style to ticket zoom answer to set it off visually from the article-list --- .../controllers/agent_ticket_zoom.js.coffee | 2 +- .../app/views/agent_ticket_zoom.jst.eco | 10 +++++----- app/assets/stylesheets/zzz.css | 18 ++++++++++++++++-- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee index 0601517fc..fa08b3381 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee @@ -110,7 +110,7 @@ class Index extends App.Controller @configure_attributes_ticket = [ { name: 'ticket_state_id', display: 'State', tag: 'select', multiple: false, null: true, relation: 'TicketState', default: 'new', class: 'span2', item_class: 'keepleft' }, - { name: 'ticket_priority_id', display: 'Priority', tag: 'select', multiple: false, null: true, relation: 'TicketPriority', default: '2 normal', class: 'span2', item_class: 'keepleft' }, + { name: 'ticket_priority_id', display: 'Priority', tag: 'select', multiple: false, null: true, relation: 'TicketPriority', default: '2 normal', class: 'span1', item_class: 'keepleft' }, { name: 'group_id', display: 'Group', tag: 'select', multiple: false, null: true, relation: 'Group', class: 'span2', item_class: 'keepleft' }, { name: 'owner_id', display: 'Owner', tag: 'select', multiple: false, null: true, relation: 'User', filter: @edit_form, nulloption: true, class: 'span2', item_class: 'keepleft' }, ] diff --git a/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco b/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco index e816bced0..b70b283c8 100644 --- a/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco @@ -2,16 +2,16 @@

<%= @ticket.title %> <%= @ticket.number %>

-
+
-
-
+
+
-
+
@@ -21,7 +21,7 @@
  - +
diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css index 6181212bf..61eed2071 100644 --- a/app/assets/stylesheets/zzz.css +++ b/app/assets/stylesheets/zzz.css @@ -74,15 +74,29 @@ footer { } .keepleft { - float:left; + float: left; +} + +.keepright { + float: right; } .update-box { margin-left: 10px; } -.article { +.ticket-answer .well { + margin-left: 0; + margin-right: 20px; +} +.ticket-answer .avatar { + margin-left: 0; +} +.ticket-answer .span8 { width: 560px; } + +.article { + margin-left: 0; padding-top: 4px; padding-bottom: 4px; margin-top: 5px;