[PATCH conductor] Apply new UI to Provider Account views

From: Jozef Zigmund <jzigmund(a)redhat.com&gt; --- .../controllers/provider_accounts_controller.rb | 6 +++ src/app/stylesheets/layout.scss | 2 +- src/app/views/provider_accounts/_properties.haml | 2 - src/app/views/provider_accounts/edit.haml | 36 ++++++++++++-------- src/app/views/provider_accounts/new.haml | 31 ++++++++++------ src/app/views/provider_accounts/show.haml | 18 +++++++++- 6 files changed, 64 insertions(+), 31 deletions(-) diff --git a/src/app/controllers/provider_accounts_controller.rb b/src/app/controllers/provider_accounts_controller.rb index ffa7aa3..0fc4005 100644 --- a/src/app/controllers/provider_accounts_controller.rb +++ b/src/app/controllers/provider_accounts_controller.rb @@ -111,6 +111,12 @@ class ProviderAccountsController < ApplicationController end end + def destroy + require_privilege(Privilege::MODIFY, @provider_account) + ProviderAccount.destroy(params[:id]) + redirect_to provider_accounts_path + end + def multi_destroy if params[:accounts_selected].blank? flash[:notice] = "You must select some accounts first." diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index 51a31ba..0f10cf3 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -1444,7 +1444,7 @@ div#content .page-header{ background: transparent url('../../images/header_icon_providers.png') no-repeat 8px center; } - h1.provider-accounts{ + h1.provider_accounts{ background: transparent url('../../images/header_icon_provider-accounts.png') no-repeat 8px center; padding: 6px 7px 7px 60px; } diff --git a/src/app/views/provider_accounts/_properties.haml b/src/app/views/provider_accounts/_properties.haml index e7d987d..5368151 100644 --- a/src/app/views/provider_accounts/_properties.haml +++ b/src/app/views/provider_accounts/_properties.haml @@ -9,5 +9,3 @@ %label Account ID: = @account.credentials_hash['account_number'] -= link_to "Edit", edit_provider_account_path(@account), { :class => 'button' } -= link_to "Test", provider_account_path(@account, {:test_account => true}), { :class => 'button' } diff --git a/src/app/views/provider_accounts/edit.haml b/src/app/views/provider_accounts/edit.haml index 028d50f..fe78a9e 100644 --- a/src/app/views/provider_accounts/edit.haml +++ b/src/app/views/provider_accounts/edit.haml @@ -1,14 +1,22 @@ -#details.grid_13 - = error_messages_for :provider_account - %h2 - = t('provider_accounts.edit.edit_provider_account') - - form_tag(provider_account_path, { :method => :put, :multipart => true }) do - = render :partial => 'provider_selection' - %fieldset.clearfix - .grid_13.alpha.omega - = submit_tag t(:save), :class => "ra nomargin dialogbutton" - %section - %p.requirement - %span.required * - \- - = t('provider_accounts.edit.required_field') += render :partial => 'layouts/admin_header' +%header.page-header + %h1{:class => controller.controller_name}= @provider_account.name + #obj_actions.button-container + = link_to 'New Provider Account', new_provider_account_url, :class => 'button primary', :id => 'new_user_button' + %div.button-group + = link_to 'Cancel Editing', provider_account_path(@provider_account), :class => 'button pill danger', :id => 'new_user_button' + .corner &nbsp; + +%section.content-section.user + %header + %h2 Properties + + .content + = error_messages_for :provider_account + %h2 + = t('provider_accounts.edit.edit_provider_account') + - form_tag(provider_account_path, { :method => :put, :multipart => true }) do + = render :partial => 'provider_selection' + %fieldset.clearfix + .grid_13.alpha.omega + = submit_tag t(:save), :class => "ra nomargin dialogbutton" diff --git a/src/app/views/provider_accounts/new.haml b/src/app/views/provider_accounts/new.haml index 93b6136..8cc5dc0 100644 --- a/src/app/views/provider_accounts/new.haml +++ b/src/app/views/provider_accounts/new.haml @@ -1,13 +1,20 @@ -#details.grid_13 - = error_messages_for :provider_account - %h2 - = t('provider_accounts.new.new_provider_account') - %label{ :for => :provider_id } - Provider - %fieldset - - unless @providers.empty? - - form_for(@provider_account, :url => provider_accounts_path, :html => {:multipart => true}) do |f| - = render :partial => 'provider_selection' += render :partial => 'layouts/admin_header' += render :partial => 'section_header' + +%section.content-section.provider_accounts + %header + %h2 New Provider Account + + .content + = error_messages_for :provider_account + %h2 + = t('provider_accounts.new.new_provider_account') + %label{ :for => :provider_id } + Provider %fieldset - .grid_13.alpha.omega - = f.submit t(:add), :class => "ra nomargin dialogbutton" + - unless @providers.empty? + - form_for(@provider_account, :url => provider_accounts_path, :html => {:multipart => true}) do |f| + = render :partial => 'provider_selection' + %fieldset + .grid_13.alpha.omega + = f.submit t(:add), :class => "ra nomargin dialogbutton" diff --git a/src/app/views/provider_accounts/show.haml b/src/app/views/provider_accounts/show.haml index 2eadbfd..30dacd5 100644 --- a/src/app/views/provider_accounts/show.haml +++ b/src/app/views/provider_accounts/show.haml @@ -1,3 +1,17 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'properties' +%header.page-header + %h1{:class => controller.controller_name}= @account.name + #obj_actions.button-container + = link_to 'New Provider Account', new_provider_account_url, :class => 'button primary', :id => 'new_user_button' + .button-group + = link_to 'Edit', edit_provider_account_path(@account), :class => 'button pill' + = button_to "Delete", provider_account_path(@account), :method => 'delete', :class => 'button pill danger' + .corner &nbsp; + +%section.content-section.user + %header + %h2 Properties + + .content + %div#view + = render :partial => 'properties' \ No newline at end of file -- 1.7.4.4