summaryrefslogtreecommitdiff
path: root/app/views/tenants
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-25 17:22:35 +0100
committerspag <spag@golwen.net>2013-01-25 17:22:35 +0100
commitf6c1afe53f5d17c42422c2a845e5922e6166947a (patch)
tree96921b0a905f5437d4d3a8554e263909612ce830 /app/views/tenants
parent0236ddcd35479936b3bb24f74826f0001eee2828 (diff)
parent5d3c52dad03a9898e1dc15ca54b322f267c3e108 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/tenants')
-rw-r--r--app/views/tenants/_table_of_sip_accounts.html.haml20
1 files changed, 6 insertions, 14 deletions
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