diff --git a/app/coffeescripts/ajax.coffee b/app/coffeescripts/ajax.coffee index 3a9ae7e..d727703 100644 --- a/app/coffeescripts/ajax.coffee +++ b/app/coffeescripts/ajax.coffee @@ -20,10 +20,10 @@ class Ajax else if data.status == 'loading_failed' _search.hideSpinner() _search.showError() + _beathaven.redrawScrollbar() else _ajax.setArchor '/artist/' +name+ '/' _pages.renderArtist data - _beathaven.redrawScrollbar() false loadSearchPage: -> @@ -44,6 +44,12 @@ class Ajax _beathaven.redrawScrollbar() false + loadAboutPage: -> + $.get '/templates/about.html', (data) -> + _pages.renderTextpage data + _ajax.setTitle 'About' + false + setArchor: (anchor) -> @referer = this.getAnchor() window.location.hash = '#' +anchor @@ -65,6 +71,8 @@ class Ajax _ajax.loadSearchPage(); else if _ajax.getAnchor().match /\/settings\// _ajax.loadSettingsPage() + else if _ajax.getAnchor().match /\/about\// + _ajax.loadAboutPage() else _ajax.loadSearchPage() false diff --git a/app/coffeescripts/beathaven.coffee b/app/coffeescripts/beathaven.coffee index c7fb7af..7a2f18b 100644 --- a/app/coffeescripts/beathaven.coffee +++ b/app/coffeescripts/beathaven.coffee @@ -10,7 +10,7 @@ _settings = null $ -> l = document.location - if l.host not in ['beathaven.org', 'localhost'] + if l.host not in ['beathaven.org', 'local.beathaven.org'] l.href = 'http://beathaven.org/'+ l.hash _beathaven = new BeatHaven() @@ -30,7 +30,8 @@ class BeatHaven this.adjustSizes() this.checkRedrawScrollbar() - _vkontakte = new Vkontakte(if document.location.host == 'beathaven.org' then 2335068 else 2383163) + # if document.location.host == 'beathaven.org' then 2335068 else 2383163 + _vkontakte = new Vkontakte(2335068) _vkontakte.init() _ajax = new Ajax() diff --git a/app/coffeescripts/pages.coffee b/app/coffeescripts/pages.coffee index 5a37855..0e56536 100644 --- a/app/coffeescripts/pages.coffee +++ b/app/coffeescripts/pages.coffee @@ -49,6 +49,7 @@ class Pages yaCounter7596904.hit _ajax.getAnchor(), data.artist.name, _ajax.referer _ajax.setTitle data.artist.name + _beathaven.redrawScrollbar() false renderSearch: (data) -> @@ -79,9 +80,22 @@ class Pages false renderSettings: (data) -> + unless _session.getUser().name? + _ajax.go('/search/') + return false $('.data-container').css background: 'none' $('.data-container .inner').html data yaCounter7596904.hit _ajax.getAnchor(), 'Settings', _ajax.referer _ajax.setTitle 'Settings' $('.settings-container .tabs .tab').first().trigger 'click' false + + renderTextpage: (data) -> + $('.data-container').css background: 'url(/images/concrete_wall_2.png) 0 -30px repeat' + $('.data-container .inner').html data + _beathaven.redrawScrollbar() + false + +$('.about').live 'click', -> + _ajax.go '/about/' + false \ No newline at end of file diff --git a/app/coffeescripts/session.coffee b/app/coffeescripts/session.coffee index 84d6003..3b59cd6 100644 --- a/app/coffeescripts/session.coffee +++ b/app/coffeescripts/session.coffee @@ -24,3 +24,7 @@ class Session q_params[key] = val $.post url, q_params, callback false + + reloadSession: -> + _session.query '/user/auth', {}, (ar) -> + _session.setUser ar.user \ No newline at end of file diff --git a/app/coffeescripts/settings.coffee b/app/coffeescripts/settings.coffee index bf4a82b..3cc300b 100644 --- a/app/coffeescripts/settings.coffee +++ b/app/coffeescripts/settings.coffee @@ -2,9 +2,11 @@ class Settings getAccountInfo: (callback) -> _session.query '/user/update/', {}, callback + false saveAccountInfo: (params, callback) -> _session.query '/user/update', params, callback + false loadFormData: (form) -> if form == 'account' @@ -13,10 +15,21 @@ class Settings else if form == 'lastfm' if _session.getUser().lastfm_username $('.form-container input[name$="username"]').first().val _session.getUser().lastfm_username + false + + updateLastfmLogin: -> + if window.lastfm_popup.closed + _session.query '/user/auth', {}, (ar) -> + _session.setUser ar.user + _settings.loadFormData 'lastfm' + else + setTimeout _settings.updateLastfmLogin, 100 + false $('.settings') .live 'click', -> _ajax.go('/settings/'); + false $('.settings-container .tabs .tab').live 'click', -> if not $(this).hasClass 'active' @@ -24,9 +37,12 @@ $('.settings-container .tabs .tab').live 'click', -> $(this).addClass 'active' $('.form-container').html $('.forms .'+ $(this).attr 'data-fieldset').html() _settings.loadFormData $(this).attr 'data-fieldset' + false $('.lastfm-connect') .live 'click', -> - window.open _session.getUser().lastfm_login_url + window.lastfm_popup = window.open _session.getUser().lastfm_login_url + setTimeout _settings.updateLastfmLogin, 100 + false $('.settings-container .form input').live 'blur', -> active_tab = $('.settings-container .tabs .tab.active').attr 'data-fieldset' @@ -35,4 +51,6 @@ $('.settings-container .form input').live 'blur', -> username: $('.settings-container .form input[name$="username"]').first().val() email: $('.settings-container .form input[name$="email"]').first().val() _settings.saveAccountInfo params, -> - $('#header-container .hello .greating').text 'Hi there, ' +(if params.username.length > 0 then params.username else '%username%')+ '!' \ No newline at end of file + $('.header-container .hello .greating span').text (if params.username.length > 0 then params.username else '%username%') + false + false \ No newline at end of file diff --git a/app/coffeescripts/vkontakte.coffee b/app/coffeescripts/vkontakte.coffee index 7fe1e7c..7dffcf7 100644 --- a/app/coffeescripts/vkontakte.coffee +++ b/app/coffeescripts/vkontakte.coffee @@ -1,15 +1,24 @@ class Vkontakte qr: null + api_id: null constructor: (@api_id) -> + getApiId: -> + @api_id + init: -> @qr = [] - VK.init - apiId: @api_id - VK.Auth.getLoginStatus this.authInfo + window.vkAsyncInit = -> + VK.init apiId: _vkontakte.getApiId() + VK.Auth.getLoginStatus _vkontakte.authInfo + + + setTimeout -> + $('#vk_api_transport').append('') + , 0 authInfo: (response) -> if typeof response isnt 'undefined' and response.session @@ -26,16 +35,18 @@ class Vkontakte _session.query '/user/update', name: r.response, (ar2) -> _session.setUser ar2.user $('.header-container .hello .greating') - .text 'Hi there, ' +(if _session.getUser().name then _session.getUser().name else '%username%')+ '!' + .html 'Tēnā koe, ' +(if _session.getUser().name then _session.getUser().name else '%username%')+ '!' else _session.setUser ar.user + $('.header-container .hello').show() $('.header-container .hello .greating') - .text 'Hi there, ' +(if _session.getUser().name then _session.getUser().name else '%username%')+ '!' + .html 'Tēnā koe, ' +(if _session.getUser().name then _session.getUser().name else '%username%')+ '!' else _session = new Session({}) + _session.setUser {} $('#vk_login, .auth_notice').css display: 'block' - $('#vk_logout').hide() + $('.header-container .hello').hide() window._session = _session loadTracksData: (artist, track, duration, callback) -> @@ -96,8 +107,13 @@ class Vkontakte @qr[query] false -$ -> - $('#vk_login').click -> - VK.Auth.login _vkontakte.authInfo(), 8 - $('#vk_logout').click -> - VK.Auth.logout _vkontakte.authInfo() +$('#vk_login').live 'click', -> + VK.Auth.login (response) -> + _vkontakte.authInfo(response) + false + , 8 + false +$('#vk_logout').live 'click', -> + _ajax.go '/search/'; + VK.Auth.logout _vkontakte.authInfo + false diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 743c62c..2a438a5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -4,7 +4,8 @@ class ApplicationController < ActionController::Base protect_from_forgery def authorized? - secret_key = request.host == 'beathaven.org' ? 'sdgwSbl3nNE4ZxafuPrp' : 's5zyjb693z6uV4rbhEyc' + # secret_key = request.host == 'beathaven.org' ? 'sdgwSbl3nNE4ZxafuPrp' : 's5zyjb693z6uV4rbhEyc' + secret_key = 'sdgwSbl3nNE4ZxafuPrp' unless params[:expire].nil? or params[:mid].nil? or params[:secret].nil? or params[:sid].nil? or params[:sig].nil? # Calculating hash hash = 'expire='+ params[:expire] +'mid='+ params[:mid] +'secret='+ params[:secret] +'sid='+ params[:sid] + secret_key diff --git a/app/controllers/artist_controller.rb b/app/controllers/artist_controller.rb index 0c5b5c6..eca6524 100644 --- a/app/controllers/artist_controller.rb +++ b/app/controllers/artist_controller.rb @@ -4,6 +4,10 @@ class ArtistController < ApplicationController @@default_album_types = ['Album', 'Soundtrack'] def data data = {} + if params[:name].nil? or params[:name].length == 0 + render :json => {status: 'loading_failed', pics: []} + return + end name = params[:name].gsub('%20', ' ').gsub('+', ' ') artist = Artist.find_by_name(name) if artist and artist.status == 0 diff --git a/app/models/artist.rb b/app/models/artist.rb index 127f91c..cecf8df 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -1,3 +1,3 @@ class Artist < ActiveRecord::Base - has_many :albums, :order => 'year ASC, id ASC', :dependent => :destroy + has_many :albums, :order => 'pic_url DESC, year ASC, id ASC', :dependent => :destroy end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 35c8427..1589aec 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,7 +5,6 @@ - <%= javascript_include_tag "jquery/jquery.min.js" %> <%= javascript_include_tag "jquery/jquery-ui/js/jquery-ui-1.8.13.custom.min.js" %> <%= javascript_include_tag "jquery/jquery.autocomplete.js" %> @@ -59,12 +58,13 @@
-
+
diff --git a/public/javascripts/coffee/ajax.js b/public/javascripts/coffee/ajax.js index 595dbd8..fbfb0de 100644 --- a/public/javascripts/coffee/ajax.js +++ b/public/javascripts/coffee/ajax.js @@ -9,22 +9,22 @@ Ajax = (function() { if (data.status != null) { if (data.status === 'loading') { _search.showArtistPics(data.pics); - return setTimeout(function() { + setTimeout(function() { return _ajax.loadArtistData(name); }, 3000); } else if (data.status === 'corrected') { - return _ajax.loadArtistData(data.page); + _ajax.loadArtistData(data.page); } else if (data.status === 'suggestions') { _search.hideSpinner(); - return _search.showSuggestions(data.values); + _search.showSuggestions(data.values); } else if (data.status === 'loading_failed') { _search.hideSpinner(); - return _search.showError(); + _search.showError(); } + return _beathaven.redrawScrollbar(); } else { _ajax.setArchor('/artist/' + name + '/'); - _pages.renderArtist(data); - return _beathaven.redrawScrollbar(); + return _pages.renderArtist(data); } }); return false; @@ -50,6 +50,13 @@ Ajax = (function() { }); return false; }; + Ajax.prototype.loadAboutPage = function() { + $.get('/templates/about.html', function(data) { + _pages.renderTextpage(data); + return _ajax.setTitle('About'); + }); + return false; + }; Ajax.prototype.setArchor = function(anchor) { this.referer = this.getAnchor(); return window.location.hash = '#' + anchor; @@ -72,6 +79,8 @@ Ajax = (function() { _ajax.loadSearchPage(); } else if (_ajax.getAnchor().match(/\/settings\//)) { _ajax.loadSettingsPage(); + } else if (_ajax.getAnchor().match(/\/about\//)) { + _ajax.loadAboutPage(); } else { _ajax.loadSearchPage(); } diff --git a/public/javascripts/coffee/beathaven.js b/public/javascripts/coffee/beathaven.js index 3236a8d..d4baf6f 100644 --- a/public/javascripts/coffee/beathaven.js +++ b/public/javascripts/coffee/beathaven.js @@ -10,7 +10,7 @@ _settings = null; $(function() { var l, _ref; l = document.location; - if ((_ref = l.host) !== 'beathaven.org' && _ref !== 'localhost') { + if ((_ref = l.host) !== 'beathaven.org' && _ref !== 'local.beathaven.org') { l.href = 'http://beathaven.org/' + l.hash; } _beathaven = new BeatHaven(); @@ -28,7 +28,7 @@ BeatHaven = (function() { BeatHaven.prototype.init = function() { this.adjustSizes(); this.checkRedrawScrollbar(); - _vkontakte = new Vkontakte(document.location.host === 'beathaven.org' ? 2335068 : 2383163); + _vkontakte = new Vkontakte(2335068); _vkontakte.init(); _ajax = new Ajax(); _player = new Player(); diff --git a/public/javascripts/coffee/pages.js b/public/javascripts/coffee/pages.js index 67b47bc..97aad84 100644 --- a/public/javascripts/coffee/pages.js +++ b/public/javascripts/coffee/pages.js @@ -52,6 +52,7 @@ Pages = (function() { $('.data-container .inner').html('').append(artist_info).append(albums_info); yaCounter7596904.hit(_ajax.getAnchor(), data.artist.name, _ajax.referer); _ajax.setTitle(data.artist.name); + _beathaven.redrawScrollbar(); return false; }; Pages.prototype.renderSearch = function(data) { @@ -80,6 +81,10 @@ Pages = (function() { return false; }; Pages.prototype.renderSettings = function(data) { + if (_session.getUser().name == null) { + _ajax.go('/search/'); + return false; + } $('.data-container').css({ background: 'none' }); @@ -89,5 +94,17 @@ Pages = (function() { $('.settings-container .tabs .tab').first().trigger('click'); return false; }; + Pages.prototype.renderTextpage = function(data) { + $('.data-container').css({ + background: 'url(/images/concrete_wall_2.png) 0 -30px repeat' + }); + $('.data-container .inner').html(data); + _beathaven.redrawScrollbar(); + return false; + }; return Pages; -})(); \ No newline at end of file +})(); +$('.about').live('click', function() { + _ajax.go('/about/'); + return false; +}); \ No newline at end of file diff --git a/public/javascripts/coffee/session.js b/public/javascripts/coffee/session.js index ffe5513..a951b6d 100644 --- a/public/javascripts/coffee/session.js +++ b/public/javascripts/coffee/session.js @@ -30,5 +30,10 @@ Session = (function() { $.post(url, q_params, callback); return false; }; + Session.prototype.reloadSession = function() { + return _session.query('/user/auth', {}, function(ar) { + return _session.setUser(ar.user); + }); + }; return Session; })(); \ No newline at end of file diff --git a/public/javascripts/coffee/settings.js b/public/javascripts/coffee/settings.js index e85a639..a061d38 100644 --- a/public/javascripts/coffee/settings.js +++ b/public/javascripts/coffee/settings.js @@ -2,36 +2,54 @@ var Settings; Settings = (function() { function Settings() {} Settings.prototype.getAccountInfo = function(callback) { - return _session.query('/user/update/', {}, callback); + _session.query('/user/update/', {}, callback); + return false; }; Settings.prototype.saveAccountInfo = function(params, callback) { - return _session.query('/user/update', params, callback); + _session.query('/user/update', params, callback); + return false; }; Settings.prototype.loadFormData = function(form) { if (form === 'account') { $('.settings-container .form input[name$="username"]').val(_session.getUser().name); - return $('.settings-container .form input[name$="email"]').val(_session.getUser().email); + $('.settings-container .form input[name$="email"]').val(_session.getUser().email); } else if (form === 'lastfm') { if (_session.getUser().lastfm_username) { - return $('.form-container input[name$="username"]').first().val(_session.getUser().lastfm_username); + $('.form-container input[name$="username"]').first().val(_session.getUser().lastfm_username); } } + return false; + }; + Settings.prototype.updateLastfmLogin = function() { + if (window.lastfm_popup.closed) { + _session.query('/user/auth', {}, function(ar) { + _session.setUser(ar.user); + return _settings.loadFormData('lastfm'); + }); + } else { + setTimeout(_settings.updateLastfmLogin, 100); + } + return false; }; return Settings; })(); $('.settings').live('click', function() { - return _ajax.go('/settings/'); + _ajax.go('/settings/'); + return false; }); $('.settings-container .tabs .tab').live('click', function() { if (!$(this).hasClass('active')) { $('.settings-container .tabs .tab').removeClass('active'); $(this).addClass('active'); $('.form-container').html($('.forms .' + $(this).attr('data-fieldset')).html()); - return _settings.loadFormData($(this).attr('data-fieldset')); + _settings.loadFormData($(this).attr('data-fieldset')); } + return false; }); $('.lastfm-connect').live('click', function() { - return window.open(_session.getUser().lastfm_login_url); + window.lastfm_popup = window.open(_session.getUser().lastfm_login_url); + setTimeout(_settings.updateLastfmLogin, 100); + return false; }); $('.settings-container .form input').live('blur', function() { var active_tab, params; @@ -41,8 +59,10 @@ $('.settings-container .form input').live('blur', function() { username: $('.settings-container .form input[name$="username"]').first().val(), email: $('.settings-container .form input[name$="email"]').first().val() }; - return _settings.saveAccountInfo(params, function() { - return $('#header-container .hello .greating').text('Hi there, ' + (params.username.length > 0 ? params.username : '%username%') + '!'); + _settings.saveAccountInfo(params, function() { + $('.header-container .hello .greating span').text((params.username.length > 0 ? params.username : '%username%')); + return false; }); } + return false; }); \ No newline at end of file diff --git a/public/javascripts/coffee/vkontakte.js b/public/javascripts/coffee/vkontakte.js index 596ac73..88a1f23 100644 --- a/public/javascripts/coffee/vkontakte.js +++ b/public/javascripts/coffee/vkontakte.js @@ -1,15 +1,24 @@ var Vkontakte; Vkontakte = (function() { Vkontakte.prototype.qr = null; + Vkontakte.prototype.api_id = null; function Vkontakte(api_id) { this.api_id = api_id; } + Vkontakte.prototype.getApiId = function() { + return this.api_id; + }; Vkontakte.prototype.init = function() { this.qr = []; - VK.init({ - apiId: this.api_id - }); - return VK.Auth.getLoginStatus(this.authInfo); + window.vkAsyncInit = function() { + VK.init({ + apiId: _vkontakte.getApiId() + }); + return VK.Auth.getLoginStatus(_vkontakte.authInfo); + }; + return setTimeout(function() { + return $('#vk_api_transport').append(''); + }, 0); }; Vkontakte.prototype.authInfo = function(response) { var _session; @@ -31,20 +40,22 @@ Vkontakte = (function() { name: r.response }, function(ar2) { _session.setUser(ar2.user); - return $('.header-container .hello .greating').text('Hi there, ' + (_session.getUser().name ? _session.getUser().name : '%username%') + '!'); + return $('.header-container .hello .greating').html('Tēnā koe, ' + (_session.getUser().name ? _session.getUser().name : '%username%') + '!'); }); }); } else { _session.setUser(ar.user); } - return $('.header-container .hello .greating').text('Hi there, ' + (_session.getUser().name ? _session.getUser().name : '%username%') + '!'); + $('.header-container .hello').show(); + return $('.header-container .hello .greating').html('Tēnā koe, ' + (_session.getUser().name ? _session.getUser().name : '%username%') + '!'); }); } else { _session = new Session({}); + _session.setUser({}); $('#vk_login, .auth_notice').css({ display: 'block' }); - $('#vk_logout').hide(); + $('.header-container .hello').hide(); } return window._session = _session; }; @@ -117,11 +128,15 @@ Vkontakte = (function() { }; return Vkontakte; })(); -$(function() { - $('#vk_login').click(function() { - return VK.Auth.login(_vkontakte.authInfo(), 8); - }); - return $('#vk_logout').click(function() { - return VK.Auth.logout(_vkontakte.authInfo()); - }); +$('#vk_login').live('click', function() { + VK.Auth.login(function(response) { + _vkontakte.authInfo(response); + return false; + }, 8); + return false; +}); +$('#vk_logout').live('click', function() { + _ajax.go('/search/'); + VK.Auth.logout(_vkontakte.authInfo); + return false; }); \ No newline at end of file diff --git a/public/stylesheets/_sass/albums.scss b/public/stylesheets/_sass/albums.scss index 370678b..25ac893 100644 --- a/public/stylesheets/_sass/albums.scss +++ b/public/stylesheets/_sass/albums.scss @@ -49,7 +49,7 @@ .add-album-button-container { position: relative; - margin: 10px -25px 0 0; + margin: 10px -50px 0 0; text-align: center; } } diff --git a/public/stylesheets/_sass/header.scss b/public/stylesheets/_sass/header.scss index ead5f67..cc41e44 100644 --- a/public/stylesheets/_sass/header.scss +++ b/public/stylesheets/_sass/header.scss @@ -1,5 +1,6 @@ .header-container { .hello { + display: none; float: right; margin: 6px 10px 0 0; color: #222; @@ -8,16 +9,21 @@ display: block; float: left; margin-right: 8px; + + span { + border-bottom: #202020 1px dotted; + cursor: pointer; + } } - .settings { + .settings-button { float: right; width: 15px; height: 15px; margin: 1px 0; background-image: url(/images/icns/settings.png); cursor: pointer; - } + } } .navigation { @@ -54,7 +60,7 @@ } } - .vk_auth { + &.vk_auth { display: none; } diff --git a/public/stylesheets/_sass/misc.scss b/public/stylesheets/_sass/misc.scss index dd04ca7..d85b283 100644 --- a/public/stylesheets/_sass/misc.scss +++ b/public/stylesheets/_sass/misc.scss @@ -15,9 +15,19 @@ @include rounded(3); &.gray { - background-color: #EEE; - color: #444; - border-color: #DDD; + background-color: #e0e0e0; + color: #404040; + text-shadow: #d0d0d0 0px 1px 1px; + border-color: #d0d0d0; + box-shadow: #c0c0c0 1px 1px 0px; + } + + &.red { + background-color: #fab0b0; + color: #e05050; + text-shadow: #c08080 0px 1px 1px; + border-color: #eaa0a0; + box-shadow: #da9090 1px 1px 0px; } } diff --git a/public/stylesheets/_sass/player.scss b/public/stylesheets/_sass/player.scss index fb76aab..c0d04c1 100644 --- a/public/stylesheets/_sass/player.scss +++ b/public/stylesheets/_sass/player.scss @@ -17,7 +17,7 @@ $icons_dir: "/images/icns/"; position: absolute; top: 0px; right: 0px; - width: 80px; + width: 50px; height: 30px; z-index: 10; @include alpha_gradient(32, 32, 32, '202020'); diff --git a/public/stylesheets/_sass/settings.scss b/public/stylesheets/_sass/settings.scss index 1515bb1..377c7f6 100644 --- a/public/stylesheets/_sass/settings.scss +++ b/public/stylesheets/_sass/settings.scss @@ -53,7 +53,10 @@ border-top: #CCC 1px solid; .form { - margin: 25px; + position: absolute; + top: 25px; + left: 0; + width: 100%; .field { height: 40px; @@ -94,8 +97,18 @@ margin-left: 5px; } } + + .saved { + float: left; + } } } + + .logout { + position: absolute; + top: 25px; + right: 0; + } } .forms { diff --git a/public/stylesheets/_sass/textpage.scss b/public/stylesheets/_sass/textpage.scss new file mode 100644 index 0000000..4432595 --- /dev/null +++ b/public/stylesheets/_sass/textpage.scss @@ -0,0 +1,3 @@ +.textpage { + margin: 25px; +} \ No newline at end of file diff --git a/public/stylesheets/albums.css b/public/stylesheets/albums.css index da37c73..b4c88a5 100644 --- a/public/stylesheets/albums.css +++ b/public/stylesheets/albums.css @@ -31,7 +31,7 @@ border: #d0d0d0 1px solid; } .albums .album .pic .add-album-button-container { position: relative; - margin: 10px -25px 0 0; + margin: 10px -50px 0 0; text-align: center; } .albums .album .name { display: block; diff --git a/public/stylesheets/beathaven.css b/public/stylesheets/beathaven.css index d9d7a62..5a9d6ef 100644 --- a/public/stylesheets/beathaven.css +++ b/public/stylesheets/beathaven.css @@ -5,3 +5,4 @@ @import "search.css" all; @import "albums.css" all; @import "settings.css" all; +@import "textpage.css" all; \ No newline at end of file diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index a01f0f2..f45fee6 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -1,4 +1,5 @@ .header-container .hello { + display: none; float: right; margin: 6px 10px 0 0; color: #222; } @@ -6,7 +7,10 @@ display: block; float: left; margin-right: 8px; } - .header-container .hello .settings { + .header-container .hello .greating span { + border-bottom: #202020 1px dotted; + cursor: pointer; } + .header-container .hello .settings-button { float: right; width: 15px; height: 15px; @@ -39,7 +43,7 @@ font-size: 9px; font-weight: normal; margin: 10px 0 0 4px; } - .header-container .navigation li .vk_auth { + .header-container .navigation li.vk_auth { display: none; } .header-container .navigation li a { color: inherit; diff --git a/public/stylesheets/misc.css b/public/stylesheets/misc.css index 339f220..95ccac6 100644 --- a/public/stylesheets/misc.css +++ b/public/stylesheets/misc.css @@ -13,9 +13,17 @@ -moz-border-radius: 3px; -webkit-border-radius: 3px; } .button.gray { - background-color: #EEE; - color: #444; - border-color: #DDD; } + background-color: #e0e0e0; + color: #404040; + text-shadow: #d0d0d0 0px 1px 1px; + border-color: #d0d0d0; + box-shadow: #c0c0c0 1px 1px 0px; } + .button.red { + background-color: #fab0b0; + color: #e05050; + text-shadow: #c08080 0px 1px 1px; + border-color: #eaa0a0; + box-shadow: #da9090 1px 1px 0px; } /* Scrollbars */ .data-container .scrollbar-pane { diff --git a/public/stylesheets/player.css b/public/stylesheets/player.css index 019047b..5392d09 100644 --- a/public/stylesheets/player.css +++ b/public/stylesheets/player.css @@ -10,7 +10,7 @@ position: absolute; top: 0px; right: 0px; - width: 80px; + width: 50px; height: 30px; z-index: 10; background: -moz-linear-gradient(left, rgba(32, 32, 32, 0) 0%, #202020 50%, #202020 100%); diff --git a/public/stylesheets/settings.css b/public/stylesheets/settings.css index 77e2c37..7635bfe 100644 --- a/public/stylesheets/settings.css +++ b/public/stylesheets/settings.css @@ -39,7 +39,10 @@ height: 500px; border-top: #CCC 1px solid; } .settings-container .form-container .form { - margin: 25px; } + position: absolute; + top: 25px; + left: 0; + width: 100%; } .settings-container .form-container .form .field { height: 40px; margin-bottom: 10px; @@ -75,5 +78,11 @@ -moz-border-radius: 3px; -webkit-border-radius: 3px; margin-left: 5px; } + .settings-container .form-container .form .field .saved { + float: left; } + .settings-container .form-container .logout { + position: absolute; + top: 25px; + right: 0; } .settings-container .forms { display: none; } diff --git a/public/stylesheets/textpage.css b/public/stylesheets/textpage.css new file mode 100644 index 0000000..6031eb6 --- /dev/null +++ b/public/stylesheets/textpage.css @@ -0,0 +1,2 @@ +.textpage { + margin: 25px; } diff --git a/public/templates/about.html b/public/templates/about.html new file mode 100644 index 0000000..a3198e8 --- /dev/null +++ b/public/templates/about.html @@ -0,0 +1,3 @@ +
+ Now back to the good part! +
\ No newline at end of file diff --git a/public/templates/settings.html b/public/templates/settings.html index d858f24..0510dea 100644 --- a/public/templates/settings.html +++ b/public/templates/settings.html @@ -17,6 +17,13 @@
Email:
+ +
+
Hello, my name is Useless Button
+
+ +
+
Log out