From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Sun, 23 Sep 2012 09:36:45 +0000 (+0200)
Subject: SONAR-3623 improve confirmation popups
X-Git-Tag: 3.3~242
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=979787042b3377fc173ebc2e4739d907d2b2b1f6;p=sonarqube.git

SONAR-3623 improve confirmation popups
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index fd50d5d2c1e..dce4ccbea67 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -734,7 +734,7 @@ module ApplicationHelper
     id = "id='#{options[:id]}'" if options[:id]
     message_key = options[:message_key]
     message_params = options[:message_params]
-    width = options[:width]||450
+    width = options[:width]||500
 
     url = "#{ApplicationController.root_context}/confirm?url=#{u post_url}"
     if message_key
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
index 3be4a3463c8..f4bd608413a 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
@@ -109,11 +109,11 @@
         </td>
 
         <td align="right">
-          <% if (!profile.default_profile? && administrator?) %>
-            <%= button_to message('set_as_default'), {:action => 'set_as_default', :id => profile.id}, :class => 'action',
-                          :id => "activate_#{u profile.key}",
-                          :confirm => message('quality_profiles.are_you_sure_want_x_profile_as_default', :params => profile.name),
-                          :method => :post %>
+          <% if !profile.default_profile? && administrator? %>
+            <%= button_to_action message('set_as_default'), "profiles/set_as_default?id=#{profile.id}",
+                                               :id => "activate_#{profile.key.parameterize}",
+                                               :message_key => 'quality_profiles.are_you_sure_want_x_profile_as_default',
+                                               :message_params => [profile.name] -%>
           <% end %>
           <% if profile.default_profile? %>
             <%= image_tag 'tick.png', :id => "is_active_#{u profile.key}" %>
diff --git a/sonar-server/src/main/webapp/stylesheets/dashboard.css b/sonar-server/src/main/webapp/stylesheets/dashboard.css
index b548d9fc502..a2574a2fdf8 100644
--- a/sonar-server/src/main/webapp/stylesheets/dashboard.css
+++ b/sonar-server/src/main/webapp/stylesheets/dashboard.css
@@ -45,7 +45,7 @@
 
 #dashboard .widget-title {
   background-color: #4B9FD5;
-  color: #EFEFEF;
+  color: #FEFEFE;
   padding: 3px 0 3px 5px;
   height: 16px;
   line-height: 16px;
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index e6d756bd433..3400d8de54e 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -2049,13 +2049,6 @@ div.break30 {
   width: 100%;
 }
 
-textarea.width100 {
-  width: 100%;
-  -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-  -moz-box-sizing: border-box; /* Firefox, other Gecko */
-  box-sizing: border-box; /* Opera/IE 8+ */
-}
-
 ul.horizontal {
   list-style-type: none;
 }
@@ -2187,6 +2180,7 @@ table.nowrap td, td.nowrap, th.nowrap {
   text-align: left;
   white-space: normal;
 }
+
 .form-val-cell li {
   margin-bottom: 5px;
 }
@@ -2345,7 +2339,7 @@ select.medium-width {
 }
 
 #dependencies .colbody > div > img {
-  //vertical-align: baseline;
+/ / vertical-align : baseline;
 }
 
 .form-head {
@@ -2354,15 +2348,19 @@ select.medium-width {
   line-height: 30px;
   height: 30px;
 }
+
 .form-body {
   border-top: 1px solid #ccc;
 }
+
 .form-field {
   padding: 5px 10px;
 }
+
 .form-field label:before {
   content: "";
 }
+
 .form-field label {
   display: block;
   text-align: right;
@@ -2371,6 +2369,7 @@ select.medium-width {
   line-height: 1;
   padding: 5px 5px 0 0;
 }
+
 .form-foot {
   text-align: right;
   padding: 0 10px;
@@ -2378,11 +2377,25 @@ select.medium-width {
   line-height: 30px;
   height: 30px;
 }
+
 .form-foot input {
   margin-right: 10px;
 }
-input[type=text],input[type=password],input[type=file] {
+
+input[type=text], input[type=password]{
   height: 18px;
   padding: 0 3px;
   color: #444;
 }
+
+textarea {
+  padding: 3px;
+}
+
+textarea.width100 {
+  width: 100%;
+  -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
+  -moz-box-sizing: border-box; /* Firefox, other Gecko */
+  box-sizing: border-box; /* Opera/IE 8+ */
+}
+