Download as
Browse Code »

Commit 1ead86ec2e6d27ec7961ff20016aec7e12054390

Authored by Larissa Reis
1 parent 99b49d6e
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

[media-panel-improvements] Really shows all items in view all 

  Uses pagination and loads the pages using ajax.
Showing 6 changed files with 21 additions and 9 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @1ead86e
@@ -385,7 +385,7 @@ class CmsController < MyProfileController @@ -385,7 +385,7 @@ class CmsController < MyProfileController
385 end 385 end
386 386
387 def view_all_media 387 def view_all_media
388 - paginate_options = {:page => 1} 388 + paginate_options = {:page => params[:page].blank? ? 1 : params[:page] }
389 @key = params[:key].to_sym 389 @key = params[:key].to_sym
390 load_recent_files(params[:parent_id], params[:q], paginate_options) 390 load_recent_files(params[:parent_id], params[:q], paginate_options)
391 end 391 end
app/views/cms/_published_media_items.html.erb
  Diff comments   View file @1ead86e
@@ -7,9 +7,6 @@ @@ -7,9 +7,6 @@
7 <%= link_to(_('View all'), {:controller => 'cms', :action => 'view_all_media', :profile => profile.identifier, :key => key}, :class => 'view-all colorbox', 'data-key' => key) %> 7 <%= link_to(_('View all'), {:controller => 'cms', :action => 'view_all_media', :profile => profile.identifier, :key => key}, :class => 'view-all colorbox', 'data-key' => key) %>
8 <% end %> 8 <% end %>
9 </div> 9 </div>
10 - <% @recent_files[key].each do |file| %>  
11 - <% @file = file %>  
12 - <%= render :partial => "cms/media_panel/#{key.to_s.singularize}" %>  
13 - <% end %> 10 + <%= render :partial => "cms/media_panel/list_published_media_items", :locals => { key: key, show_pagination_links: false } %>
14 </div> 11 </div>
15 <% end %> 12 <% end %>
app/views/cms/media_panel/_list_published_media_items.html.erb 0 → 100644
  Diff comments   View file @1ead86e
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +<% @recent_files[key].each do |file| %>
  2 + <% @file = file %>
  3 + <%= render :partial => "cms/media_panel/#{key.to_s.singularize}" %>
  4 +<% end %>
  5 +<%= pagination_links @recent_files[key] if show_pagination_links %>
app/views/cms/view_all_media.html.erb
  Diff comments   View file @1ead86e
1 <h1><%= file_types[@key] %></h1> 1 <h1><%= file_types[@key] %></h1>
2 2
3 <div class='view-all-media view-all-<%= @key %>'> 3 <div class='view-all-media view-all-<%= @key %>'>
4 - <% @recent_files[@key].each do |file| %>  
5 - <% @file = file %>  
6 - <%= render :partial => "cms/media_panel/#{@key.to_s.singularize}" %>  
7 - <% end %> 4 + <%= render :partial => "cms/media_panel/list_published_media_items", :locals => { key: @key, show_pagination_links: true } %>
8 </div> 5 </div>
  6 +
  7 +<%= javascript_include_tag 'media-panel.js' %>
app/views/cms/view_all_media.js.erb 0 → 100644
  Diff comments   View file @1ead86e
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +jQuery('.view-all-media').html('<%= escape_javascript(render :partial => "cms/media_panel/list_published_media_items", :locals => { key: @key, show_pagination_links: true }) %>');
public/javascripts/media-panel.js
  Diff comments   View file @1ead86e
1 var file_id = 1; 1 var file_id = 1;
2 2
  3 +jQuery('.view-all-media').on('click', '.pagination a', function(event) {
  4 + jQuery.ajax({
  5 + url: this.href,
  6 + beforeSend: function(){jQuery('.view-all-media').addClass('fetching')},
  7 + complete: function() {jQuery('.view-all-media').removeClass('fetching')},
  8 + dataType: 'script'
  9 + });
  10 + return false;
  11 +});
  12 +
3 jQuery('#file').fileupload({ 13 jQuery('#file').fileupload({
4 add: function(e, data){ 14 add: function(e, data){
5 data.files[0].id = file_id; 15 data.files[0].id = file_id;