From f9ada4d1437e4b1e0d5c5cf3133d9afdce9d8cf6 Mon Sep 17 00:00:00 2001 From: magnolia-fan Date: Thu, 8 Sep 2011 17:10:52 +0400 Subject: [PATCH] Moving images --- .../assets}/images/concrete_wall_2.png | Bin {public => app/assets}/images/drag.png | Bin {public => app/assets}/images/dummy.png | Bin {public => app/assets}/images/icns/empty.png | Bin {public => app/assets}/images/icns/next.png | Bin {public => app/assets}/images/icns/pause.png | Bin {public => app/assets}/images/icns/play.png | Bin {public => app/assets}/images/icns/prev.png | Bin {public => app/assets}/images/icns/repeat.png | Bin .../assets}/images/icns/settings.png | Bin .../assets}/images/icns/shuffle.png | Bin {public => app/assets}/images/kitteh.png | Bin {public => app/assets}/images/loader.gif | Bin {public => app/assets}/images/rails.png | Bin app/assets/javascripts/ajax.coffee | 2 +- app/assets/javascripts/beathaven.coffee | 1 + app/assets/javascripts/search.coffee | 4 -- app/assets/stylesheets/albums.scss | 2 - app/assets/stylesheets/main.css | 9 --- app/assets/stylesheets/pulldown.scss | 61 ------------------ app/views/layouts/application.html.haml | 5 ++ 21 files changed, 7 insertions(+), 77 deletions(-) rename {public => app/assets}/images/concrete_wall_2.png (100%) rename {public => app/assets}/images/drag.png (100%) rename {public => app/assets}/images/dummy.png (100%) rename {public => app/assets}/images/icns/empty.png (100%) rename {public => app/assets}/images/icns/next.png (100%) rename {public => app/assets}/images/icns/pause.png (100%) rename {public => app/assets}/images/icns/play.png (100%) rename {public => app/assets}/images/icns/prev.png (100%) rename {public => app/assets}/images/icns/repeat.png (100%) rename {public => app/assets}/images/icns/settings.png (100%) rename {public => app/assets}/images/icns/shuffle.png (100%) rename {public => app/assets}/images/kitteh.png (100%) rename {public => app/assets}/images/loader.gif (100%) rename {public => app/assets}/images/rails.png (100%) delete mode 100644 app/assets/stylesheets/main.css delete mode 100644 app/assets/stylesheets/pulldown.scss diff --git a/public/images/concrete_wall_2.png b/app/assets/images/concrete_wall_2.png similarity index 100% rename from public/images/concrete_wall_2.png rename to app/assets/images/concrete_wall_2.png diff --git a/public/images/drag.png b/app/assets/images/drag.png similarity index 100% rename from public/images/drag.png rename to app/assets/images/drag.png diff --git a/public/images/dummy.png b/app/assets/images/dummy.png similarity index 100% rename from public/images/dummy.png rename to app/assets/images/dummy.png diff --git a/public/images/icns/empty.png b/app/assets/images/icns/empty.png similarity index 100% rename from public/images/icns/empty.png rename to app/assets/images/icns/empty.png diff --git a/public/images/icns/next.png b/app/assets/images/icns/next.png similarity index 100% rename from public/images/icns/next.png rename to app/assets/images/icns/next.png diff --git a/public/images/icns/pause.png b/app/assets/images/icns/pause.png similarity index 100% rename from public/images/icns/pause.png rename to app/assets/images/icns/pause.png diff --git a/public/images/icns/play.png b/app/assets/images/icns/play.png similarity index 100% rename from public/images/icns/play.png rename to app/assets/images/icns/play.png diff --git a/public/images/icns/prev.png b/app/assets/images/icns/prev.png similarity index 100% rename from public/images/icns/prev.png rename to app/assets/images/icns/prev.png diff --git a/public/images/icns/repeat.png b/app/assets/images/icns/repeat.png similarity index 100% rename from public/images/icns/repeat.png rename to app/assets/images/icns/repeat.png diff --git a/public/images/icns/settings.png b/app/assets/images/icns/settings.png similarity index 100% rename from public/images/icns/settings.png rename to app/assets/images/icns/settings.png diff --git a/public/images/icns/shuffle.png b/app/assets/images/icns/shuffle.png similarity index 100% rename from public/images/icns/shuffle.png rename to app/assets/images/icns/shuffle.png diff --git a/public/images/kitteh.png b/app/assets/images/kitteh.png similarity index 100% rename from public/images/kitteh.png rename to app/assets/images/kitteh.png diff --git a/public/images/loader.gif b/app/assets/images/loader.gif similarity index 100% rename from public/images/loader.gif rename to app/assets/images/loader.gif diff --git a/public/images/rails.png b/app/assets/images/rails.png similarity index 100% rename from public/images/rails.png rename to app/assets/images/rails.png diff --git a/app/assets/javascripts/ajax.coffee b/app/assets/javascripts/ajax.coffee index c02e7eb..c62749e 100644 --- a/app/assets/javascripts/ajax.coffee +++ b/app/assets/javascripts/ajax.coffee @@ -23,7 +23,7 @@ class window.Ajax else _ajax.setArchor '/artist/' +name+ '/' _pages.renderArtist data - _search.hideSpinner() + #_search.hideSpinner() false loadSearchPage: -> diff --git a/app/assets/javascripts/beathaven.coffee b/app/assets/javascripts/beathaven.coffee index 00fc9fe..1827c71 100644 --- a/app/assets/javascripts/beathaven.coffee +++ b/app/assets/javascripts/beathaven.coffee @@ -37,6 +37,7 @@ class BeatHaven window._settings = new Settings() this.setupAutocomplete() + window._ajax.detectPage() false diff --git a/app/assets/javascripts/search.coffee b/app/assets/javascripts/search.coffee index 646f687..a753cd7 100644 --- a/app/assets/javascripts/search.coffee +++ b/app/assets/javascripts/search.coffee @@ -1,12 +1,8 @@ class window.Search - pics: [] - showSpinner: -> $('#search').val("").attr(disabled: 'disabled').blur() - $('.search-container img').first().show() $('#autocomplete-container').hide() - $('.artist_loading.failed').first().hide() this.hideSuggestions() false diff --git a/app/assets/stylesheets/albums.scss b/app/assets/stylesheets/albums.scss index f26edbe..0eca1d2 100644 --- a/app/assets/stylesheets/albums.scss +++ b/app/assets/stylesheets/albums.scss @@ -3,10 +3,8 @@ .artist-info { margin-bottom: 20px; .pic { - height: 220px; img { max-width: 220px; - max-height: 220px; } } .desc { diff --git a/app/assets/stylesheets/main.css b/app/assets/stylesheets/main.css deleted file mode 100644 index 380b0fc..0000000 --- a/app/assets/stylesheets/main.css +++ /dev/null @@ -1,9 +0,0 @@ - - - - -.playlist .artist-name { - margin-bottom: 4px; - font-size: 11px; - color: #888; -} \ No newline at end of file diff --git a/app/assets/stylesheets/pulldown.scss b/app/assets/stylesheets/pulldown.scss deleted file mode 100644 index 0076958..0000000 --- a/app/assets/stylesheets/pulldown.scss +++ /dev/null @@ -1,61 +0,0 @@ -@import "rounded"; - -.pulldown { - display: none; - position: relative; - background-color: #ffffff; - border-top: #c0c0c0 1px solid; - border-bottom: #c0c0c0 1px solid; - margin-right: 350px; - padding: 25px; - - .pd-spinner { - position: absolute; - left: 50%; - top: 50%; - width: 64px; - height: 64px; - margin: -32px 0 0 -32px; - } - - /* Search */ - .search-container { - - .spinner, .artist_loading, .artist_pics, .suggestions { - display: none; - } - - .spinner { - margin: 70px 0 0 171px; - } - - .search_form { - .search_field { - width: 300px; - font-size: 24px; - padding: 4px; - border: #CCC 1px solid; - @include rounded(3); - } - } - } -} - -.autocomplete { - margin: 4px 0 0 -1px; - - div { - font-size: 24px; - padding: 6px 5px; - border-top: #BBB 1px solid; - margin-bottom: 1px; - - &:first-child { - border: none; - } - - &.selected { - background-color: #DDD; - } - } -} \ No newline at end of file diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 2b8f23b..d7a89a0 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -79,6 +79,11 @@ Long Road to Ruin %td.song-duration 4:29 + .fullscreen + .inner + = image_tag "loader" + +