Download as
Browse Code »

Commit a7c014edfaa79d04b535e21fee021451f063f021

Authored by Jefferson Fernandes + Joao M. M. da Silva
Committed by Paulo Meireles
1 parent bbf808b4
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

[Mezuro] Google Chart is working

Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
plugins/mezuro/public/javascripts/project_content.js
  Diff comments   View file @a7c014e
... ... @@ -22,7 +22,7 @@ function display_metric_history() {
22 22 }
23 23  
24 24 function display_grade_history() {
25   - var module_name = jQuery(this).attr('show-grade-history');
  25 + var module_name = jQuery(this).attr('data-module-name');
26 26 callAction('module_grade_history', {module_name: module_name}, show_grades);
27 27 return false;
28 28 }
... ...
plugins/mezuro/views/content_viewer/_module_result.rhtml
  Diff comments   View file @a7c014e
... ... @@ -4,7 +4,7 @@
4 4 <h5><%= _('Metric results for: ') + module_label %> </h5>
5 5  
6 6 <hr/>
7   -
  7 +<div class="zoomable-image">
8 8 <table>
9 9 <thead>
10 10 <tr>
... ... @@ -43,7 +43,7 @@
43 43 <div id='historical-grade'></div>
44 44 </td>
45 45 <td colspan = "4" align = "right">
46   - <a href="#" show-grade-history="<%= module_result.module.name %>" >
  46 + <a href="#" show-grade-history="<%= module_result.module.name %>" data-module-name="<%= the_module.name%>" >
47 47 <strong>
48 48 <%= _('Grade:') %>
49 49 <%= "%.02f" % module_result.grade %>
... ... @@ -53,3 +53,4 @@
53 53 </tr>
54 54 </tfoot>
55 55 </table>
  56 +</div>
... ...
plugins/mezuro/views/content_viewer/_score_history.rhtml
  Diff comments   View file @a7c014e
1   -<tr>
2   - <div><%= MezuroPlugin::Helpers::ContentViewerHelper.generate_chart(score_history) %></div>
3   -</tr>
  1 +<%= image_tag(MezuroPlugin::Helpers::ContentViewerHelper.generate_chart(score_history)) %>
  2 +
... ...