[PATCH conductor] BZ-863465 username can contain only characters and numbers
by Tomas Hrcka
https://bugzilla.redhat.com/show_bug.cgi?id=863465
---
src/app/models/user.rb | 1 +
src/config/locales/en.yml | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/app/models/user.rb b/src/app/models/user.rb
index 5db8e95..e4b7854 100644
--- a/src/app/models/user.rb
+++ b/src/app/models/user.rb
@@ -84,6 +84,7 @@ class User < ActiveRecord::Base
validates_length_of :last_name, :maximum => 255, :allow_blank => true
validates_uniqueness_of :username
validates_length_of :username, :within => 1..100, :allow_blank => false
+ validates_format_of :username, :with => /[a-z0-9A-Z]/, :message => I18n.t("users.flash.warning.invalid_username")
validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :unless => Proc.new {|u| u.email.nil?}
validates_confirmation_of :password, :if => Proc.new {|u| u.check_password?}
validates_length_of :password, :within => 4..255, :if => Proc.new {|u| u.check_password?}
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index e052f91..6b03cf5 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -100,6 +100,7 @@ en:
warning:
not_delete: 'Cannot delete: %{reason}'
not_delete_same_user: "Cannot delete %{username} : You are logged in as this user"
+ invalid_username: 'should use only letters and numbers.'
preset_filters:
all_users: "All Users"
name_starts_with_A: "Name starts with A"
--
1.7.11.4
11 years, 7 months
[PATCH 4/4] Unified buttons across the whole Conductor
by Jaromir Coufal
From: Jaromir Coufal <jcoufal(a)redhat.com>
- Orders
- Save/Cancel at each form
- Table headers unified (texts, orders, button types)
- Component detail headers (orders, types, etc.)
---
src/app/views/catalogs/_form.html.haml | 2 +-
src/app/views/catalogs/_list.html.haml | 4 ++--
src/app/views/catalogs/show.html.haml | 8 ++++----
src/app/views/deployables/_form.html.haml | 2 +-
src/app/views/deployables/_from_url.html.haml | 2 +-
src/app/views/deployables/_new_from_image.html.haml | 2 +-
src/app/views/deployables/_upload.html.haml | 2 +-
src/app/views/deployables/show.html.haml | 2 +-
src/app/views/deployments/_launch_new.html.haml | 2 +-
src/app/views/deployments/_list.html.haml | 2 +-
src/app/views/deployments/_overview.html.haml | 2 +-
src/app/views/deployments/launch_from_catalog.html.haml | 4 ++--
src/app/views/deployments/show.html.haml | 4 ++--
src/app/views/hardware_profiles/_form.html.haml | 5 +++--
src/app/views/hardware_profiles/_list.html.haml | 4 ++--
src/app/views/hardware_profiles/show.html.haml | 4 ++--
src/app/views/images/_list.html.haml | 4 ++--
src/app/views/images/_list_for_environment.html.haml | 4 ++--
src/app/views/images/_push_all_button.html.mustache | 2 +-
src/app/views/images/edit_xml.html.haml | 2 +-
src/app/views/images/import.html.haml | 1 +
src/app/views/images/new.html.haml | 4 ++--
src/app/views/images/overview.html.haml | 4 +++-
src/app/views/images/show.html.haml | 10 +++++-----
src/app/views/instances/_instance_card.html.mustache | 4 ++--
src/app/views/instances/show.html.haml | 2 +-
src/app/views/permissions/_form.html.haml | 2 +-
src/app/views/permissions/_objects.html.haml | 11 ++++++-----
src/app/views/permissions/_permissions.html.haml | 12 ++++++------
src/app/views/pool_families/_form.html.haml | 2 +-
src/app/views/pool_families/_list.html.haml | 13 +++++++------
src/app/views/pool_families/_provider_accounts.html.haml | 2 +-
src/app/views/pool_families/show.html.haml | 4 ++--
src/app/views/pools/_form.html.haml | 2 +-
src/app/views/pools/_list.html.haml | 2 +-
src/app/views/pools/show.html.haml | 4 ++--
src/app/views/provider_accounts/_list.html.haml | 4 ++--
src/app/views/provider_accounts/_provider_form.html.haml | 4 +---
src/app/views/provider_accounts/edit.html.haml | 2 +-
src/app/views/provider_accounts/new.html.haml | 3 ++-
src/app/views/provider_accounts/show.html.haml | 5 +++--
src/app/views/providers/_edit.html.haml | 7 +++----
src/app/views/providers/index.html.haml | 2 +-
src/app/views/providers/new.html.haml | 3 ++-
src/app/views/realms/_form.html.haml | 3 ++-
src/app/views/realms/_list.html.haml | 4 ++--
src/app/views/settings/index.html.haml | 2 +-
src/app/views/settings/self_service.html.haml | 6 +++---
src/app/views/user_groups/_form.html.haml | 3 ++-
src/app/views/user_groups/_list.html.haml | 4 ++--
src/app/views/user_groups/add_members.html.haml | 2 +-
src/app/views/user_groups/show.html.haml | 6 +++---
src/app/views/users/_form.html.haml | 4 ++--
src/app/views/users/_list.html.haml | 4 ++--
src/config/locales/en.yml | 2 +-
55 files changed, 110 insertions(+), 102 deletions(-)
diff --git a/src/app/views/catalogs/_form.html.haml b/src/app/views/catalogs/_form.html.haml
index 111569c..8dac92f 100644
--- a/src/app/views/catalogs/_form.html.haml
+++ b/src/app/views/catalogs/_form.html.haml
@@ -11,5 +11,5 @@
= form.select(:pool_id, @pools.collect{|p| [p.name, p.id]}, :prompt => t("catalogs.form.select_pool"))
%fieldset.options
+ = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
= link_to t('cancel'), catalogs_path, :class => 'button danger'
- = submit_tag t('save'), :name => 'save', :class => 'button', :id => 'save_button'
diff --git a/src/app/views/catalogs/_list.html.haml b/src/app/views/catalogs/_list.html.haml
index f13c9b0..5483164 100644
--- a/src/app/views/catalogs/_list.html.haml
+++ b/src/app/views/catalogs/_list.html.haml
@@ -1,7 +1,7 @@
- content_for :form_header do
- %li= restful_submit_tag t("delete"), "destroy", multi_destroy_catalogs_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- if @can_create
- %li= link_to t("catalogs.new_catalog"), new_catalog_path, :id => 'new_catalog_button', :class => 'button'
+ %li= link_to t("catalogs.new_catalog"), new_catalog_path, :id => 'new_catalog_button', :class => 'button primary'
+ %li= restful_submit_tag t("delete"), "destroy", multi_destroy_catalogs_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- content_for :filter_controls do
%li
diff --git a/src/app/views/catalogs/show.html.haml b/src/app/views/catalogs/show.html.haml
index 9956fe3..63f0acf 100644
--- a/src/app/views/catalogs/show.html.haml
+++ b/src/app/views/catalogs/show.html.haml
@@ -8,8 +8,8 @@
= link_to t('catalogs.new_catalog'), new_catalog_url, :class => 'button primary', :id => 'new_catalog_button'
.button-group
- if check_privilege(Privilege::MODIFY, @catalog)
- = link_to t('edit'), edit_catalog_path(@catalog), :class => 'button pill', :id => 'edit_button'
- = button_to t("delete"), catalog_path(@catalog), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete'
+ = link_to t('edit'), edit_catalog_path(@catalog), :class => 'button', :id => 'edit_button'
+ = button_to t("delete"), catalog_path(@catalog), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger', :id => 'delete'
%h1.no-icon= @title
%section.content-section.user
@@ -32,9 +32,9 @@
.content
- content_for :form_header do
- %li= restful_submit_tag t("remove"), "destroy", multi_destroy_catalog_deployables_path(@catalog), 'DELETE', :id => 'delete_button', :class => 'button danger'
- if check_privilege(Privilege::CREATE, Deployable)
- %li= link_to t("catalog_entries.new_catalog_entry"), new_catalog_deployable_path(@catalog), :class => 'button', :id => 'new_deployable_button'
+ %li= link_to t("catalog_entries.new_catalog_entry"), new_catalog_deployable_path(@catalog), :class => 'button primary', :id => 'new_deployable_button'
+ %li= restful_submit_tag t("remove"), "destroy", multi_destroy_catalog_deployables_path(@catalog), 'DELETE', :id => 'delete_button', :class => 'button danger'
- content_for :filter_controls do
%li
diff --git a/src/app/views/deployables/_form.html.haml b/src/app/views/deployables/_form.html.haml
index 0a7e11d..e98dc09 100644
--- a/src/app/views/deployables/_form.html.haml
+++ b/src/app/views/deployables/_form.html.haml
@@ -29,5 +29,5 @@
%span.text_instead_input= link_to t("deployables.properties.edit_deployable_xml"), edit_polymorphic_path([@catalog, @deployable], :edit_xml=>true)
%fieldset.options
+ = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
= link_to t('cancel'), polymorphic_path([@catalog, @deployable]), :class => 'button danger'
- = submit_tag t('save'), :name => 'save', :class => 'button', :id => 'save_button'
diff --git a/src/app/views/deployables/_from_url.html.haml b/src/app/views/deployables/_from_url.html.haml
index c238c0f..7869a59 100644
--- a/src/app/views/deployables/_from_url.html.haml
+++ b/src/app/views/deployables/_from_url.html.haml
@@ -29,8 +29,8 @@
= check_box_tag(:edit_xml, true, false)
%fieldset.options
+ = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
-if @catalog.present?
= link_to t('cancel'), catalog_path(@catalog), :class => 'button danger'
-else
= link_to t('cancel'), deployables_path, :class => 'button danger'
- = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
diff --git a/src/app/views/deployables/_new_from_image.html.haml b/src/app/views/deployables/_new_from_image.html.haml
index a56f290..f76cb44 100644
--- a/src/app/views/deployables/_new_from_image.html.haml
+++ b/src/app/views/deployables/_new_from_image.html.haml
@@ -38,8 +38,8 @@
= catalog.name
%fieldset.options.align-center
- = link_to t('deployables.form.cancel'), catalogs_path, :class => 'button danger'
= submit_tag "#{t'deployables.form.save'}", :name => 'save', :class => 'button primary', :id => 'save_button', :disabled => @save_disabled
+ = link_to t('deployables.form.cancel'), catalogs_path, :class => 'button danger'
:javascript
function listChecked() {
diff --git a/src/app/views/deployables/_upload.html.haml b/src/app/views/deployables/_upload.html.haml
index 24e621f..3d36203 100644
--- a/src/app/views/deployables/_upload.html.haml
+++ b/src/app/views/deployables/_upload.html.haml
@@ -29,8 +29,8 @@
= check_box_tag(:edit_xml, true, false)
%fieldset.options
+ = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
-if @catalog.present?
= link_to t('cancel'), catalog_path(@catalog), :class => 'button danger'
-else
= link_to t('cancel'), deployables_path, :class => 'button danger'
- = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
diff --git a/src/app/views/deployables/show.html.haml b/src/app/views/deployables/show.html.haml
index a2ab532..5c8f490 100644
--- a/src/app/views/deployables/show.html.haml
+++ b/src/app/views/deployables/show.html.haml
@@ -83,7 +83,7 @@
= f.label :catalog_id, t('.choose_catalog')
= f.select :catalog_id, options_for_select((a)catalogs_options.map {|c| [c.name, c.id]})
= f.hidden_field(:deployable_id, :value => @deployable.id)
- = f.submit t('.add_catalog'), :id => :add_catalog, :class => 'button pill', :disabled => @catalogs_options.empty?
+ = f.submit t('.add_catalog'), :id => :add_catalog, :class => 'button primary', :disabled => @catalogs_options.empty?
%h2.catalogs= t('.catalogs')
.content
.centered
diff --git a/src/app/views/deployments/_launch_new.html.haml b/src/app/views/deployments/_launch_new.html.haml
index 746fba5..bcfdf99 100644
--- a/src/app/views/deployments/_launch_new.html.haml
+++ b/src/app/views/deployments/_launch_new.html.haml
@@ -40,7 +40,7 @@
%span#realm-description
%fieldset.options
- = submit_tag t('.next'), :class => 'button', :id => "next_button"
+ = submit_tag t('.next'), :class => 'button primary', :id => "next_button"
= link_to t('cancel'), @backlink || pool_path(@pool), :class => 'button danger', :id => 'cancel_deployment_button'
diff --git a/src/app/views/deployments/_list.html.haml b/src/app/views/deployments/_list.html.haml
index 70a8454..d98dc12 100644
--- a/src/app/views/deployments/_list.html.haml
+++ b/src/app/views/deployments/_list.html.haml
@@ -1,6 +1,6 @@
- content_for :form_header do
%li= restful_submit_tag "#{t'deployments.list.stop_selected'}", 'stop', multi_stop_deployments_path, 'POST', :class => 'button', :id => "stop_button", 'data-none_selected' => t('deployments.flash.error.none_selected')
- %li= restful_submit_tag "#{t'deployments.list.delete_selected'}", 'destroy', multi_destroy_deployments_path, 'DELETE', :class => 'button danger', :id => "delete_button", 'data-none_selected' => t('deployments.flash.error.none_selected')
+ %li= restful_submit_tag "#{t'delete'}", 'destroy', multi_destroy_deployments_path, 'DELETE', :class => 'button danger', :id => "delete_button", 'data-none_selected' => t('deployments.flash.error.none_selected')
= hidden_field_tag 'backlink', request.url
- content_for :filter_controls do
diff --git a/src/app/views/deployments/_overview.html.haml b/src/app/views/deployments/_overview.html.haml
index ea767b3..bb5741f 100644
--- a/src/app/views/deployments/_overview.html.haml
+++ b/src/app/views/deployments/_overview.html.haml
@@ -59,8 +59,8 @@
- @deployment.deployable_xml.assemblies.each do |assembly|
%li.image-id= assembly.image_id
%fieldset.options.align-center
- = link_to t(:cancel), pool_path(@pool), :class => 'button danger', :id => 'cancel_deployment_button'
= submit_tag t(:back), :class => 'button'
+ = link_to t(:cancel), pool_path(@pool), :class => 'button danger', :id => 'cancel_deployment_button'
= submit_tag t('.launch'), :id => 'launch_deployment_button', :disabled => (@errors && @errors.any?)
-# Quota checking to go here as well, once I understand how it works with new code
diff --git a/src/app/views/deployments/launch_from_catalog.html.haml b/src/app/views/deployments/launch_from_catalog.html.haml
index cc2cf12..7d7f911 100644
--- a/src/app/views/deployments/launch_from_catalog.html.haml
+++ b/src/app/views/deployments/launch_from_catalog.html.haml
@@ -17,7 +17,7 @@
%p= deployable.description
.controls
= link_to t(".details"),"#", :class => "collapse"
- = button_to t(".select"), launch_time_params_deployments_path(:deployment => { :name => deployable.name, :pool_id => @catalog.pool.id }, :deployable_id => deployable.id ), :class=> "button pill"
+ = button_to t(".select"), launch_time_params_deployments_path(:deployment => { :name => deployable.name, :pool_id => @catalog.pool.id }, :deployable_id => deployable.id ), :class=> "button primary"
.details.collapsible.collapsed
%p= deployable.description
%table
@@ -43,4 +43,4 @@
.align-center
%div= will_paginate @deployables
- %div= link_to t('cancel'), root_path, :class => 'button pill', :id => 'edit_button'
+ %div= link_to t('cancel'), root_path, :class => 'button danger', :id => 'edit_button'
diff --git a/src/app/views/deployments/show.html.haml b/src/app/views/deployments/show.html.haml
index da6d3b0..97a12ec 100644
--- a/src/app/views/deployments/show.html.haml
+++ b/src/app/views/deployments/show.html.haml
@@ -4,11 +4,11 @@
.obj_actions
- if check_privilege(Privilege::MODIFY, @deployment)
.button-group
- = link_to t('edit'), edit_deployment_path(@deployment), :class => 'button pill',
+ = link_to t('edit'), edit_deployment_path(@deployment), :class => 'button',
:id => 'edit_deployment_button'
= button_to t('delete'), deployment_path(@deployment), :method => :delete,
:confirm => t("deployments.confirm_delete"),
- :class => "button pill danger",
+ :class => "button danger",
:id => 'delete'
%h1.deployments= @title
diff --git a/src/app/views/hardware_profiles/_form.html.haml b/src/app/views/hardware_profiles/_form.html.haml
index a33ccaa..669a383 100644
--- a/src/app/views/hardware_profiles/_form.html.haml
+++ b/src/app/views/hardware_profiles/_form.html.haml
@@ -23,5 +23,6 @@
= hwpp_form.text_field(:value)
%fieldset.options
- = hwp_form.submit t('hardware_profiles.form.check_matches'), :class => 'danger button', :id => 'check_matches'
- = hwp_form.submit t('save'), :class => 'submit button', :id => 'save_button'
+ = hwp_form.submit t('save'), :class => 'submit button primary', :id => 'save_button'
+ = hwp_form.submit t('hardware_profiles.form.check_matches'), :class => 'button', :id => 'check_matches'
+ = link_to t('cancel'), hardware_profiles_path, :class => "button danger"
diff --git a/src/app/views/hardware_profiles/_list.html.haml b/src/app/views/hardware_profiles/_list.html.haml
index 138fef9..648c1a8 100644
--- a/src/app/views/hardware_profiles/_list.html.haml
+++ b/src/app/views/hardware_profiles/_list.html.haml
@@ -1,7 +1,7 @@
- content_for :form_header do
- %li= restful_submit_tag t('hardware_profiles.list.delete_selected'), "destroy", multi_destroy_hardware_profiles_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- if check_privilege(Privilege::CREATE, HardwareProfile)
- %li= link_to t('hardware_profiles.list.new_hardware'), new_hardware_profile_path, :id => 'new_hardware_profile_button', :class => 'button'
+ %li= link_to t('hardware_profiles.list.new_hardware'), new_hardware_profile_path, :id => 'new_hardware_profile_button', :class => 'button primary'
+ %li= restful_submit_tag t('delete'), "destroy", multi_destroy_hardware_profiles_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- content_for :filter_controls do
%li
diff --git a/src/app/views/hardware_profiles/show.html.haml b/src/app/views/hardware_profiles/show.html.haml
index 04f1899..9079348 100644
--- a/src/app/views/hardware_profiles/show.html.haml
+++ b/src/app/views/hardware_profiles/show.html.haml
@@ -5,8 +5,8 @@
= link_to t('hardware_profiles.list.new_hardware'), new_hardware_profile_url, :class => 'button primary', :id => 'new_role_button'
.button-group
- if check_privilege(Privilege::MODIFY, @hardware_profile) && !(a)hardware_profile.provider_hardware_profile?
- = link_to t('edit'), edit_hardware_profile_path(@hardware_profile), :class => 'button pill', :id => 'edit_button'
- = button_to t('delete'), hardware_profile_path(@hardware_profile), :method => :delete, :confirm => "Are you sure you want to delete?", :class => 'button pill danger'
+ = link_to t('edit'), edit_hardware_profile_path(@hardware_profile), :class => 'button', :id => 'edit_button'
+ = button_to t('delete'), hardware_profile_path(@hardware_profile), :method => :delete, :confirm => "Are you sure you want to delete?", :class => 'button danger'
%h1.hardware_profiles= @title
%section.content-section.hardware_profile
%header
diff --git a/src/app/views/images/_list.html.haml b/src/app/views/images/_list.html.haml
index 97bcb4f..67d8420 100644
--- a/src/app/views/images/_list.html.haml
+++ b/src/app/views/images/_list.html.haml
@@ -1,9 +1,9 @@
- content_for :form_header do
- if @pool_family and check_privilege(Privilege::USE, @pool_family)
- %li= restful_submit_tag t("delete"), "destroy", multi_destroy_images_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- if @pool_family.pools.any?
%li= link_to t('images.import.import_image'), new_image_path(:tab => 'import', :environment => @pool_family), { :class => 'button primary', :id => 'import_image_button'}
%li= link_to t('images.index.new'), new_image_path(:environment => @pool_family), { :class => 'button primary', :id => 'import_image_button'}
+ %li= restful_submit_tag t("delete"), "destroy", multi_destroy_images_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
= filter_table(@header, @images) do |image|
- if @pool_family.nil? and image.environment
@@ -21,4 +21,4 @@
});
%script#imageRowTemplate{ :type => 'text/html' }
- = render :partial => 'images/image_row'
\ No newline at end of file
+ = render :partial => 'images/image_row'
diff --git a/src/app/views/images/_list_for_environment.html.haml b/src/app/views/images/_list_for_environment.html.haml
index 0b281f7..7cfa2a1 100644
--- a/src/app/views/images/_list_for_environment.html.haml
+++ b/src/app/views/images/_list_for_environment.html.haml
@@ -1,9 +1,9 @@
- content_for :form_header do
- if @pool_family and check_privilege(Privilege::USE, @pool_family)
- %li= restful_submit_tag t("delete"), "destroy", multi_destroy_images_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- if @pool_family.pools.any?
%li= link_to t('images.import.import_image'), new_image_path(:tab => 'import', :environment => @pool_family), { :class => 'button primary', :id => 'import_image_button'}
%li= link_to t('images.index.new'), new_image_path(:environment => @pool_family), { :class => 'button primary', :id => 'import_image_button'}
+ %li= restful_submit_tag t("delete"), "destroy", multi_destroy_images_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
= filter_table(@header, @images) do |image|
- if @pool_family.nil? and image.environment
@@ -21,4 +21,4 @@
});
%script#imageRowTemplate{ :type => 'text/html' }
- = render :partial => 'images/image_row_for_environment'
\ No newline at end of file
+ = render :partial => 'images/image_row_for_environment'
diff --git a/src/app/views/images/_push_all_button.html.mustache b/src/app/views/images/_push_all_button.html.mustache
index 1f1db0a..e8bc88b 100644
--- a/src/app/views/images/_push_all_button.html.mustache
+++ b/src/app/views/images/_push_all_button.html.mustache
@@ -1 +1 @@
-<%= button_to(t('images.show.push_all'), '{{push_all_path}}', :class => 'button pill') %>
+<%= button_to(t('images.show.push_all'), '{{push_all_path}}', :class => 'button primary') %>
diff --git a/src/app/views/images/edit_xml.html.haml b/src/app/views/images/edit_xml.html.haml
index a2b7ac7..8650111 100644
--- a/src/app/views/images/edit_xml.html.haml
+++ b/src/app/views/images/edit_xml.html.haml
@@ -18,5 +18,5 @@
.centered
%fieldset.align-center
- = link_to t(:cancel), pool_families_path, :class => 'button danger'
= submit_tag t('.save_and_continue'), :class => 'button primary', :id => 'save_image'
+ = link_to t(:cancel), pool_families_path, :class => 'button danger'
diff --git a/src/app/views/images/import.html.haml b/src/app/views/images/import.html.haml
index 3109c5a..7e80917 100644
--- a/src/app/views/images/import.html.haml
+++ b/src/app/views/images/import.html.haml
@@ -27,3 +27,4 @@
%fieldset.options
= submit_tag t(:continue), :id => "file_button", :class => "button primary", :disabled => @accounts.empty?
+ = link_to t(:cancel), pool_families_path, :class => "button danger"
diff --git a/src/app/views/images/new.html.haml b/src/app/views/images/new.html.haml
index 2ea9cba..2df2f54 100644
--- a/src/app/views/images/new.html.haml
+++ b/src/app/views/images/new.html.haml
@@ -40,8 +40,8 @@
= check_box_tag :edit, 1, true
%fieldset.align-center
- = link_to t(:cancel), pool_families_path, :class => "button danger"
= submit_tag t(:continue), :id => "file_button", :class => "button primary", :disabled => @accounts.empty?
+ = link_to t(:cancel), pool_families_path, :class => "button danger"
%section#image-url-form
= form_tag(edit_xml_images_path, { :multipart => true, :class => 'generic horizontal' }) do
@@ -61,8 +61,8 @@
= check_box_tag :edit, 1, true
%fieldset.align-center
- = link_to t(:cancel), pool_families_path, :class => "button danger"
= submit_tag t(:continue), :id => "url_button", :class => "button primary", :disabled => @accounts.empty?
+ = link_to t(:cancel), pool_families_path, :class => "button danger"
:javascript
(function() {
diff --git a/src/app/views/images/overview.html.haml b/src/app/views/images/overview.html.haml
index 4d606b9..5022709 100644
--- a/src/app/views/images/overview.html.haml
+++ b/src/app/views/images/overview.html.haml
@@ -16,8 +16,10 @@
.lefted.image-upload-overview
%h2= t('.valid_image')
%p.description= t('.description', :name => @name)
+ %p.description
.centered
%fieldset.align-center
- = submit_tag t('.back'), :name => 'back', :id => 'back_button', :class => 'button'
= submit_tag t('.save_template'), :name => 'save', :id => 'save_button', :class => 'button primary'
+ = submit_tag t('.edit_xml'), :name => 'back', :id => 'back_button', :class => 'button'
+ = link_to t(:cancel), pool_families_path, :class => 'button danger'
diff --git a/src/app/views/images/show.html.haml b/src/app/views/images/show.html.haml
index 041dccf..1641a11 100644
--- a/src/app/views/images/show.html.haml
+++ b/src/app/views/images/show.html.haml
@@ -6,10 +6,10 @@
= link_to t('images.index.images'), images_path
- if @environment and check_privilege(Privilege::USE, @environment)
.button-group
- = link_to t('images.show.new_deployable_from_image'), new_deployable_path(:create_from_image => @image.id), :class => 'button pill'
+ = link_to t('images.show.new_deployable_from_image'), new_deployable_path(:create_from_image => @image.id), :class => 'button'
- unless @image.imported?
- = link_to t('images.show.template_xml'), template_image_path((a)image.uuid), :class => 'button pill'
- = button_to t("delete"), image_path((a)image.id), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete'
+ = link_to t('images.show.template_xml'), template_image_path((a)image.uuid), :class => 'button'
+ = button_to t("delete"), image_path((a)image.id), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger', :id => 'delete'
%h1.no-icon= @image.imported? ? @image.name + " (Imported)" : @image.name
- user_can_build = (@environment and check_privilege(Privilege::USE, @environment))
@@ -45,10 +45,10 @@
- build_text = 'images.show.build'
- if @account_groups_listing.size > 1
- build_text << '_all'
- = button_to t(build_text), rebuild_all_image_path((a)image.id), :class => 'button pill' unless @account_groups_listing.blank?
+ = button_to t(build_text), rebuild_all_image_path((a)image.id), :class => 'button' unless @account_groups_listing.blank?
#push-all-btn
- if @push_all_enabled
- = button_to t('images.show.push_all'), push_all_image_path((a)image.id, :build_id => @build.id), :class => 'button pill'
+ = button_to t('images.show.push_all'), push_all_image_path((a)image.id, :build_id => @build.id), :class => 'button'
%h2= t('images.show.provider_images')
.content
diff --git a/src/app/views/instances/_instance_card.html.mustache b/src/app/views/instances/_instance_card.html.mustache
index 2745fbc..d37b613 100644
--- a/src/app/views/instances/_instance_card.html.mustache
+++ b/src/app/views/instances/_instance_card.html.mustache
@@ -31,14 +31,14 @@
{{#stop_enabled}}
<li>
<%= button_to(t('deployments.pretty_view_show.stop'), stop_instance_path('replace_id').sub('replace_id', '{{id}}'),
- :disabled => false, :class => 'button danger') %>
+ :disabled => false, :class => 'button') %>
</li>
{{/stop_enabled}}
{{#reboot_enabled}}
<li>
<%= button_to(t('deployments.pretty_view_show.reboot'), reboot_instance_path('replace_id').sub('replace_id', '{{id}}'),
- :disabled => false, :class => 'button danger') %>
+ :disabled => false, :class => 'button') %>
</li>
{{/reboot_enabled}}
</ul>
diff --git a/src/app/views/instances/show.html.haml b/src/app/views/instances/show.html.haml
index 920c860..ab92025 100644
--- a/src/app/views/instances/show.html.haml
+++ b/src/app/views/instances/show.html.haml
@@ -2,7 +2,7 @@
%header.page-header
.obj_actions
- if check_privilege(Privilege::MODIFY, @instance)
- = link_to t('edit'), edit_instance_path(@instance), :class => 'button pill',
+ = link_to t('edit'), edit_instance_path(@instance), :class => 'button',
:id => 'edit_instance_button'
%h1.deployments= @instance.name
diff --git a/src/app/views/permissions/_form.html.haml b/src/app/views/permissions/_form.html.haml
index 6b1c04f..ffda9c4 100644
--- a/src/app/views/permissions/_form.html.haml
+++ b/src/app/views/permissions/_form.html.haml
@@ -23,8 +23,8 @@
= hidden_field_tag :permission_object_id, @permission_object.id
= hidden_field_tag :path_prefix, @path_prefix
= hidden_field_tag :use_tabs, @use_tabs
+ = restful_submit_tag t('permissions.form.grant_access'), "create", permissions_path, 'POST', :id => 'save_button', :class => 'button primary'
= link_to t('cancel'), @return_path, :class => 'button danger'
- = restful_submit_tag t('permissions.form.grant_access'), "create", permissions_path, 'POST', :id => 'save_button', :class => 'button'
= filter_table(@header, @entities,
:filter_controls => :entities_filter_controls) do |entity|
%tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/permissions/_objects.html.haml b/src/app/views/permissions/_objects.html.haml
index bb316fa..bf96145 100644
--- a/src/app/views/permissions/_objects.html.haml
+++ b/src/app/views/permissions/_objects.html.haml
@@ -1,4 +1,10 @@
- content_for :permissions_form_header do
+ %span{:id => ("tab-container-1-nav" unless @inline)}
+ - if @show_inherited
+ %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :page => 1), { :class => 'button primary', :id => 'direct_permission_button'}
+ - else
+ %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :page => 1), { :class => 'button primary', :id => 'inherited_permission_button'}
+
- if not(@show_inherited) && check_privilege(Privilege::PERM_SET)
%li= restful_submit_tag t('permissions.revoke_access'), "destroy", multi_destroy_permissions_path, 'DELETE', :id => 'revoke_button', :class => 'button danger'
%li= restful_submit_tag t('edit'), "multi_update", multi_update_permissions_path, 'POST', :id => 'perm_edit_button', :class => 'hidden'
@@ -7,11 +13,6 @@
= hidden_field_tag :path_prefix, @path_prefix
= hidden_field_tag :return_path, url_for((a)entity.entity_target)
= hidden_field_tag :use_tabs, @use_tabs ? @use_tabs : (@tabs ? 'yes' : 'no')
- %span{:id => ("tab-container-1-nav" unless @inline)}
- - if @show_inherited
- %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :page => 1), { :class => 'button primary', :id => 'direct_permission_button'}
- - else
- %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :page => 1), { :class => 'button primary', :id => 'inherited_permission_button'}
- content_for :permissions_filter_controls do
%li
diff --git a/src/app/views/permissions/_permissions.html.haml b/src/app/views/permissions/_permissions.html.haml
index aadac1d..ed5723c 100644
--- a/src/app/views/permissions/_permissions.html.haml
+++ b/src/app/views/permissions/_permissions.html.haml
@@ -17,14 +17,14 @@
%span{:id => ("tab-container-1-nav" unless @inline)}
- unless @permission_object == BasePermissionObject.general_permission_scope
- if @show_inherited
- %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :show_global => false, :page => 1), { :class => 'button primary', :id => 'direct_permission_button'}
- %li= link_to t('permissions.global_access'), params.merge(:show_inherited => false, :show_global => true, :page => 1), { :class => 'button primary', :id => 'global_permission_button'}
+ %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :show_global => false, :page => 1), { :class => 'button', :id => 'direct_permission_button'}
+ %li= link_to t('permissions.global_access'), params.merge(:show_inherited => false, :show_global => true, :page => 1), { :class => 'button', :id => 'global_permission_button'}
- elsif @show_global
- %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :show_global => false, :page => 1), { :class => 'button primary', :id => 'direct_permission_button'}
- %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :show_global => false, :page => 1), { :class => 'button primary', :id => 'inherited_permission_button'}
+ %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :show_global => false, :page => 1), { :class => 'button', :id => 'direct_permission_button'}
+ %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :show_global => false, :page => 1), { :class => 'button', :id => 'inherited_permission_button'}
- else
- %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :show_global => false, :page => 1), { :class => 'button primary', :id => 'inherited_permission_button'}
- %li= link_to t('permissions.global_access'), params.merge(:show_inherited => false, :show_global => true, :page => 1), { :class => 'button primary', :id => 'global_permission_button'}
+ %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :show_global => false, :page => 1), { :class => 'button', :id => 'inherited_permission_button'}
+ %li= link_to t('permissions.global_access'), params.merge(:show_inherited => false, :show_global => true, :page => 1), { :class => 'button', :id => 'global_permission_button'}
- content_for :permissions_filter_controls do
%li
diff --git a/src/app/views/pool_families/_form.html.haml b/src/app/views/pool_families/_form.html.haml
index 906bc6f..19d1bc8 100644
--- a/src/app/views/pool_families/_form.html.haml
+++ b/src/app/views/pool_families/_form.html.haml
@@ -13,5 +13,5 @@
= quota_form.text_field :maximum_running_instances
%fieldset.options
+ = form.submit t(:save), :class => "submit button primary"
= link_to t('cancel'), pool_families_path, :class => 'button danger'
- = form.submit t(:save), :class => "submit button"
diff --git a/src/app/views/pool_families/_list.html.haml b/src/app/views/pool_families/_list.html.haml
index e55c3d8..4c98eb1 100644
--- a/src/app/views/pool_families/_list.html.haml
+++ b/src/app/views/pool_families/_list.html.haml
@@ -1,7 +1,7 @@
%header
.section-controls
- if check_privilege(Privilege::CREATE, PoolFamily)
- = link_to t("pool_families.index.new_pool_family"), new_pool_family_path, :class => 'button pill', :id => 'new_pool_family_button'
+ = link_to t("pool_families.index.new_pool_family"), new_pool_family_path, :class => 'button primary', :id => 'new_pool_family_button'
%h2.pools= @title
.content
@@ -15,10 +15,11 @@
= link_to pool_family.name, pool_family
.section-controls
- if check_privilege(Privilege::CREATE, Pool, pool_family)
- = link_to t("pools.new_pool"), new_pool_path(:pool_family_id => pool_family.id), :class => 'pool_family_button'
+ = link_to t("pools.new_pool"), new_pool_path(:pool_family_id => pool_family.id), :class => 'button primary'
- if pool_family.pools.any? && check_privilege(Privilege::USE, pool_family)
- = link_to t("images.import.import_image"), new_image_path(:environment => pool_family.id, :tab => 'import'), :class => 'new_image_button'
- = link_to t("images.new.new_image"), new_image_path( :environment => pool_family.id), :class => 'new_image_button'
+ .button-group
+ = link_to t("images.import.import_image"), new_image_path(:environment => pool_family.id, :tab => 'import'), :class => 'button primary'
+ = link_to t("images.new.new_image"), new_image_path( :environment => pool_family.id), :class => 'button primary'
- unless pool_family.pools.blank?
%tr
%th= t("pool_families.index.pool_name")
@@ -49,8 +50,8 @@
%td= link_to pool.catalogs.first.name, catalog_path(pool.catalogs.first) if pool.catalogs.any?
%td
- if check_privilege(Privilege::MODIFY, pool)
- = link_to t(:edit), edit_pool_path(pool), :class => 'pool_family_button'
- %tr
+ = link_to t(:edit), edit_pool_path(pool), :class => 'button'
+ %tr.total
%td= t("pool_families.index.total_statistics")
%td= family_stats[:deployments]
%td= family_stats[:total_instances]
diff --git a/src/app/views/pool_families/_provider_accounts.html.haml b/src/app/views/pool_families/_provider_accounts.html.haml
index cfda880..5b8f138 100644
--- a/src/app/views/pool_families/_provider_accounts.html.haml
+++ b/src/app/views/pool_families/_provider_accounts.html.haml
@@ -1,7 +1,7 @@
- content_for :form_header do
- if check_privilege(Privilege::MODIFY)
%li= link_to t('provider_accounts.add_provider_account'), add_provider_accounts_pool_family_path(@pool_family), { :class => 'button primary', :id => 'add_provider_accounts_button'}
- %li= restful_submit_tag t('provider_accounts.remove_provider_accounts'), "destroy", remove_provider_accounts_pool_family_path(@pool_family), 'POST', :id => 'remove_button', :class => 'button danger'
+ %li= restful_submit_tag t('delete'), "destroy", remove_provider_accounts_pool_family_path(@pool_family), 'POST', :id => 'remove_button', :class => 'button danger'
= filter_table(provider_accounts_header(:without_alert => true), @pool_family.provider_accounts) do |account|
%tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/pool_families/show.html.haml b/src/app/views/pool_families/show.html.haml
index 7233a73..c3a7a07 100644
--- a/src/app/views/pool_families/show.html.haml
+++ b/src/app/views/pool_families/show.html.haml
@@ -2,8 +2,8 @@
%header.page-header
.obj_actions
.button-group
- = link_to t('edit'), edit_pool_family_path(@pool_family), :class => 'button pill'
- = button_to t('delete'), pool_family_path(@pool_family), :method => :delete, :confirm => t("pool_families.confirm_delete"), :class => "button pill danger", :id => 'delete_pool_family_button'
+ = link_to t('edit'), edit_pool_family_path(@pool_family), :class => 'button'
+ = button_to t('delete'), pool_family_path(@pool_family), :method => :delete, :confirm => t("pool_families.confirm_delete"), :class => "button danger", :id => 'delete_pool_family_button'
%h1.pool_families= @title
%section.content-section.pool_families
diff --git a/src/app/views/pools/_form.html.haml b/src/app/views/pools/_form.html.haml
index 94fa0cd..d8054e5 100644
--- a/src/app/views/pools/_form.html.haml
+++ b/src/app/views/pools/_form.html.haml
@@ -23,7 +23,7 @@
= form.label :enabled, "#{t('pools.form.pool_enabled')}?", :class => 'checkbox'
%fieldset.options
- = form.submit t("save"), :class => 'button', :id => 'save_button'
+ = form.submit t("save"), :class => 'button primary', :id => 'save_button'
- if @pool.pool_family
= link_to t('cancel'), pool_families_path, :class => 'button danger'
- else
diff --git a/src/app/views/pools/_list.html.haml b/src/app/views/pools/_list.html.haml
index bd1edd5..331684b 100644
--- a/src/app/views/pools/_list.html.haml
+++ b/src/app/views/pools/_list.html.haml
@@ -1,6 +1,6 @@
- content_for :form_header do
- if check_privilege(Privilege::CREATE, Pool)
- %li= link_to "#{t'pools.new_pool'}", new_pool_path, { :class => 'button', :id => 'new_pool_button' }
+ %li= link_to "#{t'pools.new_pool'}", new_pool_path, { :class => 'button primary', :id => 'new_pool_button' }
%li= restful_submit_tag "#{t'pools.index.destroy'}", "destroy", multi_destroy_pools_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- content_for :filter_controls do
diff --git a/src/app/views/pools/show.html.haml b/src/app/views/pools/show.html.haml
index 03317b1..a2f13d3 100644
--- a/src/app/views/pools/show.html.haml
+++ b/src/app/views/pools/show.html.haml
@@ -10,8 +10,8 @@
= render :partial => 'layouts/catalog_dropdown', :locals => {:catalogs => @pool.catalogs}
.button-group
- if check_privilege(Privilege::MODIFY, @pool)
- = link_to t('edit'), edit_pool_path(@pool), :class => 'button pill', :id => 'edit_pool_button'
- = button_to t('delete'), pool_path(@pool), :method => :delete, :confirm => t('pools.index.confirm_delete'), :class => "button pill danger", :id => 'delete_pool_button'
+ = link_to t('edit'), edit_pool_path(@pool), :class => 'button', :id => 'edit_pool_button'
+ = button_to t('delete'), pool_path(@pool), :method => :delete, :confirm => t('pools.index.confirm_delete'), :class => "button danger", :id => 'delete_pool_button'
%h1.pools= @title
= render :partial => 'scoreboard_show'
diff --git a/src/app/views/provider_accounts/_list.html.haml b/src/app/views/provider_accounts/_list.html.haml
index 31f73c7..459630e 100644
--- a/src/app/views/provider_accounts/_list.html.haml
+++ b/src/app/views/provider_accounts/_list.html.haml
@@ -1,8 +1,8 @@
.content
- content_for :form_header do
- %li= restful_submit_tag t('delete'), "destroy", multi_destroy_provider_provider_accounts_path(@provider), 'DELETE', :id => 'delete_button', :class => 'button danger'
- if check_privilege(Privilege::CREATE, ProviderAccount, @provider)
- %li= link_to t('provider_accounts.new_provider_account'), new_provider_provider_account_path(@provider), :id => 'new_provider_account', :class => 'button'
+ %li= link_to t('provider_accounts.new_provider_account'), new_provider_provider_account_path(@provider), :id => 'new_provider_account', :class => 'button primary'
+ %li= restful_submit_tag t('delete'), "destroy", multi_destroy_provider_provider_accounts_path(@provider), 'DELETE', :id => 'delete_button', :class => 'button danger'
- content_for :filter_controls do
%li
diff --git a/src/app/views/provider_accounts/_provider_form.html.haml b/src/app/views/provider_accounts/_provider_form.html.haml
index 2573a35..0a763c8 100644
--- a/src/app/views/provider_accounts/_provider_form.html.haml
+++ b/src/app/views/provider_accounts/_provider_form.html.haml
@@ -24,10 +24,8 @@
= label_tag t("quotas.quota")
.input
= text_field :quota, :maximum_running_instances, :title => t('provider_accounts.form.quota_instances'), :value => @quota.maximum_running_instances || t('provider_accounts.properties.unlimited'), :id => "quota_instances"
- (
- %button.linkbutton.nospace{ :type => 'button', :onclick => "set_unlimited_quota(\"quota_instances\");" }
+ %button.linkbutton.nospace{ :type => 'button', :onclick => "set_unlimited_quota(\"quota_instances\");", :class => "button" }
= t('provider_accounts.form.unlimited_quota')
- )
:javascript
function set_unlimited_quota(elem_id) {
diff --git a/src/app/views/provider_accounts/edit.html.haml b/src/app/views/provider_accounts/edit.html.haml
index f2ce8a2..912e7b4 100644
--- a/src/app/views/provider_accounts/edit.html.haml
+++ b/src/app/views/provider_accounts/edit.html.haml
@@ -16,4 +16,4 @@
= render :partial => "form", :locals => { :form => f }
%fieldset.options
= f.submit t('save'), :class => "button", :id => 'save'
- = link_to t('provider_accounts.edit.delete_account'), provider_provider_account_path(@provider, @provider_account), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger'
+ = link_to t('cancel'), provider_provider_account_path(@provider, @provider_account), :class => 'button danger'
diff --git a/src/app/views/provider_accounts/new.html.haml b/src/app/views/provider_accounts/new.html.haml
index b350d52..1954f11 100644
--- a/src/app/views/provider_accounts/new.html.haml
+++ b/src/app/views/provider_accounts/new.html.haml
@@ -12,4 +12,5 @@
= form_for([@provider, @provider_account], :url => provider_provider_accounts_path(@provider), :html => {:multipart => true, :class => 'generic horizontal'}) do |f|
= render :partial => "form", :locals => { :form => f }
%fieldset.options
- = f.submit t('save'), :class => "button", :id => 'save'
+ = f.submit t('save'), :class => "button primary", :id => 'save'
+ = link_to t('cancel'), edit_provider_path(@provider, :details_tab => 'accounts'), :class => "button danger"
diff --git a/src/app/views/provider_accounts/show.html.haml b/src/app/views/provider_accounts/show.html.haml
index a46ec37..ee80fdd 100644
--- a/src/app/views/provider_accounts/show.html.haml
+++ b/src/app/views/provider_accounts/show.html.haml
@@ -5,8 +5,9 @@
=t'return_to'
= link_to t('provider_accounts.new.cloud_providers'), edit_provider_path(@provider, :details_tab => 'accounts')
.button-group
- = link_to t('edit'), edit_provider_provider_account_path(@provider, @provider_account), :class => "button pill", :title => "Edit Provider Account"
- = link_to t('provider_accounts.show.test_connection'), provider_provider_account_path(@provider, @provider_account, :test_account => true), :class => 'button pill'
+ = link_to t('edit'), edit_provider_provider_account_path(@provider, @provider_account), :class => "button", :title => "Edit Provider Account"
+ = link_to t('provider_accounts.show.test_connection'), provider_provider_account_path(@provider, @provider_account, :test_account => true), :class => 'button'
+ = link_to t('provider_accounts.edit.delete_account'), provider_provider_account_path(@provider, @provider_account), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger'
%h1.provider_accounts= @title
%section.content-section
diff --git a/src/app/views/providers/_edit.html.haml b/src/app/views/providers/_edit.html.haml
index bf920c8..d7eacb5 100644
--- a/src/app/views/providers/_edit.html.haml
+++ b/src/app/views/providers/_edit.html.haml
@@ -4,7 +4,6 @@
= render :partial => 'form', :locals => { :form => f, :readonly => !can_edit }
%fieldset.options
- if can_edit
- .button-group
- = f.submit "#{t'providers.form.save_changes'}", :class => "submit button pill", :id => 'save'
- = link_to "#{t'providers.form.test_connection'}", edit_provider_path(@provider, :test_provider => true), :class => 'button pill'
- = link_to "#{t'providers.form.delete_provider'}", provider_path(@provider), :method => :delete, :confirm => t('providers.confirm_delete'), :class => "button pill danger", :id => "delete"
+ = f.submit "#{t'providers.form.save_changes'}", :class => "submit button primary", :id => 'save'
+ = link_to "#{t'providers.form.test_connection'}", edit_provider_path(@provider, :test_provider => true), :class => 'button'
+ = link_to "#{t'providers.form.delete_provider'}", provider_path(@provider), :method => :delete, :confirm => t('providers.confirm_delete'), :class => "button danger", :id => "delete"
diff --git a/src/app/views/providers/index.html.haml b/src/app/views/providers/index.html.haml
index be644b0..e9f5c7f 100644
--- a/src/app/views/providers/index.html.haml
+++ b/src/app/views/providers/index.html.haml
@@ -5,7 +5,7 @@
.content
- content_for :form_header do
- if check_privilege(Privilege::CREATE, Provider)
- %li= link_to t("providers.index.create_new_provider"), new_provider_path, :class => 'button', :id => "create_new_provider"
+ %li= link_to t("providers.index.create_new_provider"), new_provider_path, :class => 'button primary', :id => "create_new_provider"
- content_for :filter_controls do
%li
diff --git a/src/app/views/providers/new.html.haml b/src/app/views/providers/new.html.haml
index b2465b1..54144a1 100644
--- a/src/app/views/providers/new.html.haml
+++ b/src/app/views/providers/new.html.haml
@@ -18,4 +18,5 @@
= form_for @provider, :url => providers_path, :html => {:class => 'generic horizontal'} do |f|
= render :partial => "form", :locals => { :form => f, :cancel_path => providers_path, :readonly => false }
%fieldset.options
- = f.submit t("providers.new.save_provider"), :class => "submit button pill", :id => 'save'
+ = f.submit t("providers.new.save_provider"), :class => "submit button primary", :id => 'save'
+ = link_to t('cancel'), providers_path, :class => 'button danger'
diff --git a/src/app/views/realms/_form.html.haml b/src/app/views/realms/_form.html.haml
index d1ba61c..48beaf6 100644
--- a/src/app/views/realms/_form.html.haml
+++ b/src/app/views/realms/_form.html.haml
@@ -11,4 +11,5 @@
= form.text_area :description, :title => 'description', :value => @realm.description, :class => 'long'
%fieldset.options
- = form.submit t('save'), :class => "submit button"
+ = form.submit t('save'), :class => "submit button primary"
+ = link_to t('cancel'), realms_path, :class => 'button danger'
diff --git a/src/app/views/realms/_list.html.haml b/src/app/views/realms/_list.html.haml
index 70d12ab..cd6c514 100644
--- a/src/app/views/realms/_list.html.haml
+++ b/src/app/views/realms/_list.html.haml
@@ -2,9 +2,9 @@
-# If we add per-realm permissions, move delete permission check to controller
-# (vs. the all-or-nothing check here)
- if check_privilege(Privilege::MODIFY, Realm)
- %li= restful_submit_tag t('realms.list.delete_selected'), "destroy", multi_destroy_realms_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- if @provider.nil?
- %li= link_to t('realms.new_realm'), new_realm_path, :id => 'new_realm_button', :class => 'button'
+ %li= link_to t('realms.new_realm'), new_realm_path, :id => 'new_realm_button', :class => 'button primary'
+ %li= restful_submit_tag t('delete'), "destroy", multi_destroy_realms_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- content_for :filter_controls do
%li
diff --git a/src/app/views/settings/index.html.haml b/src/app/views/settings/index.html.haml
index cd7bbdc..994a2c3 100644
--- a/src/app/views/settings/index.html.haml
+++ b/src/app/views/settings/index.html.haml
@@ -9,4 +9,4 @@
- if check_privilege(Privilege::MODIFY)
%p
= t('.permissions_desc')
- = link_to t(:continue), self_service_settings_path, :class => 'button pill'
+ = link_to t(:continue), self_service_settings_path, :class => 'button'
diff --git a/src/app/views/settings/self_service.html.haml b/src/app/views/settings/self_service.html.haml
index 7194c58..898e9ab 100644
--- a/src/app/views/settings/self_service.html.haml
+++ b/src/app/views/settings/self_service.html.haml
@@ -20,6 +20,6 @@
%label= t('.instances_quota')
= text_field :self_service_default_quota, :maximum_running_instances, :class => 'grid_5'
%fieldset.options
- .obj_actions.button-group
- = link_to t('reset'), self_service_settings_path, :class => 'button pill'
- = submit_tag t(:save), :class => "button pill"
+ .obj_actions
+ = submit_tag t(:save), :class => "button primary"
+ = link_to t('reset'), self_service_settings_path, :class => 'button danger'
diff --git a/src/app/views/user_groups/_form.html.haml b/src/app/views/user_groups/_form.html.haml
index 9fe8169..cf8f92d 100644
--- a/src/app/views/user_groups/_form.html.haml
+++ b/src/app/views/user_groups/_form.html.haml
@@ -22,4 +22,5 @@
= form.text_area :description, :class => 'long'
%fieldset.options
- = form.submit "#{t'user_groups.form.save_user_group'}", :class => "submit button pill"
+ = form.submit "#{t'user_groups.form.save_user_group'}", :class => "submit button primary"
+ = link_to t('cancel'), @user_group, :class => "button danger"
diff --git a/src/app/views/user_groups/_list.html.haml b/src/app/views/user_groups/_list.html.haml
index c9af5d7..1ae61b4 100644
--- a/src/app/views/user_groups/_list.html.haml
+++ b/src/app/views/user_groups/_list.html.haml
@@ -2,8 +2,8 @@
%h2#user_groups.groups= @title
- content_for :form_header do
- %li= restful_submit_tag "#{t'user_groups.list.delete_selected'}", "destroy", multi_destroy_user_groups_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- %li= link_to t("user_groups.list.add_user_group"), new_user_group_path, :class => 'button', :id => 'add_user_group_button' unless UserGroup.active_membership_sources.nil?
+ %li= link_to t("user_groups.list.add_user_group"), new_user_group_path, :class => 'button primary', :id => 'add_user_group_button' unless UserGroup.active_membership_sources.nil?
+ %li= restful_submit_tag "#{t'delete'}", "destroy", multi_destroy_user_groups_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- content_for :filter_controls do
%li
diff --git a/src/app/views/user_groups/add_members.html.haml b/src/app/views/user_groups/add_members.html.haml
index 828ffb7..48c1ed7 100644
--- a/src/app/views/user_groups/add_members.html.haml
+++ b/src/app/views/user_groups/add_members.html.haml
@@ -12,8 +12,8 @@
%strong= t("user_groups.choose_members")
.content
- content_for :form_footer do
+ = restful_submit_tag t('user_groups.show.add_members'), "add", add_members_user_group_path(@user_group), 'POST', :id => 'save_button', :class => 'button primary'
= link_to t('cancel'), user_group_path(@user_group), :class => 'button danger'
- = restful_submit_tag t('user_groups.show.add_members'), "add", add_members_user_group_path(@user_group), 'POST', :id => 'save_button', :class => 'button'
= filter_table(members_header, @users) do |user|
%tr{:class => cycle('nostripe','stripe')}
%td{:class => 'checkbox'}
diff --git a/src/app/views/user_groups/show.html.haml b/src/app/views/user_groups/show.html.haml
index 7b9c351..cf427ea 100644
--- a/src/app/views/user_groups/show.html.haml
+++ b/src/app/views/user_groups/show.html.haml
@@ -8,8 +8,8 @@
= link_to t('user_groups.new.new_user_group'), new_user_group_url, :class => 'button primary', :id => 'new_user_group_button' unless UserGroup.active_membership_sources.nil?
.button-group
- if check_privilege(Privilege::MODIFY, User)
- = link_to t('edit'), edit_user_group_path(@user_group), :class => 'button pill', :id => 'edit_button'
- = button_to t("delete"), user_group_path(@user_group), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete'
+ = link_to t('edit'), edit_user_group_path(@user_group), :class => 'button', :id => 'edit_button'
+ = button_to t("delete"), user_group_path(@user_group), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger', :id => 'delete'
%h1.no-icon= @title
%section.content-section.user
@@ -37,8 +37,8 @@
.content
- content_for :form_header do
- if check_privilege(Privilege::CREATE, Deployable)
+ %li= link_to t("user_groups.show.add_members"), add_members_user_group_path(@user_group), :class => 'button primary', :id => 'add_members_button'
%li= restful_submit_tag t("remove"), "destroy", remove_members_user_group_path(@user_group), 'DELETE', :id => 'delete_button', :class => 'button danger'
- %li= link_to t("user_groups.show.add_members"), add_members_user_group_path(@user_group), :class => 'button', :id => 'add_members_button'
- content_for :filter_controls do
%li
diff --git a/src/app/views/users/_form.html.haml b/src/app/views/users/_form.html.haml
index abbb89a..9c5ee24 100644
--- a/src/app/views/users/_form.html.haml
+++ b/src/app/views/users/_form.html.haml
@@ -37,8 +37,8 @@
= quota_form.text_field :maximum_running_instances
%fieldset.options
- = form.submit t('users.form.save_user'), :class => "submit button pill"
- = link_to t('cancel'), @user, :class => "button pill danger"
+ = form.submit t('users.form.save_user'), :class => "submit button primary"
+ = link_to t('cancel'), @user, :class => "button danger"
:javascript
$('.check_change').change(function(){
diff --git a/src/app/views/users/_list.html.haml b/src/app/views/users/_list.html.haml
index 830c446..18f9a55 100644
--- a/src/app/views/users/_list.html.haml
+++ b/src/app/views/users/_list.html.haml
@@ -2,8 +2,8 @@
%h2#users.users= @title
- content_for :form_header do
- %li= restful_submit_tag "#{t'users.list.delete_selected'}", "destroy", multi_destroy_users_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- %li= link_to t("users.list.add_user"), new_user_path, :class => 'button', :id => 'add_user_button'
+ %li= link_to t("users.list.add_user"), new_user_path, :class => 'button primary', :id => 'add_user_button'
+ %li= restful_submit_tag "#{t'delete'}", "destroy", multi_destroy_users_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
- content_for :filter_controls do
%li
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 0fcc5c8..8234f27 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -1019,7 +1019,7 @@ en:
The markup and image references in "%{name}" were succesfully
validated. You may now save the image and create a Deployable.
make_deployable: Automatically make "%{name}" Deployable.
- back: Back
+ edit_xml: View and Edit Template XML
save_template: Save Image Template
not_on_provider: The requested image was not found on the Provider.
template_xml:
--
1.7.11.4
11 years, 7 months
[PATCH 1/4] Visually grouped Pools in Monitor + Environment's dark skin to light one
by Jaromir Coufal
From: Jaromir Coufal <jcoufal(a)redhat.com>
---
src/app/stylesheets/layout.scss | 156 +++++++++++++++++++++++-----------------
1 file changed, 91 insertions(+), 65 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index e8e75de..b09ac6a 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -867,33 +867,33 @@ $dd_icon_padding_right: 4px;
$bar_height: 37px;
div.pool.overview{
+ background: rgb(230,230,230);
+ border: 1px solid rgb(210,210,210);
+ border-radius: 7px;
+ -webkit-border-radius: 7px;
+ -moz-border-radius: 7px;
header{
position: relative;
height: $bar_height;
width: 100%;
- background-color: #e5e5e5;
- -webkit-border-radius: 7px; -moz-border-radius: 7px; border-radius: 7px;
- border: 1px solid #bcbcbc;
+ border-bottom: 1px solid rgb(195,195,195);
+ -webkit-border-radius: 5px 5px 0 0;
+ -moz-border-radius: 5px 5px 0 0;
+ border-radius: 5px 5px 0 0;
+
- box-shadow: 0 2px 5px rgba(0, 0, 0, 0.20);
- -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.20);
- -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.20);
h3.name{
display: block;
float: left;
width: 230px;
height: $bar_height;
- background: transparent url('../../images/pool_bar_name-bg-normal.png') no-repeat 0px 0px;
- border-right: 1px solid #a9a9a9;
vertical-align: top;
a{
display: block;
- text-decoration: none;
- padding: 9px;
- padding-left: 30px;
+ padding: 9px 10px 10px 10px;
font-family: $font-family-primary;
font-size: 17px;
color: #666;
@@ -933,7 +933,6 @@ div.pool.overview{
dl.statistics{
@include display_inline_block;
height: $bar_height;
- background: transparent url('../../images/pool_bar_prop-gradient.png') repeat-y 0px 0px;
}
/* statistic group list */
@@ -1032,13 +1031,21 @@ div.pool.overview{
}
+ & > .content {
+ padding: 10px;
+ margin: 0;
+ width: auto;
+ background: rgb(249,249,249);
+ }
+
ul.actions{
list-style: none;
display: block;
text-align: right;
- width: 100%;
- margin: 10px 0px 0px 0px;
font-size: 11px;
+ -webkit-border-radius: 0 0 5px 5px;
+ -moz-border-radius: 0 0 5px 5px;
+ border-radius: 0 0 5px 5px;
li{
@include display_inline_block;
@@ -1061,21 +1068,19 @@ div.pool.overview.alert{
}
div.pool.overview.collapsed{
-
- header{
- box-shadow: none;
- -moz-box-shadow: none;
- -webkit-box-shadow: none;
- border: 1px solid #ccc;
+ header {
+ border-bottom: 0 none;
a.control{
background-position: 0px -0px;
&:active{background-position: 0px -28px;}
&:hover{color: #333;}
}
+ }
+ .content {
+ display: none;
}
- .content{ display: none; }
}
div.pool.overview + div.pool.overview{
@@ -1244,12 +1249,12 @@ ul.deployment-array.large + ul.deployment-array.large{
/************************************************************************** */
$deployment-small-height: 116px;
-$deployment-small-width: 174px;
+$deployment-small-width: 170px;
$deployment-small-padding: 8px;
ul.deployment-array.small{
- margin-top: 10px;
+ margin-bottom: 10px;
list-style: none;
display: table;
height: 100%;
@@ -1259,7 +1264,7 @@ ul.deployment-array.small{
display: table-cell;
float: left;
border: 1px solid #ccc;
- background-color: #efefef;
+ background-color: rgb(240,240,240);
-webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px;
padding: $deployment-small-padding;
width: $deployment-small-width - ($deployment-small-padding * 2);
@@ -2166,71 +2171,94 @@ table.flat, form.filterable-data table{
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Pool Families Table
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
table.pool_families{
- a{
- color: white;
- text-decoration: none;
- &:hover{ text-decoration: underline; }
- }
border-collapse: separate;
width: 100%;
- color: white;
margin-bottom: 20px;
- border: 1px solid #343434;
- border-top: none;
- border-bottom: none;
-
- -webkit-border-radius: 0px 0px 7px 7px;
- -moz-border-radius: 0px 0px 7px 7px;
- border-radius: 0px 0px 7px 7px;
+ border: 1px solid #D1D1D1;
+ border-top: 0 none;
+ border-bottom: 0 none;
+ -webkit-border-radius: 0 0 5px 5px;
+ -moz-border-radius: 0 0 5px 5px;
+ border-radius: 0 0 5px 5px;
caption{
width: 100%;
- background: #686868;
- border: 1px solid #343434;
- border-bottom: none;
- -webkit-border-radius: 7px 7px 0px 0px;
- -moz-border-radius: 7px 7px 0px 0px;
- border-radius: 7px 7px 0px 0px;
box-sizing: border-box; -webkit-box-sizing:border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box;
+ background: rgb(245, 245, 245);
+ border: 1px solid #D1D1D1;
+ -webkit-border-radius: 5px 5px 0 0;
+ -moz-border-radius: 5px 5px 0 0;
+ border-radius: 5px 5px 0 0;
+
+ h2 {
+ font-size: 17px;
+ font-weight: bold;
+ padding-top: 2px;
+ margin: 0;
+ }
+
+ a {
+ color: #666;
+
+ &:hover {
+ color: black;
+ }
+ }
.caption_content{padding: 8px;}
}
th{
- background: #686868;
+ background: rgb(225, 225, 225);
padding: 2px 8px;
font-size: 10px;
font-weight: bold;
- border-bottom: 1px solid #343434;
+ color: #666;
+ font-weight: bold;
+ border-bottom: 1px solid #BFBFBF;
+
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#F3F3F3), to(#D2D2D2));
+ background-image: -moz-linear-gradient(#F3F3F3, #D2D2D2);
+ background-image: -o-linear-gradient(#F3F3F3, #D2D2D2);
+ background-image: linear-gradient(#F3F3F3, #D2D2D2);
}
td{
padding: 8px;
- border-top: 1px solid #909090;
- border-bottom: 1px solid #343434;
vertical-align: middle;
+ border-bottom: 1px solid #D1D1D1;
- background: #666666; /* Old browsers */
- background: -moz-linear-gradient(top, #666666 0%, #535353 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#666666), color-stop(100%,#535353)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #666666 0%,#535353 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #666666 0%,#535353 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #666666 0%,#535353 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#666666', endColorstr='#535353',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #666666 0%,#535353 100%); /* W3C */
+ a:not(.button) {
+ color: #3286B8;
+ }
+ }
+
+ tr {
+ background: #F3F3F3;
+
+ &.total {
+ background: rgb(225, 225, 225);
+ color: rgb(150, 150, 150);
+ }
+ }
+
+ tr:nth-child(odd):not(.total) {
+ background: #FAFAFA;
}
tr:last-child{
- td:first-child{
- -webkit-border-radius: 0px 0px 0px 7px;
- -moz-border-radius: 0px 0px 0px 7px;
- border-radius: 0px 0px 0px 7px;
+ td:first-child {
+ -webkit-border-radius: 0 0 0 5px;
+ -moz-border-radius: 0 0 0 5px;
+ border-radius: 0 0 0 5px;
}
- td:last-child{
- -webkit-border-radius: 0px 0px 7px 0px;
- -moz-border-radius: 0px 0px 7px 0px;
- border-radius: 0px 0px 7px 0px;
+
+ td:last-child {
+ -webkit-border-radius: 0 0 5px 0;
+ -moz-border-radius: 0 0 5px 0;
+ border-radius: 0 0 5px 0;
}
}
@@ -2248,7 +2276,6 @@ table.pool_families{
text-decoration: none;
white-space: nowrap;
padding: 3px 6px;
- -webkit-border-radius: 12px; -moz-border-radius: 12px; border-radius: 12px;
border: 1px solid #343434;
-webkit-box-shadow: 0px 0px 1px 0px #333;
@@ -2281,7 +2308,6 @@ table.pool_families{
padding: 3px 6px;
border: 1px solid #3a3a3a;
- -webkit-border-radius: 12px; -moz-border-radius: 12px; border-radius: 12px;
-webkit-box-shadow: 0px 0px 1px 0px #333;
-moz-box-shadow: 0px 0px 1px 0px #333;
box-shadow: 0px 0px 1px 0px #333;
--
1.7.11.4
11 years, 7 months
[PATCH 2/4] Fixed directions for expandable arrows at Monitor > Pools
by Jaromir Coufal
From: Jaromir Coufal <jcoufal(a)redhat.com>
---
src/public/images/pool_bar_expand-btn.png | Bin 2799 -> 3699 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/public/images/pool_bar_expand-btn.png b/src/public/images/pool_bar_expand-btn.png
index a065effec72e83178b5aa1c17ff6b90681e624b1..ae1042234e8d27f45c1b41c082bfa38c47eb507d 100644
GIT binary patch
delta 3678
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
delta 2791
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
--
1.7.11.4
11 years, 7 months
[PATCH 3/4] Buttons appearance: Bold font for primary button + Normal button hover to gray background
by Jaromir Coufal
From: Jaromir Coufal <jcoufal(a)redhat.com>
---
src/app/stylesheets/_buttons.scss | 72 ++++++++++++++++++++++++++++-----------
1 file changed, 53 insertions(+), 19 deletions(-)
diff --git a/src/app/stylesheets/_buttons.scss b/src/app/stylesheets/_buttons.scss
index ac39977..ae5cb00 100644
--- a/src/app/stylesheets/_buttons.scss
+++ b/src/app/stylesheets/_buttons.scss
@@ -36,7 +36,9 @@ Application Button Set
background-image: linear-gradient(#f4f4f4, #ececec);
-moz-background-clip: padding; /* for Firefox 3.6 */
background-clip: padding-box;
- border-radius: 0.2em;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
/* IE hacks */
zoom: 1;
*display: inline;
@@ -46,28 +48,25 @@ Application Button Set
.button:not(.disable):focus,
.button:not(.disable):active,
.button.active {
- border-color: #3072b3;
- border-bottom-color: #2a65a0;
- text-decoration: none;
+ border-color: rgb(100, 100, 100);
+ color: white;
text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
- color: #fff;
- background-color: #3c8dde;
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#599bdc), to(#3072b3));
- background-image: -moz-linear-gradient(#599bdc, #3072b3);
- background-image: -o-linear-gradient(#599bdc, #3072b3);
- background-image: linear-gradient(#599bdc, #3072b3);
+ background-color: rgb(110, 110, 110);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgb(125, 125, 125)), to(rgb(95, 95, 95)));
+ background-image: -moz-linear-gradient(rgb(230, 230, 230), rgb(95, 95, 95));
+ background-image: -o-linear-gradient(rgb(230, 230, 230), rgb(95, 95, 95));
+ background-image: linear-gradient(rgb(230, 230, 230), rgb(95, 95, 95));
}
.button:not(.disable):active,
.button.active {
- border-color: #2a65a0;
- border-bottom-color: #3884cd;
- background-color: #3072b3;
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3072b3), to(#599bdc));
- background-image: -moz-linear-gradient(#3072b3, #599bdc);
- background-image: -ms-linear-gradient(#3072b3, #599bdc);
- background-image: -o-linear-gradient(#3072b3, #599bdc);
- background-image: linear-gradient(#3072b3, #599bdc);
+ border-color: rgb(80, 80, 80);
+ background-color: rgb(90, 90, 90);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgb(85, 85, 85)), to(rgb(95, 95, 95)));
+ background-image: -moz-linear-gradient(rgb(85, 85, 85), rgb(95, 95, 95));
+ background-image: -o-linear-gradient(rgb(85, 85, 85), rgb(95, 95, 95));
+ background-image: linear-gradient(rgb(85, 85, 85), rgb(95, 95, 95));
+
}
/* overrides extra padding on button elements in Firefox */
@@ -84,7 +83,35 @@ Application Button Set
========================================================================== */
.button.primary {
- font-weight: bold;
+ font-weight: bold;
+
+ &:not(.disable):hover,
+ &:not(.disable):focus,
+ &:not(.disable):active,
+ &.active {
+ border-color: #3072b3;
+ border-bottom-color: #2a65a0;
+ text-decoration: none;
+ text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
+ color: #fff;
+ background-color: #3c8dde;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#599bdc), to(#3072b3));
+ background-image: -moz-linear-gradient(#599bdc, #3072b3);
+ background-image: -o-linear-gradient(#599bdc, #3072b3);
+ background-image: linear-gradient(#599bdc, #3072b3);
+ }
+
+ &:not(.disable):active,
+ &.active {
+ border-color: #2a65a0;
+ border-bottom-color: #3884cd;
+ background-color: #3072b3;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3072b3), to(#599bdc));
+ background-image: -moz-linear-gradient(#3072b3, #599bdc);
+ background-image: -ms-linear-gradient(#3072b3, #599bdc);
+ background-image: -o-linear-gradient(#3072b3, #599bdc);
+ background-image: linear-gradient(#3072b3, #599bdc);
+ }
}
/* Danger button
@@ -100,6 +127,7 @@ Application Button Set
border-color: #b53f3a;
border-bottom-color: #a0302a;
color: #fff;
+ text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
background-color: #dc5f59;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dc5f59), to(#b33630));
background-image: -moz-linear-gradient(#dc5f59, #b33630);
@@ -243,6 +271,12 @@ Application Button Set
border-radius: 0em 50em 50em 0em;
}
+.button-group .button_to:not(:only-child) div .button{
+ -webkit-border-radius: 0 3px;
+ -moz-border-radius: 0 3px 3px 0;
+ border-radius: 0 3px 3px 0;
+}
+
/* Launch deployment button
========================================================================== */
#launch_deployment_button{
--
1.7.11.4
11 years, 7 months
[PATCH] allow event to find source even if source has been soft deleted
by Tzu-Mainn Chen
From: Tzu-Mainn Chen <tzumainn(a)redhat.com>
---
src/app/models/event.rb | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/app/models/event.rb b/src/app/models/event.rb
index 5d17380..9819b66 100644
--- a/src/app/models/event.rb
+++ b/src/app/models/event.rb
@@ -47,6 +47,14 @@ class Event < ActiveRecord::Base
scope :lifetime, where(:status_code => [:first_running, :all_running, :some_running, :all_stopped])
+ def source
+ case source_type
+ when "Deployment" then Deployment.with_deleted.find(source_id)
+ when "Instance" then Instance.with_deleted.find(source_id)
+ else super
+ end
+ end
+
# Notifies the Event API if certain conditions are met
def transmit_event
# Extract just the old values from change_hash
--
1.7.6.5
11 years, 7 months
[PATCH] BZ863055 - correct provider's image ID field
by Tzu-Mainn Chen
From: Tzu-Mainn Chen <tzumainn(a)redhat.com>
---
src/app/views/images/_status.html.mustache | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/views/images/_status.html.mustache b/src/app/views/images/_status.html.mustache
index af25716..9f73fe7 100644
--- a/src/app/views/images/_status.html.mustache
+++ b/src/app/views/images/_status.html.mustache
@@ -54,7 +54,7 @@
{{account.provider_name}}
</td>
<td class="light">
- {{provider_image.uuid}}
+ {{provider_image.target_identifier}}
</td>
<td class="image_controls light">
{{#push_status.is_active_push}}
--
1.7.6.5
11 years, 7 months