From 3d0864e1ba0beec8ee47b8cc5b70bde95957e04c Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 4 Sep 2014 23:56:58 +0200 Subject: [PATCH] style create new ticket --- .../controllers/agent_ticket_create.js.coffee | 2 + .../app/views/agent_ticket_create.jst.eco | 98 ++++++++++-- .../app/views/popover/ticket.jst.eco | 2 +- .../app/views/ticket_zoom/edit.jst.eco | 2 +- app/assets/stylesheets/zzz.css.erb | 144 +++++++++++++++--- 5 files changed, 212 insertions(+), 36 deletions(-) diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index 1e6c81660..8abbd12f3 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -197,6 +197,8 @@ class App.TicketCreate extends App.Controller el: @el.find('.ticket-create').find('textarea') ) + $('#tags').tokenfield() + # start auto save @autosave() diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco index 49facbffc..780377332 100644 --- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco @@ -1,18 +1,90 @@ -
- - - -
- -
-
-   +
+
+ - -
+
    + +
  • + + <%- @T( 'E-Mail' ) %> + +
  • +
    + <%- @T( 'Received Call' ) %> + +
  • +
    + <%- @T( 'Outbound Call' ) %> + +
+ +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ + +
+ +
+ + +
+ <%- @T( 'Cancel & Go Back' ) %> + +
+
+

-
+

#

<%- @P( @ticket.number ) %>
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 c58aafc24..869493e7c 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco @@ -77,7 +77,7 @@
- +
Antwort eingeben oder diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 402e61db2..070ce4c81 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -157,6 +157,13 @@ span[data-tooltip]:hover:before { transition: transform 300ms 1.5s cubic-bezier(0.34,1.6,0.71,1), opacity 300ms 1.5s; } +.form-control::-webkit-input-placeholder, +.token-input::-webkit-input-placeholder { color: hsl(0,0%,80%); } +.form-control::-moz-placeholder, +.token-input::-moz-placeholder { opacity: 1; color: hsl(0,0%,80%); } +.form-control:-ms-input-placeholder, +.token-input:-ms-input-placeholder { color: hsl(0,0%,80%); } + .glyphicon { font-size: 13px; } @@ -630,13 +637,15 @@ label { .form-control { height: 41px; + line-height: 22px; font-weight: normal; box-shadow: none; border-radius: 3px; transition: none; } - .form-control:focus { + .form-control:focus, + .tokenfield.focus { box-shadow: none; border-color: #419ed7; } @@ -663,25 +672,6 @@ label { z-index: 1; } -.form-large { - width: 85%; - max-width: 700px; -} -.form-normal { - width: 70%; - max-width: 400px; -} -.form-small { - width: 50%; - max-width: 250px; -} -.form-normal fieldset { - margin-bottom: 10px; -} -.sidebar fieldset { - margin-bottom: 10px; -} - .form-horizontal label { text-align: right; float: left; @@ -832,6 +822,11 @@ label { color: rgba(0,0,0,.5); } +ul.tabs { + padding: 0; + list-style: none; +} + ol.tabs { padding: 0; list-style: decimal inside; @@ -1716,13 +1711,18 @@ footer { padding: 9px 24px 8px; } -.btn.primary, .btn-primary { color: white; background: #419ed7; border-color: #419ed7; } +.btn-create, +.btn-create:hover { + color: white; + background: hsl(145,51%,45%); +} + .navigation { width: 260px; background: #26272e; @@ -3166,6 +3166,108 @@ footer { opacity: 0.5; } +.create-new { + padding: 34px; +} + +.box { + background: white; + margin: 0 auto; + border: 1px solid #e6e6e6; + padding: 12px 24px 20px; +} + + .box .page-header { + text-align: center; + border-bottom: none; + margin: 0; + padding-bottom: 12px; + } + + .box h1 { + color: hsl(60,1%,34%); + } + + .box .subtle-link { + color: hsl(0,0%,89%); + } + + .box .form-control:not(:focus):not(.focus) { + border-color: hsl(0,0%,90%); + } + + .box .two-columns { + margin-left: -4px; + margin-right: -4px; + } + + .box .two-columns .column { + margin-left: 4px; + margin-right: 4px; + width: calc(50% - 8px); + } + +.formset-inset { + margin: 31px -24px 24px; + padding: 19px 24px 4px; + background: hsl(197,20%,93%); + border-top: 1px solid hsl(0,0%,90%); + border-bottom: 1px solid hsl(0,0%,90%); +} + +.type-tabs .tab { + line-height: 40px; + padding: 0; +} + +.type-tabs .icon { + vertical-align: top; + margin-right: 9px; + margin-top: 10px; + transform: scale(1.2); +} + +.tokenfield .token { + padding: 0 0 0 10px; + margin: -1px 5px 0 0; + height: 26px; + line-height: 27px; + color: white; + background: hsl(198,19%,72%); + border: none; + float: none; +} + + .tokenfield .token-input { + vertical-align: top; + margin: 2px 0 0 5px; + } + + .tokenfield .token .token-label { + padding: 0; + } + + .tokenfield.form-control { + padding-top: 8px; + } + + .tokenfield .token .close { + margin: 0; + padding: 0 10px 0 5px; + font-family: inherit; + font-weight: 100; + font-size: 30px; + line-height: 1; + color: white; + text-shadow: none; + opacity: .3; + outline: none; + } + + .tokenfield .token .close:hover { + opacity: .5; + } + /* ----------------