ActionItem507: category working on IE and some other little things

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2159 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem507: category working on IE and some other little things
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2159 3f533792-8f58-4932-b0fe-aaf55b0a4547
AurelioAHeckert
1 parent e73f1a42
Showing 8 changed files with 82 additions and 36 deletions Show diff stats
app/helpers/enterprise_homepage_helper.rb
app/models/profile.rb
app/views/search/products.rhtml
public/designs/themes/ecosol/stylesheets/controller_content_viewer.css
public/designs/themes/ecosol/stylesheets/controller_search.css
public/designs/themes/zen3/stylesheets/controller_content_viewer.css
public/designs/themes/zen3/stylesheets/controller_search.css
public/stylesheets/controller_search.css
@@ -2,34 +2,27 @@ module EnterpriseHomepageHelper
   def display_profile_info(profile)
     data = ''
-    unless profile.contact_person.blank?
-      data << content_tag('strong', _('Contact person: ')) + profile.contact_person + '<br/>'
-    end
-    unless profile.contact_email.blank?
-      data << content_tag('strong', _('E-Mail: ')) + profile.contact_email + '<br/>'
-    end
-    unless profile.contact_phone.blank?
-      data << content_tag('strong', _('Phone(s): ')) + profile.contact_phone + '<br/>'
-    end
-    unless profile.region.nil?
-      data << content_tag('strong', _('Location: ')) + profile.region.name + '<br/>'
-    end
-    unless profile.address.blank?
-      data << content_tag('strong', _('Address: ')) + profile.address + '<br/>'
-    end
-    unless profile.legal_form.blank?
-      data << content_tag('strong', _('Legal form: ')) + profile.legal_form + '<br/>'
-    end
-    unless profile.foundation_year.blank?
-      data << content_tag('strong', _('Foundation year: ')) + profile.foundation_year + '<br/>'
-    end
-    unless profile.economic_activity.blank?
-      data << content_tag('strong', _('Economic activity: ')) + profile.economic_activity + '<br/>'
-    end
+    [
+      [ _('Contact person:'),    :contact_person    ],
+      [ _('e-Mail:'),            :contact_email     ],
+      [ _('Phone(s):'),          :contact_phone     ],
+      [ _('Location:'),          :location          ],
+      [ _('Address:'),           :address           ],
+      [ _('Legal form:'),        :legal_form        ],
+      [ _('Foundation year:'),   :foundation_year   ],
+      [ _('Economic activity:'), :economic_activity ]
+    ].each { | name, att |
+      if profile.send( att ) and not profile.send( att ).blank?
+        data << content_tag( 'li', content_tag('strong', name) +' '+ profile.send( att ) ) +"\n"
+      end
+    }
     if profile.respond_to?(:distance) and !profile.distance.nil?
-      data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>'
+      data << content_tag( 'li',
+                           content_tag('strong',_('Distance:')) +' '+
+                           "%.2f%" % profile.distance
+                         ) + "\n"
     end
-    content_tag('div', data, :class => 'profile-info')
+    content_tag('div', content_tag('ul', data), :class => 'enterprise-info')
   end
 end
@@ -104,6 +104,10 @@ class Profile &lt; ActiveRecord::Base
   has_many :categories, :through => :profile_categorizations
   belongs_to :region
+  
+  def location
+    self.region.name
+  end
   def pending_categorizations
     @pending_categorizations ||= []
 <h1> 
   <% if !@query.blank? %>
-      <%=h @category ? (_('Products results for "%{query}" of enterprises in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Products results for "%s"') % @query) %> 
+      <%=h @category ? (_('Products and Services results for "%{query}" of enterprises in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Products and Services results for "%s"') % @query) %> 
   <% else %>
-    <%=h @category ? (_('Products of enterprises in "%s"') % @category.name) : _('Products') %>
+    <%=h @category ? (_('Products and Services of enterprises in "%s"') % @category.name) : _('Products and Services') %>
   <% end %>
 </h1>
 /************* enterprise homepage style *****************/
-.profile-info {
-  border: none;
+.enterprise-info {
   background: #B8CFE7;
   -moz-border-radius: 15px;
-  padding: 10px;
+  padding: 5px;
+  margin-bottom: 10px;
 }
+
+.msie6 .enterprise-info {
+  padding: 1px 5px 0px 5px;
+  margin-bottom: 20px;
+}
+
+.enterprise-info strong {
+  color: #058;
+}
+
@@ -142,7 +142,6 @@ body.category4 .search-results-type-profile.common-profile-list-block li a {
 #product-categories-menu .cat-parent {
   background-color: #E0E8F0;
-  Xborder: 1px solid #729FCF;
   -moz-border-radius: 10px;
   padding: 3px 0px 3px 10px;
 }
@@ -152,8 +151,6 @@ body.category4 .search-results-type-profile.common-profile-list-block li a {
 }
 #product-categories-menu .sub-opened {
   background-color: #CDE;
-  Xborder: 1px solid #3465A4;
-  X-moz-border-radius: 10px;
 }
+/************* enterprise homepage style *****************/
+
+.enterprise-info {
+  background: #FEA;
+  border: 2px solid #fcaf3e;
+  padding: 5px;
+  margin-bottom: 10px;
+}
+
+.msie6 .enterprise-info {
+  padding: 1px 5px 0px 5px;
+  margin-bottom: 20px;
+}
@@ -97,6 +97,27 @@ body.category4 .search-results-type-profile.common-profile-list-block li a {
   background: #F79494;
 }
+#product-categories-menu a {
+  text-decoration: none;
+}
+#product-categories-menu a:hover {
+  text-decoration: underline;
+}
+
+#product-categories-menu .cat-parent {
+  -moz-border-radius: 10px;
+  padding: 3px 0px 3px 10px;
+}
+
+#product-categories-menu .sub-opening,
+#product-categories-menu .sub-closeing {
+  background-color: #FFF8B0;
+}
+#product-categories-menu .sub-opened {
+  background-color: #FE8;
+}
+
+
 /* * * Category Page * * * * * * * * * * * * */
 #view-category h3 {
@@ -40,8 +40,11 @@
   width: 100%;
 }
-.has_cat_list .only-one-result-box .search-results-box {
-  width: 79%;
+.has_cat_list #map,
+.msie .has_cat_list #map,
+.has_cat_list .only-one-result-box .search-results-box,
+.msie .has_cat_list .only-one-result-box .search-results-box {
+  width: 80%;
   float: right;
 }
@@ -64,6 +67,7 @@
   margin: 2px 0px;
   padding: 5px 0px 0px 10px;
   list-style: none;
+  list-style-image: none;
 }
 #product-categories-menu .cat-empty {
   list-style: none;
@@ -214,6 +218,9 @@
   overflow: hidden;
   float: left;
 }
+.msie #content .only-one-result-box .search-results-type-product .product-item {
+  width: 49%;
+}
 .product-pic {
   display: block;
@@ -251,6 +258,7 @@
 .pagination {
   text-align: center;
+  clear: both;
 }
 .pagination .disabled {
1	<h1>	1	<h1>
2	<% if !@query.blank? %>	2	<% if !@query.blank? %>
3	- <%=h @category ? (_('Products results for "%{query}" of enterprises in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Products results for "%s"') % @query) %>	3	+ <%=h @category ? (_('Products and Services results for "%{query}" of enterprises in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Products and Services results for "%s"') % @query) %>
4	<% else %>	4	<% else %>
5	- <%=h @category ? (_('Products of enterprises in "%s"') % @category.name) : _('Products') %>	5	+ <%=h @category ? (_('Products and Services of enterprises in "%s"') % @category.name) : _('Products and Services') %>
6	<% end %>	6	<% end %>
7	</h1>	7	</h1>
8		8
1	/*********** enterprise homepage style ***************/	1	/*********** enterprise homepage style ***************/
2		2
3	-.profile-info {
4	- border: none;	3	+.enterprise-info {
5	background: #B8CFE7;	4	background: #B8CFE7;
6	-moz-border-radius: 15px;	5	-moz-border-radius: 15px;
7	- padding: 10px;	6	+ padding: 5px;
		7	+ margin-bottom: 10px;
8	}	8	}
		9	+
		10	+.msie6 .enterprise-info {
		11	+ padding: 1px 5px 0px 5px;
		12	+ margin-bottom: 20px;
		13	+}
		14	+
		15	+.enterprise-info strong {
		16	+ color: #058;
		17	+}
		18	+
	1	+/*********** enterprise homepage style ***************/
	2	+
	3	+.enterprise-info {
	4	+ background: #FEA;
	5	+ border: 2px solid #fcaf3e;
	6	+ padding: 5px;
	7	+ margin-bottom: 10px;
	8	+}
	9	+
	10	+.msie6 .enterprise-info {
	11	+ padding: 1px 5px 0px 5px;
	12	+ margin-bottom: 20px;
	13	+}
1	14
	@@ -97,6 +97,27 @@ body.category4 .search-results-type-profile.common-profile-list-block li a {		@@ -97,6 +97,27 @@ body.category4 .search-results-type-profile.common-profile-list-block li a {
97	background: #F79494;	97	background: #F79494;
98	}	98	}
99		99
		100	+#product-categories-menu a {
		101	+ text-decoration: none;
		102	+}
		103	+#product-categories-menu a:hover {
		104	+ text-decoration: underline;
		105	+}
		106	+
		107	+#product-categories-menu .cat-parent {
		108	+ -moz-border-radius: 10px;
		109	+ padding: 3px 0px 3px 10px;
		110	+}
		111	+
		112	+#product-categories-menu .sub-opening,
		113	+#product-categories-menu .sub-closeing {
		114	+ background-color: #FFF8B0;
		115	+}
		116	+#product-categories-menu .sub-opened {
		117	+ background-color: #FE8;
		118	+}
		119	+
		120	+
100	/* * * Category Page * * * * * * * * * * * * */	121	/* * * Category Page * * * * * * * * * * * * */
101		122
102	#view-category h3 {	123	#view-category h3 {