I don't know what is there. I'm just drunk, dammit.

This commit is contained in:
magnolia-fan
2011-09-13 01:35:46 +04:00
parent 79f57959a8
commit 6c8831618e
8 changed files with 95 additions and 29 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
.alert-message.error
%p Something very bad happened, sorry :(
%p= I18n.t 'search.fail'
+2 -2
View File
@@ -1,6 +1,6 @@
- if @loading
.alert-message.warning
%p Artist info is loading for the first time. Please, be patient! :)
%p= I18n.t 'search.loading'
.row.artist-info
.span4.columns.pic
= image_tag @artist[:artist][:pic] unless @artist[:artist][:pic].nil?
@@ -14,7 +14,7 @@
.span4.columns.art
%img{ :src => album[:pic] }
.button-container
%a.btn Add to playlist
%a.btn= I18n.t 'player.add'
.span7.columns.tracks
%h3= album[:name] + " (" + album[:year].to_s + ")"
%table.zebra-striped.tracklist
+1 -1
View File
@@ -1,5 +1,5 @@
.alert-message.warning
%p Made a typo?
%p= I18n.t 'search.typo'
%ul.suggestions
- @suggestions.each do |artist|
+5 -5
View File
@@ -18,11 +18,11 @@
%a{ :href => "#/" } BeatHaven
%ul.nav
%li
%a{ :href => "http://blog.beathaven.org/", :"data-ls" => "NEWS" } Blog
%a{ :href => "http://blog.beathaven.org/" }= I18n.t 'global.news'
%li
%a.about{ :href => "#/about/" } About
%a.about{ :href => "#/about/" }= I18n.t 'global.about'
%form#search-form{ :action => "" }
%input#search{ :type => "text", :placeholder => "Search" }
%input#search{ :type => "text", :placeholder => I18n.t('global.search') }
#artist-load-spinner
= image_tag "artist_loader.gif"
%ul.nav.secondary-nav
@@ -30,10 +30,10 @@
%a.dropdown-toggle#username{ :href => "#" } %username%
%ul.dropdown-menu
%li
%a#preferences{ :href => "#" } Preferences
%a#preferences{ :href => "#" }= I18n.t 'global.settings'
%li.divider
%li
%a#logout{ :href => "#" } Logout
%a#logout{ :href => "#" }= I18n.t 'global.logout'
.popover-wrapper
.popover.below#autocomplete-container
+15 -15
View File
@@ -1,63 +1,63 @@
%h1 Settings
%ul.tabs#settings-tabs
%li.active
%a{ :href => "#", :'data-tab' => 'account' } Account
%a{ :href => "#", :'data-tab' => 'account' }= I18n.t 'settings.tab.account'
%li
%a{ :href => "#", :'data-tab' => 'site' } Site
%a{ :href => "#", :'data-tab' => 'site' }= I18n.t 'settings.tab.site'
%li
%a{ :href => "#", :'data-tab' => 'music' } Music
%a{ :href => "#", :'data-tab' => 'music' }= I18n.t 'settings.tab.music'
%li
%a{ :href => "#", :'data-tab' => 'lastfm' } Last.fm
%a{ :href => "#", :'data-tab' => 'lastfm' }= I18n.t 'settings.tab.lastfm'
.forms#settings-forms
.form.account
%form
%fieldset
.clearfix
%label{ :for => "name" } Username
%label{ :for => "name" }= I18n.t 'settings.username'
.input
%input.xlarge#name{ :name => "name", :size => 30, :type => "text", :value => @user.name }
.clearfix
%label{ :for => "email" } Email
%label{ :for => "email" }= I18n.t 'settings.email'
.input
%input.xlarge#email{ :name => "email", :size => 30, :type => "text", :value => @user.email }
.form.site
%form
%fieldset
.clearfix
%label{ :for => "lang" } Language
%label{ :for => "lang" }= I18n.t 'settings.lang.title'
.input
%select.medium#lang{ :name => "lang" }
%option{ :value => "en", :selected => (@user.lang == 'en') } English
%option{ :value => "ru", :selected => (@user.lang == 'ru') } Русский
%option{ :value => "en", :selected => (@user.lang == 'en') }= I18n.t 'settings.lang.en'
%option{ :value => "ru", :selected => (@user.lang == 'ru') }= I18n.t 'settings.lang.ru'
.form.music
%form
%fieldset
.clearfix
%label{ :for => "album_types" } Show
%label{ :for => "album_types" }= I18n.t 'settings.show'
.input
%ul.inputs-list
%li
%label.disabled
%input{ :name => "show_album", :type => "checkbox", :checked => "checked", :disabled => "disabled" }
%span Albums
%span= I18n.t 'settings.music.albums'
%li
%label
%input{ :name => "show_single", :type => "checkbox", :disabled => "disabled" }
%span Singles
%span= I18n.t 'settings.music.singles'
%li
%label
%input{ :name => "show_live", :type => "checkbox", :disabled => "disabled" }
%span Live shows
%span= I18n.t 'settings.music.live'
%li
%label
%input{ :name => "show_bootleg", :type => "checkbox", :disabled => "disabled" }
%span Bootlegs
%span= I18n.t 'settings.music.bootlegs'
.form.lastfm
%form
%fieldset
.clearfix
%label{ :for => "lastfm_username" } Username
%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 }