Merge branch 'mezuro-dev' of gitorious.org:+mezuro/noosfero/mezuro into mezuro-dev

João M. M. da Silva · Paulo Meireles
2 parents f586dcd8 1b2e673f
Showing 30 changed files with 232 additions and 225 deletions Show diff stats
plugins/mezuro/SERVICE
plugins/mezuro/controllers/myprofile/mezuro_plugin_base_tool_controller.rb
plugins/mezuro/lib/kalibro/base_tool.rb
plugins/mezuro/lib/kalibro/model.rb
plugins/mezuro/lib/mezuro_plugin.rb
plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/licenses.yaml.example
plugins/mezuro/licenses.yml.example
plugins/mezuro/public/icons/mezuro.png
plugins/mezuro/public/style.css
plugins/mezuro/service.yaml.example
plugins/mezuro/service.yml.example
plugins/mezuro/test/features/echo_port_test.rb
plugins/mezuro/test/functional/myprofile/mezuro_plugin_base_tool_controller_test.rb
plugins/mezuro/test/unit/mezuro_plugin/configuration_content_test.rb
plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
plugins/mezuro/test/unit/mezuro_plugin_test.rb
plugins/mezuro/views/content_viewer/_metric_configuration_form.rhtml
@@ -1 +0,0 @@
-http://valinhos.ime.usp.br:50688/KalibroService/
 \ No newline at end of file
@@ -2,16 +2,9 @@ class MezuroPluginBaseToolController &lt; MezuroPluginMyprofileController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def choose_base_tool
-    @configuration_content = profile.articles.find(params[:id])
-    @base_tools = Kalibro::BaseTool.all_names
-  end
-
   def choose_metric
     @configuration_content = profile.articles.find(params[:id])
-    @base_tool = params[:base_tool]
-    base_tool = Kalibro::BaseTool.find_by_name(@base_tool)
-    @supported_metrics = base_tool.nil? ? [] : base_tool.supported_metrics 
+    @base_tools = Kalibro::BaseTool.all
   end
 end
@@ -10,6 +10,11 @@ class Kalibro::BaseTool &lt; Kalibro::Model
     new request("BaseTool", :get_base_tool, {:base_tool_name => base_tool_name})[:base_tool]
   end
+  def self.all
+    basetools = all_names
+    basetools.map{ |name| find_by_name(name) }
+  end 
+
   def supported_metric=(value)
     @supported_metric = Kalibro::NativeMetric.to_objects_array value
   end
@@ -88,7 +88,7 @@ class Kalibro::Model
   end
   def self.client(endpoint)
-    service_address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yaml")
+    service_address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yml")
     Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")
   end
@@ -14,8 +14,12 @@ class MezuroPlugin &lt; Noosfero::Plugin
     _("A metric analizer plugin.")
   end
-  def content_types
-    [MezuroPlugin::ConfigurationContent, MezuroPlugin::ProjectContent]
+  def control_panel_buttons
+    if context.profile.is_a?(Community)
+      {:title => _('Mezuro Project'), :url => {:controller =>  'cms', :action => 'new', :profile => context.profile.identifier, :type => 'MezuroPlugin::ProjectContent'}, :icon => 'mezuro' }
+    else
+      {:title => _('Mezuro Configuration'), :url => {:controller =>  'cms', :action => 'new', :profile => context.profile.identifier, :type => 'MezuroPlugin::ConfigurationContent'}, :icon => 'mezuro' }
+    end
   end
   def stylesheet?
@@ -7,7 +7,7 @@ class MezuroPlugin::ConfigurationContent &lt; Article
   after_destroy :remove_kalibro_configuration_from_service
   def self.short_description
-    'Kalibro configuration'
+    'Mezuro configuration'
   end
   def self.description
@@ -11,7 +11,7 @@ class MezuroPlugin::Helpers::ContentViewerHelper
   end
   def self.create_license_options
-   options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yaml")
+   options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yml")
    options = options.split(";")
    formated_options = []
    options.each { |option| formated_options << [option, option] }
@@ -50,7 +50,7 @@ class MezuroPlugin::Helpers::ContentViewerHelper
   end
   def self.get_license_option(selected)
-    options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yaml")
+    options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yml")
     options.split(";")
     selected_option = options.find { |license| license == selected }
   end
@@ -7,7 +7,7 @@ class MezuroPlugin::ProjectContent &lt; Article
   validate_on_create :validate_repository_url
   def self.short_description
-    'Kalibro project'
+    'Mezuro project'
   end
   def self.description
@@ -1,69 +0,0 @@
-Academic Free License 3.0 (AFL-3.0);
-Affero GNU Public License (AGPL-3.0);
-Adaptive Public License (APL-1.0);
-Apache License 2.0 (Apache-2.0);
-Apple Public Source License (APSL-2.0);
-Artistic license 2.0 (Artistic-2.0);
-Attribution Assurance Licenses (AAL);
-BSD 3-Clause "New" or "Revised" License (BSD-3-Clause);
-BSD 2-Clause "Simplified" or "FreeBSD" License (BSD-2-Clause);
-Boost Software License (BSL-1.0);
-Computer Associates Trusted Open Source License 1.1 (CATOSL-1.1);
-Common Development and Distribution License 1.0 (CDDL-1.0);
-Common Public Attribution License 1.0 (CPAL-1.0);
-CUA Office Public License Version 1.0 (CUA-OPL-1.0);
-EU DataGrid Software License (EUDatagrid);
-Eclipse Public License 1.0 (EPL-1.0);
-Educational Community License, Version 2.0 (ECL-2.0);
-Eiffel Forum License V2.0 (EFL-2.0);
-Entessa Public License (Entessa);
-European Union Public License, Version 1.1 (EUPL-1.1);
-Fair License (FAIR);
-Frameworx License (Frameworx-1.0);
-GNU Affero General Public License v3 (AGPL-3.0);
-GNU General Public License version 2.0 (GPL-2.0);
-GNU General Public License version 3.0 (GPL-3.0);
-GNU Library or "Lesser" General Public License version 2.1 (LGPL-2.1);
-GNU Library or "Lesser" General Public License version 3.0 (LGPL-3.0);
-Historical Permission Notice and Disclaimer (HPND);
-IBM Public License 1.0 (IPL-1.0);
-IPA Font License (IPA);
-ISC License (ISC);
-LaTeX Project Public License 1.3c (LPPL-1.3c);
-Lucent Public License Version 1.02 (LPL-1.02);
-MirOS Licence (MirOS);
-Microsoft Public License (Ms-PL);
-Microsoft Reciprocal License (Ms-RL);
-MIT license (MIT);
-Motosoto License (Motosoto);
-Mozilla Public License 2.0 (MPL-2.0);
-Multics License (Multics);
-NASA Open Source Agreement 1.3 (NASA 1.3);
-NTP License (NTP);
-Naumen Public License (Naumen);
-Nethack General Public License (NGPL);
-Nokia Open Source License (Nokia);
-Non-Profit Open Software License 3.0 (NPOSL-3.0);
-OCLC Research Public License 2.0 (OCLC-2.0);
-Open Font License 1.1 (OFL 1.1);
-Open Group Test Suite License (OGTSL);
-Open Software License 3.0 (OSL-3.0);
-PHP License 3.0 (PHP-3.0);
-The PostgreSQL License (PostgreSQL);
-Python License (Python-2.0);
-CNRI Python license (CNRI-Python);
-Q Public License (QPL-1.0);
-RealNetworks Public Source License V1.0 (RPSL-1.0);
-Reciprocal Public License 1.5 (RPL-1.5);
-Ricoh Source Code Public License (RSCPL);
-Simple Public License 2.0 (SimPL-2.0);
-Sleepycat License (Sleepycat);
-Sun Public License 1.0 (SPL-1.0);
-Sybase Open Watcom Public License 1.0 (Watcom-1.0);
-University of Illinois/NCSA Open Source License (NCSA);
-Vovida Software License v. 1.0 (VSL-1.0);
-W3C License (W3C);
-wxWindows Library License (WXwindows);
-X.Net License (Xnet);
-Zope Public License 2.0 (ZPL-2.0);
-zlib/libpng license (Zlib);
@@ -0,0 +1,69 @@
+Academic Free License 3.0 (AFL-3.0);
+Affero GNU Public License (AGPL-3.0);
+Adaptive Public License (APL-1.0);
+Apache License 2.0 (Apache-2.0);
+Apple Public Source License (APSL-2.0);
+Artistic license 2.0 (Artistic-2.0);
+Attribution Assurance Licenses (AAL);
+BSD 3-Clause "New" or "Revised" License (BSD-3-Clause);
+BSD 2-Clause "Simplified" or "FreeBSD" License (BSD-2-Clause);
+Boost Software License (BSL-1.0);
+Computer Associates Trusted Open Source License 1.1 (CATOSL-1.1);
+Common Development and Distribution License 1.0 (CDDL-1.0);
+Common Public Attribution License 1.0 (CPAL-1.0);
+CUA Office Public License Version 1.0 (CUA-OPL-1.0);
+EU DataGrid Software License (EUDatagrid);
+Eclipse Public License 1.0 (EPL-1.0);
+Educational Community License, Version 2.0 (ECL-2.0);
+Eiffel Forum License V2.0 (EFL-2.0);
+Entessa Public License (Entessa);
+European Union Public License, Version 1.1 (EUPL-1.1);
+Fair License (FAIR);
+Frameworx License (Frameworx-1.0);
+GNU Affero General Public License v3 (AGPL-3.0);
+GNU General Public License version 2.0 (GPL-2.0);
+GNU General Public License version 3.0 (GPL-3.0);
+GNU Library or "Lesser" General Public License version 2.1 (LGPL-2.1);
+GNU Library or "Lesser" General Public License version 3.0 (LGPL-3.0);
+Historical Permission Notice and Disclaimer (HPND);
+IBM Public License 1.0 (IPL-1.0);
+IPA Font License (IPA);
+ISC License (ISC);
+LaTeX Project Public License 1.3c (LPPL-1.3c);
+Lucent Public License Version 1.02 (LPL-1.02);
+MirOS Licence (MirOS);
+Microsoft Public License (Ms-PL);
+Microsoft Reciprocal License (Ms-RL);
+MIT license (MIT);
+Motosoto License (Motosoto);
+Mozilla Public License 2.0 (MPL-2.0);
+Multics License (Multics);
+NASA Open Source Agreement 1.3 (NASA 1.3);
+NTP License (NTP);
+Naumen Public License (Naumen);
+Nethack General Public License (NGPL);
+Nokia Open Source License (Nokia);
+Non-Profit Open Software License 3.0 (NPOSL-3.0);
+OCLC Research Public License 2.0 (OCLC-2.0);
+Open Font License 1.1 (OFL 1.1);
+Open Group Test Suite License (OGTSL);
+Open Software License 3.0 (OSL-3.0);
+PHP License 3.0 (PHP-3.0);
+The PostgreSQL License (PostgreSQL);
+Python License (Python-2.0);
+CNRI Python license (CNRI-Python);
+Q Public License (QPL-1.0);
+RealNetworks Public Source License V1.0 (RPSL-1.0);
+Reciprocal Public License 1.5 (RPL-1.5);
+Ricoh Source Code Public License (RSCPL);
+Simple Public License 2.0 (SimPL-2.0);
+Sleepycat License (Sleepycat);
+Sun Public License 1.0 (SPL-1.0);
+Sybase Open Watcom Public License 1.0 (Watcom-1.0);
+University of Illinois/NCSA Open Source License (NCSA);
+Vovida Software License v. 1.0 (VSL-1.0);
+W3C License (W3C);
+wxWindows Library License (WXwindows);
+X.Net License (Xnet);
+Zope Public License 2.0 (ZPL-2.0);
+zlib/libpng license (Zlib);
@@ -30,3 +30,8 @@ a:link,active,visited .ancestor{
 	font-style: underline;
 	display: inline;
 }
+
+.controller-profile_editor a.control-panel-mezuro,
+  .controller-profile_editor .msie6 a.control-panel-mezuro {
+  background-image: url(icons/mezuro.png)
+}
@@ -1,2 +0,0 @@
-http://localhost:8080/KalibroService/
-# http://valinhos.ime.usp.br:50688/KalibroService/
@@ -0,0 +1 @@
+http://localhost:8080/KalibroService/
@@ -9,7 +9,7 @@ class EchoPortTest &lt; ActiveSupport::TestCase
   def setup
     @port = Kalibro::Client::Port.new('Echo')
-    address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yaml")
+    address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yml")
     address['KalibroService'] = 'KalibroFake'
     @port.service_address=(address);
   end
@@ -22,20 +22,12 @@ class MezuroPluginBaseToolControllerTest &lt; ActionController::TestCase
     @content.save
   end
-  should 'test choose base tool' do
-    Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool_names).returns({:base_tool_name => @base_tool.name})
-    get :choose_base_tool, :profile => @profile.identifier, :id => @content.id
-    assert_equal [@base_tool.name], assigns(:base_tools)
-    assert_equal @content, assigns(:configuration_content)
-    assert_response 200
-  end
-
   should 'test choose metric' do
+    Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool_names).returns({:base_tool_name => @base_tool.name})
     Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool, {:base_tool_name => @base_tool.name}).returns({:base_tool => @base_tool_hash})
-    get :choose_metric, :profile => @profile.identifier, :id => @content.id, :base_tool => @base_tool.name
+    get :choose_metric, :profile => @profile.identifier, :id => @content.id
+    assert_equal @base_tool.name, assigns(:base_tools).first.name
     assert_equal @content, assigns(:configuration_content)
-    assert_equal @base_tool.name, assigns(:base_tool)
-    assert_equal @base_tool.supported_metric[0].name, assigns(:supported_metrics)[0].name
     assert_response 200
   end
@@ -14,7 +14,7 @@ class ConfigurationContentTest &lt; ActiveSupport::TestCase
   end
   should 'provide proper short description' do
-    assert_equal 'Kalibro configuration', MezuroPlugin::ConfigurationContent.short_description
+    assert_equal 'Mezuro configuration', MezuroPlugin::ConfigurationContent.short_description
   end
   should 'provide proper description' do
@@ -16,7 +16,7 @@ class ProjectContentTest &lt; ActiveSupport::TestCase
   end
   should 'provide proper short description' do
-    assert_equal 'Kalibro project', MezuroPlugin::ProjectContent.short_description
+    assert_equal 'Mezuro project', MezuroPlugin::ProjectContent.short_description
   end
   should 'provide proper description' do
@@ -18,14 +18,6 @@ class MezuroPluginTest &lt; ActiveSupport::TestCase
     assert_equal _('A metric analizer plugin.'), MezuroPlugin.plugin_description
   end
-  should 'have configuration content type' do
-    assert_includes @plugin.content_types, MezuroPlugin::ConfigurationContent
-  end
-
-  should 'have project content type' do
-    assert_includes @plugin.content_types, MezuroPlugin::ProjectContent
-  end
-
   should 'have stylesheet' do
     assert @plugin.stylesheet?
   end
@@ -0,0 +1,41 @@
+<% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
+  <%= hidden_field_tag :id, @configuration_content.id %>
+  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
+  
+  <% f.fields_for :metric do |m| %>
+  
+    <% @metric.language.each do |language| %>
+      <%= m.hidden_field :language, :multiple => true, :value => language %>
+    <% end %>
+    
+    <%= m.hidden_field "scope", :value => @metric.scope %>
+    <p>
+      <b><%= m.label :origin, "Collector Name:" %></b>
+      <%= @metric.origin %>
+      <%= m.hidden_field "origin", :value => @metric.origin %>
+    </p>
+    <p>
+      <b><%= m.label :metric_name, "Metric Name:" %></b>
+      <%= @metric.name %>
+      <%= m.hidden_field "name", :value => @metric.name %>
+    </p>
+  <% end %>
+  <p>
+    <b><%= f.label :code, "Code:" %></b>
+    <%= @metric_configuration.code %>
+    <%= f.hidden_field "code", :value => @metric_configuration.code %>
+  </p>
+  <p>
+    <b><%= f.label :aggregation_form, "Aggregation Form:" %></b>
+    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
+    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
+  </p>
+  <p>
+    <b><%= f.label :weight, "Weight:" %></b>
+    <%= f.text_field "weight", :value => @metric_configuration.weight %>
+  </p>
+
+  <p>
+    <%= f.submit "Save" %>
+  </p>
+<% end %>
@@ -0,0 +1,15 @@
+<p> 
+  <b>Collector Name:</b> <%= @metric.origin %>
+</p>
+<p> 
+  <b>Metric Name:</b> <%= @metric.name %>
+</p>
+<p>
+  <b>Code:</b> <%= @metric_configuration.code %>
+</p>
+<p>
+  <b>Aggregation Form:</b> <%= @metric_configuration.aggregation_form %>
+</p>
+<p>
+ <b>Weight:</b> <%= @metric_configuration.weight %>
+</p>
 <% @configuration_content = @page
 @kalibro_configuration = @page.kalibro_configuration %>
+<% owner = (not user.nil?) && user.id == @profile.id %>
+
 <% unless @page.errors[:base].nil? %>
   <% if @page.errors[:base] =~ /There is no configuration named/ %>
     <h3>Warning:</h3>
-    <p>This Configuration doesn't exist on the Web Service. Do you want to <%= link_to 'delete', :action => 'destroy', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %> or <%= link_to 'save it again', :action => 'edit', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %>?</p>
+    <p>This Configuration doesn't exist on the Web Service.</p>
+    <% if owner %>
+      <p> Do you want to <%= link_to 'delete', :action => 'destroy', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %> or <%= link_to 'save it again', :action => 'edit', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %>?</p>
+    <% end %>
   <% else %>
     <%= @page.errors[:base] %>
   <% end %>
@@ -22,42 +27,44 @@
   <br/>
-  <%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_base_tool", 
+  <% if owner %>
+    <%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_base_tool", 
   																			:profile => @page.profile.identifier, 
-  																			:action => "choose_base_tool", 
+  																			:action => "choose_metric", 
   																			:id => @configuration_content.id %><br/>
+  <% end %>
   <table>
     <tr class="titles">
         <td><h5>Metric Name</h5></td>
         <td><h5>Collector Name</h5></td>
         <td><h5>Metric Code</h5></td>
-        <td/><td/>
+        <td/>
     </tr>
     <% @kalibro_configuration.metric_configurations.each do |metric_configuration| %>
       <tr class="metric">
-        <td><%= metric_configuration.metric.name %></td>
         <% if metric_configuration.metric.instance_of? Kalibro::NativeMetric %>
+        <td><%= link_to metric_configuration.metric.name, :controller => "mezuro_plugin_metric_configuration", :action => "edit_metric_configuration", 
+          						  :metric_name => metric_configuration.metric.name, :id => @configuration_content.id, 
+          						  :profile => @page.profile.identifier %></td>
           <td>
             <%= metric_configuration.metric.origin %>
           </td>
           <td><%= metric_configuration.code %></td>
-          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", :action => "edit_metric_configuration", 
-          						  :metric_name => metric_configuration.metric.name, :id => @configuration_content.id, 
-          						  :profile => @page.profile.identifier %></td>
         <% else %>
+          <td><%= link_to metric_configuration.metric.name, :controller => "mezuro_plugin_metric_configuration", 
+          						  :action => "edit_compound_metric_configuration", :metric_name => metric_configuration.metric.name, 
+          						  :id => @configuration_content.id, :profile => @page.profile.identifier %></td>
           <td>
             Compound Metric
           </td>
           <td><%= metric_configuration.code %></td>
-          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", 
-          						  :action => "edit_compound_metric_configuration", :metric_name => metric_configuration.metric.name, 
-          						  :id => @configuration_content.id, :profile => @page.profile.identifier %></td>
         <% end %>
-        
-        <td><%= link_to "Remove", :controller => "mezuro_plugin_metric_configuration", :action => "remove_metric_configuration", 
+        <% if owner %>
+          <td><%= link_to "Remove", :controller => "mezuro_plugin_metric_configuration", :action => "remove_metric_configuration", 
         						  :metric_name => metric_configuration.metric.name, :id => @configuration_content.id, 
         						  :profile => @page.profile.identifier %></td>
+        <% end %>
       </tr>
     <% end %>
   </table>
@@ -1,16 +0,0 @@
-<h2><%= @configuration_content.name%> Configuration</h2>
-
-<%= link_to "New Compound Metric", :controller => "mezuro_plugin_metric_configuration", :action => "new_compound_metric_configuration",
-								   :id => @configuration_content.id %>
-
-<h5>Base Tools:</h5>
-<table id="project_info">
-  <% @base_tools.each do |base_tool| %>
-    <tr>
-      <td>
-        <%= link_to base_tool, :controller => "mezuro_plugin_base_tool", :action => "choose_metric", :base_tool => base_tool,
-        					   :id => @configuration_content.id %>
-      </td>
-    </tr>
-  <% end %>
-</table>
-<h2><%= @configuration_content.name %> Configuration</h2>
+<h2><%= @configuration_content.name%> Configuration</h2>
-<table id="project_info">
-  <tr>
-    <h5>Metric Collector: <%= @base_tool %></h5>
-  </tr>
-  <tr>
-    <h5>Choose a metric to add:</h5>
-  </tr>
-  <% @supported_metrics.each do |metric| %>
-    <tr class="metric" title="<%= metric.name %>">
-      <td>
-        <%= link_to metric.name, :controller => "mezuro_plugin_metric_configuration", :action => "new_metric_configuration",
-        						 :metric_name => metric.name, :base_tool => @base_tool, :id => @configuration_content.id %>
-      </td>
-    </tr>
-  <% end %>
-</table>
+<%= link_to "New Compound Metric", :controller => "mezuro_plugin_metric_configuration", :action => "new_compound_metric_configuration",
+								   :id => @configuration_content.id %>
+
+<h5>Base Tools:</h5>
+<% @base_tools.each do |base_tool| %>
+  <h4><%= link_to base_tool.name, "#",  :onclick => "jQuery(\"\##{base_tool.name}\").toggle();"%></h4>
+  <hr/>
+
+  <div id="<%=base_tool.name%>" style="display:none">
+    <% base_tool.supported_metrics.each do |metric| %>
+      &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp<%= link_to metric.name, :controller => "mezuro_plugin_metric_configuration", :action => "new_metric_configuration",
+      				:metric_name => metric.name, :base_tool => base_tool.name, :id => @configuration_content.id %>
+      <hr size="1" width="93%"/>
+    <% end %>
+  </div>
+<% end %>
@@ -23,7 +23,7 @@
     </p>
     <p>
       <%= m.label :script, "Script:" %>
-      <%= m.text_area "script", :value => @metric.script %>
+      <%= m.text_area "script", :value => @metric.script, :rows => 5 %>
     </p>
   <% end %>
   <p>
@@ -4,54 +4,14 @@
 <h2><%= @configuration_content.name %> Configuration</h2>
-<% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
-  <%= hidden_field_tag :id, @configuration_content.id %>
-  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
-  
-  <% f.fields_for :metric do |m| %>
-  
-    <% @metric.language.each do |language| %>
-      <%= m.hidden_field :language, :multiple => true, :value => language %>
-    <% end %>
-    
-    <%= m.hidden_field "scope", :value => @metric.scope %>
-    <p>
-      <%= m.label :origin, "Collector Name:" %>
-      <%= @metric.origin %>
-      <%= m.hidden_field "origin", :value => @metric.origin %>
-    </p>
-    <p>
-      <%= m.label :metric_name, "Metric Name:" %>
-      <%= @metric.name %>
-      <%= m.hidden_field "name", :value => @metric.name %>
-    </p>
-    <!--<p>-->    
-      <% m.label :description, "Description:" %>
-      <% @metric.description %>
-      <% m.hidden_field "description", :value => @metric.description %>
-    <!--</p>-->
-  <% end %>
-  <p>
-    <%= f.label :code, "Code:" %>
-    <%= @metric_configuration.code %>
-    <%= f.hidden_field "code", :value => @metric_configuration.code %>
-  </p>
-  <p>
-    <%= 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>
-  <p>
-    <%= f.label :weight, "Weight:" %>
-    <%= f.text_field "weight", :value => @metric_configuration.weight %>
-  </p>
+<% owner = (not user.nil?) && user.id == @profile.id %>
-  <p>
-    <%= f.submit "Save" %>
-  </p>
+<% if owner %>
+  <%=  render :partial => "content_viewer/metric_configuration_form" %>
+<% else %>
+  <%=  render :partial => "content_viewer/metric_configuration_view" %>
 <% end %>
-
 <h5> Ranges </h5><br/>
 <table id="ranges">
@@ -83,6 +43,8 @@
 </table>
 <br/>
-<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric.name} %>
+<% if owner %>
+  <%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric.name} %>
+<% end %>
 <div id="range_form" style="display:none"></div>
@@ -20,7 +20,7 @@
     </p>
     <p>
       <%= m.label :script, "Script:" %>
-      <%= m.text_area "script" %>
+      <%= m.text_area "script", :rows => 5 %>
     </p>
   <% end %>
   <p>
 <% unless @content.errors[:base].nil? %>
   <%= @content.errors[:base] %>
 <% else %>
-  <p> Choose a date to see specific project results: </p>
-  <div id="datepicker" data-date="<%= @project_result.date %>">
-    <input id="datepicker_field" style="display:none"/> 
-  </div>
-   
+  <div id="current_project_date" data-date="<%= @project_result.date %>"/>
+
   <h4><%= _('Last Result') %></h4>
   <table>
@@ -21,19 +18,24 @@
       <td><%= _('Analysis time') %></td>
       <td><%= @project_result.formatted_analysis_time %></td>
     </tr>
+    <tr>
+      <td>Click to choose specific date:</td>
+      <td><%= link_to(image_tag('/images/calendar_date_select/calendar.png', :width => 20, :height => 20, :onClick => "$( 'datepicker' ).toggle();"), "javascript:void(0)") %></td>
+    </tr>
   </table>
-  
-  
+
+  <div id="datepicker"></div>
+
   <script>
-	  jQuery(document).ready(function($) {
-  	  $("#datepicker").datepicker({ altField: '#datepicker_field', showOn: 'button', dateFormat: "yy-mm-dd",
-  	  															buttonImageOnly: true, buttonImage: '/images/calendar_date_select/calendar.png',
-  	  															onSelect: function(dateText, inst) {
-  	  															reloadProjectWithDate(dateText) } });
-  	  var date = jQuery("#datepicker").attr('data-date').substr(0,10);
-	    $("#datepicker").datepicker( "setDate" , date );
-	    
-		});
+    jQuery(document).ready(function($) {
+      $("#datepicker").datepicker({
+  	  								onSelect: function(dateText, inst) {
+  	  									reloadProjectWithDate(dateText) } });
+      $("#datepicker").toggle();
+      var date = jQuery("#current_project_date").attr('data-date').substr(0,10);
+	  $("#datepicker").datepicker( "setDate" , date );
+
+    });
   </script>
-  
+
 <% end %>
@@ -12,6 +12,13 @@
     <%=range.grade%>
   </td>
   <td bgcolor="#<%= range.color[2..-1] %>"></td>
-  <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning} %></td>
-    <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning %></td>
+  <% if (not user.nil?) && user.id == @profile.id %>
+  <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning} %>
+  </td>
+    <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning %>
+    </td>
+  <% else %>
+    <td></td>
+    <td></td>
+  <% end %>
 </tr>
@@ -14,7 +14,7 @@
       <%= f.label :beginning, "(*) Beginning:" %>
     </td>
     <td>
-      <%= f.text_field :beginning, :value => @range.beginning %>
+      <%= f.text_field :beginning, :value => @range.beginning , :id => 'beginning' %>&nbsp;<%= link_to('-&#8734', 'javascript:void(0)', :onClick => "jQuery( '#beginning' ).val('-INF');") %>
     </td>
   </tr>
   <tr>
@@ -22,7 +22,7 @@
       <%= f.label :end, "(*) End:" %>
     </td>
     <td>
-      <%= f.text_field :end, :value => @range.end %>
+      <%= f.text_field :end, :value => @range.end, :id => "end" %>&nbsp;<%= link_to('+&#8734', 'javascript:void(0)', :onClick => "jQuery( '#end' ).val('+INF');") %>
     </td>
   </tr>
   <tr>
@@ -46,7 +46,7 @@
       <%= f.label :comments, "Comments:" %>
     </td>
     <td>
-      <%= f.text_field :comments %>
+      <%= f.text_area :comments, :rows => 3 %>
     </td>
   </tr>
 </table>
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-http://valinhos.ime.usp.br:50688/KalibroService/
2	\ No newline at end of file	0	\ No newline at end of file
	@@ -88,7 +88,7 @@ class Kalibro::Model		@@ -88,7 +88,7 @@ class Kalibro::Model
88	end	88	end
89		89
90	def self.client(endpoint)	90	def self.client(endpoint)
91	- service_address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yaml")	91	+ service_address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yml")
92	Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")	92	Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")
93	end	93	end
94		94
	@@ -7,7 +7,7 @@ class MezuroPlugin::ConfigurationContent < Article		@@ -7,7 +7,7 @@ class MezuroPlugin::ConfigurationContent < Article
7	after_destroy :remove_kalibro_configuration_from_service	7	after_destroy :remove_kalibro_configuration_from_service
8		8
9	def self.short_description	9	def self.short_description
10	- 'Kalibro configuration'	10	+ 'Mezuro configuration'
11	end	11	end
12		12
13	def self.description	13	def self.description
	@@ -11,7 +11,7 @@ class MezuroPlugin::Helpers::ContentViewerHelper		@@ -11,7 +11,7 @@ class MezuroPlugin::Helpers::ContentViewerHelper
11	end	11	end
12		12
13	def self.create_license_options	13	def self.create_license_options
14	- options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yaml")	14	+ options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yml")
15	options = options.split(";")	15	options = options.split(";")
16	formated_options = []	16	formated_options = []
17	options.each { \|option\| formated_options << [option, option] }	17	options.each { \|option\| formated_options << [option, option] }
	@@ -50,7 +50,7 @@ class MezuroPlugin::Helpers::ContentViewerHelper		@@ -50,7 +50,7 @@ class MezuroPlugin::Helpers::ContentViewerHelper
50	end	50	end
51		51
52	def self.get_license_option(selected)	52	def self.get_license_option(selected)
53	- options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yaml")	53	+ options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yml")
54	options.split(";")	54	options.split(";")
55	selected_option = options.find { \|license\| license == selected }	55	selected_option = options.find { \|license\| license == selected }
56	end	56	end
	@@ -7,7 +7,7 @@ class MezuroPlugin::ProjectContent < Article		@@ -7,7 +7,7 @@ class MezuroPlugin::ProjectContent < Article
7	validate_on_create :validate_repository_url	7	validate_on_create :validate_repository_url
8		8
9	def self.short_description	9	def self.short_description
10	- 'Kalibro project'	10	+ 'Mezuro project'
11	end	11	end
12		12
13	def self.description	13	def self.description
	@@ -1,69 +0,0 @@	@@ -1,69 +0,0 @@
1	-Academic Free License 3.0 (AFL-3.0);
2	-Affero GNU Public License (AGPL-3.0);
3	-Adaptive Public License (APL-1.0);
4	-Apache License 2.0 (Apache-2.0);
5	-Apple Public Source License (APSL-2.0);
6	-Artistic license 2.0 (Artistic-2.0);
7	-Attribution Assurance Licenses (AAL);
8	-BSD 3-Clause "New" or "Revised" License (BSD-3-Clause);
9	-BSD 2-Clause "Simplified" or "FreeBSD" License (BSD-2-Clause);
10	-Boost Software License (BSL-1.0);
11	-Computer Associates Trusted Open Source License 1.1 (CATOSL-1.1);
12	-Common Development and Distribution License 1.0 (CDDL-1.0);
13	-Common Public Attribution License 1.0 (CPAL-1.0);
14	-CUA Office Public License Version 1.0 (CUA-OPL-1.0);
15	-EU DataGrid Software License (EUDatagrid);
16	-Eclipse Public License 1.0 (EPL-1.0);
17	-Educational Community License, Version 2.0 (ECL-2.0);
18	-Eiffel Forum License V2.0 (EFL-2.0);
19	-Entessa Public License (Entessa);
20	-European Union Public License, Version 1.1 (EUPL-1.1);
21	-Fair License (FAIR);
22	-Frameworx License (Frameworx-1.0);
23	-GNU Affero General Public License v3 (AGPL-3.0);
24	-GNU General Public License version 2.0 (GPL-2.0);
25	-GNU General Public License version 3.0 (GPL-3.0);
26	-GNU Library or "Lesser" General Public License version 2.1 (LGPL-2.1);
27	-GNU Library or "Lesser" General Public License version 3.0 (LGPL-3.0);
28	-Historical Permission Notice and Disclaimer (HPND);
29	-IBM Public License 1.0 (IPL-1.0);
30	-IPA Font License (IPA);
31	-ISC License (ISC);
32	-LaTeX Project Public License 1.3c (LPPL-1.3c);
33	-Lucent Public License Version 1.02 (LPL-1.02);
34	-MirOS Licence (MirOS);
35	-Microsoft Public License (Ms-PL);
36	-Microsoft Reciprocal License (Ms-RL);
37	-MIT license (MIT);
38	-Motosoto License (Motosoto);
39	-Mozilla Public License 2.0 (MPL-2.0);
40	-Multics License (Multics);
41	-NASA Open Source Agreement 1.3 (NASA 1.3);
42	-NTP License (NTP);
43	-Naumen Public License (Naumen);
44	-Nethack General Public License (NGPL);
45	-Nokia Open Source License (Nokia);
46	-Non-Profit Open Software License 3.0 (NPOSL-3.0);
47	-OCLC Research Public License 2.0 (OCLC-2.0);
48	-Open Font License 1.1 (OFL 1.1);
49	-Open Group Test Suite License (OGTSL);
50	-Open Software License 3.0 (OSL-3.0);
51	-PHP License 3.0 (PHP-3.0);
52	-The PostgreSQL License (PostgreSQL);
53	-Python License (Python-2.0);
54	-CNRI Python license (CNRI-Python);
55	-Q Public License (QPL-1.0);
56	-RealNetworks Public Source License V1.0 (RPSL-1.0);
57	-Reciprocal Public License 1.5 (RPL-1.5);
58	-Ricoh Source Code Public License (RSCPL);
59	-Simple Public License 2.0 (SimPL-2.0);
60	-Sleepycat License (Sleepycat);
61	-Sun Public License 1.0 (SPL-1.0);
62	-Sybase Open Watcom Public License 1.0 (Watcom-1.0);
63	-University of Illinois/NCSA Open Source License (NCSA);
64	-Vovida Software License v. 1.0 (VSL-1.0);
65	-W3C License (W3C);
66	-wxWindows Library License (WXwindows);
67	-X.Net License (Xnet);
68	-Zope Public License 2.0 (ZPL-2.0);
69	-zlib/libpng license (Zlib);
@@ -0,0 +1,69 @@		@@ -0,0 +1,69 @@
	1	+Academic Free License 3.0 (AFL-3.0);
	2	+Affero GNU Public License (AGPL-3.0);
	3	+Adaptive Public License (APL-1.0);
	4	+Apache License 2.0 (Apache-2.0);
	5	+Apple Public Source License (APSL-2.0);
	6	+Artistic license 2.0 (Artistic-2.0);
	7	+Attribution Assurance Licenses (AAL);
	8	+BSD 3-Clause "New" or "Revised" License (BSD-3-Clause);
	9	+BSD 2-Clause "Simplified" or "FreeBSD" License (BSD-2-Clause);
	10	+Boost Software License (BSL-1.0);
	11	+Computer Associates Trusted Open Source License 1.1 (CATOSL-1.1);
	12	+Common Development and Distribution License 1.0 (CDDL-1.0);
	13	+Common Public Attribution License 1.0 (CPAL-1.0);
	14	+CUA Office Public License Version 1.0 (CUA-OPL-1.0);
	15	+EU DataGrid Software License (EUDatagrid);
	16	+Eclipse Public License 1.0 (EPL-1.0);
	17	+Educational Community License, Version 2.0 (ECL-2.0);
	18	+Eiffel Forum License V2.0 (EFL-2.0);
	19	+Entessa Public License (Entessa);
	20	+European Union Public License, Version 1.1 (EUPL-1.1);
	21	+Fair License (FAIR);
	22	+Frameworx License (Frameworx-1.0);
	23	+GNU Affero General Public License v3 (AGPL-3.0);
	24	+GNU General Public License version 2.0 (GPL-2.0);
	25	+GNU General Public License version 3.0 (GPL-3.0);
	26	+GNU Library or "Lesser" General Public License version 2.1 (LGPL-2.1);
	27	+GNU Library or "Lesser" General Public License version 3.0 (LGPL-3.0);
	28	+Historical Permission Notice and Disclaimer (HPND);
	29	+IBM Public License 1.0 (IPL-1.0);
	30	+IPA Font License (IPA);
	31	+ISC License (ISC);
	32	+LaTeX Project Public License 1.3c (LPPL-1.3c);
	33	+Lucent Public License Version 1.02 (LPL-1.02);
	34	+MirOS Licence (MirOS);
	35	+Microsoft Public License (Ms-PL);
	36	+Microsoft Reciprocal License (Ms-RL);
	37	+MIT license (MIT);
	38	+Motosoto License (Motosoto);
	39	+Mozilla Public License 2.0 (MPL-2.0);
	40	+Multics License (Multics);
	41	+NASA Open Source Agreement 1.3 (NASA 1.3);
	42	+NTP License (NTP);
	43	+Naumen Public License (Naumen);
	44	+Nethack General Public License (NGPL);
	45	+Nokia Open Source License (Nokia);
	46	+Non-Profit Open Software License 3.0 (NPOSL-3.0);
	47	+OCLC Research Public License 2.0 (OCLC-2.0);
	48	+Open Font License 1.1 (OFL 1.1);
	49	+Open Group Test Suite License (OGTSL);
	50	+Open Software License 3.0 (OSL-3.0);
	51	+PHP License 3.0 (PHP-3.0);
	52	+The PostgreSQL License (PostgreSQL);
	53	+Python License (Python-2.0);
	54	+CNRI Python license (CNRI-Python);
	55	+Q Public License (QPL-1.0);
	56	+RealNetworks Public Source License V1.0 (RPSL-1.0);
	57	+Reciprocal Public License 1.5 (RPL-1.5);
	58	+Ricoh Source Code Public License (RSCPL);
	59	+Simple Public License 2.0 (SimPL-2.0);
	60	+Sleepycat License (Sleepycat);
	61	+Sun Public License 1.0 (SPL-1.0);
	62	+Sybase Open Watcom Public License 1.0 (Watcom-1.0);
	63	+University of Illinois/NCSA Open Source License (NCSA);
	64	+Vovida Software License v. 1.0 (VSL-1.0);
	65	+W3C License (W3C);
	66	+wxWindows Library License (WXwindows);
	67	+X.Net License (Xnet);
	68	+Zope Public License 2.0 (ZPL-2.0);
	69	+zlib/libpng license (Zlib);
	@@ -30,3 +30,8 @@ a:link,active,visited .ancestor{		@@ -30,3 +30,8 @@ a:link,active,visited .ancestor{
30	font-style: underline;	30	font-style: underline;
31	display: inline;	31	display: inline;
32	}	32	}
		33	+
		34	+.controller-profile_editor a.control-panel-mezuro,
		35	+ .controller-profile_editor .msie6 a.control-panel-mezuro {
		36	+ background-image: url(icons/mezuro.png)
		37	+}
	@@ -1,2 +0,0 @@	@@ -1,2 +0,0 @@
1	-http://localhost:8080/KalibroService/
2	-# http://valinhos.ime.usp.br:50688/KalibroService/
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+http://localhost:8080/KalibroService/