On 11/23/2010 03:31 PM, [email protected] wrote: > From: Ladislav Martincik<[email protected]> > > --- > src/app/controllers/providers_controller.rb | 6 +-- > src/app/stylesheets/aggregator.scss | 5 +- > src/app/views/providers/_form.haml | 72 > +++++++++----------------- > src/app/views/providers/_providers.haml | 4 +- > src/app/views/providers/edit.haml | 8 +++- > src/app/views/providers/new.haml | 8 +++- > src/app/views/providers/show.haml | 15 +++++- > src/config/navigation.rb | 4 +- > src/config/routes.rb | 2 +- > 9 files changed, 62 insertions(+), 62 deletions(-) > > diff --git a/src/app/controllers/providers_controller.rb > b/src/app/controllers/providers_controller.rb > index 5ea4aee..ad42186 100644 > --- a/src/app/controllers/providers_controller.rb > +++ b/src/app/controllers/providers_controller.rb > @@ -21,7 +21,7 @@ > > class ProvidersController< ApplicationController > before_filter :require_user > - before_filter :load_providers, :only => [:index, :show, :accounts, :list] > + before_filter :load_providers, :only => [:index, :show, :edit, :new, > :accounts, :list] > > def section_id > 'administration' > @@ -39,7 +39,6 @@ class ProvidersController< ApplicationController > @providers = Provider.list_for_user(@current_user, > Privilege::PROVIDER_MODIFY) > @provider = Provider.find(:first, :conditions => {:id => params[:id]}) > require_privilege(Privilege::PROVIDER_MODIFY, @provider) > - render :show > end > > def new > @@ -47,7 +46,6 @@ class ProvidersController< ApplicationController > @providers = Provider.list_for_user(@current_user, > Privilege::PROVIDER_MODIFY) > @provider = Provider.new(params[:provider]) > kick_condor > - render :show > end > > def create > @@ -74,7 +72,7 @@ class ProvidersController< ApplicationController > def update > require_privilege(Privilege::PROVIDER_MODIFY) > @providers = Provider.list_for_user(@current_user, > Privilege::PROVIDER_MODIFY) > - @provider = Provider.find(:first, :conditions => {:id => > params[:provider][:id]}) > + @provider = Provider.find(:first, :conditions => {:id => params[:id]}) > previous_cloud_type = @provider.cloud_type > > @provider.update_attributes(params[:provider]) > diff --git a/src/app/stylesheets/aggregator.scss > b/src/app/stylesheets/aggregator.scss > index 2a4711b..ce62b89 100644 > --- a/src/app/stylesheets/aggregator.scss > +++ b/src/app/stylesheets/aggregator.scss > @@ -910,12 +910,11 @@ fieldset.gap { > fieldset { > overflow: hidden; > margin: 10px 0 0; > - text-align: right; > + text-align: left; > label { > display: inline-block; > font-weight: bold; > - padding: 4px 10px 0 0; > - max-width: 10em; > + padding: 4px 0 0 0; > } > input[type='text'], input[type='password'], textarea { > display: inline-block; > diff --git a/src/app/views/providers/_form.haml > b/src/app/views/providers/_form.haml > index 94e2ebf..dca4cd3 100644 > --- a/src/app/views/providers/_form.haml > +++ b/src/app/views/providers/_form.haml > @@ -1,47 +1,25 @@ > -- readonly = controller.action_name == 'show' ? true : false > -- new_provider = ['new', 'create'].include? controller.action_name > -- edit_provider = ['edit', 'update'].include? controller.action_name > -= render :partial => 'providers' > -#details.grid_13 > - %nav.subsubnav > - = render_navigation(:level => 4) > - - if new_provider > - - form_action = 'create' > - - elsif edit_provider > - - form_action = 'update' > - - form_for @provider, :url => {:controller => :providers, :action => > form_action}, :class => "dcloud_form" do |f| > - %fieldset > - %label.grid_4.alpha.big{ :for => "provider_name" } > - = t('.provider_name') > - - unless readonly > - %span.required > - * > - %label.grid_5.big{ :for => "provider_url" } > - = t('.provider_url') > - - unless readonly > - %span.required > - * > - %div.grid_4.omega > - = f.error_message_on :url, 'URL ' > - = f.error_message_on :name, 'Name ' > - = f.text_field :name, :title => t('.provider_name'), :value => > (@provider.name if @provider), :disabled => ('disabled' if readonly), :class > => "clear grid_4 alpha" > - = f.text_field :url, :title => t('.provider_url'), :class => > 'emailinput', :value => (@provider.url if @provider), :disabled => > ('disabled' if readonly), :class => "grid_5" > - - if edit_provider: > - = f.hidden_field :id, :value => @provider.id > - .clear.prefix_4.grid_5.suffix_4.alpha.omega > - - if new_provider or edit_provider > - %span > - ( > - %button.linkbutton.nospace{ :type => 'submit', :value => > t('.test_connection'), :name => 'test_connection', :id => 'test_connection' > }<> > - = t('.test_connection') > - ) > - - unless readonly > - %p.requirement > - %span.required > - * > - \- > - = t('.required_field') > - - if edit_provider > - %input{ :type => 'submit', :value => t(:save), :name => > 'save_provider', :id => 'save_provider' } > - - elsif new_provider > - %input{ :type => 'submit', :value => t(:add), :name => > 'add_provider', :id => 'add_provider' } > +%fieldset > + %label.grid_4.alpha.big{ :for => "provider_name" } > + = t('.provider_name') > + %span.required > + * > + %label.grid_5.big{ :for => "provider_url" } > + = t('.provider_url') > + %span.required > + * > + %div.grid_4.omega > + = f.error_message_on :url, 'URL ' > + = f.error_message_on :name, 'Name ' > + = f.text_field :name, :title => t('.provider_name'), :value => > @provider.name, :class => "clear grid_4 alpha" > + = f.text_field :url, :title => t('.provider_url'), :class => > 'emailinput', :value => @provider.url, :class => "grid_5" > + .clear.prefix_4.grid_5.alpha.omega > + %span > + ( > + %button.linkbutton.nospace{ :type => 'submit', :value => > t('.test_connection'), :name => 'test_connection', :id => 'test_connection' > } > + = t('.test_connection') > + ) > +%p.requirement > + %span.required > + * > + \- > + = t('.required_field') > diff --git a/src/app/views/providers/_providers.haml > b/src/app/views/providers/_providers.haml > index b1a9bec..2687d95 100644 > --- a/src/app/views/providers/_providers.haml > +++ b/src/app/views/providers/_providers.haml > @@ -7,7 +7,7 @@ > - selected = 'selected' if @provider and (provider.id == > @provider.id) > %a{ :href => url_for(:controller => 'providers', :action => > 'show', :id => provider), :class => selected } > = provider.name > - - form_tag({:controller => 'providers', :action => 'edit', :id => > @provider}, {:method => :post , :class => 'buttononly'}) do > + - form_tag({:controller => 'providers', :action => 'edit', :id => > @provider}, {:method => :get, :class => 'buttononly'}) do > = submit_tag t(:edit), :disabled => ('disabled' unless @provider and > ['show', 'accounts'].include? controller.action_name) > - form_tag({:controller => 'providers', :action => 'new'}, {:method => > :get , :class => 'buttononly'}) do > - %input{ :type => 'submit', :value => t(:add), :disabled => > ('disabled' unless @providers.length == 0) } > + %input{ :type => 'submit', :value => t(:add), :disabled => > ('disabled' unless controller.action_name == 'index') } > diff --git a/src/app/views/providers/edit.haml > b/src/app/views/providers/edit.haml > index c66fabf..199a73a 100644 > --- a/src/app/views/providers/edit.haml > +++ b/src/app/views/providers/edit.haml > @@ -1 +1,7 @@ > -= render :partial => 'form' > += render :partial => 'providers' > +#details.grid_13 > + %nav.subsubnav > + = render_navigation(:level => 4) > + - form_for :provider, @provider, :url => provider_path(@provider), :html > => { :method => 'put', :class => "dcloud_form" } do |f| > + = render :partial => 'form', :locals => { :f => f } > + %input{ :type => 'submit', :value => t(:save), :name => > 'save_provider', :id => 'save_provider' } > diff --git a/src/app/views/providers/new.haml > b/src/app/views/providers/new.haml > index c66fabf..b3fb83f 100644 > --- a/src/app/views/providers/new.haml > +++ b/src/app/views/providers/new.haml > @@ -1 +1,7 @@ > -= render :partial => 'form' > += render :partial => 'providers' > +#details.grid_13 > + %nav.subsubnav > + = render_navigation(:level => 4) > + - form_for :provider, @provider, :url => providers_path, :html => { > :class => "dcloud_form" } do |f| > + = render :partial => 'form', :locals => { :f => f } > + %input{ :type => 'submit', :value => t(:add), :name => > 'add_provider', :id => 'add_provider' } > diff --git a/src/app/views/providers/show.haml > b/src/app/views/providers/show.haml > index c66fabf..574aed8 100644 > --- a/src/app/views/providers/show.haml > +++ b/src/app/views/providers/show.haml > @@ -1 +1,14 @@ > -= render :partial => 'form' > += render :partial => 'providers' > +#details.grid_13 > + %nav.subsubnav > + = render_navigation(:level => 4) > + %br > + %table > + %thead > + %tr > + %th{:scope => "col"} Provider Name > + %th{:scope => "col"} Provider URL > + %tbody > + %tr > + %td= @provider.name > + %td= @provider.url > diff --git a/src/config/navigation.rb b/src/config/navigation.rb > index caa864b..3b63df1 100644 > --- a/src/config/navigation.rb > +++ b/src/config/navigation.rb > @@ -7,8 +7,8 @@ SimpleNavigation::Configuration.run do |navigation| > end > first_level.item :administration, t(:administration), '#', :class => > 'administration' do |second_level| > second_level.item :system_settings, t(:system_settings), :controller > => 'settings' do |third_level| > - third_level.item :manage_providers, t(:manage_providers), > :controller => 'providers' do |fourth_level| > - fourth_level.item :provider_summary, t(:provider_summary), { > :controller => 'providers', :action => 'show', :id => (@provider.id if > @provider) }, :highlights_on => /\/providers\/(show|edit)/ > + third_level.item :manage_providers, t(:manage_providers), > providers_path do |fourth_level| > + fourth_level.item :provider_summary, t(:provider_summary), { > :controller => 'providers', :action => 'show', :id => (@provider.id if > @provider) }, :highlights_on => /\/providers\/[0-9]+/ > fourth_level.item :provider_accounts, t(:provider_accounts), { > :controller => 'providers', :action => 'accounts', :id => (@provider.id if > @provider) }, :highlights_on => /\/providers\/accounts/ > fourth_level.item :scheduling_policies, t(:scheduling_policies), > '#' > fourth_level.item :services_provided, t(:services_provided), '#' > diff --git a/src/config/routes.rb b/src/config/routes.rb > index 8afbb6a..f59a2aa 100644 > --- a/src/config/routes.rb > +++ b/src/config/routes.rb > @@ -52,7 +52,7 @@ ActionController::Routing::Routes.draw do |map| > > # Temporarily disable this route, provider stuff is not restful yet. > # Will be re-enabled in upcoming patch > - # map.resources :provider > + map.resources :providers > > # Allow downloading Web Service WSDL as a file with an extension > # instead of a file named 'wsdl'
ACK _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
