Merge branch 'develop'5.1-beta2

2 files changed, 25 insertions, 21 deletions

diff --git a/app/views/gemeinschaft_setups/new.de.html.haml b/app/views/gemeinschaft_setups/new.de.html.haml
index b78e278..cf1f207 100644
--- a/app/views/gemeinschaft_setups/new.de.html.haml
+++ b/app/views/gemeinschaft_setups/new.de.html.haml
@@ -1,27 +1,29 @@
-- content_for :title, 'Gemeinschaft 5.0'
+- content_for :title, "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}"
 - content_for :meta_description, "Konfiguration einer Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} Installation"
 
 = simple_form_for(@gemeinschaft_setup) do |f|
   = f.error_notification
 
   %h2 Admin-Konto
-  %p
-    Dieser erste Benutzer des Systems hat automatisch Admin-Rechte.
 
   = f.simple_fields_for :user, @user do |u|
     = render "users/form_core", :f => u
 
-  %h2 SIP-Domain
-  %p In den meisten Fällen sollten Sie den gleichen Wert für SIP-Realm und SIP-Domain benutzen. Wenn Sie mit diesen Begriffen nichts anfangen können, dann geben Sie hier bitte die IP-Adresse dieses Servers ein.
-
-  = f.simple_fields_for :sip_domain, @sip_domain do |s|
-    = render "sip_domains/form_core", :f => s
-
-  %h2 Allgemeine Informationen
+  %h2 Konfiguration der Telefonanlage
 
   = 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')
 
+  = f.input :default_company_name, :label => t('gemeinschaft_setups.form.default_company_name.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_company_name.hint')
+
+  = f.input :default_system_email, :label => t('gemeinschaft_setups.form.default_system_email.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_system_email.hint')
+
+  %h3 SIP-Domain
+  %p In den meisten Fällen sollten Sie den gleichen Wert für SIP-Realm und SIP-Domain benutzen. Wenn Sie mit diesen Begriffen nichts anfangen können, dann geben Sie hier bitte die IP-Adresse dieses Servers ein.
+
+  = f.simple_fields_for :sip_domain, @sip_domain do |s|
+    = render "sip_domains/form_core", :f => s
+
   .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 1b97cc0..5e2434e 100644
--- a/app/views/gemeinschaft_setups/new.html.haml
+++ b/app/views/gemeinschaft_setups/new.html.haml
@@ -1,27 +1,29 @@
-- content_for :title, 'Gemeinschaft 5.0'
+- content_for :title, "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}"
 - content_for :meta_description, "Configure a new Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} server"
 
 = simple_form_for(@gemeinschaft_setup) do |f|
   = f.error_notification
 
-  %h3 Admin user account
-  %p
-    This is the first user of this system who has admin rights by default.
+  %h2 Admin user account
 
   = f.simple_fields_for :user, @user do |u|
     = render "users/form_core", :f => u
 
-  %h3 SIP domain
-  %p You should use the same value for the SIP realm as for the SIP domain to ensure compatibility with different phone models. In case you have no clue what we are talking about: Just enter the IP address of this server.
-
-  = f.simple_fields_for :sip_domain, @sip_domain do |s|
-    = render "sip_domains/form_core", :f => s
-
-  %h3 General information
+  %h2 Configuration of this PBX
 
   = 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')
 
+  = f.input :default_company_name, :label => t('gemeinschaft_setups.form.default_company_name.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_company_name.hint')
+
+  = f.input :default_system_email, :label => t('gemeinschaft_setups.form.default_system_email.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_system_email.hint')
+
+  %h3 SIP-Domain
+  %p You should use the same value for the SIP realm as for the SIP domain to ensure compatibility with different phone models. In case you have no clue what we are talking about: Just enter the IP address of this server.
+
+  = f.simple_fields_for :sip_domain, @sip_domain do |s|
+    = render "sip_domains/form_core", :f => s
+
   .actions
     = f.button :submit, conditional_t('gemeinschaft_setups.form.submit')
\ No newline at end of file