fixing conflicing views

ryanb · Oct 19, 2008 · 4d50b58 · 4d50b58
2 parents 4c1d0d0 + 294f370
commit 4d50b58
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -43,6 +43,11 @@
       <%- end -%>
       
       <%= yield %>
+      <div class="clear">
+      	<% if params[:project_id] %>
+      	<%= link_to "&laquo; Project Home", current_project %>
+      	<% end %>
+      </div>
 	</div>
 	<div id="footer">
 		MyIdeaDrawer is a <a href="http://railsrumble.com" title="Rails Rumble 2008">Rails Rumble 2008</a> project by <a href="http://railscasts.com" title="Ryan Bates">Ryan Bates</a> and <a href="http://kellishaver.com" title="Kelli Shaver">Kelli Shaver</a>

diff --git a/app/views/palettes/show.html.erb b/app/views/palettes/show.html.erb
@@ -1,15 +1,14 @@
 <div id="left_col">
-<% title "Viewing Palette: " + h(@palette.name) %>
-<h1><%=h yield(:title) %></h1>
+	<% title "View Palette: " + @palette.name %>
+  <h1><%=h yield(:title) %></h1>
 	<div id="palette">
-		<div id="swatch_1"></a>
-		<div id="swatch_2"></a>
-		<div id="swatch_3"></a>
-		<div id="swatch_4"></a>
-		<div id="swatch_5"></a>
+  	<% for swatch in @palette.color_swatches %>
+		  <div class="big_swatch" style="background:<%= swatch.hex %>"></div>
+		<% end %>
 	</div>
+	<div class="clear"></div>
 </div>
 <div id="sidebar">
- <h3><%= link_to "&#187; Back to Project Home", project_path(project_param) %></h3>
- <%= render :partial => "projects/project_sidebar"  %>
-</div>
+  <h3><%= link_to "&#187; Back to Project Home", project_path(project_param) %></h3>
+  <%= render :partial => "projects/project_sidebar"  %>
+</div>
diff --git a/app/views/welcome/about.html.erb b/app/views/welcome/about.html.erb
@@ -3,11 +3,11 @@
 	<h1><%=h yield(:title) %></h1>
 	<p class="big_desc">
 	<%= image_tag "about.png", :align => "left" %>
-	<strong>MyIdeaDrawer</strong> lets you organize everything you need for your next project, all in one place. Whether you're building a web site, redesigning a room, or putting togther a school report. Organize code, links, notes, palettes, photos, and screen shots all in one convenient location.
+	<strong>MyIdeaDrawer</strong> lets you organize everything you need for your next project, all in one place. Whether you're building a web site, redesigning a room, or putting together a school report. Organize code, links, notes, palettes, photos, and screen shots all in one convenient location.
 	<br /><br />
-	<strong>MyIdeaDrawer</strong> was built in just under 48 hours, during the 2-day <a href="http://railsrumble.com">Rails Rumble 2008</a> competition by Ryan Bates and Kelli Shaver. We'd like to thank the many staff, sponsors, volunteers, and participants who made this competition possible and we invite each and every one of you to look around and explore our application. Remeber, if you like <strong>MyIdeaDrawer</strong>, please don't forget to <a href="http://railsrumble.com/teams/teamwnn">Vote For Us</a>!</p>
+	<strong>MyIdeaDrawer</strong> was built in just under 48 hours, during the 2-day <a href="http://railsrumble.com">Rails Rumble 2008</a> competition by Ryan Bates and Kelli Shaver. We'd like to thank the many staff, sponsors, volunteers, and participants who made this competition possible and we invite each and every one of you to look around and explore our application. Remember, if you like <strong>MyIdeaDrawer</strong>, please don't forget to <a href="http://railsrumble.com/teams/teamwnn">Vote For Us</a>!</p>
 
-	<p class="big_desc"><strong>About Kelli Shaver:</strong> <a href="http://kellishaver.com">Kelli</a> has been designing and developing web sites professionally for eight years. Although also a competent back-end programmer, Kelli chooses to specialize in front-end/user-interface design, HTML, CSS, javaScript, and icon design.</p>
+	<p class="big_desc"><strong>About Kelli Shaver:</strong> <a href="http://kellishaver.com">Kelli</a> has been designing and developing web sites professionally for eight years. Although also a competent back-end programmer, Kelli chooses to specialize in front-end/user-interface design, HTML, CSS, JavaScript, and icon design.</p>
 
 	<p class="big_desc"><strong>About Ryan Bates:</strong> Ryan Bates has been involved in web development since 1998. In 2005 he started working professionally with Ruby on Rails and is now best known for his work on <a href="http://railscasts.com">Railscasts</a>, the free Ruby on Rails screencast series.</p>
 

diff --git a/public/javascripts/thickbox.js b/public/javascripts/thickbox.js
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
@@ -65,7 +65,7 @@ fieldset { border:none; }
 			#picker { width:150px; float:left; }
 
 			#palette { width:506px; height:102px; padding:5px; border:1px solid #000; margin:0 auto 10px auto; }
-				#swatch_1, #swatch_2, #swatch_3, #swatch_4, #swatch_4, #swatch_5 { display:block; width:100px; height:100px; border:1px solid #000; border-right:none; float:left; }
+				#swatch_1, #swatch_2, #swatch_3, #swatch_4, #swatch_4, #swatch_5, .big_swatch { display:block; width:100px; height:100px; border:1px solid #000; border-right:none; float:left; }
 				#swatch_5 { border-right:1px solid #000 !important; }
 				#palette a:hover, #palette_small a:hover { text-decoration:none; }