Revert "Introduces 'image_path' for all image assets"
This reverts commit 032182d8d1.
This commit is contained in:
@@ -2,21 +2,21 @@
|
|||||||
#slider
|
#slider
|
||||||
= image_tag validate_img_url(artist.image, "artist", :mega)
|
= image_tag validate_img_url(artist.image, "artist", :mega)
|
||||||
.tabs_js.information
|
.tabs_js.information
|
||||||
%h1
|
%h1
|
||||||
= artist.name
|
= artist.name
|
||||||
- if signed_in?
|
- if signed_in?
|
||||||
%span.heart
|
%span.heart
|
||||||
%ul.nav
|
%ul.nav
|
||||||
%li= image_tag image_path("icons/artist-info.png")
|
%li= image_tag "icons/artist-info.png"
|
||||||
%li= image_tag image_path("icons/artist-links.png")
|
%li= image_tag "icons/artist-links.png"
|
||||||
%li= image_tag image_path("icons/artist-tags.png")
|
%li= image_tag "icons/artist-tags.png"
|
||||||
.content
|
.content
|
||||||
#artist_info
|
#artist_info
|
||||||
%h2 About
|
%h2 About
|
||||||
=raw artist.bio.summary.empty? ? "No information available!" : artist.bio.summary
|
=raw artist.bio.summary.empty? ? "No information available!" : artist.bio.summary
|
||||||
#artist_links
|
#artist_links
|
||||||
%ul
|
%ul
|
||||||
= image_tag image_path("bing.png"), :class=>"bing"
|
= image_tag "bing.png", :class=>"bing"
|
||||||
#artist_tags
|
#artist_tags
|
||||||
%h2 Tags
|
%h2 Tags
|
||||||
%ul
|
%ul
|
||||||
@@ -49,4 +49,4 @@
|
|||||||
:javascript
|
:javascript
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
bing_search("#{CGI.escape(artist.name)}");
|
bing_search("#{CGI.escape(artist.name)}");
|
||||||
});
|
});
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
%ul#top_artist
|
%ul#top_artist
|
||||||
- for file in @files
|
- for file in @files
|
||||||
%li= image_tag image_path("startsite/"+File.basename(file))
|
%li= image_tag "startsite/"+File.basename(file)
|
||||||
%ul#top_artist_nav
|
%ul#top_artist_nav
|
||||||
%li= link_to image_tag(image_path("startsite/small/beatles.jpg")),"", :class=>"ll dir"
|
%li= link_to image_tag("startsite/small/beatles.jpg"),"", :class=>"ll dir"
|
||||||
%li= image_tag image_path("startsite/small/katy-perry.jpg"), :class=>"cc"
|
%li= image_tag "startsite/small/katy-perry.jpg", :class=>"cc"
|
||||||
%li= link_to image_tag(image_path("startsite/small/coldplay.jpg")),"", :class=>"rr dir"
|
%li= link_to image_tag("startsite/small/coldplay.jpg"),"", :class=>"rr dir"
|
||||||
#search_home
|
#search_home
|
||||||
%br.clean
|
%br.clean
|
||||||
#home_foot
|
#home_foot
|
||||||
|
|||||||
@@ -12,14 +12,14 @@
|
|||||||
= favicon_link_tag "9minutes-logo.png", :rel=>"icon", :type=>"image/png"
|
= favicon_link_tag "9minutes-logo.png", :rel=>"icon", :type=>"image/png"
|
||||||
= csrf_meta_tag
|
= csrf_meta_tag
|
||||||
%body
|
%body
|
||||||
#loading= image_tag image_path("icons/loading_dark.gif"), :class=>"loadingimg"
|
#loading= image_tag "icons/loading_dark.gif", :class=>"loadingimg"
|
||||||
#error Error
|
#error Error
|
||||||
#block
|
#block
|
||||||
#bg_stripe
|
#bg_stripe
|
||||||
#site
|
#site
|
||||||
#uuser{:style=>"display:block; color:#ddd;"}
|
#uuser{:style=>"display:block; color:#ddd;"}
|
||||||
#head
|
#head
|
||||||
%h1= link_to image_tag(image_path("nine-minutes.png")), "/#!/home"
|
%h1= link_to image_tag("nine-minutes.png"), "/#!/home"
|
||||||
= render :partial=>"layouts/player"
|
= render :partial=>"layouts/player"
|
||||||
#navigation
|
#navigation
|
||||||
%li.active= link_to "home", "/#!/home"
|
%li.active= link_to "home", "/#!/home"
|
||||||
@@ -33,9 +33,9 @@
|
|||||||
= text_field_tag 'q', params[:q], :class => "text", :placeholder => "Search here ..."
|
= text_field_tag 'q', params[:q], :class => "text", :placeholder => "Search here ..."
|
||||||
= link_to image_tag("icons/search-navi.png", :class=>"button"), "/#!/search"
|
= link_to image_tag("icons/search-navi.png", :class=>"button"), "/#!/search"
|
||||||
- if user_signed_in?
|
- if user_signed_in?
|
||||||
%li.login= async_link_to image_tag(image_path("icons/logout.png")), destroy_user_session_path
|
%li.login= async_link_to image_tag("icons/logout.png"), destroy_user_session_path
|
||||||
- else
|
- else
|
||||||
%li.login= async_link_to image_tag(image_path("icons/login.png")), new_user_session_path
|
%li.login= async_link_to image_tag("icons/login.png"), new_user_session_path
|
||||||
%br.clean
|
%br.clean
|
||||||
#content
|
#content
|
||||||
= yield
|
= yield
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
#headline
|
#headline
|
||||||
%h2 Avril Lavigne
|
%h2 Avril Lavigne
|
||||||
%h1 Alice (In Wonderland)
|
%h1 Alice (In Wonderland)
|
||||||
#video= image_tag image_path("examples/video-big.jpg")
|
#video= image_tag "examples/video-big.jpg"
|
||||||
.sidebar
|
.sidebar
|
||||||
.top
|
.top
|
||||||
= render :partial=>"layouts/player"
|
= render :partial=>"layouts/player"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
= stylesheet_link_tag :all
|
= stylesheet_link_tag :all
|
||||||
= javascript_include_tag "http://www.google.com/jsapi"
|
= javascript_include_tag "http://www.google.com/jsapi"
|
||||||
= javascript_include_tag :all
|
= javascript_include_tag :all
|
||||||
|
|
||||||
= csrf_meta_tag
|
= csrf_meta_tag
|
||||||
%body
|
%body
|
||||||
#site
|
#site
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
=link_to "Sign Out", destroy_user_session_path
|
=link_to "Sign Out", destroy_user_session_path
|
||||||
#head
|
#head
|
||||||
%h1
|
%h1
|
||||||
= link_to image_tag(image_path("9minutes.png")), "/"
|
= link_to image_tag("9minutes.png"), "/"
|
||||||
= form_tag '/search', :method => 'get', :id => "search_form", :class => "right" do
|
= form_tag '/search', :method => 'get', :id => "search_form", :class => "right" do
|
||||||
.wrap
|
.wrap
|
||||||
= text_field_tag 'q', params[:q], :class => "input", :placeholder => "Search for"
|
= text_field_tag 'q', params[:q], :class => "input", :placeholder => "Search for"
|
||||||
@@ -64,8 +64,8 @@
|
|||||||
#volume
|
#volume
|
||||||
=raw '<input type="range" class="vol" id="progress" name="range2" min="0" max="100" step="1" value="50" />'
|
=raw '<input type="range" class="vol" id="progress" name="range2" min="0" max="100" step="1" value="50" />'
|
||||||
#icons
|
#icons
|
||||||
= link_to image_tag(image_path("ico/player-volume.png")), "javascript:void(0);", :class=>"volume"
|
= link_to image_tag("ico/player-volume.png"), "javascript:void(0);", :class=>"volume"
|
||||||
= link_to image_tag(image_path("ico/player-repeat.png")), "javascript:void(0);", :class=>"repeat"
|
= link_to image_tag("ico/player-repeat.png"), "javascript:void(0);", :class=>"repeat"
|
||||||
= link_to image_tag(image_path("ico/player-playlist.png")), "javascript:void(0);", :class=>"playlist"
|
= link_to image_tag("ico/player-playlist.png"), "javascript:void(0);", :class=>"playlist"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
.box#search_bar
|
.box#search_bar
|
||||||
= form_tag '/search', :method => 'get', :id => "search_bar_form", :remote=>true do
|
= form_tag '/search', :method => 'get', :id => "search_bar_form", :remote=>true do
|
||||||
= text_field_tag 'q', params[:q], :class => "text", :placeholder => "Search here ..."
|
= text_field_tag 'q', params[:q], :class => "text", :placeholder => "Search here ..."
|
||||||
= link_to image_tag(image_path("icons/search.png"), :class=>"button"), "/#!/search"
|
= link_to image_tag("icons/search.png", :class=>"button"), "/#!/search"
|
||||||
@@ -64,11 +64,11 @@
|
|||||||
%sub
|
%sub
|
||||||
%br.clean
|
%br.clean
|
||||||
= link_to "NACHLADEN", :class => "more" do
|
= link_to "NACHLADEN", :class => "more" do
|
||||||
= image_tag image_path("ico/more.png")
|
= image_tag "ico/more.png"
|
||||||
#search_tracks
|
#search_tracks
|
||||||
= render :partial => "tracks/list", :locals => { :tracks => @tracks, :additional_class => "tab", :count => 26 }
|
= render :partial => "tracks/list", :locals => { :tracks => @tracks, :additional_class => "tab", :count => 26 }
|
||||||
%br.clean
|
%br.clean
|
||||||
%br
|
%br
|
||||||
= link_to "NACHLADEN", :class => "more" do
|
= link_to "NACHLADEN", :class => "more" do
|
||||||
= image_tag image_path("ico/more.png")
|
= image_tag "ico/more.png"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
#sidebar
|
#sidebar
|
||||||
.box.advertisment
|
.box.advertisment
|
||||||
%sup Advertisment
|
%sup Advertisment
|
||||||
= image_tag image_path("placeholder/advertisment.png")
|
= image_tag "placeholder/advertisment.png"
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
- tracks.track.each_with_index do |track, i|
|
- tracks.track.each_with_index do |track, i|
|
||||||
- id = @youtube_client.videos_by(:query => "#{track.name} #{track.artist} official", :page => 1, :per_page => 1, :order_by => "relevance")
|
- id = @youtube_client.videos_by(:query => "#{track.name} #{track.artist} official", :page => 1, :per_page => 1, :order_by => "relevance")
|
||||||
%li
|
%li
|
||||||
= image_tag image_path("ico/play.png"), :class=>"play", :videoid=>id.videos.first.unique_id
|
= image_tag "ico/play.png", :class=>"play", :videoid=>id.videos.first.unique_id
|
||||||
= image_tag image_path("ico/add.png"), :class=>"add"
|
= image_tag "ico/add.png", :class=>"add"
|
||||||
%span= track.name
|
%span= track.name
|
||||||
= link_to trimString(track.artist, 50), "#!/artists/#{CGI.escape(track.artist)}"
|
= link_to trimString(track.artist, 50), "#!/artists/#{CGI.escape(track.artist)}"
|
||||||
@@ -3,8 +3,8 @@
|
|||||||
.information
|
.information
|
||||||
%h1= (user.username || current_user.email)
|
%h1= (user.username || current_user.email)
|
||||||
%ul.nav
|
%ul.nav
|
||||||
%li=image_tag image_path("icons/artist-info.png")
|
%li=image_tag "icons/artist-info.png"
|
||||||
%li=image_tag image_path("icons/artist-links.png")
|
%li=image_tag "icons/artist-links.png"
|
||||||
%ul.con
|
%ul.con
|
||||||
%li="#{user.playcount} Plays"
|
%li="#{user.playcount} Plays"
|
||||||
%li="#{user.playlist.count} Playlists"
|
%li="#{user.playlist.count} Playlists"
|
||||||
@@ -24,4 +24,4 @@
|
|||||||
= image_tag artist.img_url
|
= image_tag artist.img_url
|
||||||
%br.clean
|
%br.clean
|
||||||
- if user == current_user
|
- if user == current_user
|
||||||
%div=render :partial => "edit", :locals => { :user => current_user }
|
%div=render :partial => "edit", :locals => { :user => current_user }
|
||||||
Reference in New Issue
Block a user