Download as
Browse Code »

Commit c3e291034dac9d6bbc05c8cd6ccc61b463c90060

Authored by Fabio Teixeira
Committed by Thiago Ribeiro
1 parent caff86b4
Exists in master and in 53 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, stable-4.x, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, 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 10  
11 11 def content(args={})
12 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 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 3  
4 4 <ul class="software-community-events-list">
5 5 <% events.each do |event| %>
6   - <li>
  6 + <li class="software-events-list-item">
7 7 <%= render :partial=>"blocks/software_events_list_item",
8 8 :locals => {:event => event} %>
9 9 </li>
10 10 <% end %>
11 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 12 <% end %>
18   -</div>
19 13 \ No newline at end of file
  14 +</div>
... ...