Added consistent sub-navigation to program index and show

dominic · dominic · commit db0b3aa47a79 · 2011-12-29T15:48:32.000-05:00
diff --git a/app/assets/stylesheets/content.css.scss b/app/assets/stylesheets/content.css.scss
@@ -16,4 +16,26 @@ h2 {
   p {
     margin-bottom: 1em;
   }
+}
+
+ul.inline-menu {
+  @include clearfix;
+  list-style-type: none;
+  margin: 0;
+  li {
+    float: left;
+    padding-right: 1em;
+    border-right: 1px solid #ccc;
+    margin-right: 1em;
+  }
+  li:last-child {
+    border: none;
+    margin: 0;
+    padding: 0;
+  }
+}
+
+.bottom-nav {
+  border-top: 1px solid #ccc;
+  padding-top: 1.5em;
 }
diff --git a/app/views/programs/index.html.haml b/app/views/programs/index.html.haml
@@ -1,7 +1,10 @@
 - content_for :title do
-  Programs
+  - if @user
+    #{@user.username}'s Programs
+  - else
+    Programs
 
-- unless @featured.blank?
+- unless @featured.blank? or @user
   #featured.programs
     .heading
       %h3 Featured
@@ -14,12 +17,18 @@
           .author= author_link program.author_username, program
 
 #all-programs.programs
-  .heading
-    %h3 All Programs
-    .description Every program uploaded by our users!
+  - unless @user
+    .heading
+      %h3 All Programs
+      .description Every program uploaded by our users!
 
   %ul
     - @programs.each do |program|
       %li
         .title= program_link program
         .author= author_link program.author_username, program
+
+- if @user
+  %ul.inline-menu.bottom-nav
+    %li= link_to "All Programs", programs_path
+    %li= link_to "#{@user.username}'s profile", user_path(@user)
diff --git a/app/views/programs/show.html.haml b/app/views/programs/show.html.haml
@@ -19,10 +19,9 @@
     by
     = link_to @program.author_username, user_path(@program.author_username)
 
-%pre.prettyprint= @program.source_code
+#program
+  %pre.prettyprint= @program.source_code
 
-%hr/
-
-%h3 Other Programs
-
-Make sure to check out all the other programs other users have made on the #{link_to "All Programs page", programs_path}!
+  %ul.inline-menu.bottom-nav
+    %li= link_to "#{@program.author_username}'s programs", user_programs_path(@program.author_username)
+    %li= link_to "All Programs", programs_path
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
@@ -17,12 +17,12 @@
     %h2= "About #{resource.username}"
     %h4= resource.about
     %hr
-    %p 
-      = link_to "Programs", user_programs_path(resource)
-    %p 
+    %p
+      = link_to pluralize(resource.programs.count, "Program"), user_programs_path(resource)
+    %p
       Following:
       =link_to resource.following.count, resource_path(resource) + "/following"
-    %p 
+    %p
       Followers:
       = link_to resource.followers.count, resource_path(resource) + "/followers"
     %hr
@@ -32,7 +32,7 @@
 
 - unless @user.questions.empty?
   %section.questions
-    %header 
+    %header
       %h2 Questions
     - @user.questions.each do |question|
       %article.question
@@ -44,7 +44,7 @@
       %h2 Answers
     - @user.answers.each do |answer|
       %article.answer
-        %h4 
+        %h4
           = "#{@user.username} answered"
           = link_to(answer.question.title, answer.question)
           with:
