From 1488e68879280e1b97613840d35581b7dd38acb5 Mon Sep 17 00:00:00 2001
From: Paulo Meirelles <paulo@softwarelivre.org>
Date: Sat, 7 Jul 2012 00:03:55 +0400
Subject: [PATCH] [Mezuro] Refactoring configuration views

---
 plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb                        |  2 +-
 plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb                         |  2 +-
 plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb                             |  4 ++--
 plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb                        |  2 +-
 plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb                   | 12 ++++++------
 plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb                      |  8 ++++----
 plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb |  8 ++++----
 plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb          | 10 +++++-----
 plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs                              |  2 +-
 plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb  |  6 +++---
 plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb           |  6 +++---
 plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs                               |  2 +-
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb
index 494ed66..6dc8cc9 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb
@@ -1,4 +1,4 @@
 <% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= hidden_field_tag :beginning_id, beginning_id %>
-  <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :configuration_name => configuration_name, :beginning_id => beginning_id, :range => range } %>
+  <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id, :beginning_id => beginning_id, :range => range } %>
 <% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb
index 471aaea..62def0e 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb
@@ -1,3 +1,3 @@
 <% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
-  <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :configuration_name => configuration_name } %>
+  <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id } %>
 <% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb
index d99fcb4..fc5db85 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb
@@ -12,6 +12,6 @@
     <%=range.grade%>
   </td>
   <td bgcolor="#<%= range.color[2..-1] %>"></td>
-  <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>
-    <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>
+  <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>
+    <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_myprofile", :id => params[:id], :metric_name => params[:metric_name], :range_beginning => range.beginning %></td>
 </tr>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb
index 1428793..9d6db84 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb
@@ -1,4 +1,4 @@
-<%= hidden_field_tag :configuration_name, configuration_name %>
+<%= hidden_field_tag :id, id %>
 <%= hidden_field_tag :metric_name, metric_name %>
 <table>
   <tr>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb
index 254b8a8..4fb7134 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb
@@ -1,15 +1,15 @@
-<h2><%= @configuration_name%> Configuration</h2>
+<h2><%= @configuration_content.name%> Configuration</h2>
 
-<%= link_to "* New Compound Metric *", :controller => "mezuro_plugin_myprofile", :action => "new_compound_metric_configuration", :params =>
-{:configuration_name => @configuration_name} %>
+<%= link_to "New Compound Metric", :controller => "mezuro_plugin_myprofile", :action => "new_compound_metric_configuration", :params =>
+{ :id => @configuration_content.id } %>
 
 <h5>Base Tools:</h5>
 <table id="project_info">
-  <% @tool_names.base_tool_names.each do |collector_name| %>
+  <% @base_tools.each do |base_tool| %>
     <tr>
       <td>
-        <%= link_to collector_name, :controller => "mezuro_plugin_myprofile", :action => "choose_metric", :params =>
-        {:configuration_name => @configuration_name, :collector_name => collector_name} %>
+        <%= link_to base_tool, :controller => "mezuro_plugin_myprofile", :action => "choose_metric", :params =>
+        { :base_tool => base_tool, :id => @configuration_content.id} %>
       </td>
     </tr>
   <% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb
index 4ebb2e7..06c1a62 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb
@@ -1,17 +1,17 @@
-<h2><%= @configuration_name %> Configuration</h2>
+<h2><%= @configuration_content.name %> Configuration</h2>
 
 <table id="project_info">
   <tr>
-    <h5>Metric Collector: <%= @collector_name %></h5>
+    <h5>Metric Collector: <%= @base_tool %></h5>
   </tr>
   <tr>
     <h5>Choose a metric to add:</h5>
   </tr>
-  <% @collector.supported_metrics.each do |metric| %>
+  <% @supported_metrics.each do |metric| %>
     <tr class="metric" title="<%= metric.name %>">
       <td>
         <%= link_to metric.name, :controller => "mezuro_plugin_myprofile", :action => "new_metric_configuration", :params => {:metric_name => metric.name,
-        :collector_name => @collector_name, :configuration_name => @configuration_name} %>
+        :base_tool => @base_tool, :id => @configuration_content.id } %>
       </td>
     </tr>
   <% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
index 9051831..7f8fdf2 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
@@ -1,7 +1,7 @@
-<h2><%= @configuration_name %> Configuration</h2>
+<h2><%= @configuration_content.name %> Configuration</h2>
 
 <% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
-  <%= hidden_field_tag :configuration_name, @configuration_name %>
+  <%= hidden_field_tag :id, @configuration_content.id %>
   <p>
     <%= "Metric Name:" + @metric.name %>   
   </p>  
@@ -61,14 +61,14 @@
   </tr>
   <% if (@metric_configuration.ranges!=nil) 
     @metric_configuration.ranges.each do |range| %>
-      <%= render :partial => "range", :locals => {:range => range, :configuration_name => @configuration_name, 
+      <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, 
           :metric_name => @metric_configuration.metric.name} %>
     <% end
   end %>
 </table>
 
 <br/>
-<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_myprofile", :configuration_name => @configuration_name, :metric_name => @metric.name} %>
+<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_myprofile", :id => @configuration_content.id, :metric_name => @metric.name} %>
 <div id="range_form" style="display:none"></div>
 
 <br/>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
index c673ccc..a1f0b9f 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
@@ -1,9 +1,9 @@
 <script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
 
-<h2><%= @configuration_name %> Configuration</h2>
+<h2><%= @configuration_content.name %> Configuration</h2>
 
 <% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
-  <%= hidden_field_tag :configuration_name, @configuration_name %>
+  <%= hidden_field_tag :id, @configuration_content.id %>
   
   <% f.fields_for :metric do |m| %>
   
@@ -71,13 +71,13 @@
   </tr>
   <% if (@metric_configuration.ranges!=nil) 
     @metric_configuration.ranges.each do |range| %>
-      <%= render :partial => "range", :locals => {:range => range, :configuration_name => @configuration_name, 
-          :metric_name => @metric_configuration.metric.name} %>
+      <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, 
+          :metric_name => @metric.name} %>
     <% end
   end %>
 </table>
 
 <br/>
-<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_myprofile", :configuration_name => @configuration_name, :metric_name => @metric.name} %>
+<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_myprofile", :id => @configuration_content.id, :metric_name => @metric.name} %>
 <div id="range_form" style="display:none"></div>
 
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs
index 144b018..2358788 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs
@@ -1,2 +1,2 @@
-page.replace_html 'range_form', :partial => "edit_range", :locals => {:metric_name => @metric_name, :configuration_name => @configuration_name, :beginning_id => @beginning_id, :range => @range }
+page.replace_html 'range_form', :partial => "edit_range", :locals => {:metric_name => @metric_name, :id => @configuration_content.id, :beginning_id => @beginning_id, :range => @range }
 page.visual_effect :slide_down, "range_form"
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb
index bc87cb8..9682ff3 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb
@@ -1,8 +1,8 @@
-<h2><%= @configuration_name %> Configuration</h2>
+<h2><%= @configuration_content.name %> Configuration</h2>
 
 <% form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration", 
 :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
-  <%= hidden_field_tag :configuration_name, @configuration_name %> 
+  <%= hidden_field_tag :id, @configuration_content.id %>
   <% f.fields_for :metric do |m| %>
     <p>
       <%= m.label :name, "Name:" %>
@@ -35,7 +35,7 @@
     <%= f.text_field :weight %>
   </p>
   <p>
-    <%= f.submit "Save" %>
+    <%= f.submit "Add" %>
   </p>
 <% end %>
 
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
index 7d36c39..3f84df2 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
@@ -1,9 +1,9 @@
 <script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
 
-<h2><%= @configuration_name %> Configuration</h2>
+<h2><%= @configuration_content.name %> Configuration</h2>
 
 <% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_myprofile"},  :method => :get do |f| %>
-  <%= hidden_field_tag :configuration_name, @configuration_name %>
+  <%= hidden_field_tag :id, @configuration_content.id %>
   
   <% f.fields_for :metric do |m| %>
   
@@ -33,7 +33,7 @@
     <%= f.text_field :code %>
   </p>
   <p>
-    <%= f.label :aggregation_form, "Aggregation:" %>
+    <%= f.label :aggregation_form, "Aggregation Form:" %>
     <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
     ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
   </p>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs b/plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs
index a7c1352..fa13dee 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs
@@ -1,2 +1,2 @@
-page.replace_html 'range_form', :partial => "new_range", :locals => {:metric_name => @metric_name, :configuration_name => @configuration_name, :beginning_id => "bolinha" } #FIXME
+page.replace_html 'range_form', :partial => "new_range", :locals => {:metric_name => @metric_name, :id => @configuration_content.id }
 page.visual_effect :slide_down, "range_form"
--
libgit2 0.21.2