On Fri, Sep 24, 2010 at 06:01:44PM +0200, [email protected] wrote: > From: Tomas Sedovic <[email protected]> > > Hooks it up to the navigation, makes it i18n-enabled, and adds missing > elements and markup. > --- > src/app/views/settings/self_service.haml | 18 ++++++++++-------- > src/config/locales/en.yml | 5 +++++ > src/config/navigation.rb | 2 +- > 3 files changed, 16 insertions(+), 9 deletions(-) > > diff --git a/src/app/views/settings/self_service.haml > b/src/app/views/settings/self_service.haml > index 4d220ab..b620fa2 100644 > --- a/src/app/views/settings/self_service.haml > +++ b/src/app/views/settings/self_service.haml > @@ -1,19 +1,21 @@ > -Insert Page 3170 Implementation Here. > -(or 3121 -- Treatments page for Self-Service user treatment > - > .dcloud_form > = error_messages_for @parent_type > = error_messages_for 'self_service_default_quota' > %h2 > - User Treatment: Self-service default > - %br/ > + = t('.self_service_default') > + %ul > + %li.selected Self-Service User > + %form > + = submit_tag t(:edit), :disabled => 'disabled' > + = submit_tag t(:new), :disabled => 'disabled' > - form_for @self_service_default_quota, :url => { :action => 'update' } do > |form| > %fieldset > - %legend Account > + %legend > + = t('.account') > = hidden_field :self_service_default_quota, :id > %ul > %li > %label > - quota (instances) > + = t('.quota') > = text_field :self_service_default_quota, > :maximum_running_instances > - = submit_tag "Save", :class => "submit" > + = submit_tag t(:save), :class => "submit" > diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml > index c24b01a..3fde03f 100644 > --- a/src/config/locales/en.yml > +++ b/src/config/locales/en.yml > @@ -39,6 +39,7 @@ en: > launch_instance: Launch Instance > help: Help > continue: Continue > + new: New > edit: Edit > add: Add > save: Save > @@ -60,6 +61,10 @@ en: > define_services_desc: View, edit and define services that DeltaCloud > will offer. These services will be mapped to individual providers based on > their capabilities. > permissions: Permissions > permissions_desc: Create and edit User Treatments that are applied to > users. Treatments pair together Roles with Categories of Instances, Pools and > Templates. Manage the categories, and define and edit Roles. Roles group > together sets of permissions that are relevant to Pools, Templates and > Instances. > + self_service: > + self_service_default: 'User Treatment: Self-service default' > + quota: quota (instances) > + account: Account > provider: > providers: PROVIDERS > show: > diff --git a/src/config/navigation.rb b/src/config/navigation.rb > index 88ce0ea..6b0d3cc 100644 > --- a/src/config/navigation.rb > +++ b/src/config/navigation.rb > @@ -11,7 +11,7 @@ SimpleNavigation::Configuration.run do |navigation| > fourth_level.item :provider_summary, t(:provider_summary), { > :controller => 'provider', :action => 'show', :id => (@provider.id if > @provider) }, :highlights_on => /\/provider\/(show|edit|new)/ > fourth_level.item :provider_accounts, t(:provider_accounts), { > :controller => 'provider', :action => 'accounts', :id => (@provider.id if > @provider) }, :highlights_on => /\/provider\/accounts/ > end > - third_level.item :self_service_settings, t(:self_service_settings), > :controller => 'settings', :action => 'self-service' > + third_level.item :self_service_settings, t(:self_service_settings), > :controller => 'settings', :action => 'self_service' > third_level.item :manage_users, t(:manage_users), :controller => > 'users' do |fourth_level| > fourth_level.item :new_user, t(:new_user), :controller => 'users', > :action => 'new' > fourth_level.item :edit_user, t(:edit_user), :controller => > 'users', :action => 'edit' > -- > 1.7.2.3 > > _______________________________________________ > deltacloud-devel mailing list > [email protected] > https://fedorahosted.org/mailman/listinfo/deltacloud-devel
ACK, works for me. Steve. _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
