diff --git a/app/views/content_viewer/view_page.html.erb b/app/views/content_viewer/view_page.html.erb index 25cba4a..9fffef6 100644 --- a/app/views/content_viewer/view_page.html.erb +++ b/app/views/content_viewer/view_page.html.erb @@ -83,17 +83,7 @@ <% if @page.accept_comments? && @comments.count > 1 %> <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %> - <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %> - <%= javascript_include_tag "comment_order.js" %> -
- <%= form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %> - <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %> - <% end %> -
- <% end %> - - <% if @page.accept_comments? and @comments.count > 1 %> - <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %> + <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier, :page => @page.explode_path)) %> <%= javascript_include_tag "comment_order.js" %>
<%= form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %> diff --git a/public/javascripts/comment_order.js b/public/javascripts/comment_order.js index cac6a1e..b47b2a8 100644 --- a/public/javascripts/comment_order.js +++ b/public/javascripts/comment_order.js @@ -1,14 +1,12 @@ function send_order(order, url) { - open_loading(DEFAULT_LOADING_MESSAGE); - + jQuery('.article-comments-list').addClass('fetching'); jQuery.ajax({ url:url, data: {"comment_order":order}, success: function(response) { - close_loading(); jQuery(".article-comments-list").html(response); }, - error: function() { close_loading() } + complete: function(){ jQuery('.article-comments-list').removeClass('fetching') } }); } diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index f6b9fea..e41dc01 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -6690,3 +6690,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { #signup-form #result-strong { color: green; } + +.fetching { + opacity: 0.3; +} -- libgit2 0.21.2