From ddb3dfa92ec0878240211cb2b7a8e125961b1360 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 23:01:16 +0100 Subject: Moved to GsParemeter.get and set defaults for a couple of validations. --- app/views/callthroughs/_form_core.html.haml | 2 +- app/views/callthroughs/_index_core.html.haml | 4 ++-- app/views/callthroughs/show.html.haml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app/views/callthroughs') 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..2071145 100644 --- a/app/views/callthroughs/_index_core.html.haml +++ b/app/views/callthroughs/_index_core.html.haml @@ -3,7 +3,7 @@ %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 @@ -12,6 +12,6 @@ %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/show.html.haml b/app/views/callthroughs/show.html.haml index 55bd6eb..b9abca9 100644 --- a/app/views/callthroughs/show.html.haml +++ b/app/views/callthroughs/show.html.haml @@ -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 -- cgit v1.2.3 From 18ed88c7e3c789366f6e5443dc4ee0bc981a4b88 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 20:18:16 +0100 Subject: Started the migration to Twitter Bootstrap. --- app/views/callthroughs/_index_core.html.haml | 2 +- app/views/callthroughs/edit.html.haml | 2 +- app/views/callthroughs/index.html.haml | 2 +- app/views/callthroughs/new.html.haml | 2 +- app/views/callthroughs/show.html.haml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views/callthroughs') diff --git a/app/views/callthroughs/_index_core.html.haml b/app/views/callthroughs/_index_core.html.haml index 2071145..39c3719 100644 --- a/app/views/callthroughs/_index_core.html.haml +++ b/app/views/callthroughs/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('callthroughs.index.name') %th= t('callthroughs.index.phone_numbers') 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 b9abca9..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') + ":" -- cgit v1.2.3 From d8fe3b636cab1504cb5d3cb5dc57ed818749ccf5 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 21:30:48 +0100 Subject: Twitter Bootstrap stuff. --- app/views/callthroughs/_index_core.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/callthroughs') diff --git a/app/views/callthroughs/_index_core.html.haml b/app/views/callthroughs/_index_core.html.haml index 39c3719..d1c171b 100644 --- a/app/views/callthroughs/_index_core.html.haml +++ b/app/views/callthroughs/_index_core.html.haml @@ -6,9 +6,9 @@ - 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 -- cgit v1.2.3