Merge branch 'sip_account_docu' into develop

14 files changed, 93 insertions, 92 deletions

diff --git a/app/assets/images/docu/sip_accounts/breadcrumbs_sip_account.png b/app/assets/images/docu/sip_accounts/breadcrumbs_sip_account.png
new file mode 100644
index 0000000..66034d7
--- /dev/null
+++ b/app/assets/images/docu/sip_accounts/breadcrumbs_sip_account.png
diff --git a/app/assets/images/docu/sip_accounts/click_on_new_phone_number_button.png b/app/assets/images/docu/sip_accounts/click_on_new_phone_number_button.png
new file mode 100644
index 0000000..e915cd4
--- /dev/null
+++ b/app/assets/images/docu/sip_accounts/click_on_new_phone_number_button.png
diff --git a/app/assets/images/docu/sip_accounts/click_on_new_sip_account.png b/app/assets/images/docu/sip_accounts/click_on_new_sip_account.png
new file mode 100644
index 0000000..7a9b0fe
--- /dev/null
+++ b/app/assets/images/docu/sip_accounts/click_on_new_sip_account.png
diff --git a/app/assets/images/docu/sip_accounts/create_a_new_sip_account.png b/app/assets/images/docu/sip_accounts/create_a_new_sip_account.png
new file mode 100644
index 0000000..ee52184
--- /dev/null
+++ b/app/assets/images/docu/sip_accounts/create_a_new_sip_account.png
diff --git a/app/assets/images/docu/sip_accounts/enter_new_phone_number.png b/app/assets/images/docu/sip_accounts/enter_new_phone_number.png
new file mode 100644
index 0000000..d469f16
--- /dev/null
+++ b/app/assets/images/docu/sip_accounts/enter_new_phone_number.png
diff --git a/app/assets/images/docu/sip_accounts/get_to_the_tenant_view.png b/app/assets/images/docu/sip_accounts/get_to_the_tenant_view.png
new file mode 100644
index 0000000..7e1edc6
--- /dev/null
+++ b/app/assets/images/docu/sip_accounts/get_to_the_tenant_view.png
diff --git a/app/assets/images/docu/sip_accounts/help_screenshot.png b/app/assets/images/docu/sip_accounts/help_screenshot.png
new file mode 100644
index 0000000..e38ed4a
--- /dev/null
+++ b/app/assets/images/docu/sip_accounts/help_screenshot.png
diff --git a/app/assets/images/docu/sip_accounts/sip_account_view.png b/app/assets/images/docu/sip_accounts/sip_account_view.png
new file mode 100644
index 0000000..b917e59
--- /dev/null
+++ b/app/assets/images/docu/sip_accounts/sip_account_view.png
diff --git a/app/views/page/conference.html.haml b/app/views/page/conference.html.haml
deleted file mode 100644
index 2fdc043..0000000
--- a/app/views/page/conference.html.haml
+++ /dev/null
@@ -1,80 +0,0 @@
-- conf_call_topic = "The next big thing"
-- content_for :title, "Conference Call \u2013 Topic: #{conf_call_topic}"
-
-
-%section.conference
-  
-  %section.panel.speakers.first
-    %header
-      %h3 Speakers
-    ~# Naming this class message, since when you add or chat you're sending
-    ~# a message to the server.
-    %form.message
-      %input{:placeholder => '# '}
-    .actors
-      - 2.times do
-        .actor
-          .info
-            - user = current_user  #FIXME
-            - avatar_url = user.image_url(:mini) || 'stubs/user-36x.jpg'
-            = image_tag avatar_url.to_s, :class => 'display', :alt => "[ ]"
-            %span.name Fake Stefan
-            %span.status Joined at 03:00
-          .voice-actions
-            %a.make.listener{ :href => '#', :title => "Make listener" } Make listener
-            %a.voice.unmuted{ :href => '#', :title => "Mute" } Mute
-            %a.remove{ :href => '#', :title => "Remove from conference" } Remove
-
-      
-  %section.panel.listeners
-    %header
-      %h3 Listeners
-    ~# Naming this class message, since when you add or chat you're sending
-    ~# a message to the server.
-    %form.message
-      %input{:placeholder => '# '}
-    .actors
-      - 5.times do
-        .actor
-          .info
-            - user = current_user  #FIXME
-            - avatar_url = user.image_url(:mini) || 'stubs/user-36x.jpg'
-            = image_tag avatar_url.to_s, :class => 'display', :alt => "[ ]"
-            %span.name Fake Stefan
-            %span.status Joined at 03:00
-          .voice-actions
-            %a.make.speaker{ :href => '#', :title => "Make speaker" } Make speaker
-            %a.voice.unmuted{ :href => '#', :title => "Mute" } Mute
-            %a.remove{ :href => '#', :title => "Remove from conference" } Remove
-        
-      
-  %section.panel.log.last
-    %header
-      %h3 Log
-    ~# Naming this class message, since when you add or chat you're sending
-    ~# a message to the server.
-    %form.message
-      %input{:placeholder => 'Write a Message...'}
-    .messages
-      %div
-        %span.name Mario:
-        %span.content Sorry for the Delay!
-      %div.status
-        %span.name 03:11:
-        %span.content Fake Stefan is now a Speaker.
-      %div.status
-        %span.name 03:10:
-        %span.content Stefan Wintermeyer Left.
-      %div
-        %span.name Stefan:
-        %span.content Hello World.
-      %div.status
-        %span.name 03:00:
-        %span.content Stefan Wintermeyer Joined.
-      %div
-        %span.name Herpiti Derp:
-        %span.content Cool Conference Room!
-      %div
-        %span.name Pamela:
-        %span.content I'm here to sing along.
-
diff --git a/app/views/page/docu/_tenant_sip_accounts_new.html.haml b/app/views/page/docu/_tenant_sip_accounts_new.html.haml
new file mode 100644
index 0000000..fc94425
--- /dev/null
+++ b/app/views/page/docu/_tenant_sip_accounts_new.html.haml
@@ -0,0 +1,47 @@
+%h2 Wie wird ein Firmen SIP-Account angelegt?
+
+%p
+  Es gibt bestimmte SIP-Account, die keiner bestimmten Person zugeordnet werden können (z.B. für Telefone in einem Konferenzraum). Dafür gibt es Firmen SIP-Accounts.
+  %br
+  =link_to "SIP-Account für #{current_user.current_tenant} anlegen.", new_tenant_sip_account_path(current_user.current_tenant)
+
+%ul.thumbnails
+  %li.span4
+    %div.thumbnail
+      %a.thumbnail{:href => "#{image_path('docu/sip_accounts/click_on_new_sip_account.png')}"}
+        =image_tag('docu/sip_accounts/click_on_new_sip_account.png', :alt => "2. Zur zentralen Firmenansicht gehen.")
+      %div.caption
+        %p
+          Auf der zentralen Firmenansicht #{link_to tenant_url(current_user.current_tenant), current_user.current_tenant} sehen Sie eine Tabelle mit den existierenden SIP-Accounts. 
+          %br
+          Bitte klicken Sie auf den "Neu anlegen"-Button.
+  %li.span4
+    %div.thumbnail
+      %a.thumbnail{:href => "#{image_path('docu/sip_accounts/create_a_new_sip_account.png')}"}
+        =image_tag('docu/sip_accounts/create_a_new_sip_account.png', :alt => "3. SIP-Account anlegen.")
+      %div.caption
+        %p
+          In dem #{link_to new_tenant_sip_account_path(current_user.current_tenant), new_tenant_sip_account_path(current_user.current_tenant)} Formular können Sie u.a. den Caller-Name für den neuen SIP-Account einrichten. 
+          %br
+          Die Daten können später alle geändert werden.
+  %li.span4
+    %div.thumbnail
+      %a.thumbnail{:href => "#{image_path('docu/sip_accounts/click_on_new_phone_number_button.png')}"}
+        =image_tag('docu/sip_accounts/click_on_new_phone_number_button.png', :alt => "4. Neue Telefonnummer.")
+      %div.caption
+        %p
+          Auf der Ansicht des neuen SIP-Accounts bekommen Sie alle wichtigen Daten angezeigt. Unter den Daten des SIP-Accounts wird eine Tabelle der zugeordneten Telefonnummern angezeigt. Bitte klicken Sie hier auf den "Neu anlegen"-Button.
+  %li.span4
+    %div.thumbnail
+      %a.thumbnail{:href => "#{image_path('docu/sip_accounts/enter_new_phone_number.png')}"}
+        =image_tag('docu/sip_accounts/enter_new_phone_number.png', :alt => "3. SIP-Account anlegen.")
+      %div.caption
+        %p
+          In diesem Formular müssen Sie die gewünschte Telefonnummer des SIP-Accounts abspeichern.
+  %li.span4
+    %div.thumbnail
+      %a.thumbnail{:href => "#{image_path('docu/sip_accounts/sip_account_view.png')}"}
+        =image_tag('docu/sip_accounts/sip_account_view.png', :alt => "3. SIP-Account anlegen.")
+      %div.caption
+        %p
+          Auf der jetzt erscheinenden Ansicht zum SIP-Account erscheint die eben eingetragene Telefonnummer. Ein SIP-Account kann unter mehreren Telefonnummern erreicht werden. Bitte tragen Sie hier alle ein.
diff --git a/app/views/page/help.de.html.haml b/app/views/page/help.de.html.haml
index 5eef135..80c4d72 100644
--- a/app/views/page/help.de.html.haml
+++ b/app/views/page/help.de.html.haml
@@ -1,24 +1,23 @@
 - content_for :title, "Erste Schritte mit Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}!"
 
-%p
-  Sie müssen als erstes mindestens zwei neue SIP-Accounts anlegen. Dabei haben Sie die Wahl zwischen folgenden Varianten:
-
 %ul
   %li
     %strong
       Personalisierter SIP-Accounts 
     %br
-    Dieser wird einer bestimmten Person zugeordnet. In einer normalen Gemeinschaft-Installation sind die meisten SIP-Accounts personalisiert.
+    Dieser wird einer bestimmten Person zugeordnet und deshalb für diesen Account z.B. Telefontastenbelegungen definieren kann. In einer normalen Gemeinschaft-Installation sind die meisten SIP-Accounts personalisiert.
     %br
     =link_to "SIP-Account für #{current_user} anlegen.", new_user_sip_account_path(current_user)
   %li
     %strong
       Firmen SIP-Accounts
     %br
-    Es gibt bestimmte SIP-Account, die keiner bestimmten Person zugeordnet werden können (z.B. für Telefone in einem Konferenzraum). Dafür gibt es Firmen SIP-Accounts.
+    Es gibt bestimmte SIP-Account, die keiner bestimmten Person zugeordnet werden können (z.B. für Telefone in einem Konferenzraum oder einem Aufzug). Dafür gibt es Firmen SIP-Accounts.
     %br
     =link_to "SIP-Account für #{current_user.current_tenant} anlegen.", new_tenant_sip_account_path(current_user.current_tenant)
 
+= render :partial => 'page/docu/tenant_sip_accounts_new'
+
 %h2 Rufnummern
 
 %p
diff --git a/app/views/tenants/_table_of_sip_accounts.html.haml b/app/views/tenants/_table_of_sip_accounts.html.haml
index 32230b5..ef8e458 100644
--- a/app/views/tenants/_table_of_sip_accounts.html.haml
+++ b/app/views/tenants/_table_of_sip_accounts.html.haml
@@ -1,7 +1,33 @@
 - cache(['tenant_show_table_of_sip_accounts', I18n.locale, tenant, tenant.sip_accounts.count, tenant.sip_accounts.reorder(:updated_at).last]) do
-  -# SIP accounts
-  -#
-  %h2= t('sip_accounts.index.page_title')
-  - if tenant.sip_accounts.any?
-    = render "sip_accounts/index_core", :sip_accounts => tenant.sip_accounts
-  = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => SipAccount}
+  .row
+    - if GsParameter.get('AUTO_ADMIN_ONLINE_HELP') == true && !tenant.sip_accounts.any?
+      .span6
+        -# SIP accounts
+        -#
+        %h2= t('sip_accounts.index.page_title')
+        - if tenant.sip_accounts.any?
+          = render "sip_accounts/index_core", :sip_accounts => tenant.sip_accounts
+        = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => SipAccount}
+
+      .span6
+        %ul.thumbnails
+          %li.span6
+            %div.thumbnail
+              %a.thumbnail{:href => page_help_path}
+                =image_tag('docu/sip_accounts/help_screenshot.png', :alt => "2. Zur zentralen Firmenansicht gehen.")
+              %div.caption
+                %p
+                  In der #{link_to 'Admin-Doku', page_help_path} finden Sie ein Beschreibung, wie Sie einen neuen SIP-Account anlegen können.
+
+    - else
+      .span12
+        -# SIP accounts
+        -#
+        %h2= t('sip_accounts.index.page_title')
+        - if tenant.sip_accounts.any?
+          = render "sip_accounts/index_core", :sip_accounts => tenant.sip_accounts
+        = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => SipAccount}
+
+
+  .row
+    .span12
\ No newline at end of file
diff --git a/db/migrate/20130124175109_show_admin_auto_online_help.rb b/db/migrate/20130124175109_show_admin_auto_online_help.rb
new file mode 100644
index 0000000..9c3f733
--- /dev/null
+++ b/db/migrate/20130124175109_show_admin_auto_online_help.rb
@@ -0,0 +1,9 @@
+class ShowAdminAutoOnlineHelp < ActiveRecord::Migration
+  def up
+    GsParameter.create(:name => 'AUTO_ADMIN_ONLINE_HELP', :section => 'Documentation', :value => 'true', :class_type => 'Boolean', :description => 'Gemeinschaft will include tips and help whenever it seems fit.')
+  end
+
+  def down
+  	GsParameter.where(:name => 'AUTO_ADMIN_ONLINE_HELP').destroy_all
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8258394..73a1454 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130124125238) do
+ActiveRecord::Schema.define(:version => 20130124175109) do
 
   create_table "access_authorizations", :force => true do |t|
     t.string   "access_authorizationable_type"