diff --git a/app/views/blogs/_blog.html.erb b/app/views/blogs/_blog.html.erb index 5849fe6..8303015 100644 --- a/app/views/blogs/_blog.html.erb +++ b/app/views/blogs/_blog.html.erb @@ -1,5 +1,15 @@ -
-
- <%= blog.blogtext %> -
-
\ No newline at end of file +
+
+ <%= blog.blogtext %> +
+ + + <% if signed_in? %> + + <%= link_to "delete", blog, :method => :delete, + :confirm => "You sure?" %> + + + <% end %> + +
\ No newline at end of file diff --git a/app/views/geronimo/index.html.erb b/app/views/geronimo/index.html.erb index 134f65f..3dad7ca 100644 --- a/app/views/geronimo/index.html.erb +++ b/app/views/geronimo/index.html.erb @@ -5,11 +5,11 @@ Geronimo! <%= stylesheet_link_tag 'geronimo', :media => 'screen' %> - + <% if @next_show %>
Next Show: <%= @next_show.showtext %>
-
<%= link_to 'all shows', shows_path%>
+
<%= link_to 'all shows', all_shows_path%>
<% end %> diff --git a/app/views/geronimo/shows.html.erb b/app/views/geronimo/shows.html.erb index 0c2c406..1d3657b 100644 --- a/app/views/geronimo/shows.html.erb +++ b/app/views/geronimo/shows.html.erb @@ -1,10 +1,10 @@
-
---------------------Upcoming Shows-----------------------
+
---------------------Upcoming Shows-----------------------
<%= render @upcoming_shows %>
-
---------------------Past Shows---------------------------
+
---------------------Past Shows---------------------------
<%= render @past_shows %> diff --git a/app/views/layouts/_g_header.html.erb b/app/views/layouts/_g_header.html.erb index 75eefa6..bc177d3 100644 --- a/app/views/layouts/_g_header.html.erb +++ b/app/views/layouts/_g_header.html.erb @@ -1 +1 @@ -
Geronimo!
\ No newline at end of file +
Geronimo!
\ No newline at end of file diff --git a/app/views/layouts/g_application.html.erb b/app/views/layouts/g_application.html.erb index 34fc69b..3052d69 100644 --- a/app/views/layouts/g_application.html.erb +++ b/app/views/layouts/g_application.html.erb @@ -1,7 +1,7 @@ - Geronimo! + Geronimo! <%= @page_name %> <%= csrf_meta_tag %> <%= render 'layouts/g_stylesheets' %> <%= javascript_include_tag :defaults %> diff --git a/lib/tasks/geronimo_sample_data.rake b/lib/tasks/geronimo_sample_data.rake index ae0eead..3c1bdd9 100644 --- a/lib/tasks/geronimo_sample_data.rake +++ b/lib/tasks/geronimo_sample_data.rake @@ -4,12 +4,36 @@ namespace :db do desc "Fill database with geronimo sample data" task :populate => :environment do Rake::Task['db:reset'].invoke - make_users - make_microposts - make_relationships + make_blog_posts + make_shows end end +def make_blog_posts + admin = User.create!(:name => "Example User", + :email => "example_blog_maker@railstutorial.org", + :password => "foobar", + :password_confirmation => "foobar") + admin.toggle!(:admin) + 99.times do |n| + blogtext = Faker::Lorem.sentence(10) + admin.blogs.create_with_post("blog " + blogtext) + end +end + +def make_shows + admin = User.create!(:name => "Example User", + :email => "example_show_maker@railstutorial.org", + :password => "foobar", + :password_confirmation => "foobar") + admin.toggle!(:admin) + 99.times do |n| + showtext = Faker::Lorem.sentence(10) + Show.new_from_post("show " + Date.today.next_day(n - 50).strftime('%m/%d/%y') + " " + showtext).save + end +end + + def make_users admin = User.create!(:name => "Example User", :email => "example@railstutorial.org", diff --git a/public/stylesheets/geronimo.css b/public/stylesheets/geronimo.css index 72013bf..4d04589 100644 --- a/public/stylesheets/geronimo.css +++ b/public/stylesheets/geronimo.css @@ -1,10 +1,14 @@ body{ - background-color: #BFDAD7; + background-color: #333333; font-family:"Courier New",Times,serif; height: 100%; } +body.home_page{ + color: white; +} + .leftside { /*set the div in the top-left corner of the screen*/ position:absolute; @@ -106,7 +110,7 @@ body{ -moz-border-radius: 10px 10px 10px 10px; -webkit-border-radius: 10px 10px 10px 10px; -moz-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.5) inset, 0 1px 0 rgba(255, 255, 255, 0.9), 0 -1px 0 rgba(0, 0, 0, 0.6); - -webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.5) inset, 0 1px 0 rgba(255, 255, 255, 0.9), 0 -1px 0 rgba(0, 0, 0, 0.6); + /*-webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.5) inset, 0 1px 0 rgba(255, 255, 255, 0.9), 0 -1px 0 rgba(0, 0, 0, 0.6);*/ display: inline-block; } @@ -145,6 +149,21 @@ a:hover { .BandName{ font-size: 40px; + color: white +} + + +a.BandName{ + text-decoration: none; + color: white; +} + +a:hover { + color: orange; +} + +.dashHeading{ + color: #99CCFF; } .container { @@ -172,8 +191,6 @@ a:hover { padding: 10px; } - - .show{ margin: 5px; } @@ -182,7 +199,6 @@ a:hover { nav { padding: 0 0.7em; white-space: nowrap; - } nav.footer{