From f5a512fe34fff50bcc7e96b57120d56a79ea47cb Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 30 Dec 2012 22:25:52 +0100 Subject: Set a couple of :autofocus => true to make the UI better. --- app/views/sip_accounts/_form_core.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/sip_accounts') diff --git a/app/views/sip_accounts/_form_core.html.haml b/app/views/sip_accounts/_form_core.html.haml index dbd27fe..6a63da6 100644 --- a/app/views/sip_accounts/_form_core.html.haml +++ b/app/views/sip_accounts/_form_core.html.haml @@ -1,7 +1,7 @@ .inputs = f.input :auth_name, :as => :string, :label => t('sip_accounts.form.auth_name.label'), :hint => conditional_hint('sip_accounts.form.auth_name.hint') = f.input :password, :as => :string, :label => t('sip_accounts.form.password.label'), :hint => conditional_hint('sip_accounts.form.password.hint') - = f.input :caller_name, :as => :string, :label => t('sip_accounts.form.caller_name.label'), :hint => conditional_hint('sip_accounts.form.caller_name.hint') + = f.input :caller_name, :as => :string, :label => t('sip_accounts.form.caller_name.label'), :hint => conditional_hint('sip_accounts.form.caller_name.hint'), :autofocus => true = f.input :voicemail_pin, :as => :string, :label => t('sip_accounts.form.voicemail_pin.label'), :hint => conditional_hint('sip_accounts.form.voicemail_pin.hint') = f.input :call_waiting, :label => t('sip_accounts.form.call_waiting.label'), :hint => conditional_hint('sip_accounts.form.call_waiting.hint') = f.input :clir, :label => t('sip_accounts.form.clir.label'), :hint => conditional_hint('sip_accounts.form.clir.hint') -- cgit v1.2.3 From c24bd3a8212e85894b2f7c26e190fe5e89fbaaf2 Mon Sep 17 00:00:00 2001 From: spag Date: Mon, 31 Dec 2012 08:47:23 +0100 Subject: hide hotdeskable check box for tenant sip accounts --- app/views/sip_accounts/_form_core.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/views/sip_accounts') diff --git a/app/views/sip_accounts/_form_core.html.haml b/app/views/sip_accounts/_form_core.html.haml index dbd27fe..bb70edb 100644 --- a/app/views/sip_accounts/_form_core.html.haml +++ b/app/views/sip_accounts/_form_core.html.haml @@ -6,7 +6,8 @@ = f.input :call_waiting, :label => t('sip_accounts.form.call_waiting.label'), :hint => conditional_hint('sip_accounts.form.call_waiting.hint') = f.input :clir, :label => t('sip_accounts.form.clir.label'), :hint => conditional_hint('sip_accounts.form.clir.hint') = f.input :clip, :label => t('sip_accounts.form.clip.label'), :hint => conditional_hint('sip_accounts.form.clip.hint') - = f.input :hotdeskable, :label => t('sip_accounts.form.hotdeskable.label'), :hint => conditional_hint('sip_accounts.form.hotdeskable.hint') + - if @sip_account.sip_accountable_type == 'User' + = f.input :hotdeskable, :label => t('sip_accounts.form.hotdeskable.label'), :hint => conditional_hint('sip_accounts.form.hotdeskable.hint') = f.input :clip_no_screening, :label => t('sip_accounts.form.clip_no_screening.label'), :hint => conditional_hint('sip_accounts.form.clip_no_screening.hint') - if CallForward.where(:phone_number_id => @sip_account.phone_number_ids).count == 0 || @sip_account.callforward_rules_act_per_sip_account == true = f.input :callforward_rules_act_per_sip_account, :label => t('sip_accounts.form.callforward_rules_act_per_sip_account.label'), :hint => conditional_hint('sip_accounts.form.callforward_rules_act_per_sip_account.hint') -- 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/sip_accounts/_index_core.html.haml | 2 +- app/views/sip_accounts/edit.html.haml | 2 +- app/views/sip_accounts/index.html.haml | 2 +- app/views/sip_accounts/new.html.haml | 2 +- app/views/sip_accounts/show.html.haml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views/sip_accounts') diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml index 69c9302..f8dac6f 100644 --- a/app/views/sip_accounts/_index_core.html.haml +++ b/app/views/sip_accounts/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('sip_accounts.index.online') %th= t('sip_accounts.index.caller_name') diff --git a/app/views/sip_accounts/edit.html.haml b/app/views/sip_accounts/edit.html.haml index c070ff7..d26b245 100644 --- a/app/views/sip_accounts/edit.html.haml +++ b/app/views/sip_accounts/edit.html.haml @@ -1,3 +1,3 @@ -- title t("sip_accounts.edit.page_title") +- content_for :title, t("sip_accounts.edit.page_title") = render "form" diff --git a/app/views/sip_accounts/index.html.haml b/app/views/sip_accounts/index.html.haml index 1131770..fbdba48 100644 --- a/app/views/sip_accounts/index.html.haml +++ b/app/views/sip_accounts/index.html.haml @@ -1,4 +1,4 @@ -- title t("sip_accounts.index.page_title") +- content_for :title, t("sip_accounts.index.page_title") - if @sip_accounts.count > 0 = render "index_core", :sip_accounts => @sip_accounts diff --git a/app/views/sip_accounts/new.html.haml b/app/views/sip_accounts/new.html.haml index 9d44680..bc4e00b 100644 --- a/app/views/sip_accounts/new.html.haml +++ b/app/views/sip_accounts/new.html.haml @@ -1,3 +1,3 @@ -- title t("sip_accounts.new.page_title") +- content_for :title, t("sip_accounts.new.page_title") = render "form" diff --git a/app/views/sip_accounts/show.html.haml b/app/views/sip_accounts/show.html.haml index c6344cd..4f6244f 100644 --- a/app/views/sip_accounts/show.html.haml +++ b/app/views/sip_accounts/show.html.haml @@ -1,4 +1,4 @@ -- title t("sip_accounts.show.page_title") +- content_for :title, t("sip_accounts.show.page_title") %p %strong= t('sip_accounts.show.auth_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/sip_accounts/_index_core.html.haml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'app/views/sip_accounts') diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml index f8dac6f..cac29d0 100644 --- a/app/views/sip_accounts/_index_core.html.haml +++ b/app/views/sip_accounts/_index_core.html.haml @@ -4,15 +4,14 @@ %th= t('sip_accounts.index.caller_name') %th= t('sip_accounts.index.phone_numbers') %th= t('phones.name') - - - reset_cycle + - for sip_account in sip_accounts - %tr{:class => cycle('odd', 'even')} + %tr %td - if sip_account.registration - =image_tag 'icons/phone-down-green-32x.png' + %i.icon-ok - else - =image_tag 'icons/phone-down-grey-32x.png' + %i.icon-thumbs-down %td = sip_account.caller_name - phone_numbers = sip_account.phone_numbers -- cgit v1.2.3 From c52babd4346b1a52c28bb7437d0434ecfb9ab70f Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 22:25:32 +0100 Subject: Twitter Bootstrap stuff. --- app/views/sip_accounts/_index_core.html.haml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/views/sip_accounts') diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml index cac29d0..a24d0d3 100644 --- a/app/views/sip_accounts/_index_core.html.haml +++ b/app/views/sip_accounts/_index_core.html.haml @@ -4,6 +4,7 @@ %th= t('sip_accounts.index.caller_name') %th= t('sip_accounts.index.phone_numbers') %th= t('phones.name') + %th{:colspan => '3'} - for sip_account in sip_accounts %tr -- cgit v1.2.3 From 6f69c1a85055ec7c2515719d79d2a7a4e60cec50 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 15:31:47 +0100 Subject: UI improvements. --- app/views/sip_accounts/_index_core.html.haml | 2 -- 1 file changed, 2 deletions(-) (limited to 'app/views/sip_accounts') diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml index a24d0d3..8d9791d 100644 --- a/app/views/sip_accounts/_index_core.html.haml +++ b/app/views/sip_accounts/_index_core.html.haml @@ -19,8 +19,6 @@ %td - if sip_account.phone_numbers.count > 0 = render 'phone_numbers/listing', :phone_numbers => sip_account.phone_numbers.order(:number) - %br - = render :partial => 'shared/create_link', :locals => {:parent => sip_account, :child_class => PhoneNumber, :short_link => true} %td - sip_account.phones.each do |phone| -- cgit v1.2.3