Download as
Browse Code »

Commit 2b7b639fabf732e51dfdf11ba7a65c8ed7780d9f

Authored by AntonioTerceiro
1 parent 48468ffa
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

ActionItem114: still replacing s/favorite/favourite/ 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@845 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 6 changed files with 33 additions and 33 deletions   Show diff stats
app/design_blocks/favourite_links/controllers/favorite_links_controller.rb
  Diff comments   View file @2b7b639
1 -class FavoriteLinksController < ApplicationController 1 +class FavouriteLinksController < ApplicationController
2 2
3 3
4 # The methods above are specific for noosfero application. I think 4 # The methods above are specific for noosfero application. I think
@@ -24,7 +24,7 @@ class FavoriteLinksController &lt; ApplicationController @@ -24,7 +24,7 @@ class FavoriteLinksController &lt; ApplicationController
24 } 24 }
25 25
26 def index 26 def index
27 - get_favorite_links 27 + get_favourite_links
28 design_render 28 design_render
29 end 29 end
30 30
@@ -34,7 +34,7 @@ class FavoriteLinksController &lt; ApplicationController @@ -34,7 +34,7 @@ class FavoriteLinksController &lt; ApplicationController
34 34
35 def save 35 def save
36 if @design_block.update_attributes(params[:design_block]) 36 if @design_block.update_attributes(params[:design_block])
37 - get_favorite_links 37 + get_favourite_links
38 design_render_on_edit :action => 'manage_links' 38 design_render_on_edit :action => 'manage_links'
39 else 39 else
40 design_render_on_edit :nothing => true 40 design_render_on_edit :nothing => true
@@ -42,7 +42,7 @@ class FavoriteLinksController &lt; ApplicationController @@ -42,7 +42,7 @@ class FavoriteLinksController &lt; ApplicationController
42 end 42 end
43 43
44 def manage_links 44 def manage_links
45 - get_favorite_links 45 + get_favourite_links
46 design_render_on_edit 46 design_render_on_edit
47 end 47 end
48 48
@@ -52,13 +52,13 @@ class FavoriteLinksController &lt; ApplicationController @@ -52,13 +52,13 @@ class FavoriteLinksController &lt; ApplicationController
52 52
53 def remove_link 53 def remove_link
54 @design_block.delete_link(params[:link]) 54 @design_block.delete_link(params[:link])
55 - get_favorite_links 55 + get_favourite_links
56 design_render_on_edit :action => 'manage_links' 56 design_render_on_edit :action => 'manage_links'
57 end 57 end
58 58
59 - def get_favorite_links  
60 - favorite_links = @design_block.favorite_links  
61 - @favorite_links_pages, @favorite_links = paginate_by_collection favorite_links 59 + def get_favourite_links
  60 + favourite_links = @design_block.favourite_links
  61 + @favourite_links_pages, @favourite_links = paginate_by_collection favourite_links
62 end 62 end
63 63
64 def paginate_by_collection(collection, options = {}) 64 def paginate_by_collection(collection, options = {})
app/design_blocks/favourite_links/models/favorite_links.rb
  Diff comments   View file @2b7b639
1 -class FavoriteLinks < Design::Block 1 +class FavouriteLinks < Design::Block
2 2
3 def self.description 3 def self.description
4 - _('Favorite Links') 4 + _('Favourite Links')
5 end 5 end
6 6
7 def limit_number= value 7 def limit_number= value
@@ -12,26 +12,26 @@ class FavoriteLinks &lt; Design::Block @@ -12,26 +12,26 @@ class FavoriteLinks &lt; Design::Block
12 self.settings[:limit_number] || 5 12 self.settings[:limit_number] || 5
13 end 13 end
14 14
15 - def favorite_links_limited  
16 - self.favorite_links.first(self.limit_number) 15 + def favourite_links_limited
  16 + self.favourite_links.first(self.limit_number)
17 end 17 end
18 18
19 - def favorite_links  
20 - self.settings[:favorite_links] ||= [] 19 + def favourite_links
  20 + self.settings[:favourite_links] ||= []
21 end 21 end
22 22
23 def delete_link link 23 def delete_link link
24 - self.settings[:favorite_links].reject!{ |item| item == link } 24 + self.settings[:favourite_links].reject!{ |item| item == link }
25 self.save 25 self.save
26 end 26 end
27 27
28 - def favorite_link 28 + def favourite_link
29 nil 29 nil
30 end 30 end
31 31
32 - def favorite_link= link  
33 - self.favorite_links.push(link)  
34 - self.favorite_links.uniq! 32 + def favourite_link= link
  33 + self.favourite_links.push(link)
  34 + self.favourite_links.uniq!
35 end 35 end
36 36
37 end 37 end
app/design_blocks/favourite_links/views/add_link.rhtml
  Diff comments   View file @2b7b639
1 -<h2> <%= _('Editing Favorite Links') %> </h2> 1 +<h2> <%= _('Editing Favourite Links') %> </h2>
2 2
3 <% design_form_remote_tag( :url => {:action => 'save'}) do %> 3 <% design_form_remote_tag( :url => {:action => 'save'}) do %>
4 4
5 <p> 5 <p>
6 <label for="design_block_title"> <%= _("Title") %> </label> 6 <label for="design_block_title"> <%= _("Title") %> </label>
7 - <%= text_field 'design_block', 'favorite_link'%> 7 + <%= text_field 'design_block', 'favourite_link'%>
8 </p> 8 </p>
9 9
10 <%= submit_tag _('Save') %> 10 <%= submit_tag _('Save') %>
app/design_blocks/favourite_links/views/edit.rhtml
  Diff comments   View file @2b7b639
1 1
2 -<h2> <%= _('Editing Favorite Links') %> </h2> 2 +<h2> <%= _('Editing Favourite Links') %> </h2>
3 3
4 <% design_form_remote_tag( :url => {:action => 'save'}) do %> 4 <% design_form_remote_tag( :url => {:action => 'save'}) do %>
5 5
app/design_blocks/favourite_links/views/index.rhtml
  Diff comments   View file @2b7b639
1 1
2 -<% if @favorite_links_pages.current.previous%>  
3 - <%= design_link_to_remote(_('Previous'), :url => {:action => 'index', :page => @favorite_links_pages.current.previous}) %> 2 +<% if @favourite_links_pages.current.previous%>
  3 + <%= design_link_to_remote(_('Previous'), :url => {:action => 'index', :page => @favourite_links_pages.current.previous}) %>
4 <% end %> 4 <% end %>
5 -<% if @favorite_links_pages.current.next %>  
6 - <%= design_link_to_remote(_('Next'), :url => {:action => 'index', :page => @favorite_links_pages.current.next}) %> 5 +<% if @favourite_links_pages.current.next %>
  6 + <%= design_link_to_remote(_('Next'), :url => {:action => 'index', :page => @favourite_links_pages.current.next}) %>
7 <% end %> 7 <% end %>
8 8
9 -<% @favorite_links.each do |link| %> 9 +<% @favourite_links.each do |link| %>
10 <ul> 10 <ul>
11 <li> 11 <li>
12 <%= link_to link, link, :popup => true %> 12 <%= link_to link, link, :popup => true %>
app/design_blocks/favourite_links/views/manage_links.rhtml
  Diff comments   View file @2b7b639
1 1
2 <h2> 2 <h2>
3 - <%= _('Favorite Links') %> 3 + <%= _('Favourite Links') %>
4 <%= design_link_to_remote(_('Add Link'), :url => {:action => 'add_link'} )%> 4 <%= design_link_to_remote(_('Add Link'), :url => {:action => 'add_link'} )%>
5 5
6 </h2> 6 </h2>
7 -<% if @favorite_links_pages.current.previous%>  
8 - <%= design_link_to_remote(_('Previous'), :url => {:action => 'manage_links', :page => @favorite_links_pages.current.previous}) %> 7 +<% if @favourite_links_pages.current.previous%>
  8 + <%= design_link_to_remote(_('Previous'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.previous}) %>
9 <% end %> 9 <% end %>
10 -<% if @favorite_links_pages.current.next %>  
11 - <%= design_link_to_remote(_('Next'), :url => {:action => 'manage_links', :page => @favorite_links_pages.current.next}) %> 10 +<% if @favourite_links_pages.current.next %>
  11 + <%= design_link_to_remote(_('Next'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.next}) %>
12 <% end %> 12 <% end %>
13 13
14 -<% @favorite_links.each do |link| %> 14 +<% @favourite_links.each do |link| %>
15 <ul> 15 <ul>
16 <li> 16 <li>
17 <%= link_to link, link, :popup => true %> 17 <%= link_to link, link, :popup => true %>