summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-25 13:50:46 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-25 13:50:46 +0100
commit03bda4ca389990d2158639e365bbac063614aa95 (patch)
tree21121e2a2cabf65d4e8d02b9f618ff406aefab3b /app
parent969e7614b52469f7b826a9f865ad7852380a4f8b (diff)
page#help
Diffstat (limited to 'app')
-rw-r--r--app/assets/images/docu/sip_accounts/breadcrumbs_sip_account.pngbin109575 -> 0 bytes
-rw-r--r--app/assets/images/docu/sip_accounts/click_on_new_phone_number_button.pngbin137454 -> 0 bytes
-rw-r--r--app/assets/images/docu/sip_accounts/click_on_new_sip_account.pngbin126481 -> 0 bytes
-rw-r--r--app/assets/images/docu/sip_accounts/create_a_new_sip_account.pngbin117503 -> 0 bytes
-rw-r--r--app/assets/images/docu/sip_accounts/enter_new_phone_number.pngbin105519 -> 0 bytes
-rw-r--r--app/assets/images/docu/sip_accounts/get_to_the_tenant_view.pngbin131412 -> 0 bytes
-rw-r--r--app/assets/images/docu/sip_accounts/help_screenshot.pngbin136912 -> 0 bytes
-rw-r--r--app/assets/images/docu/sip_accounts/sip_account_view.pngbin152426 -> 0 bytes
-rw-r--r--app/views/page/docu/_screencast_list.html.haml4
-rw-r--r--app/views/page/help.de.html.haml20
-rw-r--r--app/views/tenants/_table_of_sip_accounts.html.haml20
11 files changed, 27 insertions, 17 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
deleted file mode 100644
index 66034d7..0000000
--- a/app/assets/images/docu/sip_accounts/breadcrumbs_sip_account.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index e915cd4..0000000
--- a/app/assets/images/docu/sip_accounts/click_on_new_phone_number_button.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 7a9b0fe..0000000
--- a/app/assets/images/docu/sip_accounts/click_on_new_sip_account.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index ee52184..0000000
--- a/app/assets/images/docu/sip_accounts/create_a_new_sip_account.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index d469f16..0000000
--- a/app/assets/images/docu/sip_accounts/enter_new_phone_number.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 7e1edc6..0000000
--- a/app/assets/images/docu/sip_accounts/get_to_the_tenant_view.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/docu/sip_accounts/help_screenshot.png b/app/assets/images/docu/sip_accounts/help_screenshot.png
deleted file mode 100644
index e38ed4a..0000000
--- a/app/assets/images/docu/sip_accounts/help_screenshot.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/docu/sip_accounts/sip_account_view.png b/app/assets/images/docu/sip_accounts/sip_account_view.png
deleted file mode 100644
index b917e59..0000000
--- a/app/assets/images/docu/sip_accounts/sip_account_view.png
+++ /dev/null
Binary files differ
diff --git a/app/views/page/docu/_screencast_list.html.haml b/app/views/page/docu/_screencast_list.html.haml
index cbfb826..23d4708 100644
--- a/app/views/page/docu/_screencast_list.html.haml
+++ b/app/views/page/docu/_screencast_list.html.haml
@@ -1,12 +1,10 @@
-%p
- Zu diesem Thema stehen Screencast-Videos in folgenden Formaten zum Download bereit:
%table.table.table-striped
%thead
%tr
%th
Format
%th
- Dateigrösse
+ Dateigröße
%tbody
- ['mp4', 'mov', 'gif'].each do |file_extension|
diff --git a/app/views/page/help.de.html.haml b/app/views/page/help.de.html.haml
index d2eba69..05184be 100644
--- a/app/views/page/help.de.html.haml
+++ b/app/views/page/help.de.html.haml
@@ -1,5 +1,25 @@
- content_for :title, "Erste Schritte mit Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}!"
+.row
+ .span6
+ %h2 User-Interface
+ %p
+ Die WebGUI zu Gemeinschaft ist komplex. Es gibt sehr viele Konfigurationsmöglichkeiten und Features, die bedienbar sein müssen. Wir haben uns bemüht die GUI so sauber und strukturiert wie möglich zu halten. Im Screenshot mit den wichtigsten drei Seiten-Elementen:
+ %ol
+ %li
+ Breadcrumb-Navigation. Ganz wichtig! Hiermit finden Sie immer wieder den Weg zurück.
+ %li
+ Link zum User-Account. Er führt Sie zu Ihrem persönlichen Bereich, in dem Sie z.B. Ihre Voicemails oder Faxe abrufen können. Dort können Sie ebenfalls Ihre persönlichen Telefone konfigurieren.
+ %li
+ Rechts oben können Sie sich immer ausloggen.
+ %p
+ Sie können bei der Arbeit mit Gemeinschaft selbstverständlich die Vor- und Zurück-Funktion Ihres Webbrowsers benutzen. Ebenfalls können Sie die einzelnen Seiten als Bookmarks abspeichern.
+ .span6
+ %ul.thumbnails
+ %li.span6
+ %div.thumbnail
+ %a.thumbnail{:href => "#{image_path('docu/user_interface.png')}"}
+ =image_tag('docu/user_interface.png', :alt => "Gemeinschaft User-Interface")
= render :partial => 'page/docu/tenant_sip_accounts_new'
diff --git a/app/views/tenants/_table_of_sip_accounts.html.haml b/app/views/tenants/_table_of_sip_accounts.html.haml
index ef8e458..ff36531 100644
--- a/app/views/tenants/_table_of_sip_accounts.html.haml
+++ b/app/views/tenants/_table_of_sip_accounts.html.haml
@@ -1,7 +1,7 @@
- cache(['tenant_show_table_of_sip_accounts', I18n.locale, tenant, tenant.sip_accounts.count, tenant.sip_accounts.reorder(:updated_at).last]) do
.row
- if GsParameter.get('AUTO_ADMIN_ONLINE_HELP') == true && !tenant.sip_accounts.any?
- .span6
+ .span4
-# SIP accounts
-#
%h2= t('sip_accounts.index.page_title')
@@ -9,15 +9,11 @@
= 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.
+ .span8
+ .well
+ %p
+ In der #{link_to 'Admin-Doku', page_help_path} finden Sie die Beschreibung wie ein neues Telefon mit einem SIP-Account eingerichtet werden kann. Dazu gibt es auch einen Screencast:
+ = render :partial => 'page/docu/screencast_list', :locals => {:screencast_name => 'firmen_sip_account_und_telefon_anlegen'}
- else
.span12
@@ -27,7 +23,3 @@
- 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