Download as
Browse Code »

Commit 1488e68879280e1b97613840d35581b7dd38acb5

Authored by Paulo Meireles
1 parent 1b4bf774
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

[Mezuro] Refactoring configuration views

Showing 12 changed files with 32 additions and 32 deletions   Show diff stats
plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb
  Diff comments   View file @1488e68
1 1 <% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
2 2 <%= hidden_field_tag :beginning_id, beginning_id %>
3   - <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :configuration_name => configuration_name, :beginning_id => beginning_id, :range => range } %>
  3 + <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id, :beginning_id => beginning_id, :range => range } %>
4 4 <% end %>
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb
  Diff comments   View file @1488e68
1 1 <% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
2   - <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :configuration_name => configuration_name } %>
  2 + <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id } %>
3 3 <% end %>
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb
  Diff comments   View file @1488e68
... ... @@ -12,6 +12,6 @@
12 12 <%=range.grade%>
13 13 </td>
14 14 <td bgcolor="#<%= range.color[2..-1] %>"></td>
15   - <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_myprofile", :configuration_name => params[:configuration_name], :metric_name => params[:metric_name], :beginning_id => range.beginning} %></td>
16   - <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_myprofile", :configuration_name => params[:configuration_name], :metric_name => params[:metric_name], :range_beginning => range.beginning %></td>
  15 + <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_myprofile", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning} %></td>
  16 + <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_myprofile", :id => params[:id], :metric_name => params[:metric_name], :range_beginning => range.beginning %></td>
17 17 </tr>
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb
  Diff comments   View file @1488e68
1   -<%= hidden_field_tag :configuration_name, configuration_name %>
  1 +<%= hidden_field_tag :id, id %>
2 2 <%= hidden_field_tag :metric_name, metric_name %>
3 3 <table>
4 4 <tr>
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb
  Diff comments   View file @1488e68
1   -<h2><%= @configuration_name%> Configuration</h2>
  1 +<h2><%= @configuration_content.name%> Configuration</h2>
2 2  
3   -<%= link_to "* New Compound Metric *", :controller => "mezuro_plugin_myprofile", :action => "new_compound_metric_configuration", :params =>
4   -{:configuration_name => @configuration_name} %>
  3 +<%= link_to "New Compound Metric", :controller => "mezuro_plugin_myprofile", :action => "new_compound_metric_configuration", :params =>
  4 +{ :id => @configuration_content.id } %>
5 5  
6 6 <h5>Base Tools:</h5>
7 7 <table id="project_info">
8   - <% @tool_names.base_tool_names.each do |collector_name| %>
  8 + <% @base_tools.each do |base_tool| %>
9 9 <tr>
10 10 <td>
11   - <%= link_to collector_name, :controller => "mezuro_plugin_myprofile", :action => "choose_metric", :params =>
12   - {:configuration_name => @configuration_name, :collector_name => collector_name} %>
  11 + <%= link_to base_tool, :controller => "mezuro_plugin_myprofile", :action => "choose_metric", :params =>
  12 + { :base_tool => base_tool, :id => @configuration_content.id} %>
13 13 </td>
14 14 </tr>
15 15 <% end %>
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb
  Diff comments   View file @1488e68
1   -<h2><%= @configuration_name %> Configuration</h2>
  1 +<h2><%= @configuration_content.name %> Configuration</h2>
2 2  
3 3 <table id="project_info">
4 4 <tr>
5   - <h5>Metric Collector: <%= @collector_name %></h5>
  5 + <h5>Metric Collector: <%= @base_tool %></h5>
6 6 </tr>
7 7 <tr>
8 8 <h5>Choose a metric to add:</h5>
9 9 </tr>
10   - <% @collector.supported_metrics.each do |metric| %>
  10 + <% @supported_metrics.each do |metric| %>
11 11 <tr class="metric" title="<%= metric.name %>">
12 12 <td>
13 13 <%= link_to metric.name, :controller => "mezuro_plugin_myprofile", :action => "new_metric_configuration", :params => {:metric_name => metric.name,
14   - :collector_name => @collector_name, :configuration_name => @configuration_name} %>
  14 + :base_tool => @base_tool, :id => @configuration_content.id } %>
15 15 </td>
16 16 </tr>
17 17 <% end %>
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
  Diff comments   View file @1488e68
1   -<h2><%= @configuration_name %> Configuration</h2>
  1 +<h2><%= @configuration_content.name %> Configuration</h2>
2 2  
3 3 <% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
4   - <%= hidden_field_tag :configuration_name, @configuration_name %>
  4 + <%= hidden_field_tag :id, @configuration_content.id %>
5 5 <p>
6 6 <%= "Metric Name:" + @metric.name %>
7 7 </p>
... ... @@ -61,14 +61,14 @@
61 61 </tr>
62 62 <% if (@metric_configuration.ranges!=nil)
63 63 @metric_configuration.ranges.each do |range| %>
64   - <%= render :partial => "range", :locals => {:range => range, :configuration_name => @configuration_name,
  64 + <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id,
65 65 :metric_name => @metric_configuration.metric.name} %>
66 66 <% end
67 67 end %>
68 68 </table>
69 69  
70 70 <br/>
71   -<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_myprofile", :configuration_name => @configuration_name, :metric_name => @metric.name} %>
  71 +<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_myprofile", :id => @configuration_content.id, :metric_name => @metric.name} %>
72 72 <div id="range_form" style="display:none"></div>
73 73  
74 74 <br/>
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
  Diff comments   View file @1488e68
1 1 <script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
2 2  
3   -<h2><%= @configuration_name %> Configuration</h2>
  3 +<h2><%= @configuration_content.name %> Configuration</h2>
4 4  
5 5 <% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
6   - <%= hidden_field_tag :configuration_name, @configuration_name %>
  6 + <%= hidden_field_tag :id, @configuration_content.id %>
7 7  
8 8 <% f.fields_for :metric do |m| %>
9 9  
... ... @@ -71,13 +71,13 @@
71 71 </tr>
72 72 <% if (@metric_configuration.ranges!=nil)
73 73 @metric_configuration.ranges.each do |range| %>
74   - <%= render :partial => "range", :locals => {:range => range, :configuration_name => @configuration_name,
75   - :metric_name => @metric_configuration.metric.name} %>
  74 + <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id,
  75 + :metric_name => @metric.name} %>
76 76 <% end
77 77 end %>
78 78 </table>
79 79  
80 80 <br/>
81   -<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_myprofile", :configuration_name => @configuration_name, :metric_name => @metric.name} %>
  81 +<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_myprofile", :id => @configuration_content.id, :metric_name => @metric.name} %>
82 82 <div id="range_form" style="display:none"></div>
83 83  
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs
  Diff comments   View file @1488e68
1   -page.replace_html 'range_form', :partial => "edit_range", :locals => {:metric_name => @metric_name, :configuration_name => @configuration_name, :beginning_id => @beginning_id, :range => @range }
  1 +page.replace_html 'range_form', :partial => "edit_range", :locals => {:metric_name => @metric_name, :id => @configuration_content.id, :beginning_id => @beginning_id, :range => @range }
2 2 page.visual_effect :slide_down, "range_form"
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb
  Diff comments   View file @1488e68
1   -<h2><%= @configuration_name %> Configuration</h2>
  1 +<h2><%= @configuration_content.name %> Configuration</h2>
2 2  
3 3 <% form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration",
4 4 :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
5   - <%= hidden_field_tag :configuration_name, @configuration_name %>
  5 + <%= hidden_field_tag :id, @configuration_content.id %>
6 6 <% f.fields_for :metric do |m| %>
7 7 <p>
8 8 <%= m.label :name, "Name:" %>
... ... @@ -35,7 +35,7 @@
35 35 <%= f.text_field :weight %>
36 36 </p>
37 37 <p>
38   - <%= f.submit "Save" %>
  38 + <%= f.submit "Add" %>
39 39 </p>
40 40 <% end %>
41 41  
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
  Diff comments   View file @1488e68
1 1 <script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
2 2  
3   -<h2><%= @configuration_name %> Configuration</h2>
  3 +<h2><%= @configuration_content.name %> Configuration</h2>
4 4  
5 5 <% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
6   - <%= hidden_field_tag :configuration_name, @configuration_name %>
  6 + <%= hidden_field_tag :id, @configuration_content.id %>
7 7  
8 8 <% f.fields_for :metric do |m| %>
9 9  
... ... @@ -33,7 +33,7 @@
33 33 <%= f.text_field :code %>
34 34 </p>
35 35 <p>
36   - <%= f.label :aggregation_form, "Aggregation:" %>
  36 + <%= f.label :aggregation_form, "Aggregation Form:" %>
37 37 <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"],
38 38 ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
39 39 </p>
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs
  Diff comments   View file @1488e68
1   -page.replace_html 'range_form', :partial => "new_range", :locals => {:metric_name => @metric_name, :configuration_name => @configuration_name, :beginning_id => "bolinha" } #FIXME
  1 +page.replace_html 'range_form', :partial => "new_range", :locals => {:metric_name => @metric_name, :id => @configuration_content.id }
2 2 page.visual_effect :slide_down, "range_form"
... ...