app/controllers/home_controller.rb
app/views/home/about.html.erb
@@ -86,10 +86,6 @@ class AudiographyController < ApplicationController
render :nothing => true
end
- def about
- @title = "About"
- end
-
# def import_list
# if logged_in? && current_user.admin?
# audiography = current_user.audiography
app/controllers/audiography_controller.rb
@@ -1,5 +1,8 @@
<div class="page_content_holder">
- <h1>Admin</h1><br/>
+ <div class="page_title_holder">
+ <div class="page_title">Admin</div>
+ </div><br/>
+ <%= link_to "Get recent Last.fm tracks", :controller => 'track', :action => 'lfm_list' %><br/>
<%= link_to "Set order of all tracks", :action => "set_order_of_all_tracks" %><br/>
</div>
\ No newline at end of file
app/views/admin/index.rhtml
@@ -6,6 +6,7 @@
<!-- LHS -->
<span class="general_top_nav_items">
+ <%= render(:partial => 'shared/nav_link', :locals => { :link_url => "/about", :link_text => "about" } ) %>
<%= render(:partial => 'shared/nav_link', :locals => { :link_url => "/track/latest", :link_text => "latest" } ) %>
</span>
@@ -53,4 +54,4 @@
<% else %>
<br/>
<% end-%>
-</div>
\ No newline at end of file
+</div>
\ No newline at end of file
app/views/shared/_header.rhtml
@@ -6,7 +6,7 @@
<!-- link to audiography -->
<% if link_to_audiography %>
<div class="track_audiography_holder">
- <a href='/<%=track.audiography.url_title%>'><%=track.audiography.url_title%></a>
+ <a href='<%= track.audiography.get_url() %>'><%=track.audiography.title%></a>
</div>
<% end-%>
app/views/track/_controls_and_links.html.erb
@@ -8,11 +8,11 @@
<% controls_dom_id = 'drag_handle' + track.id.to_s %>
<li id='<%= track_dom_id %>'
- class="track_list_item track_content" style="margin:0 0 0 -50"
+ class="track_list_item track_content"
onmouseover="Element.show('<%=controls_dom_id%>')"
onmouseout="Element.hide('<%=controls_dom_id%>')">
- <div style="margin:0 0 0 50">
+ <div class="track_holder">
<%= render(:partial => 'track/controls_and_links', :locals => { :link_to_audiography => link_to_audiography,
:track => track,
:user_can_edit => user_can_edit,
app/views/track/_show.html.erb
@@ -43,7 +43,7 @@ ActionController::Routing::Routes.draw do |map|
map.resource :sessions
map.connect 'admin', :controller => 'admin', :action => 'index'
- map.connect 'about', :controller => 'audiography', :action => 'about'
+ map.connect 'about', :controller => 'home', :action => 'about'
map.connect 'track', :controller => 'track'
map.connect 'track/add_from_search', :controller => 'track', :action => 'add_from_search', :format => 'html'
config/routes.rb
@@ -44,7 +44,7 @@ module Linking
if production?()
return "http://" + self.site()
else
- return self.site()
+ return "http://" + self.site()
end
end
lib/linking.rb
@@ -27,7 +27,7 @@ hr { border:1px #aaa solid; height:1; }
.page_title { font-size:22px; color:#fff; margin-left:auto; margin-right:auto; width:545; padding:5 0 5 0; margin:0 0 0 1000; }
.follow { float:right; padding:2 4 0 0; }
-.top_nav { margin-left:auto; margin-right:auto; width:550; text-align:right; margin-top:0; border-top:2px #224 solid; padding:2 0 2 0; }
+.top_nav { margin-left:auto; margin-right:auto; width:550; text-align:right; margin-top:0; border-top:1px #224 solid; padding:2 0 2 0; }
.bottom_nav { margin-left:auto; margin-right:auto; width:210; text-decoration:none; color:#224; }
.general_top_nav_items { float:left; }
.page_content_holder { margin-left:auto; margin-right:auto; width:550;text-align:justify; }
@@ -97,8 +97,9 @@ textarea { border: 1px solid #224; width:296; font-size: 12px; font-family:'Luci
.permalink_handle { cursor:pointer; display:inline; }
.permalink { font-size:9.6; }
-LI.track_list_item { list-style:none; }
-
+LI.track_list_item { list-style:none; margin:0 0 0 -130px; }
+.track_holder { margin:0 0 0 130px; }
+
/* admin */
.admin_table { border:1px solid #666; }
.admin_table_td { border: 1px solid #666; padding:5px; vertical-align:top; font-size:12px; }
public/stylesheets/main.css
470d419c42b59145e130b56bf356d76bbaf55608
Mary Cook
maryrosecook@mary-cooks-macbook-pro.local
http://github.com/maryrosecook/playmary/commit/2f57db90b5b0457f6e05020dc395bce4650296b6
2f57db90b5b0457f6e05020dc395bce4650296b6
2009-10-24T06:45:18-07:00
2009-10-24T06:45:18-07:00
wider hover area for controls; new about page
df6c88d03f720a67cdd1352a7530b4bb9037c373
Mary Cook
maryrosecook@mary-cooks-macbook-pro.local