diff options
| author | spag <spag@golwen.net> | 2013-02-14 10:42:39 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-02-14 10:42:39 +0100 |
| commit | 41303b0a2a07b897f7373eebba25708da89085a1 (patch) | |
| tree | 88e48da31bdd92d80af76c18d0df992f7d09f91b /app/views/tenants | |
| parent | a1aafe9eec98f91fd76d104964ad98fcafc94a80 (diff) | |
| parent | a9bf3a7e1fd802025824668e477a5ec14ce81d5a (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/tenants')
| -rw-r--r-- | app/views/tenants/_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/tenants/_index_core.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/tenants/_form.html.haml b/app/views/tenants/_form.html.haml index 1641e78..981293c 100644 --- a/app/views/tenants/_form.html.haml +++ b/app/views/tenants/_form.html.haml @@ -20,5 +20,5 @@ - if GsParameter.get('STRICT_DID_HANDLING') == true = f.input :did_list, :label => t('tenants.form.did_list.label'), :hint => conditional_hint('tenants.form.did_list.hint') - .actions - = f.button :submit, conditional_t('tenants.form.submit')
\ No newline at end of file + .form-actions + = f.button :submit, conditional_t('tenants.form.submit') diff --git a/app/views/tenants/_index_core.html.haml b/app/views/tenants/_index_core.html.haml index a220b1b..2430b67 100644 --- a/app/views/tenants/_index_core.html.haml +++ b/app/views/tenants/_index_core.html.haml @@ -13,6 +13,6 @@ - if current_user && current_user.current_tenant != tenant && current_user.tenants.include?(tenant) = simple_form_for([current_user.current_tenant, current_user]) do |f| = f.hidden_field :current_tenant_id, :value => tenant.id - .actions + .form-actions = f.button :submit, conditional_t('tenants.switch_to_tenant') - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => tenant}
\ No newline at end of file + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => tenant} |