Download as
Browse Code »

Commit c0610875f20a116155853171961635487fe95aea

Authored by João M. M. da Silva + Carlos Morais
Committed by Paulo Meireles
1 parent 8217f536
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

show loading message for ajax results

Showing 3 changed files with 16 additions and 6 deletions   Show diff stats
plugins/mezuro/public/javascripts/results.js
  Diff comments   View file @c061087
@@ -4,11 +4,19 @@ function results($) { @@ -4,11 +4,19 @@ function results($) {
4 var project = $('#module-result').attr('data-project-id'); 4 var project = $('#module-result').attr('data-project-id');
5 var module_name = $(this).attr('data-module-name'); 5 var module_name = $(this).attr('data-module-name');
6 var endpoint = '/profile/' + profile + '/plugins/mezuro/metrics/' + project; 6 var endpoint = '/profile/' + profile + '/plugins/mezuro/metrics/' + project;
7 - // FIXME turn on the 'loading ...'  
8 - $.get(endpoint, { module_name: module_name }, function(content) { 7 + show_loading_message();
  8 + $.get(endpoint, {module_name: module_name}, function(content) {
9 $('#module-result').html(content); 9 $('#module-result').html(content);
10 - // FIXME turn off the 'loading ...' 10 + show_result_table();
11 }); 11 });
12 return false; 12 return false;
13 }); 13 });
14 -};  
15 \ No newline at end of file 14 \ No newline at end of file
  15 +}
  16 +function show_loading_message() {
  17 + jQuery('#loading-message').attr("style", "display: inline");
  18 + jQuery('#module-result').attr("style", "display: none");
  19 +}
  20 +function show_result_table(){
  21 + jQuery('#loading-message').attr("style", "display: none");
  22 + jQuery('#module-result').attr("style", "display: inline");
  23 +}
16 \ No newline at end of file 24 \ No newline at end of file
plugins/mezuro/views/content_viewer/_module_result.rhtml
  Diff comments   View file @c061087
@@ -18,5 +18,4 @@ @@ -18,5 +18,4 @@
18 </tr> 18 </tr>
19 19
20 <% end %> 20 <% end %>
21 -</table>  
22 - 21 +</table>
23 \ No newline at end of file 22 \ No newline at end of file
plugins/mezuro/views/content_viewer/show_project.rhtml
  Diff comments   View file @c061087
@@ -71,6 +71,9 @@ @@ -71,6 +71,9 @@
71 <div id='module-result' data-project-id='<%= @page.id %>'> 71 <div id='module-result' data-project-id='<%= @page.id %>'>
72 <%= render :partial => 'module_result', :locals => { :module_result => @page.module_result(@project.name) } %> 72 <%= render :partial => 'module_result', :locals => { :module_result => @page.module_result(@project.name) } %>
73 </div> 73 </div>
  74 + <div id="loading-message">
  75 + loading results...
  76 + </div>
74 <script> 77 <script>
75 jQuery(results); 78 jQuery(results);
76 </script> 79 </script>