Download as
Browse Code »

Commit 76b05779e23e1c31d56c31cb8c2c1b9734f0a57b

Authored by Joenio Costa
2 parents eb3c2f4b a84121dc
Exists in master and in 2 other branches mezuro_spb, stable-5.1

Merge branch 'fix_softwares_block' into 'master' 

Fix softwares block

See merge request !250
Showing 3 changed files with 18 additions and 36 deletions   Show diff stats
src/noosfero-spb/software_communities/lib/software_communities_plugin/softwares_block.rb
  Diff comments   View file @76b0577
... ... @@ -69,15 +69,10 @@ class SoftwareCommunitiesPlugin::SoftwaresBlock < CommunitiesBlock
69 69 end
70 70  
71 71 def content(arg={})
72   - if self.box.owner_type == "Environment" && self.box.position == 1
73   - block = self
74   -
75   - proc do
76   - render :file => 'blocks/main_area_softwares',
77   - :locals => {:profiles=> block.profile_list(), :block => block}
78   - end
79   - else
80   - super(arg)
  72 + block = self
  73 + proc do
  74 + render :file => 'blocks/main_area_softwares',
  75 + :locals => {:profiles=> block.profile_list(), :block => block}
81 76 end
82 77 end
83 78  
... ...
src/noosfero-spb/software_communities/public/style.css
  Diff comments   View file @76b0577
... ... @@ -66,19 +66,19 @@
66 66 color: red;
67 67 }
68 68  
69   -#content .softwares-block ul {
  69 +#content .software-communities-plugin_softwares-block ul {
70 70 min-width: 196px;
71 71 width: 192px;
72 72 margin: 0px 0px 0px -3px;
73 73 padding: 0px;
74 74 }
75 75  
76   -#content .box-1 .softwares-block ul {
  76 +#content .box-1 .software-communities-plugin_softwares-block ul {
77 77 width: auto;
78 78 display: block;
79 79 }
80 80  
81   -#content .softwares-block .block-footer-content a {
  81 +#content .software-communities-plugin_softwares-block .block-footer-content a {
82 82 background: url(../../../designs/themes/base/imgs/arrow-right-p.png) 100% 50% no-repeat;
83 83 }
84 84  
... ...
src/noosfero-spb/software_communities/views/blocks/main_area_softwares.html.erb
  Diff comments   View file @76b0577
1   -<%= block_title(block.title) %>
2   -<% profiles.each do |profile| %>
3   - <%= link_to profile.url do %>
4   - <div class="software-block">
5   - <div class="software-block-content">
6   - <div class="software-block-logo">
7   - <%= profile_image(profile, :big) %>
8   - </div>
  1 +<% extend PeopleBlockHelper %>
9 2  
10   - <div class="software-block-info">
11   - <div class="software-block-title">
12   - <h3> <%=profile.name%> </h3>
13   - </div>
14   - <div class="software-block-description"><%= profile.description %></div>
15   - </div>
16   - </div>
  3 +<%= block_title(block.view_title) %>
17 4  
18   - <div class="software-block-finality">
19   - <p>
20   - <%= profile.software_info.finality %>
21   - </p>
22   -
23   - <%= _("See More") %>
24   - </div>
25   - </div>
  5 +<div>
  6 + <% unless block.profile_count == 0 %>
  7 + <ul>
  8 + <%= profiles_images_list(block.profile_list) %>
  9 + </ul>
  10 + <% else %>
  11 + <div class="common-profile-list-block-none"><%= c_('None') %></div>
26 12 <% end %>
27   -<% end %>
  13 + <br style="clear:both" />
  14 +</div>
... ...