Download as
Browse Code »

Commit d570e770d71bf7e97e33f897e38a157c694347a8

Authored by Antonio Terceiro
2 parents c7903fb7 20bb3721
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'favorite-enterprises' into 'master' 

Favorite enterprises block footer and content fixes

Before: 
![profile-list-block-before](https://gitlab.com/diguliu/noosfero/uploads/de95f699a4e2b081f699450229818a38/profile-list-block-before.png)

After:
 ![profile-list-block-after](https://gitlab.com/diguliu/noosfero/uploads/4df324beee47ad7874af2b2bffa1b308/profile-list-block-after.png)

Had to move the "view all" button to the bottom because of this problem: 
![view-all-problem](https://gitlab.com/diguliu/noosfero/uploads/a1e3b62eebf18b72c39034ff149de0e1/view-all-problem.png)


See merge request !676
Showing 2 changed files with 7 additions and 7 deletions   Show diff stats
app/models/favorite_enterprises_block.rb
  Diff comments   View file @d570e77
@@ -16,7 +16,7 @@ class FavoriteEnterprisesBlock < ProfileListBlock @@ -16,7 +16,7 @@ class FavoriteEnterprisesBlock < ProfileListBlock
16 owner = self.owner 16 owner = self.owner
17 return '' unless owner.kind_of?(Person) 17 return '' unless owner.kind_of?(Person)
18 proc do 18 proc do
19 - link_to _('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises' 19 + link_to _('enterprises|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'}, :class => 'view-all'
20 end 20 end
21 end 21 end
22 22
public/designs/themes/base/style.scss
  Diff comments   View file @d570e77
@@ -484,6 +484,7 @@ div#notice { @@ -484,6 +484,7 @@ div#notice {
484 #content .profile-list-block ul, 484 #content .profile-list-block ul,
485 #content .enterprises-block ul, 485 #content .enterprises-block ul,
486 #content .communities-block ul, 486 #content .communities-block ul,
  487 +#content .favorite-enterprises-block ul,
487 #content .fans-block ul { 488 #content .fans-block ul {
488 min-width: 196px; 489 min-width: 196px;
489 width: 192px; 490 width: 192px;
@@ -499,15 +500,14 @@ div#notice { @@ -499,15 +500,14 @@ div#notice {
499 display: block; 500 display: block;
500 } 501 }
501 502
  503 +.block-footer-content {
  504 + text-align: center;
  505 + padding-top: 3px;
  506 +}
  507 +
502 .block-footer-content a.view-all { 508 .block-footer-content a.view-all {
503 - position: absolute;  
504 - top: 2px;  
505 - right: 0px;  
506 font-size: 11px; 509 font-size: 11px;
507 color: #000; 510 color: #000;
508 - text-decoration: none;  
509 - padding-right: 15px;  
510 - background: url(imgs/arrow-right-p.png) 100% 50% no-repeat;  
511 } 511 }
512 512
513 #content .profile-list-block .block-title { 513 #content .profile-list-block .block-title {