Commit 947f76ab

@@ -10,7 +10,7 @@ module ApplicationHelper
   end
 
   def full_title(title)
-    if( title.blank? )
+    if title.blank?
       "CakeSide - for cake lovers!"
     else
       "#{title} - CakeSide"
@@ -28,4 +28,8 @@ module ApplicationHelper
     signature = OpenSSL::HMAC.hexdigest('sha1', ENV['DISQUS_SECRET_KEY'] || '', "#{message} #{timestamp}")
     "#{message} #{signature} #{timestamp}"
   end
+
+  def controller?(name)
+    params[:controller].include?(name)
+  end
 end

@@ -1,4 +1,4 @@
-<%= render :partial => "shared/account_nav", :locals => { :selected => :picture } %>
+<%= render partial: "shared/account_nav" %>
 <div class="row-fluid">
   <div class="span12">
     <%= avatar_for(current_user) %>

@@ -14,7 +14,7 @@
   <% end %>
 <% end -%>
 
-<%= render partial: "shared/account_nav", locals: { selected: :creations } %>
+<%= render partial: "shared/account_nav" %>
 <div id="backbone-content"></div>
 <div id="disqus_thread"></div>
 <div id="modal" class="modal hide fade"></div>

@@ -1,5 +1,5 @@
 <% provide(:title, "Dashboard") -%>
-<%= render :partial => "shared/account_nav", :locals => { :selected => :dashboard } %>
+<%= render partial: "shared/account_nav" %>
 <div class="row-fluid">
   <div class="span7">
     <% @items.each do |item| %>

@@ -1,5 +1,5 @@
 <% provide(:title, "My Favorites") -%>
-<%= render :partial => "shared/account_nav", :locals => { :selected => :favorites } %>
+<%= render partial: "shared/account_nav" %>
 <div class="row-fluid">
   <% @creations.each_slice(6).each do |batch| %>
     <ul class='thumbnails'>

@@ -1,4 +1,4 @@
-<%= render :partial => "shared/account_nav", :locals => { :selected => :password } %>
+<%= render partial: "shared/account_nav" %>
 
 <div class="row-fluid">
   <div class="span12">

@@ -7,7 +7,7 @@
 </script>
 <% end %>
 
-<%= render :partial => "shared/account_nav", :locals => { :selected => :basic_info } %>
+<%= render partial: "shared/account_nav" %>
 
 <div class="row-fluid">
   <div class="span12">

@@ -1,12 +1,12 @@
 <div class="row-fluid">
   <div class="span12">
     <ul class="nav nav-tabs">
-      <li class="<%= selected == :dashboard ? "active" : "" %>"><%= link_to "Dashboard", my_dashboard_path %></li>
-      <li class="<%= selected == :creations ? "active" : "" %>"><%= link_to "Creations", my_root_path(anchor: 'cakes') %></li>
-      <li class="<%= selected == :favorites ? "active" : "" %>"><%= link_to "Favorites", my_favorites_path %></li>
-      <li class="<%= selected == :basic_info ? "active" : "" %>"><%= link_to "Settings", my_settings_path %></li>
-      <li class="<%= selected == :password ? "active" : "" %>"><%= link_to "Password", my_passwords_path %></li>
-      <li class="<%= selected == :picture ? "active" : "" %>"><%= link_to "Picture", edit_my_avatar_path(current_user) %></li>
+      <li class="<%= "active" if controller?("dashboard") %>"><%= link_to "Dashboard", my_dashboard_path %></li>
+      <li class="<%= "active" if controller?("cakes") %>"><%= link_to "Creations", my_root_path(anchor: 'cakes') %></li>
+      <li class="<%= "active" if controller?("favorites") %>"><%= link_to "Favorites", my_favorites_path %></li>
+      <li class="<%= 'active' if controller?('settings') %>"><%= link_to "Settings", my_settings_path %></li>
+      <li class="<%= 'active' if controller?('passwords') %>"><%= link_to "Password", my_passwords_path %></li>
+      <li class="<%= 'active' if controller?('avatars') %>"><%= link_to "Picture", edit_my_avatar_path(current_user) %></li>
       <li class="pull-right"><%= link_to t('.logout'), logout_path, method: :delete, class: "btn btn-inverse" %></li>
       <% if current_user.admin? %>
       <li class="pull-right"><%= link_to t('.admin'), admin_root_path %></li>

@@ -1,20 +0,0 @@
-<ul class="thumbnails">
-  <% @creations.each do |creation| %>
-    <li class="span3">
-    <div class="thumbnail">
-      <%= link_to creation do %>
-        <img src="<%= creation.primary_image.url_for(:thumb) %>" alt="<%= creation.name %>" style="width:260px;height:180px;" />
-      <% end %>
-      <h3><%= link_to short_name(creation, 15), creation %></h3>
-      <h4><small>By <%= link_to shrink(creation.user.name, 20), profile_path(creation.user) %></small></h4>
-      <p>
-      <%= link_to creation_favorites_path(:creation_id => creation.id) do %>
-        <span class="badge"><%= creation.favorites.size %> <i class="icon-heart-empty"></i></span>
-      <% end %>
-      <span class="badge badge-warning"><i class="icon-comments"> <a href="<%= url_for creation %>#disqus_thread" data-disqus-identifier="c-<%= creation.id %>"></a></i></span>
-      </p>
-    </div>
-    </li>
-  <% end %>
-</ul>
-<%= render "shared/paging", items: @creations %>