Download as
Browse Code »

Commit 1acb5dd85bc9d931226ce807f58f7e7f27ad4571

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent b741bc26
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

Small improvements for events layout 

 - Better formatting for select a day message
 - Changing style of arrow for next and previous links
 - Adding icon for Event in link list block
 - Dont show horizontal scroll in events list

(ActionItem1255)
Showing 5 changed files with 22 additions and 11 deletions   Show diff stats
app/helpers/events_helper.rb
  Diff comments   View file @1acb5dd
1 module EventsHelper 1 module EventsHelper
2 2
3 def list_events(date, events) 3 def list_events(date, events)
4 - return content_tag('em', _("Select a day on the left to display it's events here"), :class => 'no-events') unless date 4 + return content_tag('em', _("Select a day on the left to display it's events here"), :class => 'select-a-day') unless date
5 title = _('Events for %s') % show_date(date) 5 title = _('Events for %s') % show_date(date)
6 content_tag('h2', title) + 6 content_tag('h2', title) +
7 content_tag('div', 7 content_tag('div',
8 (events.any? ? 8 (events.any? ?
9 content_tag('table', events.select { |item| item.public? }.map {|item| display_event_in_listing(item)}.join('')) : 9 content_tag('table', events.select { |item| item.public? }.map {|item| display_event_in_listing(item)}.join('')) :
10 - content_tag('em', _('No events for this date')) 10 + content_tag('em', _('No events for this date'), :class => 'no-events')
11 ), :id => 'agenda-items' 11 ), :id => 'agenda-items'
12 ) 12 )
13 end 13 end
app/models/link_list_block.rb
  Diff comments   View file @1acb5dd
@@ -24,7 +24,8 @@ class LinkListBlock < Block @@ -24,7 +24,8 @@ class LinkListBlock < Block
24 ['spread', N_('Spread')], 24 ['spread', N_('Spread')],
25 ['eyes', N_('Eyes')], 25 ['eyes', N_('Eyes')],
26 ['photos', N_('Photos')], 26 ['photos', N_('Photos')],
27 - ['menu-people', N_('Person')] 27 + ['menu-people', N_('Person')],
  28 + ['menu-events', N_('Event')]
28 ] 29 ]
29 30
30 settings_items :links, Array, :default => [] 31 settings_items :links, Array, :default => []
app/views/events/_agenda.rhtml
  Diff comments   View file @1acb5dd
@@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
3 <table class='noborder current-month'> 3 <table class='noborder current-month'>
4 <caption> 4 <caption>
5 <h2><%= show_month(params[:year], params[:month]) %></h2> 5 <h2><%= show_month(params[:year], params[:month]) %></h2>
6 - <%= link_to_previous_month(params[:year], params[:month], '&larr; previous') %>  
7 - <%= link_to_next_month(params[:year], params[:month], 'next &rarr;') %> 6 + <%= link_to_previous_month(params[:year], params[:month], '&laquo; previous') %>
  7 + <%= link_to_next_month(params[:year], params[:month], 'next &raquo;') %>
8 </caption> 8 </caption>
9 <%= render :partial => 'events/month', :locals => {:calendar => @calendar, :abbreviated => true} %> 9 <%= render :partial => 'events/month', :locals => {:calendar => @calendar, :abbreviated => true} %>
10 </table> 10 </table>
features/events.feature
  Diff comments   View file @1acb5dd
@@ -12,22 +12,22 @@ Feature: events @@ -12,22 +12,22 @@ Feature: events
12 12
13 Scenario: go to next month 13 Scenario: go to next month
14 Given I am on /profile/josesilva/events/2009/10 14 Given I am on /profile/josesilva/events/2009/10
15 - When I follow "next →" 15 + When I follow "next »"
16 Then I should see "November 2009" within ".current-month" 16 Then I should see "November 2009" within ".current-month"
17 17
18 Scenario: go to next month in global agenda 18 Scenario: go to next month in global agenda
19 Given I am on /assets/events?year=2009&month=11 19 Given I am on /assets/events?year=2009&month=11
20 - When I follow "next →" 20 + When I follow "next »"
21 Then I should see "December 2009" within ".current-month" 21 Then I should see "December 2009" within ".current-month"
22 22
23 Scenario: go to previous month 23 Scenario: go to previous month
24 Given I am on /profile/josesilva/events/2009/10 24 Given I am on /profile/josesilva/events/2009/10
25 - When I follow "← previous" 25 + When I follow "« previous"
26 Then I should see "September 2009" within ".current-month" 26 Then I should see "September 2009" within ".current-month"
27 27
28 Scenario: go to previous month in global agenda 28 Scenario: go to previous month in global agenda
29 Given I am on /assets/events?year=2009&month=11 29 Given I am on /assets/events?year=2009&month=11
30 - When I follow "← previous" 30 + When I follow "« previous"
31 Then I should see "October 2009" within ".current-month" 31 Then I should see "October 2009" within ".current-month"
32 32
33 Scenario: go to next month by clicking in month name 33 Scenario: go to next month by clicking in month name
@@ -107,9 +107,9 @@ Feature: events @@ -107,9 +107,9 @@ Feature: events
107 Scenario: provide links to days with events 107 Scenario: provide links to days with events
108 Given I am on /profile/josesilva/events/2009/10 108 Given I am on /profile/josesilva/events/2009/10
109 Then I should see "24" link 109 Then I should see "24" link
110 - When I follow "next →" 110 + When I follow "next »"
111 Then I should see "24" link 111 Then I should see "24" link
112 - When I follow "next →" 112 + When I follow "next »"
113 Then I should not see "24" link 113 Then I should not see "24" link
114 114
115 Scenario: provide links to all days between start and end date 115 Scenario: provide links to all days between start and end date
public/stylesheets/controller_events.css
  Diff comments   View file @1acb5dd
@@ -74,6 +74,8 @@ @@ -74,6 +74,8 @@
74 #agenda #events-of-the-day #agenda-items { 74 #agenda #events-of-the-day #agenda-items {
75 display: block; 75 display: block;
76 overflow: auto; 76 overflow: auto;
  77 + overflow-x: hidden;
  78 + height: 90%;
77 } 79 }
78 80
79 body.noosfero #content .no-boxes a.button.icon-back { 81 body.noosfero #content .no-boxes a.button.icon-back {
@@ -82,3 +84,11 @@ body.noosfero #content .no-boxes a.button.icon-back { @@ -82,3 +84,11 @@ body.noosfero #content .no-boxes a.button.icon-back {
82 border: none; 84 border: none;
83 opacity: 0.5; 85 opacity: 0.5;
84 } 86 }
  87 +
  88 +#agenda #events-of-the-day .select-a-day {
  89 + font-size: 14px;
  90 + font-style: normal;
  91 + font-weight: bold;
  92 + display: block;
  93 + margin-top: 10px;
  94 +}