summaryrefslogtreecommitdiff
path: root/app/views/callthroughs
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 15:33:06 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 15:33:06 +0100
commit39aa7132ceed3d4beab3a9b828e571bbfc67c07e (patch)
tree6c88289c9f99be0af8635636fcdf64102090e5ec /app/views/callthroughs
parent5ad8203ce4f1bfea997960d0b52c626dea24b944 (diff)
parent6f69c1a85055ec7c2515719d79d2a7a4e60cec50 (diff)
Merge branch 'develop'5.1-beta1
Diffstat (limited to 'app/views/callthroughs')
-rw-r--r--app/views/callthroughs/_form_core.html.haml2
-rw-r--r--app/views/callthroughs/_index_core.html.haml10
-rw-r--r--app/views/callthroughs/edit.html.haml2
-rw-r--r--app/views/callthroughs/index.html.haml2
-rw-r--r--app/views/callthroughs/new.html.haml2
-rw-r--r--app/views/callthroughs/show.html.haml4
6 files changed, 11 insertions, 11 deletions
diff --git a/app/views/callthroughs/_form_core.html.haml b/app/views/callthroughs/_form_core.html.haml
index 1f137d9..cf05e06 100644
--- a/app/views/callthroughs/_form_core.html.haml
+++ b/app/views/callthroughs/_form_core.html.haml
@@ -15,7 +15,7 @@
= f.simple_fields_for :access_authorizations do |access_authorization|
= render "access_authorizations/form_core", :f => access_authorization
- - if CALLTHROUGH_HAS_WHITELISTS == true
+ - if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
- if @callthrough && @callthrough.whitelists.size > 0
%h2= t('callthroughs.form.whitelists.label')
- if !t('callthroughs.form.whitelists.hint').blank?
diff --git a/app/views/callthroughs/_index_core.html.haml b/app/views/callthroughs/_index_core.html.haml
index f1802d4..d1c171b 100644
--- a/app/views/callthroughs/_index_core.html.haml
+++ b/app/views/callthroughs/_index_core.html.haml
@@ -1,17 +1,17 @@
-%table
+%table{:class => 'table table-striped'}
%tr
%th= t('callthroughs.index.name')
%th= t('callthroughs.index.phone_numbers')
%th= t('callthroughs.index.access_authorized_phone_numbers')
- - if CALLTHROUGH_HAS_WHITELISTS == true
+ - if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
%th= t('callthroughs.index.whitelist_phone_numbers')
- - reset_cycle
+
- for callthrough in callthroughs
- %tr{:class => cycle('odd', 'even')}
+ %tr
%td= callthrough.name
%td=render 'phone_numbers/listing', :phone_numbers => callthrough.phone_numbers
%td=render 'phone_numbers/listing', :phone_numbers => callthrough.access_authorization_phone_numbers
- - if CALLTHROUGH_HAS_WHITELISTS == true
+ - if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
%td=render 'phone_numbers/listing', :phone_numbers => callthrough.whitelisted_phone_numbers
=render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => callthrough.tenant, :child => callthrough} \ No newline at end of file
diff --git a/app/views/callthroughs/edit.html.haml b/app/views/callthroughs/edit.html.haml
index 44fe17e..26fd026 100644
--- a/app/views/callthroughs/edit.html.haml
+++ b/app/views/callthroughs/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("callthroughs.edit.page_title")
+- content_for :title, t("callthroughs.edit.page_title")
= render "form" \ No newline at end of file
diff --git a/app/views/callthroughs/index.html.haml b/app/views/callthroughs/index.html.haml
index c595351..bb3ab63 100644
--- a/app/views/callthroughs/index.html.haml
+++ b/app/views/callthroughs/index.html.haml
@@ -1,4 +1,4 @@
-- title t("callthroughs.index.page_title")
+- content_for :title, t("callthroughs.index.page_title")
- if @callthroughs.count > 0
= render "index_core", :callthroughs => @callthroughs
diff --git a/app/views/callthroughs/new.html.haml b/app/views/callthroughs/new.html.haml
index ff47c1c..deabb71 100644
--- a/app/views/callthroughs/new.html.haml
+++ b/app/views/callthroughs/new.html.haml
@@ -1,3 +1,3 @@
-- title t("callthroughs.new.page_title")
+- content_for :title, t("callthroughs.new.page_title")
= render "form"
diff --git a/app/views/callthroughs/show.html.haml b/app/views/callthroughs/show.html.haml
index 55bd6eb..da1a676 100644
--- a/app/views/callthroughs/show.html.haml
+++ b/app/views/callthroughs/show.html.haml
@@ -1,4 +1,4 @@
-- title t("callthroughs.show.page_title")
+- content_for :title, t("callthroughs.show.page_title")
%p
%strong= t('callthroughs.show.name') + ":"
@@ -19,7 +19,7 @@
%br
= render :partial => 'shared/create_link', :locals => {:parent => @callthrough, :child_class => AccessAuthorization}
-- if CALLTHROUGH_HAS_WHITELISTS == true
+- if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
%h2= t('callthroughs.form.whitelists.label')
- if @callthrough.whitelisted_phone_numbers.count > 0
= render 'whitelists/index_core', :whitelists => @callthrough.whitelists