color changes. fixes.

chriserin · Jan 19, 2011 · a4dc730 · a4dc730
1 parent ceba581
commit a4dc730
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 19 deletions.
diff --git a/app/views/blogs/_blog.html.erb b/app/views/blogs/_blog.html.erb
@@ -1,5 +1,15 @@
-			<div class="blogContainer round">
-				<article>
-					<%= blog.blogtext %>
-				</article>
-			</div>
+<div class="blogContainer round">
+	<article>
+		<%= blog.blogtext %>
+	</article>
+
+	<span>
+		<% if signed_in? %>
+			<span>
+				<%= link_to "delete", blog, :method => :delete,
+										   :confirm => "You sure?" %>
+			</span>
+
+		<% end %>
+	</span>
+</div>
diff --git a/app/views/geronimo/index.html.erb b/app/views/geronimo/index.html.erb
@@ -5,11 +5,11 @@
 	<title>Geronimo!</title>
 	<%= stylesheet_link_tag 'geronimo', :media => 'screen' %>	
 </head>
-<body>
+<body class="home_page">
 <span class="BandImages">
 	<% if @next_show %>
 		<div class="NextShow">Next Show: <%= @next_show.showtext %></div>
-		<div class="AllShows"><%= link_to 'all shows', shows_path%></div>
+		<div class="AllShows"><%= link_to 'all shows', all_shows_path%></div>
 	<% end %>
 	<span class="CenterImages">
 		<span class="TriptychContainer">

diff --git a/app/views/geronimo/shows.html.erb b/app/views/geronimo/shows.html.erb
@@ -1,10 +1,10 @@
 <div id="ShowsContainer">
-	<div class="showsHeader">---------------------Upcoming Shows-----------------------</div>	
+	<div class="showsHeader">---------------------<span class="dashHeading">Upcoming Shows</span>-----------------------</div>	
 	<div id="UpcomingShows" class="round">
 
 				<%= render @upcoming_shows %>
 	</div>
-	<div class="showsHeader">---------------------Past Shows---------------------------</div>
+	<div class="showsHeader">---------------------<span class="dashHeading">Past Shows</span>---------------------------</div>
 	<div id="PastShows" class="round">
 
 				<%= render @past_shows %>

diff --git a/app/views/layouts/_g_header.html.erb b/app/views/layouts/_g_header.html.erb
@@ -1 +1 @@
-<div class="BandName">Geronimo!</div>
+<div class="BandName"><a href="/" class="BandName">Geronimo!</a></div>
diff --git a/app/views/layouts/g_application.html.erb b/app/views/layouts/g_application.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Geronimo!</title>
+    <title>Geronimo! <%= @page_name %></title>
     <%= 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
@@ -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 => "[email protected]",
+                       :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 => "[email protected]",
+                       :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 => "[email protected]",

diff --git 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{
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<div class="BandName">Geronimo!</div>
		<div class="BandName"><a href="/" class="BandName">Geronimo!</a></div>