diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-06-20 19:06:19 +0200 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-06-20 19:06:19 +0200 |
| commit | eb0e1cc5c26275ff3e5c341404e8bc558f8312b8 (patch) | |
| tree | 71f449ccd6f15422717de3ac24f87d5e888ddd79 /app/views/gateway_settings | |
| parent | df6e17e48995f25e72509986f30700d778b179b6 (diff) | |
| parent | 3b27a5d45b12f6bac65da2a8e17387bfda42a2f1 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/views/gateway_settings')
| -rw-r--r-- | app/views/gateway_settings/_form_core.html.haml | 2 | ||||
| -rw-r--r-- | app/views/gateway_settings/_index_core.html.haml | 8 | ||||
| -rw-r--r-- | app/views/gateway_settings/show.html.haml | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/views/gateway_settings/_form_core.html.haml b/app/views/gateway_settings/_form_core.html.haml index 229009b..a66dd2e 100644 --- a/app/views/gateway_settings/_form_core.html.haml +++ b/app/views/gateway_settings/_form_core.html.haml @@ -1,4 +1,4 @@ .inputs - = f.input :name, :collection => GatewaySetting::GATEWAY_SETTINGS[@gateway.technology].keys, :label => t('gateway_settings.form.name.label'), :hint => conditional_hint('gateway_settings.form.name.hint'), :autofocus => true, :include_blank => false + = f.input :name, :collection => GatewaySetting::GATEWAY_SETTINGS[@gateway.technology].map {|k,v| [t("gateway_settings.settings.#{@gateway.technology}.#{k}.label"), k] }, :label => t('gateway_settings.form.name.label'), :hint => conditional_hint('gateway_settings.form.name.hint'), :autofocus => true, :include_blank => false = f.input :value, :label => t('gateway_settings.form.value.label'), :hint => conditional_hint('gateway_settings.form.value.hint') = f.input :description, :label => t('gateway_settings.form.description.label'), :hint => conditional_hint('gateway_settings.form.description.hint') diff --git a/app/views/gateway_settings/_index_core.html.haml b/app/views/gateway_settings/_index_core.html.haml index 8098488..36b47c8 100644 --- a/app/views/gateway_settings/_index_core.html.haml +++ b/app/views/gateway_settings/_index_core.html.haml @@ -8,7 +8,11 @@ %tbody - for gateway_setting in gateway_settings %tr - %td= gateway_setting.name + %td= t("gateway_settings.settings.#{@gateway.technology}.#{gateway_setting.name}.label") %td= gateway_setting.value - %td= gateway_setting.description + %td + - if gateway_setting.description.blank? + = t("gateway_settings.settings.#{@gateway.technology}.#{gateway_setting.name}.hint") + - else + = gateway_setting.description =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => gateway_setting.gateway, :child => gateway_setting} diff --git a/app/views/gateway_settings/show.html.haml b/app/views/gateway_settings/show.html.haml index 019aec4..9880d01 100644 --- a/app/views/gateway_settings/show.html.haml +++ b/app/views/gateway_settings/show.html.haml @@ -1,7 +1,7 @@ - content_for :title, t("gateway_settings.show.page_title") %p - %strong= t('gateway_settings.show.gateway_id') + ":" + %strong= t('gateway_settings.show.gateway') + ":" = @gateway_setting.gateway %p %strong= t('gateway_settings.show.name') + ":" |