Download as
Browse Code »

Commit 07f66267c81ba1d4fbb2bc6a89fec11fb3bbfb6c

Authored by Rodrigo Souto
1 parent fb090c19
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

comments: fix sort comments 

ActionItem3185
Showing 3 changed files with 7 additions and 15 deletions   Show diff stats
app/views/content_viewer/view_page.html.erb
  Diff comments   View file @07f6626
... ... @@ -83,17 +83,7 @@
83 83 <% if @page.accept_comments? && @comments.count > 1 %>
84 84 <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %>
85 85  
86   - <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
87   - <%= javascript_include_tag "comment_order.js" %>
88   - <div class="comment-order">
89   - <%= form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
90   - <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
91   - <% end %>
92   - </div>
93   - <% end %>
94   -
95   - <% if @page.accept_comments? and @comments.count > 1 %>
96   - <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
  86 + <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier, :page => @page.explode_path)) %>
97 87 <%= javascript_include_tag "comment_order.js" %>
98 88 <div class="comment-order">
99 89 <%= form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
... ...
public/javascripts/comment_order.js
  Diff comments   View file @07f6626
1 1 function send_order(order, url) {
2   - open_loading(DEFAULT_LOADING_MESSAGE);
3   -
  2 + jQuery('.article-comments-list').addClass('fetching');
4 3 jQuery.ajax({
5 4 url:url,
6 5 data: {"comment_order":order},
7 6 success: function(response) {
8   - close_loading();
9 7 jQuery(".article-comments-list").html(response);
10 8 },
11   - error: function() { close_loading() }
  9 + complete: function(){ jQuery('.article-comments-list').removeClass('fetching') }
12 10 });
13 11 }
14 12  
... ...
public/stylesheets/application.css
  Diff comments   View file @07f6626
... ... @@ -6690,3 +6690,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6690 6690 #signup-form #result-strong {
6691 6691 color: green;
6692 6692 }
  6693 +
  6694 +.fetching {
  6695 + opacity: 0.3;
  6696 +}
... ...