On 01/10/2012 04:04 PM, jtomasek(a)redhat.com wrote:
From: Jiri Tomasek<jtomasek(a)redhat.com>
---
.../provider_accounts/_provider_form.html.haml | 46 +++++++++----------
src/config/locales/en.yml | 1 +
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/app/views/provider_accounts/_provider_form.html.haml
b/src/app/views/provider_accounts/_provider_form.html.haml
index 1553c5f..56b7e74 100644
--- a/src/app/views/provider_accounts/_provider_form.html.haml
+++ b/src/app/views/provider_accounts/_provider_form.html.haml
@@ -1,31 +1,29 @@
-%fieldset
- %p
- = label :provider_account,
t('provider_accounts.index.provider_account_name')
- = text_field :provider_account, :label, :class => 'em long'
+%p
+ = label :provider_account, t('provider_accounts.index.provider_account_name')
+ = text_field :provider_account, :label, :class => 'em long'
- CredentialDefinition::CREDENTIAL_DEFINITIONS_ORDER.each do |cred_order|
- @provider_account.all_credentials((a)provider).each do |cred|
- if cred_order == cred.credential_definition.name
- %fieldset
- %p
- = label_tag cred.credential_definition.label
- - if cred.credential_definition.input_type == "password"
- = password_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]",
cred.value
- - elsif cred.credential_definition.input_type == "file"
- = file_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]", :value
=> cred.value
- - else
- = text_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]",
cred.value
+ %p
+ = label_tag cred.credential_definition.label
+ - if cred.credential_definition.input_type == "password"
+ = password_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]",
cred.value
+ - elsif cred.credential_definition.input_type == "file"
+ %span.text_instead_input=
t("provider_accounts.edit.file_already_uploaded") if cred.value
+ = file_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]", :value
=> cred.value
+ - else
+ = text_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]",
cred.value
-%fieldset
- %p
- = label :provider_account, t('provider_accounts.index.priority')
- = text_field :provider_account, :priority, :class => 'em'
- %p
- = label_tag t("quotas.quota")
- = text_field :quota, :maximum_running_instances, :title =>
t('provider_accounts.form.quota_instances'), :value =>
@quota.maximum_running_instances || t('provider_accounts.properties.unlimited'),
:id => "quota_instances"
- (
- %button.linkbutton.nospace{ :type => 'button', :onclick =>
"set_unlimited_quota(\"quota_instances\");" }<>
- = t('provider_accounts.form.unlimited_quota')
- )
+%p
+ = label :provider_account, t('provider_accounts.index.priority')
+ = text_field :provider_account, :priority, :class => 'em'
+%p
+ = label_tag t("quotas.quota")
+ = text_field :quota, :maximum_running_instances, :title =>
t('provider_accounts.form.quota_instances'), :value =>
@quota.maximum_running_instances || t('provider_accounts.properties.unlimited'),
:id => "quota_instances"
+ (
+ %button.linkbutton.nospace{ :type => 'button', :onclick =>
"set_unlimited_quota(\"quota_instances\");" }<>
+ = t('provider_accounts.form.unlimited_quota')
+ )
:javascript
function set_unlimited_quota(elem_id) {
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index b1feea1..83f46fa 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -976,6 +976,7 @@ en:
required_field: Required field.
account: "Account:"
delete_account: Delete Account
+ file_already_uploaded: "Already uploaded. Reupload?"
show:
account: "Account:"
test_connection: Test Connection
Self ACK & Pushed.