SONAR-4761 Use modal windows in Manual metrics pages

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb
index 3583ed33f4513082f66de0c00b3771a32b2f6f95..a3c70485396022eef1f3993a1bd8f98975778cd3 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb
@@ -25,7 +25,7 @@ class MetricsController < ApplicationController
 
   def index
     prepare_metrics_and_domains
-    
+
     if params['id']
       @metric=Metric.find(params['id'].to_i)
       params['domain']=@metric.domain(false)
@@ -36,7 +36,7 @@ class MetricsController < ApplicationController
   end
 
  def create_form
-    prepare_metrics_and_domains
+   prepare_metrics_and_domains
 
     if params['id']
       @metric=Metric.find(params['id'].to_i)
@@ -111,7 +111,7 @@ class MetricsController < ApplicationController
       @domains = metric.domain
       render :partial => 'metrics/create_form', :status => 400
     else
-      redirect_to :action => 'index', :domain => metric.domain(false)
+      render :text => 'ok', :status => 200
     end
   end
 
@@ -128,7 +128,6 @@ class MetricsController < ApplicationController
     redirect_to :action => 'index', :domain => metric.domain(false)
   end
 
-
   def delete_from_web
     metric = Metric.by_id(params[:id].to_i) if params[:id] && params[:id].size > 0
     if metric

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb
index 9343c7a4ba5c6d23db420d00117c1a7772b44774..a7519083d02fb321b352b91d7c7758d8b7026d07 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb
@@ -12,11 +12,11 @@
         <label for="user[login]">Name <em class="mandatory">*</em></label><%= f.text_field :short_name %><br/>
       </div>
       <div class="modal-field">
-        <label for="user[login]"> Description</label><%= f.text_area :description, :size => 40, :cols => 25, :rows => 2 %><br/>
+        <label for="user[login]"> Description</label><%= f.text_area :description, :size => 40, :cols => 50, :rows => 2 %><br/>
       </div>
       <div class="modal-field">
         <label for="user[login]">Domain</label><%= f.select( :domain, @domains, :include_blank => true) %>
-        <span class="desc">or</span> <input id="newdomain" name="newdomain" size="15" type="text"><br/><br/>
+        <span class="desc">or</span> <input id="newdomain" name="newdomain" size="15" type="text"><br/>
       </div>
       <div class="modal-field">
         <label for="user[login]">Type</label><%= f.select( :val_type, Metric.value_type_names.invert) %><br/>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_edit_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_edit_form.html.erb
index 5bb510b6d9f7e82d52c239096a9a138b5271bb42..b6fd6cdca3310f699f3e2caf080c4e9eb7ddd3a8 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_edit_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_edit_form.html.erb
@@ -12,11 +12,11 @@
               <label for="user[login]">Name <em class="mandatory">*</em></label><%= f.text_field :short_name %><br/>
           </div>
           <div class="modal-field">
-              <label for="user[login]"> Description</label><%= f.text_area :description, :size => 40, :cols => 25, :rows => 2 %><br/>
+              <label for="user[login]"> Description</label><%= f.text_area :description, :size => 40, :cols => 50, :rows => 2 %><br/>
           </div>
           <div class="modal-field">
               <label for="user[login]">Domain</label><%= f.select( :domain, @domains, :include_blank => true) %>
-              <span class="desc">or</span> <input id="newdomain" name="newdomain" size="15" type="text"><br/><br/>
+              <span class="desc">or</span> <input id="newdomain" name="newdomain" size="15" type="text"><br/>
           </div>
           <div class="modal-field">
               <label for="user[login]">Type</label><%= f.select( :val_type, Metric.value_type_names.invert) %><br/>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
index b94bdf07c8efdde5f13179ecffee40f279e13023..d4320791ab198fbc2fb8eba57bb6e9f08f0ad43e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
@@ -33,7 +33,7 @@
             <td class="left" id="metric_type_name<%= metric.key -%>"><%= metric.value_type_name -%></td>
             <td class="right thin nowrap">
             <% if is_admin? %>
-             <a id="create-link-metric" href="<%=ApplicationController.root_context-%>/metrics/edit_form/<%= metric.id -%>" id="edit_<%= h(metric.short_name)-%>" class="open-modal link-action">Edit</a>
+             <a id="edit_<%= h(metric.short_name)-%>" href="<%=ApplicationController.root_context-%>/metrics/edit_form/<%= metric.id -%>" id="edit_<%= h(metric.short_name)-%>" class="open-modal link-action">Edit</a>
               &nbsp;
               <%= link_to_action message('delete'), "#{ApplicationController.root_context}/metrics/delete_from_web/#{metric.id}",
                                  :class => 'link-action link-red',