Download as
Browse Code »

Commit c86198332b919618899f26a8674d3f4761bf76bb

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent cac9b82e
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1020: removing pagination when viewing a community

Showing 3 changed files with 9 additions and 10 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @c861983
@@ -420,7 +420,7 @@ module ApplicationHelper @@ -420,7 +420,7 @@ module ApplicationHelper
420 end 420 end
421 content_tag tag, 421 content_tag tag,
422 link_to_remote( display, 422 link_to_remote( display,
423 - :update => 'search-results', 423 + :update => 'search-results-and-pages',
424 :url => {:controller => 'account', :action => 'profile_details', :profile => profile.identifier}, 424 :url => {:controller => 'account', :action => 'profile_details', :profile => profile.identifier},
425 :onclick => 'document.location.href = this.href', # work-arround for ie. 425 :onclick => 'document.location.href = this.href', # work-arround for ie.
426 :class => 'profile_link url', 426 :class => 'profile_link url',
app/views/memberships/new_community.rhtml
  Diff comments   View file @c861983
@@ -17,11 +17,9 @@ @@ -17,11 +17,9 @@
17 <%= f.text_field('tag_list', :size => 64) %> 17 <%= f.text_field('tag_list', :size => 64) %>
18 <%= content_tag( 'small', _('Separate tags with commas') ) %> 18 <%= content_tag( 'small', _('Separate tags with commas') ) %>
19 19
20 - <div id="profile_change_picture">  
21 - <% f.fields_for :image_builder, @community.image do |i| %>  
22 - <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>  
23 - <% end %>  
24 - </div> 20 + <% f.fields_for :image_builder, @community.image do |i| %>
  21 + <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
  22 + <% end %>
25 23
26 <div style='margin-bottom: 1em; margin-top: 1em;'> 24 <div style='margin-bottom: 1em; margin-top: 1em;'>
27 <%= _('New members must be approved:')%> 25 <%= _('New members must be approved:')%>
app/views/search/communities.rhtml
  Diff comments   View file @c861983
@@ -12,11 +12,12 @@ @@ -12,11 +12,12 @@
12 <div class='atention'><%= __('Choose the communities you want to join and/or create your own.') %></div> 12 <div class='atention'><%= __('Choose the communities you want to join and/or create your own.') %></div>
13 <% end %> 13 <% end %>
14 14
15 -<%# FIXME ARMENGUE %>  
16 -<%= display_results(false) %>  
17 -  
18 -<%= pagination_links @results.values.first %> 15 +<div id='search-results-and-pages'>
  16 + <%# FIXME ARMENGUE %>
  17 + <%= display_results(false) %>
19 18
  19 + <%= pagination_links @results.values.first %>
  20 +</div>
20 21
21 <% if logged_in? %> 22 <% if logged_in? %>
22 <% button_bar do %> 23 <% button_bar do %>