--- src/app/views/builds/index.haml | 2 +- src/app/views/layouts/_header.haml | 2 +- src/app/views/permissions/list.haml | 2 +- src/app/views/permissions/new.haml | 2 +- src/app/views/pools/new.haml | 4 ++-- src/app/views/providers/_form.haml | 4 ++-- src/app/views/providers/_providers.haml | 4 ++-- src/app/views/providers/new.haml | 2 +- src/app/views/settings/self_service.haml | 4 ++-- src/app/views/templates/index.haml | 2 +- src/app/views/user_sessions/new.haml | 2 +- src/app/views/users/_form.haml | 4 ++-- 12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/app/views/builds/index.haml b/src/app/views/builds/index.haml index 0d2d5ce..b3007de 100644 --- a/src/app/views/builds/index.haml +++ b/src/app/views/builds/index.haml @@ -6,7 +6,7 @@ {:name => 'STATUS', :sort_attr => 'status'}, | ] |
-- form_tag :action => "" do += form_tag :action => "" do .actionsidebar.grid_3 %dl %dt Build Job Actions diff --git a/src/app/views/layouts/_header.haml b/src/app/views/layouts/_header.haml index f31b6cd..076a8c0 100644 --- a/src/app/views/layouts/_header.haml +++ b/src/app/views/layouts/_header.haml @@ -12,7 +12,7 @@ = t(:configure)
%li.hello - - link_to :controller => 'users', :action => 'edit', :id => @current_user.id do + = link_to :controller => 'users', :action => 'edit', :id => @current_user.id do = t(:hello) + " " %b = "#{@current_user.first_name} #{@current_user.last_name}" diff --git a/src/app/views/permissions/list.haml b/src/app/views/permissions/list.haml index 27831d0..f48c014 100644 --- a/src/app/views/permissions/list.haml +++ b/src/app/views/permissions/list.haml @@ -15,7 +15,7 @@ %td= permission.role.name %td - if has_set_perms? - - form_tag :action => 'destroy' do + = form_tag :action => 'destroy' do = hidden_field :permission, :id, :value => permission.id = submit_tag "delete", :class => "submit_link", :id => "delete_#{permission.id}" - } diff --git a/src/app/views/permissions/new.haml b/src/app/views/permissions/new.haml index 15a06f9..1ed9a3d 100644 --- a/src/app/views/permissions/new.haml +++ b/src/app/views/permissions/new.haml @@ -3,7 +3,7 @@ %h2 Add new Permission for #{@permission_object.name} %br/ - - form_tag :action => 'create' do + = form_tag :action => 'create' do %ul %li %label diff --git a/src/app/views/pools/new.haml b/src/app/views/pools/new.haml index 037c7c4..7e1b5c8 100644 --- a/src/app/views/pools/new.haml +++ b/src/app/views/pools/new.haml @@ -1,12 +1,12 @@ .grid_16 = error_messages_for 'account' %h1 Create a new Pool - - form_for @pool, :action => 'create' do |form| + = form_for @pool, :action => 'create' do |form| %h2 Pool %fieldset %label.grid_2.alpha Name: = form.text_field :name, :class => "grid_5" - = form.error_message_on :name, 'Name ' + = form.error_message_on :name, :prepend_text => 'Name ' .clear.grid_14.prefix_2.alpha Provide a descriptive name for this pool.
= submit_tag "Save", :class => "submit formbutton" diff --git a/src/app/views/providers/_form.haml b/src/app/views/providers/_form.haml index dca4cd3..969d6dd 100644 --- a/src/app/views/providers/_form.haml +++ b/src/app/views/providers/_form.haml @@ -8,8 +8,8 @@ %span.required * %div.grid_4.omega - = f.error_message_on :url, 'URL ' - = f.error_message_on :name, 'Name ' + = f.error_message_on :url, :prepend_text => 'URL ' + = f.error_message_on :name, :prepend_text => '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 diff --git a/src/app/views/providers/_providers.haml b/src/app/views/providers/_providers.haml index 6c46532..b7ec259 100644 --- a/src/app/views/providers/_providers.haml +++ b/src/app/views/providers/_providers.haml @@ -8,9 +8,9 @@ %a{ :href => url_for(:controller => 'providers', :action => 'show', :id => provider), :class => selected } = provider.name = edit_button(@provider, controller.action_name) - - form_tag({:controller => 'providers', :action => 'new'}, {:method => :get , :class => 'buttononly'}) do + = form_tag({:controller => 'providers', :action => 'new'}, {:method => :get , :class => 'buttononly'}) do %input{ :type => 'submit', :value => t(:add), :disabled => ('disabled' unless controller.action_name == 'index') } - - form_tag({:controller => 'providers', :action => 'destroy', :id => @provider}, {:method => :delete , :class => 'buttononly'}) do + = form_tag({:controller => 'providers', :action => 'destroy', :id => @provider}, {:method => :delete , :class => 'buttononly'}) do = submit_tag 'delete', :disabled => ('disabled' unless @provider and controller.action_name == 'show')
:javascript diff --git a/src/app/views/providers/new.haml b/src/app/views/providers/new.haml index 2803b64..cd55393 100644 --- a/src/app/views/providers/new.haml +++ b/src/app/views/providers/new.haml @@ -2,6 +2,6 @@ #details.grid_13 %nav.subsubnav = render_navigation({:context => 'old', :level => 4}) - - form_for :provider, @provider, :url => providers_path, :html => { :class => "dcloud_form" } do |f| + = form_for @provider, :as => :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/settings/self_service.haml b/src/app/views/settings/self_service.haml index 8fd9950..9d82a76 100644 --- a/src/app/views/settings/self_service.haml +++ b/src/app/views/settings/self_service.haml @@ -10,7 +10,7 @@ = error_messages_for @parent_type %h2 = t('.self_service_default') - - form_for @self_service_default_quota, :url => { :action => 'update' } do |form| + = form_for @self_service_default_quota, :url => { :action => 'update' } do |form| %h3 Instances %fieldset.clearfix %label.grid_2.alpha Permissions: @@ -52,7 +52,7 @@ = t('.quota') + ":" = text_field :self_service_default_quota, :maximum_running_instances, :class => 'grid_5' .grid_2.la (instances) - = form.error_message_on :maximum_running_instances, 'Maximum Running Instances ' + = form.error_message_on :maximum_running_instances, :prepend_text => 'Maximum Running Instances ' %h3 POOLS %fieldset.clearfix %label.grid_2.alpha Permissions: diff --git a/src/app/views/templates/index.haml b/src/app/views/templates/index.haml index 38b32de..d27d75a 100644 --- a/src/app/views/templates/index.haml +++ b/src/app/views/templates/index.haml @@ -1,4 +1,4 @@ -- form_tag(:action => 'index_action') do += form_tag(:action => 'index_action') do .actionsidebar.grid_3 %dl %dt Actions diff --git a/src/app/views/user_sessions/new.haml b/src/app/views/user_sessions/new.haml index b76fba7..b613bff 100644 --- a/src/app/views/user_sessions/new.haml +++ b/src/app/views/user_sessions/new.haml @@ -1,7 +1,7 @@ .modalbox %h2 Log In .dcloud_form - - form_for @user_session, :url => url_for(:action => :create) do |f| + = form_for @user_session, :url => url_for(:action => :create) do |f| %fieldset = f.label :login, "Username:" = f.text_field :login diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml index 8d87a2f..115445a 100644 --- a/src/app/views/users/_form.haml +++ b/src/app/views/users/_form.haml @@ -1,5 +1,5 @@ .dcloud_form - - form_for @user, :url => account_path do |form| + = form_for @user, :url => account_path do |form| = hidden_field :user, :id, :value => @user.id = form.error_messages %fieldset.clear @@ -40,7 +40,7 @@ = quota_form.label :maximum_running_instances, t(:maximum_running_instances), :class => "alpha grid_3" = quota_form.text_field :maximum_running_instances, :class => "grid_5" (instances) - = quota_form.error_message_on :maximum_running_instances, 'Maximum Running Instances ' + = quota_form.error_message_on :maximum_running_instances, :prepend_text => 'Maximum Running Instances ' %fieldset.clearfix = form.submit "Save", :class => "submit formbutton" = form.submit "Reset", :class => "submit formbutton"