Download as
Browse Code »

Commit c3e291034dac9d6bbc05c8cd6ccc61b463c90060

Authored by Fabio Teixeira
Committed by Thiago Ribeiro
1 parent caff86b4
Exists in master and in 24 other branches add_you_are_here_breadcrumbs_label, backup_not_prod, disable_email_dev, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, header_fix, margin_fix, mezuro_cookbook, remove-unused-images, remove_secondary_email_from_user, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_catalog_style_fix, stable-4.x, thread_dropdown, update_software_api

Better html structure for event list 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
(cherry picked from commit dbbf4ca3ef01dc555df627681513fa0109657c77)
Showing 3 changed files with 10 additions and 17 deletions   Show diff stats
src/noosfero-spb/software_communities/lib/software_events_block.rb
  Diff comments   View file @c3e2910
@@ -10,7 +10,7 @@ class SoftwareEventsBlock &lt; Block @@ -10,7 +10,7 @@ class SoftwareEventsBlock &lt; Block
10 10
11 def content(args={}) 11 def content(args={})
12 today = DateTime.now.beginning_of_day 12 today = DateTime.now.beginning_of_day
13 - events = self.owner.events.where("start_date >= ? AND end_date >= ?", today, today).order(:start_date) 13 + events = self.owner.events.where("end_date >= ?", today).order(:start_date)
14 14
15 block = self 15 block = self
16 16
src/noosfero-spb/software_communities/views/blocks/_software_events_list_item.html.erb
  Diff comments   View file @c3e2910
1 -<div class="software-events-list-item">  
2 - <div class="software-events-list-item-calendar"></div> 1 +<span class="software-events-list-item-calendar"></span>
3 2
4 - <div class="software-events-list-item-date">  
5 - <%= event.start_date.strftime "%m/%d" %>  
6 - </div> 3 +<span class="software-events-list-item-date">
  4 + <%= event.start_date.strftime "%d/%m - " %>
  5 +</span>
7 6
8 - <div class="software-events-list-item-title">  
9 - <%= link_to event.title, event.url %>  
10 - </div>  
11 -</div> 7 +<span class="software-events-list-item-title">
  8 + <%= link_to event.title, event.url %>
  9 +</span>
src/noosfero-spb/software_communities/views/blocks/software_events.html.erb
  Diff comments   View file @c3e2910
@@ -3,16 +3,11 @@ @@ -3,16 +3,11 @@
3 3
4 <ul class="software-community-events-list"> 4 <ul class="software-community-events-list">
5 <% events.each do |event| %> 5 <% events.each do |event| %>
6 - <li> 6 + <li class="software-events-list-item">
7 <%= render :partial=>"blocks/software_events_list_item", 7 <%= render :partial=>"blocks/software_events_list_item",
8 :locals => {:event => event} %> 8 :locals => {:event => event} %>
9 </li> 9 </li>
10 <% end %> 10 <% end %>
11 </ul> 11 </ul>
12 -  
13 - <% else %>  
14 - <div class="software-community-events-no-event">  
15 - <%= _("This community does not have any events yet") %>  
16 - </div>  
17 <% end %> 12 <% end %>
18 -</div>  
19 \ No newline at end of file 13 \ No newline at end of file
  14 +</div>