From 442995dbc9ab289485691c5b1471151c6968e38e Mon Sep 17 00:00:00 2001
From: magnolia-fan <magnolia_fan@me.com>
Date: Wed, 14 Sep 2011 22:39:44 +0400
Subject: [PATCH] Settings template updated

---
 app/assets/stylesheets/settings.scss | 11 +++++++++++
 app/views/user/_settings.html.haml   | 17 ++++++++++++-----
 config/locales/en.yml                |  4 ++++
 config/locales/ru.yml                |  4 ++++
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss
index c11e8a4..a85c269 100644
--- a/app/assets/stylesheets/settings.scss
+++ b/app/assets/stylesheets/settings.scss
@@ -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;
+  }
 }
\ No newline at end of file
diff --git a/app/views/user/_settings.html.haml b/app/views/user/_settings.html.haml
index 13c10cc..c30f3d1 100644
--- a/app/views/user/_settings.html.haml
+++ b/app/views/user/_settings.html.haml
@@ -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?) }
\ No newline at end of file
+            %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') }
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7f16e4e..ab57e7a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -25,7 +25,11 @@ en:
       music: "Music"
       lastfm: "Last.fm"
     music:
+      title: "Show"
       albums: "Albums"
+      singles: "Singles"
+      live: "Live"
+      bootlegs: "Bootlegs"
     username: "Username"
     email: "Email"
     lang:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index aeae8e0..41ed4ad 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -25,7 +25,11 @@ ru:
       music: "Музыка"
       lastfm: "Last.fm"
     music:
+      title: "Показывать"
       albums: "Альбомы"
+      singles: "Синглы"
+      live: "Живые выступления"
+      bootlegs: "Бутлеги"
     username: "Имя"
     email: "Почта"
     lang: