Download as
Browse Code »

Commit 73a75da0d1766220d35c9b76b080ab7e2c194ade

Authored by Daniel Cunha
Committed by Daniela Feitosa
1 parent 61abd4ff
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Adding CommunitiesBlock, EnterprisesBlock, FriendsBlock and PeopleBlock to acceptable blocks

Showing 3 changed files with 20 additions and 1 deletions   Show diff stats
app/models/box.rb
  Diff comments   View file @73a75da
@@ -11,8 +11,12 @@ class Box < ActiveRecord::Base @@ -11,8 +11,12 @@ class Box < ActiveRecord::Base
11 11
12 def acceptable_center_blocks 12 def acceptable_center_blocks
13 %w{ 13 %w{
14 - MainBlock 14 + CommunitiesBlock
  15 + EnterprisesBlock
  16 + FriendsBlock
15 LinkListBlock 17 LinkListBlock
  18 + MainBlock
  19 + PeopleBlock
16 } 20 }
17 end 21 end
18 22
@@ -25,6 +29,7 @@ class Box < ActiveRecord::Base @@ -25,6 +29,7 @@ class Box < ActiveRecord::Base
25 EnvironmentStatisticsBlock 29 EnvironmentStatisticsBlock
26 FeaturedProductsBlock 30 FeaturedProductsBlock
27 FeedReaderBlock 31 FeedReaderBlock
  32 + FriendsBlock
28 HighlightsBlock 33 HighlightsBlock
29 LinkListBlock 34 LinkListBlock
30 LocationBlock 35 LocationBlock
public/designs/themes/base/style.css
  Diff comments   View file @73a75da
@@ -483,6 +483,17 @@ div#notice { @@ -483,6 +483,17 @@ div#notice {
483 padding: 0px; 483 padding: 0px;
484 } 484 }
485 485
  486 +#content .box-1 .people-block ul,
  487 +#content .box-1 .profile-list-block ul,
  488 +#content .box-1 .enterprises-block ul,
  489 +#content .box-1 .members-block ul,
  490 +#content .box-1 .communities-block ul,
  491 +#content .box-1 .friends-block ul,
  492 +#content .box-1 .fans-block ul {
  493 + width: auto;
  494 + display: block;
  495 +}
  496 +
486 #content .tags-block .block-footer-content a, 497 #content .tags-block .block-footer-content a,
487 #content .people-block .block-footer-content a, 498 #content .people-block .block-footer-content a,
488 #content .profile-list-block .block-footer-content a, 499 #content .profile-list-block .block-footer-content a,
public/stylesheets/application.css
  Diff comments   View file @73a75da
@@ -1772,6 +1772,9 @@ input.disabled { @@ -1772,6 +1772,9 @@ input.disabled {
1772 width: 92px; 1772 width: 92px;
1773 overflow: hidden; 1773 overflow: hidden;
1774 } 1774 }
  1775 +.box-1 .common-profile-list-block span {
  1776 + width: 102px;
  1777 +}
1775 .common-profile-list-block .profile-image { 1778 .common-profile-list-block .profile-image {
1776 width: 92px; 1779 width: 92px;
1777 display: table-cell; 1780 display: table-cell;