highlight current page, highlight current category, display categorie…

…s in main nav, add feature for it
scottkf · Nov 1, 2010 · 3704f64 · 3704f64
1 parent a9d1545
commit 3704f64
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 8 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,5 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  before_filter :main_categories
 
   rescue_from CanCan::AccessDenied do |exception|
     flash[:notice] = exception.message
@@ -8,13 +9,9 @@ class ApplicationController < ActionController::Base
 
 
   def main_categories
-    Category.roots
+    @main_categories = Category.roots
   end
 
-  #returns all direct descendants of category
-  def sub_categories(name)
-    Category.find_by_name(name).children
-  end
 
 
   #returns an array of hashes to be used for a form

diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
@@ -73,6 +73,7 @@ def list
       #get all articles belonging to category, paginated
       #check if the url is a subcategory, if it is, just get subcats
     else
+      flash[:notice] = "No articles found in category, #{@category.name}, sorry!"
       redirect_to articles_path
     end
   end

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -34,6 +34,9 @@
 				<% if can? :manage, Article %>
 				<li<%= is_active?("articles", "all", "edit")%>><%= link_to "manage articles", articles_all_path %></li>
 				<% end %>
+				<% if can? :manage, Category %>
+				<li<%= is_active?("categories", "index", "new", "edit", "show")%>><%= link_to "manage categories", categories_path %></li>
+				<% end %>
 			<% else %>
 				<li><%= link_to "sign in", new_user_session_path %></li>
 			<% end %>
@@ -45,7 +48,11 @@
 		<nav class="main">
 			<ul>
 				<li<%= is_active?("articles", "index")%>><%= link_to "home", articles_path %></li>
-				<li<%= is_active?("categories", "index", "new", "edit", "show")%>><%= link_to "categories", categories_path %></li>
+				<% @main_categories.each do |c| -%>
+					<li<%= is_active?("categories", "list") if @category and @category.id == c.id %>>
+						<%= link_to c.name, articles_category_path(c.url) %>
+					</li>
+				<% end -%>
 				<li><a href="mailto:web@487teabags.com">contact</a></li>
 			</ul>
 		</nav>

diff --git a/features/category.feature b/features/category.feature
@@ -58,6 +58,16 @@ Feature: Category
 		Then "hello" should not be seen within select "category[parent_id]"
 
 
+	@navigation
+	Scenario: For every category, a link should exist in the main nav
+		Given there is a category with name "hello" and url "hello123"
+		And there is a category with name "hello2" and url "1234"
+	  	When I go to the homepage
+		Then I should see "hello" within xpath "//nav[@class='main']/ul/li/a"
+		And I should see "hello2" within xpath "//nav[@class='main']/ul/li/a"
+
+
+
 
 
 	# fopen to add something unique to the layout to check for it
@@ -69,7 +79,6 @@ Feature: Category
 		And I have an article in that category
 		And the layout has "<html><body><h1>UNCOMMONSHIBBOLETH</h1><%= yield %></body></html>"
 	 	When I am on the hello23 category page
-		And show me the page
 	 	Then I should see "UNCOMMONSHIBBOLETH" within "h1"
 
 

diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
@@ -146,6 +146,11 @@ def with_scope(locator)
   end
 end
 
+Then /^I should see "([^"]*)" within xpath "([^"]*)"$/ do |text, xpath|
+  page.should have_xpath(xpath, :text => text)
+end
+
+
 Then /^"([^"]*)" should be selected for "([^"]*)"$/ do |value, field|
   assert page.has_xpath?("//option[@selected = 'selected' and contains(string(), value)]") 
 end

diff --git a/public/stylesheets/sass/screen.scss b/public/stylesheets/sass/screen.scss
@@ -85,6 +85,7 @@ body.bp {
 		  @include column(14, true);
       ul {
         li {
+          padding: 0em 0.5em 0em 0.5em;
           float: right;
           &.active {
             background-color: $link-color - #222;

diff --git a/public/stylesheets/screen.css b/public/stylesheets/screen.css