Got all the breadcrumbs working properly and revised the homepage so …

…that it shows a full list of projects and looks better.
BSVino · Nov 8, 2011 · cd899a9 · cd899a9
1 parent 62bf41e
commit cd899a9
Show file tree

Hide file tree

Showing 16 changed files with 112 additions and 7 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -24,7 +24,7 @@ body {
 	margin-left: 50px;
 }
 
-.breadcrumbitem a, .breadcrumbitem a:hover, .breadcrumbitem a:visited {
+.breadcrumbitem a, .breadcrumbitem a:hover, .breadcrumbitem a:visited, .breadcrumbitem {
 	padding: 5px 10px 8px 10px;
 	background: #fff;
 	font-weight: bold;

diff --git a/app/assets/stylesheets/home.css.scss b/app/assets/stylesheets/home.css.scss
@@ -1,3 +1,28 @@
 // Place all the styles related to the home controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+#newprojectbox {
+	text-transform: uppercase;
+	letter-spacing: 1px;
+	float: right;
+	text-align: center;
+	border: 2px solid #cebf62;
+	margin-top: 20px;
+	margin-right: 20px;
+	padding: 20px 20px 20px 20px;
+	padding-bottom: 15px;
+}
+
+#home_content {
+	margin: 15px 15px 15px 15px;
+	margin: auto;
+	text-align: center;
+	width: 750px;
+}
+
+hr {
+	width: 740px;
+	color: #d3d3d3;
+	height: 2px;
+}
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -1,5 +1,6 @@
 class HomeController < ApplicationController
   def index
+  	@projects = Project.all
   end
 
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -91,8 +91,8 @@ def tasks
 
   # GET /projects/1/tasks/new
   def tasks_new
-    project = Project.find(params[:id])
-    @task = project.tasks.build
+    @project = Project.find(params[:id])
+    @task = @project.tasks.build
 
     render '/tasks/new'
   end

diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
@@ -14,6 +14,7 @@ def index
   # GET /tasks/1.json
   def show
     @task = Task.find(params[:id])
+    @project = @task.project
 
     respond_to do |format|
       format.html # show.html.erb

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
@@ -1,3 +1,10 @@
 <h1>Hivemind</h1>
-<%= link_to "List of projects", projects_path %>
+Hivemind helps you find creative projects to collaborate on.
+<hr />
+
+<% @projects.each do |project| %>
+<div>
+  <%= link_to project.name, project %> - <%= project.engine %>
+</div>
+<% end %>
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -10,9 +10,7 @@
 
   <div id="header">
     <div id="breadcrumb">
-      <span class="breadcrumbitem"><a href="/">Hivemind</a></span>
-      <span class="breadcrumbgt">&gt;</span>
-      <span class="breadcrumbitem"><a href="/projects">Projects</a></span>
+	  <%= yield :breadcrumb %>
     </div>
     <div id="loginbox">
       <a href="/"><img id="hivemindlogo" src="/assets/header-hivemind.png" /></a>

diff --git a/app/views/layouts/home.html.erb b/app/views/layouts/home.html.erb
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Hivemind</title>
+  <%= stylesheet_link_tag    "application" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+  <div id="header">
+    <div id="newprojectbox">
+	  <span style="font-size:large;"><strong>Got big ideas?</strong></span>
+	  <p><em><%= link_to 'Start a new project', '/projects/new' %></em></p>
+    </div>
+  </div>
+
+  <div id="home_content">
+    <%= yield %>
+  </div>
+
+</body>
+</html>
diff --git a/app/views/projects/edit.html.erb b/app/views/projects/edit.html.erb
@@ -1,3 +1,9 @@
+<% content_for :breadcrumb do %>
+	<span class="breadcrumbitem"><%= link_to @project.name, @project %></span>
+	<span class="breadcrumbgt">&gt;</span>
+	<span class="breadcrumbitem">Update</span>
+<% end %>
+
 <h1>Editing project</h1>
 
 <%= render 'form' %>

diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
@@ -1,3 +1,9 @@
+<% content_for :breadcrumb do %>
+	<span class="breadcrumbitem"><a href="/">Hivemind</a></span>
+	<span class="breadcrumbgt">&gt;</span>
+	<span class="breadcrumbitem"><a href="/projects">Projects</a></span>
+<% end %>
+
 <h1>Listing projects</h1>
 
 <table>

diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
@@ -1,5 +1,13 @@
+<% content_for :breadcrumb do %>
+	<span class="breadcrumbitem"><a href="/projects">Projects</a></span>
+	<span class="breadcrumbgt">&gt;</span>
+	<span class="breadcrumbitem">Create</span>
+<% end %>
+
 <h1>New project</h1>
 
+<p>Yo ho! You are the adventurous, the enterprising, the few and the proud who dare to create!</p>
+
 <%= render 'form' %>
 
 <%= link_to 'Back', projects_path %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
@@ -1,3 +1,9 @@
+<% content_for :breadcrumb do %>
+	<span class="breadcrumbitem"><a href="/projects">Projects</a></span>
+	<span class="breadcrumbgt">&gt;</span>
+	<span class="breadcrumbitem"><%= link_to @project.name, @project %></span>
+<% end %>
+
 <p id="notice"><%= notice %></p>
 
 <p>

diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb
@@ -1,3 +1,9 @@
+<% content_for :breadcrumb do %>
+	<span class="breadcrumbitem"><%= link_to @task.name, @task %></span>
+	<span class="breadcrumbgt">&gt;</span>
+	<span class="breadcrumbitem">Edit</span>
+<% end %>
+
 <h1>Editing task</h1>
 
 <%= render 'form' %>

diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
@@ -1,3 +1,9 @@
+<% content_for :breadcrumb do %>
+	<span class="breadcrumbitem"><%= link_to @project.name, @project %></span>
+	<span class="breadcrumbgt">&gt;</span>
+	<span class="breadcrumbitem">Tasks</span>
+<% end %>
+
 <h1>Listing tasks</h1>
 
 <table>

diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb
@@ -1,3 +1,9 @@
+<% content_for :breadcrumb do %>
+	<span class="breadcrumbitem"><%= link_to @project.name, @project %></span>
+	<span class="breadcrumbgt">&gt;</span>
+	<span class="breadcrumbitem">New Task</span>
+<% end %>
+
 <h1>New task</h1>
 
 <%= render '/tasks/form' %>

diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb
@@ -1,3 +1,9 @@
+<% content_for :breadcrumb do %>
+	<span class="breadcrumbitem"><%= link_to @project.name, @project %></span>
+	<span class="breadcrumbgt">&gt;</span>
+	<span class="breadcrumbitem"><%= link_to @task.name, @task %></span>
+<% end %>
+
 <p id="notice"><%= notice %></p>
 
 <p>