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

CSS improvements.

Browse source
This commit is contained in:
Martin Edenhofer 2013-09-22 22:55:04 +02:00
parent 696504635f
commit 6163f763aa
8 changed files with 59 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
View file

@ -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) )

7
app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee
View file

@ -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 '#'

37
app/assets/javascripts/app/views/customer_ticket_create.jst.eco
View file

@ -1,17 +1,26 @@
<div class="content-one ticket-create">
<div class="page-header clearfix">
<div class="page-header-title">
<h1 class="pull-left"><%- @T( 'New Ticket' ) %></h1>
</div>
<div class="content-two">
<div class="sidebar">
</div>
<div class="page-content">
<form class="form-horizontal form-large">
<input type="hidden" value="" name="article_type"/>
<div id="form_create"></div>
<div class="form-actions">
<button type="reset" class="btn btn-default cancel"><%- @T( 'Cancel' ) %></button>
<button type="submit" class="btn btn-primary submit"><%- @T( 'Create' ) %></button>
<div class="main">
<div class="ticket-create">
<div class="page-header clearfix">
<div class="page-header-title">
<h1 class="pull-left"><%- @T( 'New Ticket' ) %></h1>
</div>
</div>
</form>
<div class="page-content">
<form class="form-horizontal form-large">
<input type="hidden" value="" name="article_type"/>
<div id="form_create"></div>
<div class="form-actions">
<button type="reset" class="btn btn-default cancel"><%- @T( 'Cancel' ) %></button>
<button type="submit" class="btn btn-primary submit"><%- @T( 'Create' ) %></button>
</div>
</form>
</div>
</div>
</div>
</div>
</div>

2
app/assets/javascripts/app/views/password/reset.jst.eco
View file

@ -6,7 +6,7 @@
<% end %>
<div id="form-password">
<h2><%- @T( 'Forgot your password?' ) %><small></small></h2>
<form id="form-password-item" class="form-small">
<form id="form-password-item" class="form-normal">
<a href="#/" class="btn btn-default cancel"><%- @T( 'Cancel' ) %></a>
<button class="btn btn-primary submit"><%- @T( 'Submit' ) %></button>
</form>

2
app/assets/javascripts/app/views/password/reset_change.jst.eco
View file

@ -1,6 +1,6 @@
<div class="hero-unit">
<h2><%- @T( 'Choose your new password.' ) %><small></small></h2>
<form class="form-small">
<form class="form-normal">
<p id="form-password-change"></p>
<button class="btn btn-primary submit"><%- @T( 'Submit' ) %></button>
</form>

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

@ -1,6 +1,6 @@
<div class="hero-unit">
<h1><%- @T( 'Join' ) %> <%= @C( 'product_name' ) %><small></small></h1>
<form class="form-group form-small">
<form class="form-group form-normal">
<p id="form-signup"></p>
<a href="#/" class="btn btn-default cancel"><%- @T( 'Cancel' ) %></a>
<button class="btn btn-primary submit"><%- @T( 'Create my account' ) %></button>

29
app/assets/stylesheets/zzz.css
View file

@ -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 {

4
db/seeds.rb
View file

@ -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