From 9a4fbc1ef8507856ad24ca7218d1819a27dd2b1d Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sat, 22 Sep 2012 00:44:30 +0200 Subject: [PATCH] SONAR-3623 support confirmation popups --- .../app/controllers/confirm_controller.rb | 27 ++ .../app/controllers/profiles_controller.rb | 3 +- .../WEB-INF/app/helpers/application_helper.rb | 25 ++ .../app/views/confirm/_confirm.html.erb | 16 ++ .../dashboard/_widget_definitions.html.erb | 2 +- .../WEB-INF/app/views/layouts/_head.html.erb | 4 +- .../app/views/profiles/_rename_form.html.erb | 24 +- .../WEB-INF/app/views/profiles/index.html.erb | 238 +++++++++--------- .../main/webapp/javascripts/application.js | 15 +- .../src/main/webapp/stylesheets/style.css | 20 +- 10 files changed, 221 insertions(+), 153 deletions(-) create mode 100644 sonar-server/src/main/webapp/WEB-INF/app/controllers/confirm_controller.rb create mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/confirm/_confirm.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/confirm_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/confirm_controller.rb new file mode 100644 index 00000000000..b7152864157 --- /dev/null +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/confirm_controller.rb @@ -0,0 +1,27 @@ +# +# Sonar, entreprise quality control tool. +# Copyright (C) 2008-2012 SonarSource +# mailto:contact AT sonarsource DOT com +# +# Sonar is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 3 of the License, or (at your option) any later version. +# +# Sonar is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with Sonar; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 +# +class ConfirmController < ApplicationController + + # GET /confirm?url=&[t= 'confirm/confirm' + end + +end \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb index f4dce0e9777..8cde294ce38 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb @@ -24,7 +24,7 @@ class ProfilesController < ApplicationController verify :method => :post, :only => ['create', 'delete', 'copy', 'set_as_default', 'restore', 'set_projects', 'rename', 'change_parent'], :redirect_to => { :action => 'index' } # the backup action is allow to non-admin users : see http://jira.codehaus.org/browse/SONAR-2039 - before_filter :admin_required, :only => ['create', 'delete', 'set_as_default', 'copy', 'restore', 'change_parent', 'set_projects', 'rename'] + before_filter :admin_required, :only => ['create', 'delete', 'set_as_default', 'copy', 'restore', 'change_parent', 'set_projects', 'rename_form', 'rename'] # # @@ -95,7 +95,6 @@ class ProfilesController < ApplicationController @profile = Profile.find(params[:id]) if @profile && @profile.deletable? java_facade.deleteProfile(@profile.id) - flash[:notice]=message('quality_profiles.profile_x_deleted', :params => @profile.name) end redirect_to(:controller => 'profiles', :action => 'index') end 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 6113d09b376..fd50d5d2c1e 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 @@ -719,4 +719,29 @@ module ApplicationHelper js = "$j('##{html_id}').select2({#{js_options.map{|k,v| "#{k}:#{v}"}.join(',')}});" "#{html}" end + + # + # Creates a button linked to a POST action. A confirmation popup is opened when user clicks on the button. + # ==== Options + # * :id - HTML ID of the button + # * :class - Additional CSS class, generally 'red-button' for deletions + # * :message_key - + # * :message_params - + # * :width - width in pixels + # + def button_to_action(label, post_url, options={}) + clazz = options[:class] + id = "id='#{options[:id]}'" if options[:id] + message_key = options[:message_key] + message_params = options[:message_params] + width = options[:width]||450 + + url = "#{ApplicationController.root_context}/confirm?url=#{u post_url}" + if message_key + url += "&k=#{message_key}&" + url += message_params.map{|p| "p=#{p}"}.join('&') if message_params + end + + "#{label}" + end end diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/confirm/_confirm.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/confirm/_confirm.html.erb new file mode 100644 index 00000000000..241ce2d0d4f --- /dev/null +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/confirm/_confirm.html.erb @@ -0,0 +1,16 @@ +<% + message_key = params[:k] || 'are_you_sure' + message_params = params[:p] || [] +%> +
+
+
+ + <%= message(message_key, :params => message_params) -%> +
+
+ + <%= message('cancel') -%> +
+
+
\ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb index af498ab13a9..152208a55ed 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb @@ -16,7 +16,7 @@ Search: - + diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb index 8ef39b808f0..e64ca8eab87 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb @@ -55,7 +55,9 @@ <% end %> + var $j = jQuery.noConflict(); + $j(document).ready(function () {$j('.open-modal').modal()}); + <%= yield :script -%> \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb index d024b747940..4364287eff6 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb @@ -1,17 +1,23 @@ -

Rename Profile: <%= h @profile.name -%>

+
- <% if @error %> -

<%= h @error -%>

- <% end %> +
+

Rename Profile: <%= h @profile.name -%>

+
+
+ <% if @error %> +
+

<%= h @error -%>

+
+ <% end %> -
-
- - +
+ + +
-
+
<%= message('cancel') -%>
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 b69715c0791..3be4a3463c8 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 @@ -1,24 +1,24 @@
-<% if administrator? %> - -<% end %> + <% if administrator? %> + + <% end %>

<%= message('quality_profiles.page') -%>

<% if administrator? %> - + - + @@ -34,134 +34,130 @@ <% - languages.sort{|x,y| x.getName() <=> y.getName()}.each do |language| - importers=controller.java_facade.getProfileImportersForLanguage(language.getKey()) + languages.sort { |x, y| x.getName() <=> y.getName() }.each do |language| + importers=controller.java_facade.getProfileImportersForLanguage(language.getKey()) %> -
- <% if administrator? %> - - <% end %> -

<%= message('quality_profiles.x_language_profiles', :params => language.getName()) -%>

-
+
+ <% if administrator? %> + + <% end %> +

<%= message('quality_profiles.x_language_profiles', :params => language.getName()) -%>

+
-<% if administrator? %> - - -
<%= message('backup_verb') -%>: <%= message('backup_verb') -%>: <%= file_field_tag 'backup' %>
- - - - - <% importers.to_a.sort{|x,y| x.getName() <=> y.getName()}.each do |importer| %> - - - - - <% end %> + <% if administrator? %> + + +
<%= message('name') -%>:
<%= importer.getName() -%>: - <%= file_field_tag "backup[#{importer.getKey()}]" %> - <%= message('quality_profiles.optional_configuration_file') -%> -
+ + + + + <% importers.to_a.sort { |x, y| x.getName() <=> y.getName() }.each do |importer| %> + + + + + <% end %> - - - -
<%= message('name') -%>:
<%= importer.getName() -%>: + <%= file_field_tag "backup[#{importer.getKey()}]" %> + <%= message('quality_profiles.optional_configuration_file') -%> +
- - <%= message('cancel') -%> -
- -<% end %> + + + + <%= message('cancel') -%> + + + + + <% end %> - +
- - - - - - - <% if administrator? %> + + + + + + + <% if administrator? %> - <% end %> - + <% end %> + - <% @profiles.select{|p| p.language==language.getKey()}.each do |profile| %> - - - - - - - - - - + <% @profiles.select { |p| p.language==language.getKey() }.each do |profile| %> + + + - <% if administrator? %> + - - + + + + + - - <% end %> - + <%= button_to_action message('delete'), "profiles/delete/#{profile.id}", + :class => 'red-button', + :id => "delete_#{profile.key.parameterize}", + :message_key => 'quality_profiles.are_you_sure_want_delete_profile_x', + :message_params => [profile.name] + -%> + <% end %> + + <% end %> + <% end %> -
<%= message('name') -%><%= message('rules') -%><%= message('alerts') -%><%= message('projects') -%><%= message('default') -%>
<%= message('name') -%><%= message('rules') -%><%= message('alerts') -%><%= message('projects') -%><%= message('default') -%><%= message('operations') -%>
<%= h profile.name %> - <%= profile.count_active_rules -%> - <%= profile.alerts.size -%> - <% unless profile.default_profile? %> - <%= profile.projects.size -%> - <% end %> - - <% 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 %> - <% end %> - <% if profile.default_profile? %> - <%= image_tag 'tick.png', :id => "is_active_#{u profile.key}" %> - <% end %> -
+ <%= h profile.name %> + + <%= profile.count_active_rules -%> + <%= profile.alerts.size -%> - <% if !profile.provided? %> - <% form_tag(:action => 'backup', :id => profile.id) do -%> - - <% end - end %> + + <% unless profile.default_profile? %> + <%= profile.projects.size -%> + <% end %> - <% if !profile.provided? %> - <%= message('rename') -%> + <% 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 %> + <% end %> + <% if profile.default_profile? %> + <%= image_tag 'tick.png', :id => "is_active_#{u profile.key}" %> <% end %> - <% form_tag(:action => 'copy', :id => profile.id) do -%> + + <% if administrator? %> + + + <% if !profile.provided? %> + <% form_tag(:action => 'backup', :id => profile.id) do -%> + + <% end + end %> + + <% if !profile.provided? %> + <%= message('rename') -%> + <% end %> + + <% form_tag(:action => 'copy', :id => profile.id) do -%> <%= hidden_field_tag 'copy_' + profile.id.to_s %> "); if (name!=null) {$("copy_<%= profile.id %>").value=name; submit();} else {return false;}'> <% end %> - + <% if profile.deletable? %> - <%= button_to message('delete'), { :action => 'delete', :id => profile.id }, :class => 'action red-button', - :id => "delete_#{u profile.key}", - :confirm => message('quality_profiles.are_you_sure_want_delete_profile_x', :params => profile.name), - :method => :post %> - <% end %> -
-

-<% end %> - -<% content_for :script do %> - -<% end %> + +

+<% end %> \ No newline at end of file diff --git a/sonar-server/src/main/webapp/javascripts/application.js b/sonar-server/src/main/webapp/javascripts/application.js index 5fcbff6a86f..50ae86c1269 100644 --- a/sonar-server/src/main/webapp/javascripts/application.js +++ b/sonar-server/src/main/webapp/javascripts/application.js @@ -261,32 +261,24 @@ Treemap.prototype.onLoaded = function (componentsSize) { (function ($j) { $j.fn.extend({ - modal:function (options) { - var defaults = { - width:540, - urlAttr:'href' - }; - var options = $j.extend(defaults, options); - + modal:function () { return this.each(function () { - var o = options; var obj = $j(this); var $link = obj.bind('click', function () { if ($j('#modal').length) { return; // another window is already opening } var $dialog = $j('').appendTo('body'); - $j.get($link.attr(o.urlAttr), {}, function (html) { + $j.get($link.attr('href'), {}, function (html) { $dialog.html(html); $dialog .dialog({ - width:o.width, + width:($link.attr('modal-width')||540), draggable:false, autoOpen:false, modal:true, minHeight: 50, resizable:false, - dialogClass:o.dialogClass, close: function() { $j('#modal').remove(); } @@ -294,7 +286,6 @@ Treemap.prototype.onLoaded = function (componentsSize) { $dialog.dialog("open"); }); - $link.click(function () { $dialog.dialog('open'); return false; diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css index 565a81f3bfb..5d9dfa29c0c 100644 --- a/sonar-server/src/main/webapp/stylesheets/style.css +++ b/sonar-server/src/main/webapp/stylesheets/style.css @@ -2347,13 +2347,17 @@ select.medium-width { //vertical-align: baseline; } -.modal-title { - border-bottom: 1px solid #ccc; - padding: 0.5em; +.form-head { + padding: 0 10px; background-color: #EFEFEF; + line-height: 30px; + height: 30px; +} +.form-body { + border-top: 1px solid #ccc; } .form-field { - padding: 5px; + padding: 5px 10px; } .form-field label:before { content: ""; @@ -2366,12 +2370,14 @@ select.medium-width { line-height: 1; padding: 5px 5px 0 0; } -.form-footer { +.form-foot { text-align: right; - padding: 4px 10px; + padding: 0 10px; border-top: 1px solid #CCC; + line-height: 30px; + height: 30px; } -.form-footer input { +.form-foot input { margin-right: 10px; } input[type=text],input[type=password] { -- 2.39.5