From df6d28640a93c933b8d2866546306a1a968e1cdf Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Thu, 9 May 2013 13:34:35 -0300
Subject: [PATCH] Including a link to the start of the catalog on catalog categories left block

---
 app/models/enterprise.rb           | 4 ++++
 app/views/catalog/index.rhtml      | 3 ++-
 public/stylesheets/application.css | 6 +++---
 test/unit/enterprise_test.rb       | 8 ++++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index 5001a69..fc19707 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -185,4 +185,8 @@ class Enterprise < Organization
     Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY action_tracker.updated_at DESC")
   end
 
+  def catalog_url
+    { :profile => identifier, :controller => 'catalog'}
+  end
+
 end
diff --git a/app/views/catalog/index.rhtml b/app/views/catalog/index.rhtml
index 34fd648..d5be460 100644
--- a/app/views/catalog/index.rhtml
+++ b/app/views/catalog/index.rhtml
@@ -7,7 +7,8 @@
 
 <div class='l-sidebar-left-bar'>
   <ul>
-    <%= content_tag('li', link_to(_('Enterprise homepage'), profile.public_profile_url), :id => 'catalog-categories-homepage-link') %>
+    <%= content_tag('li', link_to(_('Enterprise homepage'), profile.public_profile_url), :class => 'catalog-categories-link') %>
+    <%= content_tag('li', link_to(_('Catalog start'), profile.catalog_url), :class => 'catalog-categories-link') %>
     <% if @categories.present? %>
       <% @categories.each do |category| %>
         <%= category_link(category) %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 081eb01..9498e72 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2723,7 +2723,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   padding-bottom: 0.5em;
 }
 
-#catalog-categories-homepage-link {
+.l-sidebar-left-bar .catalog-categories-link {
   background-color: #d3d7cf;
   font-weight: bold;
   height: 28px;
@@ -2733,12 +2733,12 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
 }
 
 
-#catalog-categories-homepage-link:hover {
+.l-sidebar-left-bar .catalog-categories-link:hover {
   background-color: #babdb6;
 }
 
 
-#catalog-categories-homepage-link a{
+.l-sidebar-left-bar .catalog-categories-link a{
   display: inline-block;
   height: 100%;
   width: 100%;
diff --git a/test/unit/enterprise_test.rb b/test/unit/enterprise_test.rb
index 365f100..155f6dc 100644
--- a/test/unit/enterprise_test.rb
+++ b/test/unit/enterprise_test.rb
@@ -523,4 +523,12 @@ class EnterpriseTest < ActiveSupport::TestCase
     assert_not_includes enterprise.activities.map { |a| a.klass.constantize.find(a.id) }, article.activity
   end
 
+  should 'provide URL to catalog area' do
+    environment = create_environment('mycolivre.net')
+    enterprise = build(Enterprise, :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
+
+    assert_equal({:profile => enterprise.identifier, :controller => 'catalog'}, enterprise.catalog_url)
+  end
+
+
 end
--
libgit2 0.21.2