localhots/oldhaven
1
0
Fork 0
Code Releases Activity

Settings template updated

Browse Source
This commit is contained in:
magnolia-fan
2011-09-14 22:39:44 +04:00
parent 567e2d90c6
commit 442995dbc9
4 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/settings.scss
+11
View File
@@ -8,4 +8,15 @@
.lastfm {
display: none;
}
.borderless {
border: none !important;
background: transparent !important;
-webkit-transition: none !important;
-moz-transition: none !important;
transition: none !important;
-webkit-box-shadow: none !important;
-moz-box-shadow: none !important;
box-shadow: none !important;
margin-top: 2px !important;
}
}
app/views/user/_settings.html.haml
+12 -5
View File
@@ -21,6 +21,8 @@
%label{ :for => "email" }= I18n.t 'settings.email'
.input
%input.xlarge#email{ :name => "email", :size => 30, :type => "text", :value => @user.email }
.actions
%input.btn.primary{ :type => "submit", :value => I18n.t('settings.save') }
.form.site
%form
%fieldset
@@ -30,11 +32,13 @@
%select.medium#lang{ :name => "lang" }
%option{ :value => "en", :selected => (@user.lang == 'en') }= I18n.t 'settings.lang.en'
%option{ :value => "ru", :selected => (@user.lang == 'ru') }= I18n.t 'settings.lang.ru'
.actions
%input.btn.primary{ :type => "submit", :value => I18n.t('settings.save') }
.form.music
%form
%fieldset
.clearfix
%label{ :for => "album_types" }= I18n.t 'settings.show'
%label{ :for => "album_types" }= I18n.t 'settings.music.title'
.input
%ul.inputs-list
%li
@@ -53,13 +57,16 @@
%label
%input{ :name => "show_bootleg", :type => "checkbox", :disabled => "disabled" }
%span= I18n.t 'settings.music.bootlegs'
.actions
%input.btn.primary{ :type => "submit", :value => I18n.t('settings.save') }
.form.lastfm
%form
%fieldset
.clearfix
%label{ :for => "lastfm_username" }= I18n.t 'settings.username'
.input
.input-append
%input#lastfm_username{ :name => "lastfm_username", :type => "text", :disabled => "disabled", :value => @user.lastfm_username }
%label.add-on.disabled{ :class => ('active' unless @user.lastfm_key.nil?) }
%input{ :type => "checkbox", :disabled => "disabled", :checked => (!@user.lastfm_key.nil?) }
%input.borderless#lastfm_username{ :type => "text", :readonly => "readonly", :value => (@user.lastfm_username || I18n.t('settings.not_connected')) }
%span.help-inline
%input.btn{ :type => "submit", :value => I18n.t('settings.connect') }
.actions
%input.btn.primary{ :type => "submit", :value => I18n.t('settings.save') }