From 6163f763aa9de25ac13275dd8bef6c2c102a9c67 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sun, 22 Sep 2013 22:55:04 +0200 Subject: [PATCH] CSS improvements. --- .../_application_controller_generic.js.coffee | 7 +++- .../customer_ticket_create.js.coffee | 7 ++++ .../app/views/customer_ticket_create.jst.eco | 37 ++++++++++++------- .../app/views/password/reset.jst.eco | 2 +- .../app/views/password/reset_change.jst.eco | 2 +- .../javascripts/app/views/signup.jst.eco | 2 +- app/assets/stylesheets/zzz.css | 29 +++++++++------ db/seeds.rb | 4 ++ 8 files changed, 59 insertions(+), 31 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee index 7053ade60..e51b9a2b5 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee @@ -203,12 +203,15 @@ class App.ControllerDrox extends App.Controller constructor: (params) -> super - if params.data && params.data.text + if params.data && ( params.data.text || params.data.html ) @inline(params.data) inline: (data) -> @html App.view('generic/drox')(data) - @el.find('.drox-body').text(data.text) + if data.text + @el.find('.drox-body').text(data.text) + if data.html + @el.find('.drox-body').html(data.html) template: (data) -> drox = $( App.view('generic/drox')(data) ) diff --git a/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee index 01e4e40d8..a6e1069dd 100644 --- a/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee @@ -114,6 +114,13 @@ class Index extends App.ControllerContent # update textarea size @el.find('textarea').trigger('change') + new App.ControllerDrox( + el: @el.find('.sidebar') + data: + header: App.i18n.translateInline('What can you do here?') + html: App.i18n.translateInline('The way to communicate with us is this thing called "Ticket".') + ' ' + App.i18n.translateInline('Here you can create one.') + ) + cancel: -> @navigate '#' diff --git a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco index de3e25bc6..a84e55d2c 100644 --- a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco @@ -1,17 +1,26 @@ -
-
-
-

<%- @T( 'New Ticket' ) %>

-
+
+
-
-
- -
-
- - +
+ +
+
+
+

<%- @T( 'New Ticket' ) %>

+
- +
+
+ +
+
+ + +
+
+
+
+
-
\ No newline at end of file +
+ diff --git a/app/assets/javascripts/app/views/password/reset.jst.eco b/app/assets/javascripts/app/views/password/reset.jst.eco index 2c0b5df1e..100d61e70 100644 --- a/app/assets/javascripts/app/views/password/reset.jst.eco +++ b/app/assets/javascripts/app/views/password/reset.jst.eco @@ -6,7 +6,7 @@ <% end %>

<%- @T( 'Forgot your password?' ) %>

-
+ <%- @T( 'Cancel' ) %>
diff --git a/app/assets/javascripts/app/views/password/reset_change.jst.eco b/app/assets/javascripts/app/views/password/reset_change.jst.eco index 21b6239d6..d16f2c4d8 100644 --- a/app/assets/javascripts/app/views/password/reset_change.jst.eco +++ b/app/assets/javascripts/app/views/password/reset_change.jst.eco @@ -1,6 +1,6 @@

<%- @T( 'Choose your new password.' ) %>

-
+

diff --git a/app/assets/javascripts/app/views/signup.jst.eco b/app/assets/javascripts/app/views/signup.jst.eco index 547b413ca..a9b71599f 100644 --- a/app/assets/javascripts/app/views/signup.jst.eco +++ b/app/assets/javascripts/app/views/signup.jst.eco @@ -1,6 +1,6 @@

<%- @T( 'Join' ) %> <%= @C( 'product_name' ) %>

-
+

<%- @T( 'Cancel' ) %> diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css index 104d58200..e2c9642f4 100644 --- a/app/assets/stylesheets/zzz.css +++ b/app/assets/stylesheets/zzz.css @@ -75,7 +75,7 @@ table th, table td { } .popover { - min-width: 180px; + min-width: 240px; z-index: 1110; } .hero-two { @@ -161,6 +161,8 @@ table th, table td { position: absolute; overflow-y: auto; overflow-x: hidden; + right: 0; + left: 0; } .content-two .main > .nav { margin-top: 12px; @@ -288,6 +290,16 @@ table th, table td { border-right: 1px solid #563d7c; } +#global-search { + width: 150px; + border-radius: 8px; + background-color: #f4f4f4; +} +#global-search:focus { + width: 200px; + background-color: #ffffff; +} + #task { position: fixed; display: table; @@ -397,12 +409,15 @@ h5 { .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; @@ -800,17 +815,7 @@ footer { .navbar-form { margin-top: 6px; margin-bottom: 6px; -} - -.nav .form-control { - border-radius: 8px; -} - -.nav .form-control { - background-color: #f5f5f5; -} -.nav .form-control:focus { - background-color: #ffffff; + padding: 0; } .navbar-brand { diff --git a/db/seeds.rb b/db/seeds.rb index 597b082bf..3ad5661b7 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1859,6 +1859,10 @@ Translation.create_if_not_exists( :locale => 'de', :source => "Feedback about ou Translation.create_if_not_exists( :locale => 'de', :source => "What ideas do you have?", :target => "Welche Ideen haben Sie?" ) Translation.create_if_not_exists( :locale => 'de', :source => "Attach Screenshot of page", :target => "Screenshot dieser Seite anhängen" ) Translation.create_if_not_exists( :locale => 'de', :source => "Thanks for your Feedback!", :target => "Vielen Dank für Ihre Feedback!" ) +Translation.create_if_not_exists( :locale => 'de', :source => "What can you do here?", :target => "Was können Sie hier machen?" ) +Translation.create_if_not_exists( :locale => 'de', :source => "Here you can create one.", :target => "Hier können Sie eins erstellen." ) +Translation.create_if_not_exists( :locale => 'de', :source => "Fold in", :target => "Einklappen" ) + #Translation.create_if_not_exists( :locale => 'de', :source => "", :target => "" ) # install all packages in auto_install