diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-21 14:10:02 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-21 14:10:02 +0100 |
| commit | 29a22b3f498f2962c45f0c834d04d550b22b9348 (patch) | |
| tree | bf4eec95c2423027ef57e8e231d20608255733d3 /app/views/gemeinschaft_setups | |
| parent | f7c8227521a758f769d3bde892b8b7201bf841dc (diff) | |
| parent | 86e94e36e52ff7a3dbc7219db5b3bea5a7f56711 (diff) | |
Merge branch 'area_code' into develop
Diffstat (limited to 'app/views/gemeinschaft_setups')
| -rw-r--r-- | app/views/gemeinschaft_setups/new.de.html.haml | 1 | ||||
| -rw-r--r-- | app/views/gemeinschaft_setups/new.html.haml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/gemeinschaft_setups/new.de.html.haml b/app/views/gemeinschaft_setups/new.de.html.haml index 2e148f3..1afa5d4 100644 --- a/app/views/gemeinschaft_setups/new.de.html.haml +++ b/app/views/gemeinschaft_setups/new.de.html.haml @@ -20,6 +20,7 @@ = f.association :country, :label => t('gemeinschaft_setups.form.country_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.country_id.hint'), :include_blank => false = f.association :language, :label => t('gemeinschaft_setups.form.language_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.language_id.hint'), :include_blank => false + = f.input :default_area_code, :label => t('gemeinschaft_setups.form.default_area_code.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_area_code.hint') .actions = f.button :submit, conditional_t('gemeinschaft_setups.form.submit')
\ No newline at end of file diff --git a/app/views/gemeinschaft_setups/new.html.haml b/app/views/gemeinschaft_setups/new.html.haml index ab5a70f..da3c60e 100644 --- a/app/views/gemeinschaft_setups/new.html.haml +++ b/app/views/gemeinschaft_setups/new.html.haml @@ -20,6 +20,7 @@ = f.association :country, :label => t('gemeinschaft_setups.form.country_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.country_id.hint'), :include_blank => false = f.association :language, :label => t('gemeinschaft_setups.form.language_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.language_id.hint'), :include_blank => false + = f.input :default_area_code, :label => t('gemeinschaft_setups.form.default_area_code.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_area_code.hint') .actions = f.button :submit, conditional_t('gemeinschaft_setups.form.submit')
\ No newline at end of file |