summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/voicemail_settings/_form_core.html.haml3
-rw-r--r--app/views/voicemail_settings/_index_core.html.haml2
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/voicemail_settings/_form_core.html.haml b/app/views/voicemail_settings/_form_core.html.haml
index bf47e46..31c6bbf 100644
--- a/app/views/voicemail_settings/_form_core.html.haml
+++ b/app/views/voicemail_settings/_form_core.html.haml
@@ -1,9 +1,10 @@
+
.inputs
- if !@no_edit or !@no_edit[:name]
= f.input :name, :collection => VoicemailSetting::VOICEMAIL_SETTINGS.keys.collect{|i, k| [t("voicemail_settings.settings.#{i}"), i]}, :label => t('voicemail_settings.form.name.label'), :hint => conditional_hint('voicemail_settings.form.name.hint'), :autofocus => true, :include_blank => false
= f.input :value, :label => t('voicemail_settings.form.value.label'), :hint => conditional_hint('voicemail_settings.form.value.hint')
- else
- = f.input :value, :label => t("voicemail_settings.settings.#{@no_edit[:name][:name]}"), :hint => conditional_hint('voicemail_settings.form.value.hint'), :as => @no_edit[:name][:input]
+ = f.input :value, :label => t("voicemail_settings.settings.#{@no_edit[:name][:name]}"), :hint => conditional_hint('voicemail_settings.form.value.hint'), :as => @no_edit[:name][:input], input_html: @no_edit[:name][:html]
- if !@no_edit or !@no_edit[:description]
= f.input :description, :label => t('voicemail_settings.form.description.label'), :hint => conditional_hint('voicemail_settings.form.description.hint')
diff --git a/app/views/voicemail_settings/_index_core.html.haml b/app/views/voicemail_settings/_index_core.html.haml
index 94ebfb1..9173fe6 100644
--- a/app/views/voicemail_settings/_index_core.html.haml
+++ b/app/views/voicemail_settings/_index_core.html.haml
@@ -8,7 +8,7 @@
%tbody
- for voicemail_setting in voicemail_settings
%tr
- %td= voicemail_setting.name
+ %td= t("voicemail_settings.settings.#{voicemail_setting.name}")
%td= voicemail_setting.value
%td= voicemail_setting.description
=render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => voicemail_setting.voicemail_account, :child => voicemail_setting}