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/call_forwards/_form_core.html.haml | 2 +- app/views/phone_numbers/_form_core.html.haml | 6 +++--- app/views/sip_accounts/_form_core.html.haml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views') diff --git a/app/views/call_forwards/_form_core.html.haml b/app/views/call_forwards/_form_core.html.haml index 3dadb68..f75181f 100644 --- a/app/views/call_forwards/_form_core.html.haml +++ b/app/views/call_forwards/_form_core.html.haml @@ -1,5 +1,5 @@ .inputs - = f.input :call_forward_case_id, :as => :select, :collection => @available_call_forward_cases.map {|x| [I18n.t("call_forward_cases.#{x.value}"), x.id] }, :label => t('call_forwards.form.call_forward_case_id.label'), :hint => conditional_hint('call_forwards.form.call_forward_case_id.hint'), :include_blank => false + = f.input :call_forward_case_id, :as => :select, :collection => @available_call_forward_cases.map {|x| [I18n.t("call_forward_cases.#{x.value}"), x.id] }, :label => t('call_forwards.form.call_forward_case_id.label'), :hint => conditional_hint('call_forwards.form.call_forward_case_id.hint'), :include_blank => false, :autofocus => true = f.input :timeout, :label => t('call_forwards.form.timeout.label'), :hint => conditional_hint('call_forwards.form.timeout.hint') = f.input :call_forwarding_destination , :as => :select, :collection => @call_forwarding_destinations, :label => t('call_forwards.form.call_forwarding_destination.label'), :hint => conditional_hint('call_forwards.form.call_forwarding_destination.hint'), :include_blank => false diff --git a/app/views/phone_numbers/_form_core.html.haml b/app/views/phone_numbers/_form_core.html.haml index add3039..a1ce1f3 100644 --- a/app/views/phone_numbers/_form_core.html.haml +++ b/app/views/phone_numbers/_form_core.html.haml @@ -2,9 +2,9 @@ - if @phone_book_entry = f.input :name, :collection => ['Office', 'Home', 'Mobile', 'Fax'], :include_blank => false, :label => t('phone_numbers.form.name.label'), :hint => conditional_hint('phone_numbers.form.name.hint') - = f.input :number, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint') + = f.input :number, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint'), :autofocus => true - else - if @callthrough || @hunt_group_member || @access_authorization || @current_user.current_tenant.array_of_available_internal_extensions_and_dids.count == 0 || @current_user.current_tenant.array_of_available_internal_extensions_and_dids.count > 250 - = f.input :number, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint') + = f.input :number, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint'), :autofocus => true - else - = f.input :number, :collection => @current_user.current_tenant.array_of_available_internal_extensions_and_dids, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint'), :include_blank => false + = f.input :number, :collection => @current_user.current_tenant.array_of_available_internal_extensions_and_dids, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint'), :include_blank => false, :autofocus => true 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') 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 5867df0eff12622c826cf0d699d3c2ec4aff5a7d Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 4 Jan 2013 10:01:48 +0100 Subject: Set :autofocus => true for the first_name. --- app/views/phone_book_entries/_form_core.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/phone_book_entries/_form_core.html.haml b/app/views/phone_book_entries/_form_core.html.haml index c05139e..5159668 100644 --- a/app/views/phone_book_entries/_form_core.html.haml +++ b/app/views/phone_book_entries/_form_core.html.haml @@ -1,6 +1,6 @@ .inputs = f.input :is_male, :collection => [[true, t('phone_book_entries.form.gender.male')], [false, t('phone_book_entries.form.gender.female')]], :label_method => :last, :value_method => :first, :label => t('phone_book_entries.form.male.label'), :hint => conditional_hint('phone_book_entries.form.gender.hint'), :label => t('phone_book_entries.form.gender.label'), :as => :radio - = f.input :first_name, :label => t('phone_book_entries.form.first_name.label'), :hint => conditional_hint('phone_book_entries.form.first_name.hint') + = f.input :first_name, :label => t('phone_book_entries.form.first_name.label'), :hint => conditional_hint('phone_book_entries.form.first_name.hint'), :autofocus => true = f.input :middle_name, :label => t('phone_book_entries.form.middle_name.label'), :hint => conditional_hint('phone_book_entries.form.middle_name.hint') = f.input :last_name, :label => t('phone_book_entries.form.last_name.label'), :hint => conditional_hint('phone_book_entries.form.last_name.hint') = f.input :birth_name, :label => t('phone_book_entries.form.birth_name.label'), :hint => conditional_hint('phone_book_entries.form.birth_name.hint') -- cgit v1.2.3 From 7171f3ecfb8af4f9fcc30bcd168159d05ec4ae7f Mon Sep 17 00:00:00 2001 From: spag Date: Fri, 4 Jan 2013 10:23:47 +0100 Subject: snom idle icon settings --- app/views/config_snom/show.xml.haml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'app/views') diff --git a/app/views/config_snom/show.xml.haml b/app/views/config_snom/show.xml.haml index d9953c5..a11715d 100644 --- a/app/views/config_snom/show.xml.haml +++ b/app/views/config_snom/show.xml.haml @@ -68,6 +68,11 @@ %dkey_conf{:perm => 'RW'}= @dkeys[:conf] %dkey_redial{:perm => 'RW'}= @dkeys[:redial] %dkey_directory{:perm => 'RW'}= @dkeys[:directory] + %dkey_touch_idle_adr_book{:perm => 'RW'}= @dkeys[:touch_idle_adr_book] + %dkey_touch_idle_list_missed{:perm => 'RW'}= @dkeys[:touch_idle_list_missed] + %dkey_touch_idle_list_taken{:perm => 'RW'}= @dkeys[:touch_idle_list_taken] + %dkey_touch_idle_redial{:perm => 'RW'}= @dkeys[:touch_idle_redial] + %dkey_touch_idle_dialog{:perm => 'RW'}= @dkeys[:touch_idle_dialog] %idle_ok_key_action{:perm => 'RW'}= @dkeys[:idle_ok] %idle_cancel_key_action{:perm => 'RW'}= @dkeys[:idle_cancel] @@ -76,6 +81,29 @@ %idle_left_key_action{:perm => 'RW'}= @dkeys[:idle_left] %idle_right_key_action{:perm => 'RW'}= @dkeys[:idle_right] + / Display + %backlight{:perm => 'RW'}= '15' + %backlight_idle{:perm => 'RW'}= '0' + %dim_timer{:perm => 'RW'}= '300' + + - if @phone.phone_model.name == 'Snom 870' + / Snom 870 idle icons + %idle_icon_01{:perm => 'RW'}= '9' + %idle_icon_02{:perm => 'RW'}= '20' + %idle_icon_03{:perm => 'RW'}= '4' + %idle_icon_04{:perm => 'RW'}= '-1' + %idle_icon_05{:perm => 'RW'}= '6' + %idle_icon_06{:perm => 'RW'}= '-1' + %idle_icon_07{:perm => 'RW'}= '-1' + %idle_icon_08{:perm => 'RW'}= '-1' + %idle_icon_09{:perm => 'RW'}= '-1' + %idle_icon_10{:perm => 'RW'}= '-1' + %idle_icon_11{:perm => 'RW'}= '15' + %idle_icon_12{:perm => 'RW'}= '-1' + %idle_icon_13{:perm => 'RW'}= '-1' + %idle_icon_14{:perm => 'RW'}= '13' + %idle_icon_15{:perm => 'RW'}= '12' + != "\ -%html.no-js{ :lang => "en" } - ~#OPTIMIZE Make html lang attribute reflect the actual language. +%html.no-js{ :lang => I18n.locale.to_s } %header %meta{ :charset => "utf-8" }/ @@ -19,7 +18,8 @@ %body #container - = render :partial => "shared/header" + - cache(['application_header', I18n.locale, current_user]) do + = render :partial => "shared/header" = render :partial => "shared/flash", :locals => { :flash => flash} #content{:role => 'main'} @@ -30,18 +30,19 @@ %h1= yield(:title) = yield - %footer#main - %ul - %li - %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} - - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) + - cache(['application_footer', I18n.locale]) do + %footer#main + %ul %li - %a{:href => "http://amooma.de"} Kommerzieller Support und Consulting - - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) - %li - %a{:href => "https://groups.google.com/group/gs5-users/"} Kostenlose Mailingliste + %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) + %li + %a{:href => "http://amooma.de"} Kommerzieller Support und Consulting + - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) + %li + %a{:href => "https://groups.google.com/group/gs5-users/"} Kostenlose Mailingliste - .amooma-logo - %span brought to you by - %a{ :target => '_blank', :href => "http://amooma.de/" } Amooma + .amooma-logo + %span brought to you by + %a{ :target => '_blank', :href => "http://amooma.de/" } Amooma -- cgit v1.2.3 From 113e3c6c6117fbeca7b9bf1f0e6dc26b0db9c407 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Wed, 16 Jan 2013 08:33:45 -0500 Subject: call_routes added --- app/views/call_routes/_form.html.haml | 7 +++++++ app/views/call_routes/_form_core.html.haml | 6 ++++++ app/views/call_routes/_index_core.html.haml | 17 +++++++++++++++++ app/views/call_routes/edit.html.haml | 3 +++ app/views/call_routes/index.html.haml | 6 ++++++ app/views/call_routes/new.html.haml | 3 +++ app/views/call_routes/show.html.haml | 19 +++++++++++++++++++ 7 files changed, 61 insertions(+) create mode 100644 app/views/call_routes/_form.html.haml create mode 100644 app/views/call_routes/_form_core.html.haml create mode 100644 app/views/call_routes/_index_core.html.haml create mode 100644 app/views/call_routes/edit.html.haml create mode 100644 app/views/call_routes/index.html.haml create mode 100644 app/views/call_routes/new.html.haml create mode 100644 app/views/call_routes/show.html.haml (limited to 'app/views') diff --git a/app/views/call_routes/_form.html.haml b/app/views/call_routes/_form.html.haml new file mode 100644 index 0000000..1415852 --- /dev/null +++ b/app/views/call_routes/_form.html.haml @@ -0,0 +1,7 @@ += simple_form_for(@call_route) do |f| + = f.error_notification + + = render "form_core", :f => f + + .actions + = f.button :submit, conditional_t('call_routes.form.submit') \ No newline at end of file diff --git a/app/views/call_routes/_form_core.html.haml b/app/views/call_routes/_form_core.html.haml new file mode 100644 index 0000000..4b97434 --- /dev/null +++ b/app/views/call_routes/_form_core.html.haml @@ -0,0 +1,6 @@ +.inputs + = f.input :table, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint') + = f.input :name, :label => t('call_routes.form.name.label'), :hint => conditional_hint('call_routes.form.name.hint') + = f.input :endpoint_type, :label => t('call_routes.form.endpoint_type.label'), :hint => conditional_hint('call_routes.form.endpoint_type.hint') + = f.input :endpoint_id, :label => t('call_routes.form.endpoint_id.label'), :hint => conditional_hint('call_routes.form.endpoint_id.hint') + = f.input :position, :label => t('call_routes.form.position.label'), :hint => conditional_hint('call_routes.form.position.hint') diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml new file mode 100644 index 0000000..6ea3af7 --- /dev/null +++ b/app/views/call_routes/_index_core.html.haml @@ -0,0 +1,17 @@ +%table + %tr + %th= t('call_routes.index.table') + %th= t('call_routes.index.name') + %th= t('call_routes.index.endpoint_type') + %th= t('call_routes.index.endpoint_id') + %th= t('call_routes.index.position') + + - reset_cycle + - for call_route in call_routes + %tr{:class => cycle('odd', 'even')} + %td= call_route.table + %td= call_route.name + %td= call_route.endpoint_type + %td= call_route.endpoint_id + %td= call_route.position + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route} \ No newline at end of file diff --git a/app/views/call_routes/edit.html.haml b/app/views/call_routes/edit.html.haml new file mode 100644 index 0000000..0ad46c5 --- /dev/null +++ b/app/views/call_routes/edit.html.haml @@ -0,0 +1,3 @@ +- title t("call_routes.edit.page_title") + += render "form" \ No newline at end of file diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml new file mode 100644 index 0000000..687a9dc --- /dev/null +++ b/app/views/call_routes/index.html.haml @@ -0,0 +1,6 @@ +- title t("call_routes.index.page_title") + +- if @call_routes && @call_routes.count > 0 + = render "index_core", :call_routes => @call_routes + += render :partial => 'shared/create_link', :locals => {:child_class => CallRoute} \ No newline at end of file diff --git a/app/views/call_routes/new.html.haml b/app/views/call_routes/new.html.haml new file mode 100644 index 0000000..0796d7f --- /dev/null +++ b/app/views/call_routes/new.html.haml @@ -0,0 +1,3 @@ +- title t("call_routes.new.page_title") + += render "form" \ No newline at end of file diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml new file mode 100644 index 0000000..31c3cb0 --- /dev/null +++ b/app/views/call_routes/show.html.haml @@ -0,0 +1,19 @@ +- title t("call_routes.show.page_title") + +%p + %strong= t('call_routes.show.table') + ":" + = @call_route.table +%p + %strong= t('call_routes.show.name') + ":" + = @call_route.name +%p + %strong= t('call_routes.show.endpoint_type') + ":" + = @call_route.endpoint_type +%p + %strong= t('call_routes.show.endpoint_id') + ":" + = @call_route.endpoint_id +%p + %strong= t('call_routes.show.position') + ":" + = @call_route.position + += render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @call_route } \ No newline at end of file -- cgit v1.2.3 From 8c83a89c6fbfdb31cae8ea6fcf2fd50c12c076a5 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Wed, 16 Jan 2013 08:37:56 -0500 Subject: route_elements added --- app/views/route_elements/_form.html.haml | 7 +++++++ app/views/route_elements/_form_core.html.haml | 9 +++++++++ app/views/route_elements/_index_core.html.haml | 23 +++++++++++++++++++++ app/views/route_elements/edit.html.haml | 3 +++ app/views/route_elements/index.html.haml | 6 ++++++ app/views/route_elements/new.html.haml | 3 +++ app/views/route_elements/show.html.haml | 28 ++++++++++++++++++++++++++ 7 files changed, 79 insertions(+) create mode 100644 app/views/route_elements/_form.html.haml create mode 100644 app/views/route_elements/_form_core.html.haml create mode 100644 app/views/route_elements/_index_core.html.haml create mode 100644 app/views/route_elements/edit.html.haml create mode 100644 app/views/route_elements/index.html.haml create mode 100644 app/views/route_elements/new.html.haml create mode 100644 app/views/route_elements/show.html.haml (limited to 'app/views') diff --git a/app/views/route_elements/_form.html.haml b/app/views/route_elements/_form.html.haml new file mode 100644 index 0000000..cfa4c6b --- /dev/null +++ b/app/views/route_elements/_form.html.haml @@ -0,0 +1,7 @@ += simple_form_for(@route_element) do |f| + = f.error_notification + + = render "form_core", :f => f + + .actions + = f.button :submit, conditional_t('route_elements.form.submit') \ No newline at end of file diff --git a/app/views/route_elements/_form_core.html.haml b/app/views/route_elements/_form_core.html.haml new file mode 100644 index 0000000..7697cb0 --- /dev/null +++ b/app/views/route_elements/_form_core.html.haml @@ -0,0 +1,9 @@ +.inputs + = f.input :call_route_id, :label => t('route_elements.form.call_route_id.label'), :hint => conditional_hint('route_elements.form.call_route_id.hint') + = f.input :var_in, :label => t('route_elements.form.var_in.label'), :hint => conditional_hint('route_elements.form.var_in.hint') + = f.input :var_out, :label => t('route_elements.form.var_out.label'), :hint => conditional_hint('route_elements.form.var_out.hint') + = f.input :pattern, :label => t('route_elements.form.pattern.label'), :hint => conditional_hint('route_elements.form.pattern.hint') + = f.input :replacement, :label => t('route_elements.form.replacement.label'), :hint => conditional_hint('route_elements.form.replacement.hint') + = f.input :action, :label => t('route_elements.form.action.label'), :hint => conditional_hint('route_elements.form.action.hint') + = f.input :mandatory, :label => t('route_elements.form.mandatory.label'), :hint => conditional_hint('route_elements.form.mandatory.hint') + = f.input :position, :label => t('route_elements.form.position.label'), :hint => conditional_hint('route_elements.form.position.hint') diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml new file mode 100644 index 0000000..63665fd --- /dev/null +++ b/app/views/route_elements/_index_core.html.haml @@ -0,0 +1,23 @@ +%table + %tr + %th= t('route_elements.index.call_route_id') + %th= t('route_elements.index.var_in') + %th= t('route_elements.index.var_out') + %th= t('route_elements.index.pattern') + %th= t('route_elements.index.replacement') + %th= t('route_elements.index.action') + %th= t('route_elements.index.mandatory') + %th= t('route_elements.index.position') + + - reset_cycle + - for route_element in route_elements + %tr{:class => cycle('odd', 'even')} + %td= route_element.call_route_id + %td= route_element.var_in + %td= route_element.var_out + %td= route_element.pattern + %td= route_element.replacement + %td= route_element.action + %td= route_element.mandatory + %td= route_element.position + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => route_element} \ No newline at end of file diff --git a/app/views/route_elements/edit.html.haml b/app/views/route_elements/edit.html.haml new file mode 100644 index 0000000..770eb6c --- /dev/null +++ b/app/views/route_elements/edit.html.haml @@ -0,0 +1,3 @@ +- title t("route_elements.edit.page_title") + += render "form" \ No newline at end of file diff --git a/app/views/route_elements/index.html.haml b/app/views/route_elements/index.html.haml new file mode 100644 index 0000000..b05236b --- /dev/null +++ b/app/views/route_elements/index.html.haml @@ -0,0 +1,6 @@ +- title t("route_elements.index.page_title") + +- if @route_elements && @route_elements.count > 0 + = render "index_core", :route_elements => @route_elements + += render :partial => 'shared/create_link', :locals => {:child_class => RouteElement} \ No newline at end of file diff --git a/app/views/route_elements/new.html.haml b/app/views/route_elements/new.html.haml new file mode 100644 index 0000000..903e808 --- /dev/null +++ b/app/views/route_elements/new.html.haml @@ -0,0 +1,3 @@ +- title t("route_elements.new.page_title") + += render "form" \ No newline at end of file diff --git a/app/views/route_elements/show.html.haml b/app/views/route_elements/show.html.haml new file mode 100644 index 0000000..a439353 --- /dev/null +++ b/app/views/route_elements/show.html.haml @@ -0,0 +1,28 @@ +- title t("route_elements.show.page_title") + +%p + %strong= t('route_elements.show.call_route_id') + ":" + = @route_element.call_route_id +%p + %strong= t('route_elements.show.var_in') + ":" + = @route_element.var_in +%p + %strong= t('route_elements.show.var_out') + ":" + = @route_element.var_out +%p + %strong= t('route_elements.show.pattern') + ":" + = @route_element.pattern +%p + %strong= t('route_elements.show.replacement') + ":" + = @route_element.replacement +%p + %strong= t('route_elements.show.action') + ":" + = @route_element.action +%p + %strong= t('route_elements.show.mandatory') + ":" + = @route_element.mandatory +%p + %strong= t('route_elements.show.position') + ":" + = @route_element.position + += render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @route_element } \ No newline at end of file -- cgit v1.2.3 From 0ee17f52f8ad337c1240b4c55dbd8f6c6c74dc90 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 16 Jan 2013 16:32:59 +0100 Subject: Fixed routes and breadcrumbs. #106 --- app/views/route_elements/_form.html.haml | 2 +- app/views/route_elements/_form_core.html.haml | 1 - app/views/route_elements/_index_core.html.haml | 4 +--- app/views/route_elements/index.html.haml | 2 +- app/views/route_elements/show.html.haml | 5 +---- 5 files changed, 4 insertions(+), 10 deletions(-) (limited to 'app/views') diff --git a/app/views/route_elements/_form.html.haml b/app/views/route_elements/_form.html.haml index cfa4c6b..8feacaa 100644 --- a/app/views/route_elements/_form.html.haml +++ b/app/views/route_elements/_form.html.haml @@ -1,4 +1,4 @@ -= simple_form_for(@route_element) do |f| += simple_form_for([@call_route, @route_element]) do |f| = f.error_notification = render "form_core", :f => f diff --git a/app/views/route_elements/_form_core.html.haml b/app/views/route_elements/_form_core.html.haml index 7697cb0..133d1df 100644 --- a/app/views/route_elements/_form_core.html.haml +++ b/app/views/route_elements/_form_core.html.haml @@ -1,5 +1,4 @@ .inputs - = f.input :call_route_id, :label => t('route_elements.form.call_route_id.label'), :hint => conditional_hint('route_elements.form.call_route_id.hint') = f.input :var_in, :label => t('route_elements.form.var_in.label'), :hint => conditional_hint('route_elements.form.var_in.hint') = f.input :var_out, :label => t('route_elements.form.var_out.label'), :hint => conditional_hint('route_elements.form.var_out.hint') = f.input :pattern, :label => t('route_elements.form.pattern.label'), :hint => conditional_hint('route_elements.form.pattern.hint') diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml index 63665fd..c1df665 100644 --- a/app/views/route_elements/_index_core.html.haml +++ b/app/views/route_elements/_index_core.html.haml @@ -1,6 +1,5 @@ %table %tr - %th= t('route_elements.index.call_route_id') %th= t('route_elements.index.var_in') %th= t('route_elements.index.var_out') %th= t('route_elements.index.pattern') @@ -12,7 +11,6 @@ - reset_cycle - for route_element in route_elements %tr{:class => cycle('odd', 'even')} - %td= route_element.call_route_id %td= route_element.var_in %td= route_element.var_out %td= route_element.pattern @@ -20,4 +18,4 @@ %td= route_element.action %td= route_element.mandatory %td= route_element.position - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => route_element} \ No newline at end of file + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @call_route, :child => route_element} \ No newline at end of file diff --git a/app/views/route_elements/index.html.haml b/app/views/route_elements/index.html.haml index b05236b..8a6f7bc 100644 --- a/app/views/route_elements/index.html.haml +++ b/app/views/route_elements/index.html.haml @@ -3,4 +3,4 @@ - if @route_elements && @route_elements.count > 0 = render "index_core", :route_elements => @route_elements -= render :partial => 'shared/create_link', :locals => {:child_class => RouteElement} \ No newline at end of file += render :partial => 'shared/create_link', :locals => {:parent => @call_route, :child_class => RouteElement} \ No newline at end of file diff --git a/app/views/route_elements/show.html.haml b/app/views/route_elements/show.html.haml index a439353..8e41f80 100644 --- a/app/views/route_elements/show.html.haml +++ b/app/views/route_elements/show.html.haml @@ -1,8 +1,5 @@ - title t("route_elements.show.page_title") -%p - %strong= t('route_elements.show.call_route_id') + ":" - = @route_element.call_route_id %p %strong= t('route_elements.show.var_in') + ":" = @route_element.var_in @@ -25,4 +22,4 @@ %strong= t('route_elements.show.position') + ":" = @route_element.position -= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @route_element } \ No newline at end of file += render :partial => 'shared/show_edit_destroy_part', :locals => {:parent => @call_route, :child => @route_element } \ No newline at end of file -- cgit v1.2.3 From 0d5fd7ba5092b4d00826f3572448bb54ac2ec983 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 16 Jan 2013 17:14:12 +0100 Subject: Limit call_histories to 1000 and add caching. --- app/views/call_histories/_index_core.html.haml | 119 +++++++++++++------------ 1 file changed, 61 insertions(+), 58 deletions(-) (limited to 'app/views') diff --git a/app/views/call_histories/_index_core.html.haml b/app/views/call_histories/_index_core.html.haml index 2d7658a..4ed4fc4 100644 --- a/app/views/call_histories/_index_core.html.haml +++ b/app/views/call_histories/_index_core.html.haml @@ -1,64 +1,67 @@ = form_tag(destroy_multiple_sip_account_call_histories_path(@sip_account), :method => :delete, :id => 'call_history_form') do %header.entries-nav= render :partial => "call_histories/navigation" .content - %table - - reset_cycle - - for call_history in call_histories - - phone_number = call_history.display_number - - voicemail_message = call_history.voicemail_message - - if phone_number - - phone_book_entry = call_history.phone_book_entry_by_number(phone_number) - %tr.call-history-entry{:class => cycle('odd', 'even')} - %td.select_box= check_box_tag("selected_ids[]", call_history.id, false, :id => "select_item_#{call_history.id}", :class => 'select_item') - %td.thumbnail - - image = call_history.display_image(:small, phone_book_entry) - - if image - = image_tag(image, :itemprop => 'image') - %td.time - - if voicemail_message - .voicemail-message - %a{:href => sip_account_voicemail_messages_path(@sip_account, :anchor => "message_#{voicemail_message.id}")} - = image_tag('icons/gs_envelope_16x.png', :class => 'display') - = call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - elsif call_history.entry_type == 'forwarded' - .call-forwarded= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - if call_history.callee_account_type.to_s.downcase == 'voicemail' - = t("call_histories.index.voicemail") - - else - = call_history.destination_number - - elsif call_history.entry_type == 'dialed' - .call-placed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - elsif call_history.entry_type == 'received' - .call-received= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - elsif call_history.entry_type == 'missed' - .call-missed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - else - .call-unknown - = t("call_histories.index.#{call_history.entry_type}") - = call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - if call_history.forwarding_service && call_history.entry_type != 'forwarded' - = t("call_histories.index.forwarded_by") - = call_history.display_auth_account_name - %td.user - - display_name = call_history.display_name - - if display_name.blank? - - display_name = phone_book_entry.to_s - - if phone_book_entry - %a.name{:href => phone_book_phone_book_entry_path(phone_book_entry.phone_book, phone_book_entry), :itemprop => "name"}= display_name - - else - .name= display_name - .phone= phone_number - %td.status - - if call_history.display_duration - .duration= call_history.display_duration - - else - .disposition= t("call_histories.call_results.#{call_history.result}") - %td.actions - - if @sip_account.registration && can?(:call, call_history) - = link_to t('call_histories.index.actions.call'), call_sip_account_call_history_path(@sip_account, call_history), :method => :put - %td.actions - - if can? :destroy, call_history - = link_to t('call_histories.index.actions.destroy'), sip_account_call_history_path(@sip_account, call_history), :method => :delete + - cache(['call_history_table', I18n.locale, @sip_account, call_histories.first, call_histories.last, call_histories.count]) do + %table + - reset_cycle + - for call_history in call_histories + - tr_background_colour = cycle('odd', 'even') + - cache(['call_history_table_row', I18n.locale, call_history, tr_background_colour]) do + - phone_number = call_history.display_number + - voicemail_message = call_history.voicemail_message + - if phone_number + - phone_book_entry = call_history.phone_book_entry_by_number(phone_number) + %tr.call-history-entry{:class => tr_background_colour} + %td.select_box= check_box_tag("selected_ids[]", call_history.id, false, :id => "select_item_#{call_history.id}", :class => 'select_item') + %td.thumbnail + - image = call_history.display_image(:small, phone_book_entry) + - if image + = image_tag(image, :itemprop => 'image') + %td.time + - if voicemail_message + .voicemail-message + %a{:href => sip_account_voicemail_messages_path(@sip_account, :anchor => "message_#{voicemail_message.id}")} + = image_tag('icons/gs_envelope_16x.png', :class => 'display') + = call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - elsif call_history.entry_type == 'forwarded' + .call-forwarded= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - if call_history.callee_account_type.to_s.downcase == 'voicemail' + = t("call_histories.index.voicemail") + - else + = call_history.destination_number + - elsif call_history.entry_type == 'dialed' + .call-placed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - elsif call_history.entry_type == 'received' + .call-received= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - elsif call_history.entry_type == 'missed' + .call-missed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - else + .call-unknown + = t("call_histories.index.#{call_history.entry_type}") + = call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - if call_history.forwarding_service && call_history.entry_type != 'forwarded' + = t("call_histories.index.forwarded_by") + = call_history.display_auth_account_name + %td.user + - display_name = call_history.display_name + - if display_name.blank? + - display_name = phone_book_entry.to_s + - if phone_book_entry + %a.name{:href => phone_book_phone_book_entry_path(phone_book_entry.phone_book, phone_book_entry), :itemprop => "name"}= display_name + - else + .name= display_name + .phone= phone_number + %td.status + - if call_history.display_duration + .duration= call_history.display_duration + - else + .disposition= t("call_histories.call_results.#{call_history.result}") + %td.actions + - if @sip_account.registration && can?(:call, call_history) + = link_to t('call_histories.index.actions.call'), call_sip_account_call_history_path(@sip_account, call_history), :method => :put + %td.actions + - if can? :destroy, call_history + = link_to t('call_histories.index.actions.destroy'), sip_account_call_history_path(@sip_account, call_history), :method => :delete %footer.entries-nav= render :partial => "call_histories/navigation" = image_submit_tag('icons/cross-16x.png', :confirm => t("call_histories.index.actions.confirm_selected")) -- cgit v1.2.3 From 7cdcbdc4b851b348bb21e0f2ff437138e8b9884b Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 16 Jan 2013 21:00:41 +0100 Subject: Added page caching for the gemeinschaft_setup#new page. --- app/views/users/_form_core.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/users/_form_core.html.haml b/app/views/users/_form_core.html.haml index 8e18d12..24b15f5 100644 --- a/app/views/users/_form_core.html.haml +++ b/app/views/users/_form_core.html.haml @@ -1,6 +1,6 @@ .inputs - if GuiFunction.display?('name_data_fields_in_user_edit_form', current_user) - = f.input :male, :collection => [[true, t('users.form.gender.male')], [false, t('users.form.gender.female')]], :label_method => :last, :value_method => :first, :label => t('users.form.male.label'), :hint => conditional_hint('users.form.gender.hint'), :label => t('users.form.gender.label'), :as => :radio + = f.input :male, :collection => [[true, t('users.form.gender.male')], [false, t('users.form.gender.female')]], :label_method => :last, :value_method => :first, :label => t('users.form.male.label'), :hint => conditional_hint('users.form.gender.hint'), :label => t('users.form.gender.label'), :as => :radio_buttons = f.input :first_name, :label => t('users.form.first_name.label'), :hint => conditional_hint('users.form.first_name.hint'), :autofocus => true = f.input :middle_name, :label => t('users.form.middle_name.label'), :hint => conditional_hint('users.form.middle_name.hint') = f.input :last_name, :label => t('users.form.last_name.label'), :hint => conditional_hint('users.form.last_name.hint') -- cgit v1.2.3 From 046ce09895a08778c971052f6d22ecd6422aee6d Mon Sep 17 00:00:00 2001 From: spag Date: Wed, 16 Jan 2013 21:24:24 +0100 Subject: list route elements in route view --- app/views/call_routes/show.html.haml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml index 31c3cb0..c5c7397 100644 --- a/app/views/call_routes/show.html.haml +++ b/app/views/call_routes/show.html.haml @@ -16,4 +16,10 @@ %strong= t('call_routes.show.position') + ":" = @call_route.position -= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @call_route } \ No newline at end of file += render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @call_route } + +%h3= t('route_elements.index.page_title') +- if @call_route.route_elements && @call_route.route_elements.count > 0 + = render "route_elements/index_core", :route_elements => @call_route.route_elements + += render :partial => 'shared/create_link', :locals => { :parent => @call_route, :child_class => RouteElement } -- cgit v1.2.3 From 9ffaaeeb42b364f2c7d9b7d17a272c530f546c83 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 16 Jan 2013 21:46:37 +0100 Subject: Refactoring and adding user_groups to tenant#show #105 --- app/views/tenants/_admin_area.de.html.haml | 4 +++ app/views/tenants/_admin_area.html.haml | 4 +++ app/views/user_groups/_index_core.html.haml | 46 ++++++++++++++++------------- app/views/users/_listing.html.haml | 6 ++-- 4 files changed, 36 insertions(+), 24 deletions(-) (limited to 'app/views') diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml index beab94e..89e14cb 100644 --- a/app/views/tenants/_admin_area.de.html.haml +++ b/app/views/tenants/_admin_area.de.html.haml @@ -30,6 +30,10 @@ %h2 Admin Bereich = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} +- if @tenant.user_groups.any? + %h2 Gruppen + = render "user_groups/index_core", :user_groups => @tenant.user_groups + %h2 Features = render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant} diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index 65810e7..7136f1e 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -29,6 +29,10 @@ %h2 Admin Area = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} +- if @tenant.user_groups.any? + %h2 Groups + = render "user_groups/index_core", :user_groups => @tenant.user_groups + %h2 Features = render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant} diff --git a/app/views/user_groups/_index_core.html.haml b/app/views/user_groups/_index_core.html.haml index d2b6e88..481a507 100644 --- a/app/views/user_groups/_index_core.html.haml +++ b/app/views/user_groups/_index_core.html.haml @@ -1,24 +1,28 @@ -%table - %tr - %th= t('user_groups.index.name') - %th= t('user_groups.index.description') - - if @user - %th= t('user_groups.index.tenant_id') - - else - %th= t('user_groups.index.members') - - - reset_cycle - - for user_group in user_groups - %tr{:class => cycle('odd', 'even')} - %td= user_group.name - %td= user_group.description +- cache(['user_groups_table', I18n.locale, current_user, @user, user_groups, User.order(:updated_at).last, User.count, UserGroupMembership.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do + %table + %tr + %th= t('user_groups.index.name') + - if user_groups.pluck(:description).uniq != [nil] + %th= t('user_groups.index.description') - if @user - %td= user_group.tenant + %th= t('user_groups.index.tenant_id') - else - %td - =render 'users/listing', :users => user_group.users - - if user_group.users.count > 1 - %br - = render :partial => 'shared/create_link', :locals => {:parent => user_group, :child_class => UserGroupMembership} + %th= t('user_groups.index.members') + + - reset_cycle + - for user_group in user_groups + %tr{:class => cycle('odd', 'even')} + %td= user_group.name + - if user_groups.pluck(:description).uniq != [nil] + %td= user_group.description + - if @user + %td= user_group.tenant + - else + %td + =render 'users/listing', :users => user_group.users + - if user_group.users.any? + %br + - if (user_group.tenant.user_ids - user_group.user_ids).any? + = render :partial => 'shared/create_link', :locals => {:parent => user_group, :child_class => UserGroupMembership} - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user_group.tenant, :child => user_group} + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user_group.tenant, :child => user_group} diff --git a/app/views/users/_listing.html.haml b/app/views/users/_listing.html.haml index 0a97ad1..9b7b653 100644 --- a/app/views/users/_listing.html.haml +++ b/app/views/users/_listing.html.haml @@ -1,8 +1,8 @@ - amount_of_users = users.count - if amount_of_users > 0 - - if amount_of_users < 30 + - if amount_of_users < GsParameter.get('NUMBER_OF_SHOWN_ITEMS') = users.map{|user| user}.join(', ') - else - = users.limit(15).map{|user| user}.join(', ') + ', ' + = users.limit((GsParameter.get('NUMBER_OF_SHOWN_ITEMS') / 2).floor).map{|user| user}.join(', ') + ', ' = '[...]' - = users.offset(amount_of_users - 15).map{|user| user}.join(', ') \ No newline at end of file + = users.offset(amount_of_users - (GsParameter.get('NUMBER_OF_SHOWN_ITEMS') / 2).floor).map{|user| user}.join(', ') \ No newline at end of file -- cgit v1.2.3 From 1bd91b138c773aedbd5f18b9df79e28fac240dbc Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 16 Jan 2013 22:04:44 +0100 Subject: Added a users table to tenant#view. Related to #105. Still a lot of room for improvement. --- app/views/tenants/_admin_area.de.html.haml | 17 +++++++++++++---- app/views/tenants/_admin_area.html.haml | 19 ++++++++++++++----- 2 files changed, 27 insertions(+), 9 deletions(-) (limited to 'app/views') diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml index 89e14cb..0ef9da3 100644 --- a/app/views/tenants/_admin_area.de.html.haml +++ b/app/views/tenants/_admin_area.de.html.haml @@ -30,15 +30,24 @@ %h2 Admin Bereich = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} +%h2= t("users.index.page_title") +- if @tenant.users.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') + = render "users/index_core", :users => @tenant.users + = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => User} +- else + %p + = link_to "Liste aller User.", tenant_users_path(@tenant) + - if @tenant.user_groups.any? - %h2 Gruppen + %h2= t("user_groups.index.page_title") = render "user_groups/index_core", :user_groups => @tenant.user_groups + = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => UserGroup} %h2 Features = render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant} -%h2 Gemeinschaft Konfiguration -= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant} - %h2=t("phone_books.index.page_title") = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant} + +%h2 Gemeinschaft Konfiguration += render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant} \ No newline at end of file diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index 7136f1e..7b47587 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -29,15 +29,24 @@ %h2 Admin Area = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} +%h2= t("users.index.page_title") +- if @tenant.users.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') + = render "users/index_core", :users => @tenant.users + = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => User} +- else + %p + = link_to "Liste aller User.", tenant_users_path(@tenant) + - if @tenant.user_groups.any? - %h2 Groups + %h2= t("user_groups.index.page_title") = render "user_groups/index_core", :user_groups => @tenant.user_groups + = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => UserGroup} %h2 Features = render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant} -%h2 Gemeinschaft Configuration -= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant} - %h2=t("phone_books.index.page_title") -= render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant} \ No newline at end of file += render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant} + +%h2 Gemeinschaft Configuration += render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant} \ No newline at end of file -- cgit v1.2.3 From 35b857cd917b2005aef993c40021253abe96e2d2 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 16 Jan 2013 22:08:19 +0100 Subject: It doesn't make sense to create a tenant.user_group here. #105 --- app/views/users/_user_groups.html.haml | 1 - 1 file changed, 1 deletion(-) (limited to 'app/views') diff --git a/app/views/users/_user_groups.html.haml b/app/views/users/_user_groups.html.haml index 7e206b6..81191ae 100644 --- a/app/views/users/_user_groups.html.haml +++ b/app/views/users/_user_groups.html.haml @@ -5,4 +5,3 @@ %h2=t("user_groups.index.page_title") - if user.user_groups.count > 0 = render "user_groups/index_core", :user_groups => user.user_groups.where(:tenant_id => tenant.id).order(:name) - = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => UserGroup} \ No newline at end of file -- cgit v1.2.3 From 4ba228de6ecbfa0eeca20f8f7b70aee78fde9385 Mon Sep 17 00:00:00 2001 From: spag Date: Wed, 16 Jan 2013 23:08:53 +0100 Subject: position removed --- app/views/call_routes/show.html.haml | 3 --- 1 file changed, 3 deletions(-) (limited to 'app/views') diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml index c5c7397..8be64e6 100644 --- a/app/views/call_routes/show.html.haml +++ b/app/views/call_routes/show.html.haml @@ -12,9 +12,6 @@ %p %strong= t('call_routes.show.endpoint_id') + ":" = @call_route.endpoint_id -%p - %strong= t('call_routes.show.position') + ":" - = @call_route.position = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @call_route } -- cgit v1.2.3 From 416a9c563ed52b2b4f5350b8a069313f5843489c Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 17 Jan 2013 09:51:34 +0100 Subject: Cache bug fixed. --- app/views/users/show.html.haml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'app/views') diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index f74d0a5..9a0ae02 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -47,16 +47,14 @@ - cache(['user_show_user_groups_overview', I18n.locale, @user, @user.user_groups]) do = render :partial => 'user_groups', :locals => {:user => @user, :tenant => @tenant} - - cache(['user_show_overview_for_sip_account_phones_fax_accounts_and_conferences', I18n.locale, @user, @user.sip_accounts, @user.phones, @user.fax_accounts, @user.conferences]) do + - cache(['user_show_sip_accounts_overview', I18n.locale, @user, @user.sip_accounts]) do + = render :partial => 'sip_accounts', :locals => {:user => @user} - - cache(['user_show_sip_accounts_overview', I18n.locale, @user, @user.sip_accounts]) do - = render :partial => 'sip_accounts', :locals => {:user => @user} + - cache(['user_show_phones_overview', I18n.locale, @user, @user.phones]) do + = render :partial => 'phones', :locals => {:user => @user} - - cache(['user_show_phones_overview', I18n.locale, @user, @user.phones]) do - = render :partial => 'phones', :locals => {:user => @user} + - cache(['user_show_fax_accounts_overview', I18n.locale, @user, @user.fax_accounts]) do + = render :partial => 'fax_accounts', :locals => {:user => @user} - - cache(['user_show_fax_accounts_overview', I18n.locale, @user, @user.fax_accounts]) do - = render :partial => 'fax_accounts', :locals => {:user => @user} - - - cache(['user_show_conferences_overview', I18n.locale, @user, @user.conferences]) do - = render :partial => 'conferences', :locals => {:user => @user} + - cache(['user_show_conferences_overview', I18n.locale, @user, @user.conferences]) do + = render :partial => 'conferences', :locals => {:user => @user} -- cgit v1.2.3 From ae8ce84e44d776b3c2318795ceff611f0639b7ec Mon Sep 17 00:00:00 2001 From: spag Date: Thu, 17 Jan 2013 12:31:10 +0100 Subject: call route views --- app/views/call_routes/_form_core.html.haml | 3 +-- app/views/call_routes/_index_core.html.haml | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'app/views') diff --git a/app/views/call_routes/_form_core.html.haml b/app/views/call_routes/_form_core.html.haml index 4b97434..4712e2f 100644 --- a/app/views/call_routes/_form_core.html.haml +++ b/app/views/call_routes/_form_core.html.haml @@ -1,6 +1,5 @@ .inputs - = f.input :table, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint') + = f.input :table, :collection => CallRoute::ROUTING_TABLES, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint'), :include_blank => false = f.input :name, :label => t('call_routes.form.name.label'), :hint => conditional_hint('call_routes.form.name.hint') = f.input :endpoint_type, :label => t('call_routes.form.endpoint_type.label'), :hint => conditional_hint('call_routes.form.endpoint_type.hint') = f.input :endpoint_id, :label => t('call_routes.form.endpoint_id.label'), :hint => conditional_hint('call_routes.form.endpoint_id.hint') - = f.input :position, :label => t('call_routes.form.position.label'), :hint => conditional_hint('call_routes.form.position.hint') diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml index 6ea3af7..9e7b94e 100644 --- a/app/views/call_routes/_index_core.html.haml +++ b/app/views/call_routes/_index_core.html.haml @@ -4,7 +4,6 @@ %th= t('call_routes.index.name') %th= t('call_routes.index.endpoint_type') %th= t('call_routes.index.endpoint_id') - %th= t('call_routes.index.position') - reset_cycle - for call_route in call_routes @@ -13,5 +12,4 @@ %td= call_route.name %td= call_route.endpoint_type %td= call_route.endpoint_id - %td= call_route.position =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route} \ No newline at end of file -- cgit v1.2.3 From 808a9d19c7376907370e58662856cd028e9b83b1 Mon Sep 17 00:00:00 2001 From: spag Date: Thu, 17 Jan 2013 12:31:28 +0100 Subject: route elements views --- app/views/route_elements/_form_core.html.haml | 3 +-- app/views/route_elements/_index_core.html.haml | 2 -- app/views/route_elements/show.html.haml | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) (limited to 'app/views') diff --git a/app/views/route_elements/_form_core.html.haml b/app/views/route_elements/_form_core.html.haml index 133d1df..a9a38a7 100644 --- a/app/views/route_elements/_form_core.html.haml +++ b/app/views/route_elements/_form_core.html.haml @@ -3,6 +3,5 @@ = f.input :var_out, :label => t('route_elements.form.var_out.label'), :hint => conditional_hint('route_elements.form.var_out.hint') = f.input :pattern, :label => t('route_elements.form.pattern.label'), :hint => conditional_hint('route_elements.form.pattern.hint') = f.input :replacement, :label => t('route_elements.form.replacement.label'), :hint => conditional_hint('route_elements.form.replacement.hint') - = f.input :action, :label => t('route_elements.form.action.label'), :hint => conditional_hint('route_elements.form.action.hint') + = f.input :action, :collection => RouteElement::ELEMENT_ACTIONS, :label => t('route_elements.form.action.label'), :hint => conditional_hint('route_elements.form.action.hint'), :include_blank => false = f.input :mandatory, :label => t('route_elements.form.mandatory.label'), :hint => conditional_hint('route_elements.form.mandatory.hint') - = f.input :position, :label => t('route_elements.form.position.label'), :hint => conditional_hint('route_elements.form.position.hint') diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml index c1df665..3435686 100644 --- a/app/views/route_elements/_index_core.html.haml +++ b/app/views/route_elements/_index_core.html.haml @@ -6,7 +6,6 @@ %th= t('route_elements.index.replacement') %th= t('route_elements.index.action') %th= t('route_elements.index.mandatory') - %th= t('route_elements.index.position') - reset_cycle - for route_element in route_elements @@ -17,5 +16,4 @@ %td= route_element.replacement %td= route_element.action %td= route_element.mandatory - %td= route_element.position =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @call_route, :child => route_element} \ No newline at end of file diff --git a/app/views/route_elements/show.html.haml b/app/views/route_elements/show.html.haml index 8e41f80..c637a4d 100644 --- a/app/views/route_elements/show.html.haml +++ b/app/views/route_elements/show.html.haml @@ -18,8 +18,5 @@ %p %strong= t('route_elements.show.mandatory') + ":" = @route_element.mandatory -%p - %strong= t('route_elements.show.position') + ":" - = @route_element.position = render :partial => 'shared/show_edit_destroy_part', :locals => {:parent => @call_route, :child => @route_element } \ No newline at end of file -- cgit v1.2.3 From 24e47521f1a57c73dc349de35909af7e1f8a4a1f Mon Sep 17 00:00:00 2001 From: spag Date: Thu, 17 Jan 2013 17:50:47 +0100 Subject: group by table --- app/views/call_routes/_index_core.html.haml | 2 -- app/views/call_routes/index.html.haml | 11 ++++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'app/views') diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml index 9e7b94e..aa22437 100644 --- a/app/views/call_routes/_index_core.html.haml +++ b/app/views/call_routes/_index_core.html.haml @@ -1,6 +1,5 @@ %table %tr - %th= t('call_routes.index.table') %th= t('call_routes.index.name') %th= t('call_routes.index.endpoint_type') %th= t('call_routes.index.endpoint_id') @@ -8,7 +7,6 @@ - reset_cycle - for call_route in call_routes %tr{:class => cycle('odd', 'even')} - %td= call_route.table %td= call_route.name %td= call_route.endpoint_type %td= call_route.endpoint_id diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml index 687a9dc..c83606b 100644 --- a/app/views/call_routes/index.html.haml +++ b/app/views/call_routes/index.html.haml @@ -1,6 +1,11 @@ - title t("call_routes.index.page_title") - if @call_routes && @call_routes.count > 0 - = render "index_core", :call_routes => @call_routes - -= render :partial => 'shared/create_link', :locals => {:child_class => CallRoute} \ No newline at end of file + %table + - @tables.each do |table| + %tr + %td{:colspan => 3} + %h3= table + = render "index_core", :call_routes => @call_routes.where(:table => table) + += render :partial => 'shared/create_link', :locals => {:child_class => CallRoute} -- cgit v1.2.3 From 17206a20e5bcb44fa4d90f0e176f7aa0fe43bca3 Mon Sep 17 00:00:00 2001 From: spag Date: Thu, 17 Jan 2013 21:51:58 +0100 Subject: rename_column table to routing_table --- app/views/call_routes/_form_core.html.haml | 2 +- app/views/call_routes/index.html.haml | 6 +++--- app/views/call_routes/show.html.haml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views') diff --git a/app/views/call_routes/_form_core.html.haml b/app/views/call_routes/_form_core.html.haml index 4712e2f..2eee795 100644 --- a/app/views/call_routes/_form_core.html.haml +++ b/app/views/call_routes/_form_core.html.haml @@ -1,5 +1,5 @@ .inputs - = f.input :table, :collection => CallRoute::ROUTING_TABLES, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint'), :include_blank => false + = f.input :routing_table, :collection => CallRoute::ROUTING_TABLES, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint'), :include_blank => false = f.input :name, :label => t('call_routes.form.name.label'), :hint => conditional_hint('call_routes.form.name.hint') = f.input :endpoint_type, :label => t('call_routes.form.endpoint_type.label'), :hint => conditional_hint('call_routes.form.endpoint_type.hint') = f.input :endpoint_id, :label => t('call_routes.form.endpoint_id.label'), :hint => conditional_hint('call_routes.form.endpoint_id.hint') diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml index c83606b..151fc0e 100644 --- a/app/views/call_routes/index.html.haml +++ b/app/views/call_routes/index.html.haml @@ -2,10 +2,10 @@ - if @call_routes && @call_routes.count > 0 %table - - @tables.each do |table| + - @routing_tables.each do |routing_table| %tr %td{:colspan => 3} - %h3= table - = render "index_core", :call_routes => @call_routes.where(:table => table) + %h3= routing_table + = render "index_core", :call_routes => @call_routes.where(:routing_table => routing_table) = render :partial => 'shared/create_link', :locals => {:child_class => CallRoute} diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml index 8be64e6..bada227 100644 --- a/app/views/call_routes/show.html.haml +++ b/app/views/call_routes/show.html.haml @@ -2,7 +2,7 @@ %p %strong= t('call_routes.show.table') + ":" - = @call_route.table + = @call_route.routing_table %p %strong= t('call_routes.show.name') + ":" = @call_route.name -- cgit v1.2.3 From 5efd9bdd2f78a15569fb7d1569dceff3bb4f8800 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 18 Jan 2013 10:19:09 +0100 Subject: Fixed a strange strong_parameter cancan bug. --- app/views/call_routes/_form_core.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/call_routes/_form_core.html.haml b/app/views/call_routes/_form_core.html.haml index 2eee795..b64d660 100644 --- a/app/views/call_routes/_form_core.html.haml +++ b/app/views/call_routes/_form_core.html.haml @@ -1,5 +1,5 @@ .inputs - = f.input :routing_table, :collection => CallRoute::ROUTING_TABLES, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint'), :include_blank => false + = f.input :routing_table, :collection => CallRoute::ROUTING_TABLES, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint'), :include_blank => false, :autofocus => true = f.input :name, :label => t('call_routes.form.name.label'), :hint => conditional_hint('call_routes.form.name.hint') = f.input :endpoint_type, :label => t('call_routes.form.endpoint_type.label'), :hint => conditional_hint('call_routes.form.endpoint_type.hint') = f.input :endpoint_id, :label => t('call_routes.form.endpoint_id.label'), :hint => conditional_hint('call_routes.form.endpoint_id.hint') -- cgit v1.2.3 From 8feb9102570d23f53c3443ccd3a409d87c97828d Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 18 Jan 2013 10:57:12 +0100 Subject: Refactoring and fixing #112 --- app/views/tenants/_admin_area.de.html.haml | 46 ++++++++-------------- app/views/tenants/_admin_area.html.haml | 45 ++++++++------------- .../tenants/_sip_accounts_and_phones.html.haml | 2 +- app/views/tenants/show.html.haml | 14 +++---- 4 files changed, 38 insertions(+), 69 deletions(-) (limited to 'app/views') diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml index 0ef9da3..268c8e7 100644 --- a/app/views/tenants/_admin_area.de.html.haml +++ b/app/views/tenants/_admin_area.de.html.haml @@ -1,32 +1,3 @@ -- cache(['tenant_show_admin_area', I18n.locale, @tenant, UserGroup.count, UserGroup.order(:updated_at).last, User.count, User.order(:updated_at).last, Manufacturer.all]) do - %p - Sie sind Mitglied der - = link_to 'Admin Gruppe', tenant_user_group_path(@tenant, @tenant.user_groups.find_by_name('Admins')) - und haben deshalb besondere Rechte. Aber wie Peter Parker schon sagte: "With great power comes great responsibility." - - %p - = @tenant - hat - = link_to pluralize(@tenant.user_groups.count, 'user group'), tenant_user_groups_path(@tenant) - - if @tenant.user_groups.count < 5 - = "(#{@tenant.user_groups.order(:name).map{|group| group.to_s }.join(', ')})" - die in Summe - = link_to pluralize(@tenant.users.count, 'user'), tenant_users_path(@tenant) - verwalten. - Das System kann - = PhoneModel.count - verschiedene Telefonmodelle von den folgenden Herstellern verwalten: - - Manufacturer.all.each do |manufacturer| - - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last - = succeed ', ' do - =link_to manufacturer, manufacturer_path(manufacturer) - - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last - = succeed ' und ' do - =link_to manufacturer, manufacturer_path(manufacturer) - - else - = succeed '.' do - =link_to manufacturer, manufacturer_path(manufacturer) - %h2 Admin Bereich = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} @@ -50,4 +21,19 @@ = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant} %h2 Gemeinschaft Konfiguration -= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant} \ No newline at end of file += render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant} + +%p + Das System kann + = PhoneModel.count + verschiedene Telefonmodelle von den folgenden Herstellern verwalten: + - Manufacturer.all.each do |manufacturer| + - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last + = succeed ', ' do + =link_to manufacturer, manufacturer_path(manufacturer) + - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last + = succeed ' und ' do + =link_to manufacturer, manufacturer_path(manufacturer) + - else + = succeed '.' do + =link_to manufacturer, manufacturer_path(manufacturer) \ No newline at end of file diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index 7b47587..e708215 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -1,31 +1,3 @@ -- cache(['tenant_show_admin_area', I18n.locale, @tenant, UserGroup.count, UserGroup.order(:updated_at).last, User.count, User.order(:updated_at).last, Manufacturer.all]) do - %p - You belong to the - = link_to 'admin group', tenant_user_group_path(@tenant, @tenant.user_groups.find_by_name('Admins')) - and therefore have super powers. But always remember Peter Parker's: "With great power comes great responsibility." - - %p - = succeed '.' do - This tenant has - = link_to pluralize(@tenant.user_groups.count, 'user group'), tenant_user_groups_path(@tenant) - - if @tenant.user_groups.count < 5 - = "(#{@tenant.user_groups.order(:name).map{|group| group.to_s }.join(', ')})" - which handle a total of - = link_to pluralize(@tenant.users.count, 'user'), tenant_users_path(@tenant) - This system can setup - = PhoneModel.count - different phone models from the manufacturers - - Manufacturer.all.each do |manufacturer| - - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last - = succeed ', ' do - =link_to manufacturer, manufacturer_path(manufacturer) - - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last - = succeed ' and ' do - =link_to manufacturer, manufacturer_path(manufacturer) - - else - = succeed '.' do - =link_to manufacturer, manufacturer_path(manufacturer) - %h2 Admin Area = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} @@ -49,4 +21,19 @@ = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant} %h2 Gemeinschaft Configuration -= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant} \ No newline at end of file += render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant} + +%p + This system can setup + = PhoneModel.count + different phone models from the manufacturers + - Manufacturer.all.each do |manufacturer| + - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last + = succeed ', ' do + =link_to manufacturer, manufacturer_path(manufacturer) + - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last + = succeed ' and ' do + =link_to manufacturer, manufacturer_path(manufacturer) + - else + = succeed '.' do + =link_to manufacturer, manufacturer_path(manufacturer) \ No newline at end of file diff --git a/app/views/tenants/_sip_accounts_and_phones.html.haml b/app/views/tenants/_sip_accounts_and_phones.html.haml index e322b67..4b84b1c 100644 --- a/app/views/tenants/_sip_accounts_and_phones.html.haml +++ b/app/views/tenants/_sip_accounts_and_phones.html.haml @@ -21,7 +21,7 @@ = '[' + truncate(sip_account.phone_numbers.map{|phone_number| phone_number.to_s}.join(', '), :length => 25) + ']' = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => SipAccount} - - cache(['tenant_show_admin_area_sip_accounts_table_cell', I18n.locale, @tenant, @tenant.phones.count, @tenant.phones.reorder(:updated_at).last]) do + - cache(['tenant_show_admin_area_phones_table_cell', I18n.locale, @tenant, @tenant.phones.count, @tenant.phones.reorder(:updated_at).last]) do %td - if tenant.phones.any? - if tenant.phones.count > GsParameter.get('NUMBER_OF_SHOWN_ITEMS') diff --git a/app/views/tenants/show.html.haml b/app/views/tenants/show.html.haml index 10845cf..f5cff5f 100644 --- a/app/views/tenants/show.html.haml +++ b/app/views/tenants/show.html.haml @@ -1,15 +1,11 @@ -- title t("tenants.show.page_title") +- title @tenant.name -- cache(['tenant_show_name_and_description', I18n.locale, @tenant, current_user]) do +- if !@tenant.description.blank? %p - %strong= t('tenants.show.name') + ":" - = @tenant.name - - if !@tenant.description.blank? - %p - %strong= t('tenants.show.description') + ":" - = @tenant.description + %strong= t('tenants.show.description') + ":" + = @tenant.description - = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @tenant } += render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @tenant } - if @tenant.user_groups.where(:name => 'Admins').count > 0 && @tenant.user_groups.where(:name => 'Admins').first.users.include?(current_user) = render 'admin_area' \ No newline at end of file -- cgit v1.2.3 From ba4d32db18a7e6dd701dcfb210ec6af062ee2446 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 18 Jan 2013 11:07:08 +0100 Subject: Added caching for users table. --- app/views/users/_index_core.html.haml | 36 ++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'app/views') diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index 51c15de..5d0fd16 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -1,18 +1,20 @@ -%table - %tr - %th - %th= t('users.index.user_name') - %th= t('users.index.email') - %th= t('users.index.first_name') - %th= t('users.index.last_name') +- cache(['user_table_row_inner_td', I18n.locale, current_user, users.order(:updated_at).last, users.count]) do + %table + %tr + %th + %th= t('users.index.user_name') + %th= t('users.index.email') + %th= t('users.index.first_name') + %th= t('users.index.last_name') - - reset_cycle - - for user in users - %tr{:class => cycle('odd', 'even')} - %td - = image_tag user.image_url(:mini).to_s if user.image_url(:mini) - %td= user.user_name - %td= user.email - %td= user.first_name - %td= user.last_name - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @tenant, :child => user} \ No newline at end of file + - reset_cycle + - for user in users + %tr{:class => cycle('odd', 'even')} + - cache(['user_table_row_inner_td', I18n.locale, current_user, user]) do + %td + = image_tag user.image_url(:mini).to_s if user.image_url(:mini) + %td= user.user_name + %td= user.email + %td= user.first_name + %td= user.last_name + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @tenant, :child => user} \ No newline at end of file -- cgit v1.2.3 From d4e7d4a5d5bdb63fbda279dbc8dd2ec495b90907 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 18 Jan 2013 11:08:34 +0100 Subject: Added GsParameter.get('NUMBER_OF_SHOWN_ITEMS') to the cache key. --- app/views/users/_index_core.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index 5d0fd16..9376826 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -1,4 +1,4 @@ -- cache(['user_table_row_inner_td', I18n.locale, current_user, users.order(:updated_at).last, users.count]) do +- cache(['user_table_row_inner_td', I18n.locale, current_user, users.order(:updated_at).last, users.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do %table %tr %th -- cgit v1.2.3 From a4c2b5b00c074d8861ef313f672032611d662fff Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 19 Jan 2013 08:53:02 +0100 Subject: Refactoring. --- app/views/tenants/_admin_area.de.html.haml | 15 ++------------- app/views/tenants/_admin_area.html.haml | 15 ++------------- app/views/tenants/_table_of_phone_books.html.haml | 1 + app/views/tenants/_user_groups_table.de.html.haml | 4 ++++ app/views/tenants/_users_table.de.html.haml | 7 +++++++ 5 files changed, 16 insertions(+), 26 deletions(-) create mode 100644 app/views/tenants/_user_groups_table.de.html.haml create mode 100644 app/views/tenants/_users_table.de.html.haml (limited to 'app/views') diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml index 268c8e7..fed7d4f 100644 --- a/app/views/tenants/_admin_area.de.html.haml +++ b/app/views/tenants/_admin_area.de.html.haml @@ -1,23 +1,12 @@ -%h2 Admin Bereich = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} -%h2= t("users.index.page_title") -- if @tenant.users.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') - = render "users/index_core", :users => @tenant.users - = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => User} -- else - %p - = link_to "Liste aller User.", tenant_users_path(@tenant) += render :partial => 'users_table', :locals => {:tenant => @tenant} -- if @tenant.user_groups.any? - %h2= t("user_groups.index.page_title") - = render "user_groups/index_core", :user_groups => @tenant.user_groups - = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => UserGroup} += render :partial => 'user_groups_table', :locals => {:tenant => @tenant} %h2 Features = render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant} -%h2=t("phone_books.index.page_title") = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant} %h2 Gemeinschaft Konfiguration diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index e708215..50ed372 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -1,23 +1,12 @@ -%h2 Admin Area = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} -%h2= t("users.index.page_title") -- if @tenant.users.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') - = render "users/index_core", :users => @tenant.users - = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => User} -- else - %p - = link_to "Liste aller User.", tenant_users_path(@tenant) += render :partial => 'users_table', :locals => {:tenant => @tenant} -- if @tenant.user_groups.any? - %h2= t("user_groups.index.page_title") - = render "user_groups/index_core", :user_groups => @tenant.user_groups - = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => UserGroup} += render :partial => 'user_groups_table', :locals => {:tenant => @tenant} %h2 Features = render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant} -%h2=t("phone_books.index.page_title") = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant} %h2 Gemeinschaft Configuration diff --git a/app/views/tenants/_table_of_phone_books.html.haml b/app/views/tenants/_table_of_phone_books.html.haml index 6baca58..9d9b97c 100644 --- a/app/views/tenants/_table_of_phone_books.html.haml +++ b/app/views/tenants/_table_of_phone_books.html.haml @@ -1,4 +1,5 @@ - cache(['user_show_phone_books', I18n.locale, tenant, tenant.phone_books]) do + %h2=t("phone_books.index.page_title") -# Phone books -# - if GuiFunction.display?('show_phone_books_in_user_show_view', current_user) diff --git a/app/views/tenants/_user_groups_table.de.html.haml b/app/views/tenants/_user_groups_table.de.html.haml new file mode 100644 index 0000000..61b3e3d --- /dev/null +++ b/app/views/tenants/_user_groups_table.de.html.haml @@ -0,0 +1,4 @@ +- if @tenant.user_groups.any? + %h2= t("user_groups.index.page_title") + = render "user_groups/index_core", :user_groups => tenant.user_groups + = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => UserGroup} diff --git a/app/views/tenants/_users_table.de.html.haml b/app/views/tenants/_users_table.de.html.haml new file mode 100644 index 0000000..850ea5e --- /dev/null +++ b/app/views/tenants/_users_table.de.html.haml @@ -0,0 +1,7 @@ +%h2= t("users.index.page_title") +- if @tenant.users.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') + = render "users/index_core", :users => tenant.users + = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => User} +- else + %p + = link_to "Liste aller User.", tenant_users_path(tenant) \ No newline at end of file -- cgit v1.2.3 From b4abd87252db53e3d79a9601cf9c581f61827f10 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 19 Jan 2013 09:05:50 +0100 Subject: Added call_routes to tenant#show --- app/views/tenants/_admin_area.de.html.haml | 4 +++- app/views/tenants/_call_routes.html.haml | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 app/views/tenants/_call_routes.html.haml (limited to 'app/views') diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml index fed7d4f..ba64e9a 100644 --- a/app/views/tenants/_admin_area.de.html.haml +++ b/app/views/tenants/_admin_area.de.html.haml @@ -25,4 +25,6 @@ =link_to manufacturer, manufacturer_path(manufacturer) - else = succeed '.' do - =link_to manufacturer, manufacturer_path(manufacturer) \ No newline at end of file + =link_to manufacturer, manufacturer_path(manufacturer) + += render :partial => 'call_routes', :locals => {:tenant => @tenant} \ No newline at end of file diff --git a/app/views/tenants/_call_routes.html.haml b/app/views/tenants/_call_routes.html.haml new file mode 100644 index 0000000..ade24c9 --- /dev/null +++ b/app/views/tenants/_call_routes.html.haml @@ -0,0 +1,8 @@ +%h2= t("call_routes.index.page_title") + +- if CallRoute.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') + = render "call_routes/index_core", :call_routes => CallRoute.call + = render :partial => 'shared/create_link', :locals => {:child_class => CallRoute} +- else + %p + = link_to t("call_routes.index.page_title"), call_routes_path \ No newline at end of file -- cgit v1.2.3 From bb7992ac94e763c80fc7f4b5d850a19d88f5bf3b Mon Sep 17 00:00:00 2001 From: spag Date: Sat, 19 Jan 2013 09:07:43 +0100 Subject: allow arrows if no parent defined --- app/views/shared/_index_view_edit_destroy_part.html.haml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/shared/_index_view_edit_destroy_part.html.haml b/app/views/shared/_index_view_edit_destroy_part.html.haml index 06ec904..ff5a988 100644 --- a/app/views/shared/_index_view_edit_destroy_part.html.haml +++ b/app/views/shared/_index_view_edit_destroy_part.html.haml @@ -26,4 +26,10 @@ = link_to t("#{child.class.name.underscore.pluralize}.index.actions.edit"), method( :"edit_#{child.class.name.underscore}_path" ).(child) %td{ :style => style } - if can? :destroy, child - = link_to t("#{child.class.name.underscore.pluralize}.index.actions.destroy"), method( :"#{child.class.name.underscore}_path" ).(child), :method => :delete \ No newline at end of file + = link_to t("#{child.class.name.underscore.pluralize}.index.actions.destroy"), method( :"#{child.class.name.underscore}_path" ).(child), :method => :delete + - if child.respond_to?(:move_up?) or child and child.respond_to?(:move_down?) + %td{ :style => style } + - if can? :move_down, child and child.respond_to?(:move_down?) and child.move_down? + = link_to '⇩'.html_safe, method( :"move_lower_#{child.class.name.underscore}_path" ).(child), :method => :put + - if can? :move_up, child and child.respond_to?(:move_up?) and child.move_up? + = link_to '⇧'.html_safe, method( :"move_higher_#{child.class.name.underscore}_path" ).(child), :method => :put -- cgit v1.2.3 From 525e7ad4cac6fff7bd0370828b06159d610573ef Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 20 Jan 2013 19:45:36 +0100 Subject: Added caching. --- app/views/call_routes/_index_core.html.haml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'app/views') diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml index aa22437..124f4d0 100644 --- a/app/views/call_routes/_index_core.html.haml +++ b/app/views/call_routes/_index_core.html.haml @@ -1,13 +1,15 @@ -%table - %tr - %th= t('call_routes.index.name') - %th= t('call_routes.index.endpoint_type') - %th= t('call_routes.index.endpoint_id') +- cache(['call_routes_table', call_routes.count, call_routes.reorder(:updated_at).last]) do + %table + %tr + %th= t('call_routes.index.name') + %th= t('call_routes.index.endpoint_type') + %th= t('call_routes.index.endpoint_id') - - reset_cycle - - for call_route in call_routes - %tr{:class => cycle('odd', 'even')} - %td= call_route.name - %td= call_route.endpoint_type - %td= call_route.endpoint_id - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route} \ No newline at end of file + - reset_cycle + - for call_route in call_routes + %tr{:class => cycle('odd', 'even')} + - cache(['call_route_single_table_row', call_route]) do + %td= call_route.name + %td= call_route.endpoint_type + %td= call_route.endpoint_id + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route} \ No newline at end of file -- cgit v1.2.3 From 93a839b41f7172eecd1aeb497ccec6c73d2c4c1e Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 20 Jan 2013 19:46:13 +0100 Subject: Better cache key. --- app/views/call_routes/_index_core.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml index 124f4d0..32877b2 100644 --- a/app/views/call_routes/_index_core.html.haml +++ b/app/views/call_routes/_index_core.html.haml @@ -8,7 +8,7 @@ - reset_cycle - for call_route in call_routes %tr{:class => cycle('odd', 'even')} - - cache(['call_route_single_table_row', call_route]) do + - cache(['call_route_single_table_row_within_tr', call_route]) do %td= call_route.name %td= call_route.endpoint_type %td= call_route.endpoint_id -- cgit v1.2.3 From 5b5cbfddd9fa3a26de90ca8aa42668eb95648605 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 20 Jan 2013 19:48:19 +0100 Subject: Small logic fix. --- app/views/call_routes/_index_core.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml index 32877b2..12e89ee 100644 --- a/app/views/call_routes/_index_core.html.haml +++ b/app/views/call_routes/_index_core.html.haml @@ -8,7 +8,7 @@ - reset_cycle - for call_route in call_routes %tr{:class => cycle('odd', 'even')} - - cache(['call_route_single_table_row_within_tr', call_route]) do + - cache(['call_route_single_table_row_within_tr', call_route, call_routes.count]) do %td= call_route.name %td= call_route.endpoint_type %td= call_route.endpoint_id -- cgit v1.2.3 From 4ea0e252683d89794deff7b1b3689d2cdf61e0d0 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 20 Jan 2013 19:54:11 +0100 Subject: Added a gateways table to tenant#view. --- app/views/gateways/show.html.haml | 2 +- app/views/tenants/_admin_area.de.html.haml | 4 +++- app/views/tenants/_admin_area.html.haml | 4 +++- app/views/tenants/_call_routes.html.haml | 2 +- app/views/tenants/_gateways.html.haml | 8 ++++++++ 5 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 app/views/tenants/_gateways.html.haml (limited to 'app/views') diff --git a/app/views/gateways/show.html.haml b/app/views/gateways/show.html.haml index a9b0d18..9d0ee53 100644 --- a/app/views/gateways/show.html.haml +++ b/app/views/gateways/show.html.haml @@ -28,8 +28,8 @@ %br = render :partial => 'shared/create_link', :locals => { :parent => @gateway, :child_class => GatewaySetting } +%h3= t('gateway_parameters.index.page_title') - if @gateway.gateway_parameters.any? - %h3= t('gateway_parameters.index.page_title') = render "gateway_parameters/index_core", :gateway_parameters => @gateway.gateway_parameters %br = render :partial => 'shared/create_link', :locals => { :parent => @gateway, :child_class => GatewayParameter } diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml index ba64e9a..6a4bef9 100644 --- a/app/views/tenants/_admin_area.de.html.haml +++ b/app/views/tenants/_admin_area.de.html.haml @@ -27,4 +27,6 @@ = succeed '.' do =link_to manufacturer, manufacturer_path(manufacturer) -= render :partial => 'call_routes', :locals => {:tenant => @tenant} \ No newline at end of file += render :partial => 'call_routes', :locals => {:tenant => @tenant} + += render :partial => 'gateways', :locals => {:tenant => @tenant} \ No newline at end of file diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index 50ed372..b974c02 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -25,4 +25,6 @@ =link_to manufacturer, manufacturer_path(manufacturer) - else = succeed '.' do - =link_to manufacturer, manufacturer_path(manufacturer) \ No newline at end of file + =link_to manufacturer, manufacturer_path(manufacturer) + += render :partial => 'call_routes', :locals => {:tenant => @tenant} \ No newline at end of file diff --git a/app/views/tenants/_call_routes.html.haml b/app/views/tenants/_call_routes.html.haml index ade24c9..41066ae 100644 --- a/app/views/tenants/_call_routes.html.haml +++ b/app/views/tenants/_call_routes.html.haml @@ -1,7 +1,7 @@ %h2= t("call_routes.index.page_title") - if CallRoute.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') - = render "call_routes/index_core", :call_routes => CallRoute.call + = render "call_routes/index_core", :call_routes => CallRoute.all = render :partial => 'shared/create_link', :locals => {:child_class => CallRoute} - else %p diff --git a/app/views/tenants/_gateways.html.haml b/app/views/tenants/_gateways.html.haml new file mode 100644 index 0000000..c861ad3 --- /dev/null +++ b/app/views/tenants/_gateways.html.haml @@ -0,0 +1,8 @@ +%h2= t("gateways.index.page_title") + +- if Gateway.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') + = render "gateways/index_core", :gateways => Gateway.all + = render :partial => 'shared/create_link', :locals => {:child_class => Gateway} +- else + %p + = link_to t("gateways.index.page_title"), gateways_path \ No newline at end of file -- cgit v1.2.3 From fe5b9f2c046561f9918a5660b4a5193ef66fd3aa Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 20 Jan 2013 20:01:06 +0100 Subject: Replaced some order with reorder within cache key generation. --- app/views/gs_parameters/index.html.haml | 2 +- app/views/tenants/_gs_parameter_table.html.haml | 6 +++--- app/views/tenants/_table_of_functions.html.haml | 10 +++++----- app/views/users/_index_core.html.haml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'app/views') diff --git a/app/views/gs_parameters/index.html.haml b/app/views/gs_parameters/index.html.haml index 37fe825..3844c3d 100644 --- a/app/views/gs_parameters/index.html.haml +++ b/app/views/gs_parameters/index.html.haml @@ -1,7 +1,7 @@ - title t("gs_parameters.index.page_title") - if @gs_parameters && @gs_parameters.count > 0 - - cache(['gs_parameters_table', I18n.locale, @gs_parameters_unordered.order(:updated_at).last, @gs_parameters_unordered.count]) do + - cache(['gs_parameters_table', I18n.locale, @gs_parameters_unordered.reorder(:updated_at).last, @gs_parameters_unordered.count]) do - if @sections %table - @sections.each do |section| diff --git a/app/views/tenants/_gs_parameter_table.html.haml b/app/views/tenants/_gs_parameter_table.html.haml index 3af06cf..94c44e5 100644 --- a/app/views/tenants/_gs_parameter_table.html.haml +++ b/app/views/tenants/_gs_parameter_table.html.haml @@ -1,4 +1,4 @@ -- cache(['gs_parameters_tenant_overview_table', I18n.locale, tenant, GuiFunction.count, GuiFunction.order(:updated_at).last, GsParameter.count, GsParameter.order(:updated_at).last]) do +- cache(['gs_parameters_tenant_overview_table', I18n.locale, tenant, GuiFunction.count, GuiFunction.reorder(:updated_at).last, GsParameter.count, GsParameter.reorder(:updated_at).last]) do %table %tr{:class => 'even'} %th @@ -14,11 +14,11 @@ %td = link_to GuiFunction.count.to_s, gui_functions_path %td - = l GuiFunction.order(:updated_at).last.updated_at, :format => :short + = l GuiFunction.reorder(:updated_at).last.updated_at, :format => :short %tr{:class => 'even'} %td = t("gs_parameters.name") %td = link_to GsParameter.count.to_s, gs_parameters_path %td - = l GsParameter.order(:updated_at).last.updated_at, :format => :short + = l GsParameter.reorder(:updated_at).last.updated_at, :format => :short diff --git a/app/views/tenants/_table_of_functions.html.haml b/app/views/tenants/_table_of_functions.html.haml index 75b2332..957687b 100644 --- a/app/views/tenants/_table_of_functions.html.haml +++ b/app/views/tenants/_table_of_functions.html.haml @@ -1,4 +1,4 @@ -- cache(['table_of_pbx_features', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.order(:updated_at).last, tenant.conferences.count, tenant.conferences.order(:updated_at).last, tenant.hunt_groups.count, tenant.hunt_groups.order(:updated_at).last, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.order(:updated_at).last]) do +- cache(['table_of_pbx_features', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.reorder(:updated_at).last, tenant.conferences.count, tenant.conferences.reorder(:updated_at).last, tenant.hunt_groups.count, tenant.hunt_groups.reorder(:updated_at).last, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.reorder(:updated_at).last]) do %table %tr{:class => 'even'} %th @@ -6,7 +6,7 @@ %th Anzahl %th - - cache(['table_of_pbx_features_callthroughs_row', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.order(:updated_at).last]) do + - cache(['table_of_pbx_features_callthroughs_row', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.reorder(:updated_at).last]) do %tr{:class => 'odd'} %td = t("callthroughs.name") @@ -17,7 +17,7 @@ = '-' %td = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Callthrough} - - cache(['table_of_pbx_features_conferences_row', I18n.locale, tenant, tenant.conferences.count, tenant.conferences.order(:updated_at).last]) do + - cache(['table_of_pbx_features_conferences_row', I18n.locale, tenant, tenant.conferences.count, tenant.conferences.reorder(:updated_at).last]) do %tr{:class => 'even'} %td = t("conferences.name") @@ -28,7 +28,7 @@ = '-' %td = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Conference} - - cache(['table_of_pbx_features_hunt_groups_row', I18n.locale, tenant, tenant.hunt_groups.count, tenant.hunt_groups.order(:updated_at).last]) do + - cache(['table_of_pbx_features_hunt_groups_row', I18n.locale, tenant, tenant.hunt_groups.count, tenant.hunt_groups.reorder(:updated_at).last]) do %tr{:class => 'odd'} %td = t("hunt_groups.name") @@ -39,7 +39,7 @@ = '-' %td = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => HuntGroup} - - cache(['table_of_pbx_features_automatic_call_distributors_row', I18n.locale, tenant, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.order(:updated_at).last]) do + - cache(['table_of_pbx_features_automatic_call_distributors_row', I18n.locale, tenant, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.reorder(:updated_at).last]) do %tr{:class => 'even'} %td = t("automatic_call_distributors.name") diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index 9376826..5f0cb41 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -1,4 +1,4 @@ -- cache(['user_table_row_inner_td', I18n.locale, current_user, users.order(:updated_at).last, users.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do +- cache(['user_table_row_inner_td', I18n.locale, current_user, users.reorder(:updated_at).last, users.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do %table %tr %th -- cgit v1.2.3 From 4e67f8769a3a3199bfb5b363fe9baa231c329a2b Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 20 Jan 2013 20:57:35 +0100 Subject: Refactoring --- app/views/gateways/_index_core.html.haml | 34 ++++++++++++++++-------------- app/views/tenants/_admin_area.de.html.haml | 32 ---------------------------- app/views/tenants/_admin_area.html.haml | 24 +++++++++++---------- app/views/tenants/show.html.haml | 4 ++-- 4 files changed, 33 insertions(+), 61 deletions(-) delete mode 100644 app/views/tenants/_admin_area.de.html.haml (limited to 'app/views') diff --git a/app/views/gateways/_index_core.html.haml b/app/views/gateways/_index_core.html.haml index 21414c3..dd2d1f5 100644 --- a/app/views/gateways/_index_core.html.haml +++ b/app/views/gateways/_index_core.html.haml @@ -1,17 +1,19 @@ -%table - %tr - %th= t('gateways.index.name') - %th= t('gateways.index.technology') - %th= t('gateways.index.inbound') - %th= t('gateways.index.outbound') - %th= t('gateways.index.description') +- cache(['gateways_table', gateways.count, gateways.first, gateways.last]) do + %table + %tr + %th= t('gateways.index.name') + %th= t('gateways.index.technology') + %th= t('gateways.index.inbound') + %th= t('gateways.index.outbound') + %th= t('gateways.index.description') - - reset_cycle - - for gateway in gateways - %tr{:class => cycle('odd', 'even')} - %td= gateway.name - %td= gateway.technology - %td= gateway.inbound - %td= gateway.outbound - %td= gateway.description - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gateway} \ No newline at end of file + - reset_cycle + - for gateway in gateways + %tr{:class => cycle('odd', 'even')} + - cache(['gateway_single_table_row_within_tr', gateway, gateways.count]) do + %td= gateway.name + %td= gateway.technology + %td= gateway.inbound + %td= gateway.outbound + %td= gateway.description + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gateway} \ No newline at end of file diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml deleted file mode 100644 index 6a4bef9..0000000 --- a/app/views/tenants/_admin_area.de.html.haml +++ /dev/null @@ -1,32 +0,0 @@ -= render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} - -= render :partial => 'users_table', :locals => {:tenant => @tenant} - -= render :partial => 'user_groups_table', :locals => {:tenant => @tenant} - -%h2 Features -= render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant} - -= render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant} - -%h2 Gemeinschaft Konfiguration -= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant} - -%p - Das System kann - = PhoneModel.count - verschiedene Telefonmodelle von den folgenden Herstellern verwalten: - - Manufacturer.all.each do |manufacturer| - - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last - = succeed ', ' do - =link_to manufacturer, manufacturer_path(manufacturer) - - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last - = succeed ' und ' do - =link_to manufacturer, manufacturer_path(manufacturer) - - else - = succeed '.' do - =link_to manufacturer, manufacturer_path(manufacturer) - -= render :partial => 'call_routes', :locals => {:tenant => @tenant} - -= render :partial => 'gateways', :locals => {:tenant => @tenant} \ No newline at end of file diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index b974c02..7e7e46b 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -1,30 +1,32 @@ -= render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} += render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => tenant} -= render :partial => 'users_table', :locals => {:tenant => @tenant} += render :partial => 'users_table', :locals => {:tenant => tenant} -= render :partial => 'user_groups_table', :locals => {:tenant => @tenant} += render :partial => 'user_groups_table', :locals => {:tenant => tenant} %h2 Features -= render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant} += render :partial => 'tenants/table_of_functions', :locals => {:tenant => tenant} -= render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant} += render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant} -%h2 Gemeinschaft Configuration -= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant} +%h2 Gemeinschaft Konfiguration += render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => tenant} %p - This system can setup + Das System kann = PhoneModel.count - different phone models from the manufacturers + verschiedene Telefonmodelle von den folgenden Herstellern verwalten: - Manufacturer.all.each do |manufacturer| - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last = succeed ', ' do =link_to manufacturer, manufacturer_path(manufacturer) - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last - = succeed ' and ' do + = succeed ' und ' do =link_to manufacturer, manufacturer_path(manufacturer) - else = succeed '.' do =link_to manufacturer, manufacturer_path(manufacturer) -= render :partial => 'call_routes', :locals => {:tenant => @tenant} \ No newline at end of file += render :partial => 'call_routes', :locals => {:tenant => tenant} + += render :partial => 'gateways', :locals => {:tenant => tenant, :gateways => gateways} \ No newline at end of file diff --git a/app/views/tenants/show.html.haml b/app/views/tenants/show.html.haml index f5cff5f..9b9d4ec 100644 --- a/app/views/tenants/show.html.haml +++ b/app/views/tenants/show.html.haml @@ -7,5 +7,5 @@ = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @tenant } -- if @tenant.user_groups.where(:name => 'Admins').count > 0 && @tenant.user_groups.where(:name => 'Admins').first.users.include?(current_user) - = render 'admin_area' \ No newline at end of file +- if @tenant.user_groups.where(:name => 'Admins').any? && @tenant.user_groups.where(:name => 'Admins').first.users.include?(current_user) + = render :partial => 'admin_area', :locals => { :tenant => @tenant, :gateways => @gateways} \ No newline at end of file -- cgit v1.2.3 From 86e94e36e52ff7a3dbc7219db5b3bea5a7f56711 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 14:09:38 +0100 Subject: factory_defaults_prerouting --- app/views/gemeinschaft_setups/new.de.html.haml | 1 + app/views/gemeinschaft_setups/new.html.haml | 1 + 2 files changed, 2 insertions(+) (limited to 'app/views') diff --git a/app/views/gemeinschaft_setups/new.de.html.haml b/app/views/gemeinschaft_setups/new.de.html.haml index 2e148f3..1afa5d4 100644 --- a/app/views/gemeinschaft_setups/new.de.html.haml +++ b/app/views/gemeinschaft_setups/new.de.html.haml @@ -20,6 +20,7 @@ = f.association :country, :label => t('gemeinschaft_setups.form.country_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.country_id.hint'), :include_blank => false = f.association :language, :label => t('gemeinschaft_setups.form.language_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.language_id.hint'), :include_blank => false + = f.input :default_area_code, :label => t('gemeinschaft_setups.form.default_area_code.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_area_code.hint') .actions = f.button :submit, conditional_t('gemeinschaft_setups.form.submit') \ No newline at end of file diff --git a/app/views/gemeinschaft_setups/new.html.haml b/app/views/gemeinschaft_setups/new.html.haml index ab5a70f..da3c60e 100644 --- a/app/views/gemeinschaft_setups/new.html.haml +++ b/app/views/gemeinschaft_setups/new.html.haml @@ -20,6 +20,7 @@ = f.association :country, :label => t('gemeinschaft_setups.form.country_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.country_id.hint'), :include_blank => false = f.association :language, :label => t('gemeinschaft_setups.form.language_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.language_id.hint'), :include_blank => false + = f.input :default_area_code, :label => t('gemeinschaft_setups.form.default_area_code.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_area_code.hint') .actions = f.button :submit, conditional_t('gemeinschaft_setups.form.submit') \ No newline at end of file -- 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. --- .../access_authorizations/_index_core.html.haml | 2 +- app/views/access_authorizations/edit.html.haml | 2 +- app/views/access_authorizations/index.html.haml | 2 +- app/views/access_authorizations/new.html.haml | 2 +- app/views/access_authorizations/show.html.haml | 2 +- app/views/acd_agents/_index_core.html.haml | 2 +- app/views/acd_agents/edit.html.haml | 2 +- app/views/acd_agents/index.html.haml | 2 +- app/views/acd_agents/new.html.haml | 2 +- app/views/acd_agents/show.html.haml | 2 +- app/views/acd_callers/_index_core.html.haml | 2 +- app/views/acd_callers/index.html.haml | 2 +- app/views/acd_callers/show.html.haml | 2 +- app/views/addresses/_index_core.html.haml | 2 +- app/views/addresses/edit.html.haml | 2 +- app/views/addresses/index.html.haml | 2 +- app/views/addresses/new.html.haml | 2 +- app/views/addresses/show.html.haml | 2 +- .../_index_core.html.haml | 2 +- .../automatic_call_distributors/edit.html.haml | 2 +- .../automatic_call_distributors/index.html.haml | 2 +- .../automatic_call_distributors/new.html.haml | 2 +- .../automatic_call_distributors/show.html.haml | 4 +- app/views/call_forwards/_index_core.html.haml | 2 +- app/views/call_forwards/edit.html.haml | 2 +- app/views/call_forwards/index.html.haml | 2 +- app/views/call_forwards/new.html.haml | 2 +- app/views/call_forwards/show.html.haml | 2 +- app/views/call_histories/_index_core.html.haml | 2 +- app/views/call_histories/index.html.haml | 4 +- app/views/call_routes/_index_core.html.haml | 4 +- app/views/call_routes/edit.html.haml | 2 +- app/views/call_routes/index.html.haml | 4 +- app/views/call_routes/new.html.haml | 2 +- app/views/call_routes/show.html.haml | 2 +- app/views/calls/_index_core.html.haml | 2 +- app/views/calls/index.html.haml | 2 +- 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 +- .../conference_invitees/_index_core.html.haml | 2 +- app/views/conference_invitees/edit.html.haml | 2 +- app/views/conference_invitees/index.html.haml | 2 +- app/views/conference_invitees/new.html.haml | 2 +- app/views/conference_invitees/show.html.haml | 2 +- app/views/conferences/_index_core.html.haml | 2 +- app/views/conferences/edit.html.haml | 2 +- app/views/conferences/index.html.haml | 2 +- app/views/conferences/new.html.haml | 2 +- app/views/conferences/show.html.haml | 2 +- app/views/config_polycom/_call_history.xml.haml | 2 +- app/views/config_polycom/_phone_book.xml.haml | 2 +- app/views/fax_accounts/_index_core.html.haml | 2 +- app/views/fax_accounts/edit.html.haml | 2 +- app/views/fax_accounts/index.html.haml | 2 +- app/views/fax_accounts/new.html.haml | 2 +- app/views/fax_accounts/show.html.haml | 2 +- app/views/fax_documents/_index_core.html.haml | 2 +- app/views/fax_documents/edit.html.haml | 2 +- app/views/fax_documents/index.html.haml | 2 +- app/views/fax_documents/new.html.haml | 2 +- app/views/fax_documents/show.html.haml | 2 +- .../_index_core.html.haml | 2 +- .../freeswitch_voicemail_msgs/index.html.haml | 2 +- app/views/gateway_parameters/_index_core.html.haml | 2 +- app/views/gateway_parameters/edit.html.haml | 2 +- app/views/gateway_parameters/index.html.haml | 2 +- app/views/gateway_parameters/new.html.haml | 2 +- app/views/gateway_parameters/show.html.haml | 2 +- app/views/gateway_settings/_index_core.html.haml | 2 +- app/views/gateway_settings/edit.html.haml | 2 +- app/views/gateway_settings/index.html.haml | 2 +- app/views/gateway_settings/new.html.haml | 2 +- app/views/gateway_settings/show.html.haml | 2 +- app/views/gateways/_index_core.html.haml | 2 +- app/views/gateways/edit.html.haml | 2 +- app/views/gateways/index.html.haml | 2 +- app/views/gateways/new.html.haml | 2 +- app/views/gateways/show.html.haml | 2 +- app/views/gemeinschaft_setups/new.de.html.haml | 3 +- app/views/gemeinschaft_setups/new.html.haml | 3 +- .../_index_core.html.haml | 2 +- .../gs_cluster_sync_log_entries/edit.html.haml | 2 +- .../gs_cluster_sync_log_entries/index.html.haml | 2 +- .../gs_cluster_sync_log_entries/new.html.haml | 2 +- .../gs_cluster_sync_log_entries/show.html.haml | 2 +- app/views/gs_nodes/_index_core.html.haml | 2 +- app/views/gs_nodes/edit.html.haml | 2 +- app/views/gs_nodes/index.html.haml | 2 +- app/views/gs_nodes/new.html.haml | 2 +- app/views/gs_nodes/show.html.haml | 2 +- app/views/gs_parameters/edit.html.haml | 2 +- app/views/gs_parameters/index.html.haml | 6 +- app/views/gs_parameters/show.html.haml | 2 +- app/views/gui_functions/_index_core.html.haml | 2 +- app/views/gui_functions/edit.html.haml | 2 +- app/views/gui_functions/index.html.haml | 2 +- app/views/gui_functions/new.html.haml | 2 +- app/views/gui_functions/show.html.haml | 2 +- app/views/hunt_group_members/_index_core.html.haml | 2 +- app/views/hunt_group_members/edit.html.haml | 2 +- app/views/hunt_group_members/index.html.haml | 2 +- app/views/hunt_group_members/new.html.haml | 2 +- app/views/hunt_group_members/show.html.haml | 2 +- app/views/hunt_groups/_index_core.html.haml | 2 +- app/views/hunt_groups/edit.html.haml | 2 +- app/views/hunt_groups/index.html.haml | 2 +- app/views/hunt_groups/new.html.haml | 2 +- app/views/hunt_groups/show.html.haml | 2 +- app/views/layouts/_footer.html.haml | 3 + app/views/layouts/_navbar.html.haml | 21 +++++++ app/views/layouts/application.html.haml | 73 +++++++++------------- app/views/layouts/old-application.html.haml | 48 ++++++++++++++ app/views/layouts/old_navbar.html.haml | 10 +++ app/views/layouts/test.haml | 0 app/views/manufacturers/_index_core.html.haml | 2 +- app/views/manufacturers/edit.html.haml | 2 +- app/views/manufacturers/index.html.haml | 2 +- app/views/manufacturers/new.html.haml | 2 +- app/views/manufacturers/show.html.haml | 2 +- app/views/page/beginners_intro.de.html.haml | 2 +- app/views/page/beginners_intro.html.haml | 2 +- app/views/page/conference.html.haml | 2 +- app/views/page/index.de.html.haml | 2 +- app/views/page/index.html.haml | 2 +- .../phone_book_entries/_index_core.de.html.haml | 2 +- app/views/phone_book_entries/_index_core.html.haml | 2 +- app/views/phone_book_entries/edit.html.haml | 2 +- app/views/phone_book_entries/index.html.haml | 2 +- app/views/phone_book_entries/new.html.haml | 2 +- app/views/phone_book_entries/show.html.haml | 2 +- .../phone_book_entries/show.html.haml.examlple | 2 +- app/views/phone_books/_index_core.html.haml | 2 +- app/views/phone_books/edit.html.haml | 2 +- app/views/phone_books/index.html.haml | 2 +- app/views/phone_books/new.html.haml | 2 +- app/views/phone_books/show.html.haml | 2 +- app/views/phone_models/_index_core.html.haml | 2 +- app/views/phone_models/edit.html.haml | 2 +- app/views/phone_models/index.html.haml | 2 +- app/views/phone_models/new.html.haml | 2 +- app/views/phone_models/show.html.haml | 2 +- .../phone_number_ranges/_index_core.html.haml | 2 +- app/views/phone_number_ranges/edit.html.haml | 2 +- app/views/phone_number_ranges/index.html.haml | 2 +- app/views/phone_number_ranges/new.html.haml | 2 +- app/views/phone_number_ranges/show.html.haml | 2 +- app/views/phone_numbers/_index_core.html.haml | 2 +- app/views/phone_numbers/edit.html.haml | 2 +- app/views/phone_numbers/index.html.haml | 2 +- app/views/phone_numbers/new.html.haml | 2 +- app/views/phone_numbers/show.html.haml | 2 +- app/views/phone_sip_accounts/_index_core.html.haml | 2 +- app/views/phone_sip_accounts/index.html.haml | 2 +- app/views/phone_sip_accounts/new.html.haml | 2 +- app/views/phone_sip_accounts/show.html.haml | 2 +- app/views/phones/_index_core.html.haml | 2 +- app/views/phones/edit.html.haml | 2 +- app/views/phones/index.html.haml | 2 +- app/views/phones/new.html.haml | 2 +- app/views/phones/show.html.haml | 2 +- app/views/ringtones/_index_core.html.haml | 2 +- app/views/ringtones/edit.html.haml | 2 +- app/views/ringtones/index.html.haml | 2 +- app/views/ringtones/new.html.haml | 2 +- app/views/ringtones/show.html.haml | 2 +- app/views/route_elements/_index_core.html.haml | 2 +- app/views/route_elements/edit.html.haml | 2 +- app/views/route_elements/index.html.haml | 2 +- app/views/route_elements/new.html.haml | 2 +- app/views/route_elements/show.html.haml | 2 +- app/views/sessions/new.html.haml | 2 +- app/views/shared/_create_link.html.haml | 13 +++- app/views/shared/_flash.html.haml | 19 ------ .../shared/_index_view_edit_destroy_part.html.haml | 62 +++++++++--------- app/views/shared/_show_edit_destroy_part.html.haml | 20 +++--- app/views/shared/_system_message.html.haml | 10 --- 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 +- app/views/sip_domains/_index_core.html.haml | 2 +- app/views/sip_domains/edit.html.haml | 2 +- app/views/sip_domains/index.html.haml | 2 +- app/views/sip_domains/new.html.haml | 2 +- app/views/sip_domains/show.html.haml | 2 +- app/views/softkeys/_index_core.html.haml | 2 +- app/views/softkeys/edit.html.haml | 2 +- app/views/softkeys/index.html.haml | 2 +- app/views/softkeys/new.html.haml | 2 +- app/views/softkeys/show.html.haml | 2 +- app/views/system_messages/_index_core.html.haml | 2 +- app/views/system_messages/index.html.haml | 2 +- app/views/system_messages/new.html.haml | 2 +- app/views/system_messages/show.html.haml | 2 +- app/views/tenants/_gs_parameter_table.html.haml | 8 +-- app/views/tenants/_index_core.html.haml | 2 +- .../tenants/_sip_accounts_and_phones.html.haml | 8 +-- app/views/tenants/_table_of_functions.html.haml | 12 ++-- app/views/tenants/edit.html.haml | 2 +- app/views/tenants/index.html.haml | 2 +- app/views/tenants/new.html.haml | 2 +- app/views/tenants/show.html.haml | 2 +- .../user_group_memberships/_index_core.html.haml | 2 +- app/views/user_group_memberships/edit.html.haml | 2 +- app/views/user_group_memberships/index.html.haml | 2 +- app/views/user_group_memberships/new.html.haml | 2 +- app/views/user_group_memberships/show.html.haml | 2 +- app/views/user_groups/_index_core.html.haml | 2 +- app/views/user_groups/edit.html.haml | 2 +- app/views/user_groups/index.html.haml | 2 +- app/views/user_groups/new.html.haml | 2 +- app/views/user_groups/show.html.haml | 2 +- app/views/users/_index_core.html.haml | 2 +- app/views/users/edit.html.haml | 2 +- app/views/users/index.html.haml | 2 +- app/views/users/new.html.haml | 2 +- app/views/users/show.html.haml | 8 +-- app/views/voicemail_messages/_index_core.html.haml | 2 +- app/views/voicemail_messages/index.html.haml | 4 +- app/views/voicemail_settings/edit.html.haml | 2 +- app/views/voicemail_settings/show.html.haml | 2 +- app/views/whitelists/_index_core.html.haml | 2 +- app/views/whitelists/edit.html.haml | 2 +- app/views/whitelists/index.html.haml | 2 +- app/views/whitelists/new.html.haml | 2 +- app/views/whitelists/show.html.haml | 2 +- 230 files changed, 410 insertions(+), 351 deletions(-) create mode 100644 app/views/layouts/_footer.html.haml create mode 100644 app/views/layouts/_navbar.html.haml create mode 100644 app/views/layouts/old-application.html.haml create mode 100644 app/views/layouts/old_navbar.html.haml create mode 100644 app/views/layouts/test.haml delete mode 100644 app/views/shared/_flash.html.haml delete mode 100644 app/views/shared/_system_message.html.haml (limited to 'app/views') diff --git a/app/views/access_authorizations/_index_core.html.haml b/app/views/access_authorizations/_index_core.html.haml index 083b16b..e195171 100644 --- a/app/views/access_authorizations/_index_core.html.haml +++ b/app/views/access_authorizations/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('access_authorizations.index.name') %th= t('access_authorizations.index.login') diff --git a/app/views/access_authorizations/edit.html.haml b/app/views/access_authorizations/edit.html.haml index 414f094..b05c23e 100644 --- a/app/views/access_authorizations/edit.html.haml +++ b/app/views/access_authorizations/edit.html.haml @@ -1,3 +1,3 @@ -- title t("access_authorizations.edit.page_title") +- content_for :title, t("access_authorizations.edit.page_title") = render "form" diff --git a/app/views/access_authorizations/index.html.haml b/app/views/access_authorizations/index.html.haml index 05b27db..7a0dfd3 100644 --- a/app/views/access_authorizations/index.html.haml +++ b/app/views/access_authorizations/index.html.haml @@ -1,4 +1,4 @@ -- title t("access_authorizations.index.page_title") +- content_for :title, t("access_authorizations.index.page_title") - if @access_authorizations.count > 0 = render "index_core", :access_authorizations => @access_authorizations diff --git a/app/views/access_authorizations/new.html.haml b/app/views/access_authorizations/new.html.haml index 0bbf16c..f1ba872 100644 --- a/app/views/access_authorizations/new.html.haml +++ b/app/views/access_authorizations/new.html.haml @@ -1,3 +1,3 @@ -- title t("access_authorizations.new.page_title") +- content_for :title, t("access_authorizations.new.page_title") = render "form" diff --git a/app/views/access_authorizations/show.html.haml b/app/views/access_authorizations/show.html.haml index 17d1d9b..f39a509 100644 --- a/app/views/access_authorizations/show.html.haml +++ b/app/views/access_authorizations/show.html.haml @@ -1,4 +1,4 @@ -- title t("access_authorizations.show.page_title") +- content_for :title, t("access_authorizations.show.page_title") %p %strong= t('access_authorizations.show.name') + ":" diff --git a/app/views/acd_agents/_index_core.html.haml b/app/views/acd_agents/_index_core.html.haml index 7cb1aae..cc1ca7f 100644 --- a/app/views/acd_agents/_index_core.html.haml +++ b/app/views/acd_agents/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('acd_agents.index.name') %th= t('acd_agents.index.status') diff --git a/app/views/acd_agents/edit.html.haml b/app/views/acd_agents/edit.html.haml index 8ab14b8..41671b2 100644 --- a/app/views/acd_agents/edit.html.haml +++ b/app/views/acd_agents/edit.html.haml @@ -1,3 +1,3 @@ -- title t("acd_agents.edit.page_title") +- content_for :title, t("acd_agents.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/acd_agents/index.html.haml b/app/views/acd_agents/index.html.haml index d586dcf..ddf5fde 100644 --- a/app/views/acd_agents/index.html.haml +++ b/app/views/acd_agents/index.html.haml @@ -1,4 +1,4 @@ -- title t("acd_agents.index.page_title") +- content_for :title, t("acd_agents.index.page_title") - if @acd_agents && @acd_agents.count > 0 = render "index_core", :acd_agents => @acd_agents diff --git a/app/views/acd_agents/new.html.haml b/app/views/acd_agents/new.html.haml index 546136b..fb4d256 100644 --- a/app/views/acd_agents/new.html.haml +++ b/app/views/acd_agents/new.html.haml @@ -1,3 +1,3 @@ -- title t("acd_agents.new.page_title") +- content_for :title, t("acd_agents.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/acd_agents/show.html.haml b/app/views/acd_agents/show.html.haml index 0c90f4b..39c0036 100644 --- a/app/views/acd_agents/show.html.haml +++ b/app/views/acd_agents/show.html.haml @@ -1,4 +1,4 @@ -- title t("acd_agents.show.page_title") +- content_for :title, t("acd_agents.show.page_title") %p %strong= t('acd_agents.show.name') + ":" diff --git a/app/views/acd_callers/_index_core.html.haml b/app/views/acd_callers/_index_core.html.haml index 958b3ff..6a5f1b0 100644 --- a/app/views/acd_callers/_index_core.html.haml +++ b/app/views/acd_callers/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('acd_callers.index.channel_uuid') %th= t('acd_callers.index.automatic_call_distributor_id') diff --git a/app/views/acd_callers/index.html.haml b/app/views/acd_callers/index.html.haml index 70439ed..7047600 100644 --- a/app/views/acd_callers/index.html.haml +++ b/app/views/acd_callers/index.html.haml @@ -1,4 +1,4 @@ -- title t("acd_callers.index.page_title") +- content_for :title, t("acd_callers.index.page_title") - if @acd_callers && @acd_callers.count > 0 = render "index_core", :acd_callers => @acd_callers diff --git a/app/views/acd_callers/show.html.haml b/app/views/acd_callers/show.html.haml index 0ce8345..060f829 100644 --- a/app/views/acd_callers/show.html.haml +++ b/app/views/acd_callers/show.html.haml @@ -1,4 +1,4 @@ -- title t("acd_callers.show.page_title") +- content_for :title, t("acd_callers.show.page_title") %p %strong= t('acd_callers.show.channel_uuid') + ":" diff --git a/app/views/addresses/_index_core.html.haml b/app/views/addresses/_index_core.html.haml index 2050ded..ab272ab 100644 --- a/app/views/addresses/_index_core.html.haml +++ b/app/views/addresses/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('addresses.index.phone_book_entry_id') %th= t('addresses.index.line1') diff --git a/app/views/addresses/edit.html.haml b/app/views/addresses/edit.html.haml index 3d85ae6..a9e482f 100644 --- a/app/views/addresses/edit.html.haml +++ b/app/views/addresses/edit.html.haml @@ -1,4 +1,4 @@ -- title t("addresses.edit.page_title") +- content_for :title, t("addresses.edit.page_title") = render "form" diff --git a/app/views/addresses/index.html.haml b/app/views/addresses/index.html.haml index ecebc65..615f267 100644 --- a/app/views/addresses/index.html.haml +++ b/app/views/addresses/index.html.haml @@ -1,4 +1,4 @@ -- title t("addresses.index.page_title") +- content_for :title, t("addresses.index.page_title") - if @addresses.count > 0 = render "index_core", :addresses => @addresses diff --git a/app/views/addresses/new.html.haml b/app/views/addresses/new.html.haml index 280de55..e75b55a 100644 --- a/app/views/addresses/new.html.haml +++ b/app/views/addresses/new.html.haml @@ -1,3 +1,3 @@ -- title t("addresses.new.page_title") +- content_for :title, t("addresses.new.page_title") = render "form" diff --git a/app/views/addresses/show.html.haml b/app/views/addresses/show.html.haml index 211d020..6c8c651 100644 --- a/app/views/addresses/show.html.haml +++ b/app/views/addresses/show.html.haml @@ -1,4 +1,4 @@ -- title t("addresses.show.page_title") +- content_for :title, t("addresses.show.page_title") %p %strong= t('addresses.show.phone_book_entry_id') + ":" diff --git a/app/views/automatic_call_distributors/_index_core.html.haml b/app/views/automatic_call_distributors/_index_core.html.haml index c31a648..7f27908 100644 --- a/app/views/automatic_call_distributors/_index_core.html.haml +++ b/app/views/automatic_call_distributors/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('automatic_call_distributors.index.name') %th= t('automatic_call_distributors.index.strategy') diff --git a/app/views/automatic_call_distributors/edit.html.haml b/app/views/automatic_call_distributors/edit.html.haml index 28cba74..c776945 100644 --- a/app/views/automatic_call_distributors/edit.html.haml +++ b/app/views/automatic_call_distributors/edit.html.haml @@ -1,3 +1,3 @@ -- title t("automatic_call_distributors.edit.page_title") +- content_for :title, t("automatic_call_distributors.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/automatic_call_distributors/index.html.haml b/app/views/automatic_call_distributors/index.html.haml index f3f8b2b..4f2d040 100644 --- a/app/views/automatic_call_distributors/index.html.haml +++ b/app/views/automatic_call_distributors/index.html.haml @@ -1,4 +1,4 @@ -- title t("automatic_call_distributors.index.page_title") +- content_for :title, t("automatic_call_distributors.index.page_title") - if @automatic_call_distributors && @automatic_call_distributors.count > 0 = render "index_core", :automatic_call_distributors => @automatic_call_distributors diff --git a/app/views/automatic_call_distributors/new.html.haml b/app/views/automatic_call_distributors/new.html.haml index 96a2d93..72817a7 100644 --- a/app/views/automatic_call_distributors/new.html.haml +++ b/app/views/automatic_call_distributors/new.html.haml @@ -1,3 +1,3 @@ -- title t("automatic_call_distributors.new.page_title") +- content_for :title, t("automatic_call_distributors.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/automatic_call_distributors/show.html.haml b/app/views/automatic_call_distributors/show.html.haml index 53ce127..c29f2df 100644 --- a/app/views/automatic_call_distributors/show.html.haml +++ b/app/views/automatic_call_distributors/show.html.haml @@ -1,6 +1,6 @@ -- title t("automatic_call_distributors.show.page_title") +- content_for :title, t("automatic_call_distributors.show.page_title") -%table +%table{:class => 'table table-striped'} %tr %th= t('automatic_call_distributors.show.name') + ":" %td= @automatic_call_distributor.name diff --git a/app/views/call_forwards/_index_core.html.haml b/app/views/call_forwards/_index_core.html.haml index 7733855..286cdae 100644 --- a/app/views/call_forwards/_index_core.html.haml +++ b/app/views/call_forwards/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr - if !@phone_number %th= t('call_forwards.index.phone_number_id') diff --git a/app/views/call_forwards/edit.html.haml b/app/views/call_forwards/edit.html.haml index 5fa9dcd..f55052b 100644 --- a/app/views/call_forwards/edit.html.haml +++ b/app/views/call_forwards/edit.html.haml @@ -1,3 +1,3 @@ -- title t("call_forwards.edit.page_title", :resource => " for phone number #{@phone_number}" ) +- content_for :title, t("call_forwards.edit.page_title", :resource => " for phone number #{@phone_number}" ) = render "form" \ No newline at end of file diff --git a/app/views/call_forwards/index.html.haml b/app/views/call_forwards/index.html.haml index 93d64f2..91b923a 100644 --- a/app/views/call_forwards/index.html.haml +++ b/app/views/call_forwards/index.html.haml @@ -1,4 +1,4 @@ -- title t("call_forwards.index.page_title") +- content_for :title, t("call_forwards.index.page_title") - if @call_forwards.count > 0 = render "index_core", :call_forwards => @call_forwards diff --git a/app/views/call_forwards/new.html.haml b/app/views/call_forwards/new.html.haml index 960a9e6..bb0c983 100644 --- a/app/views/call_forwards/new.html.haml +++ b/app/views/call_forwards/new.html.haml @@ -1,3 +1,3 @@ -- title t("call_forwards.new.page_title") +- content_for :title, t("call_forwards.new.page_title") = render "form" diff --git a/app/views/call_forwards/show.html.haml b/app/views/call_forwards/show.html.haml index 6d1a0c6..c2187b1 100644 --- a/app/views/call_forwards/show.html.haml +++ b/app/views/call_forwards/show.html.haml @@ -1,4 +1,4 @@ -- title t("call_forwards.show.page_title") +- content_for :title, t("call_forwards.show.page_title") %p %strong= t('call_forwards.show.phone_number_id') + ":" diff --git a/app/views/call_histories/_index_core.html.haml b/app/views/call_histories/_index_core.html.haml index 4ed4fc4..f799ead 100644 --- a/app/views/call_histories/_index_core.html.haml +++ b/app/views/call_histories/_index_core.html.haml @@ -2,7 +2,7 @@ %header.entries-nav= render :partial => "call_histories/navigation" .content - cache(['call_history_table', I18n.locale, @sip_account, call_histories.first, call_histories.last, call_histories.count]) do - %table + %table{:class => 'table table-striped'} - reset_cycle - for call_history in call_histories - tr_background_colour = cycle('odd', 'even') diff --git a/app/views/call_histories/index.html.haml b/app/views/call_histories/index.html.haml index adf6838..a939387 100644 --- a/app/views/call_histories/index.html.haml +++ b/app/views/call_histories/index.html.haml @@ -1,6 +1,6 @@ - if @type - - title t("call_histories.index.page_title_#{@type}") + - content_for :title, t("call_histories.index.page_title_#{@type}") - else - - title t("call_histories.index.page_title") + - content_for :title, t("call_histories.index.page_title") = render "index_core", :call_histories => @call_histories diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml index 12e89ee..e0ca39b 100644 --- a/app/views/call_routes/_index_core.html.haml +++ b/app/views/call_routes/_index_core.html.haml @@ -1,5 +1,5 @@ - cache(['call_routes_table', call_routes.count, call_routes.reorder(:updated_at).last]) do - %table + %table{:class => 'table table-striped'} %tr %th= t('call_routes.index.name') %th= t('call_routes.index.endpoint_type') @@ -7,7 +7,7 @@ - reset_cycle - for call_route in call_routes - %tr{:class => cycle('odd', 'even')} + %tr - cache(['call_route_single_table_row_within_tr', call_route, call_routes.count]) do %td= call_route.name %td= call_route.endpoint_type diff --git a/app/views/call_routes/edit.html.haml b/app/views/call_routes/edit.html.haml index 0ad46c5..6048200 100644 --- a/app/views/call_routes/edit.html.haml +++ b/app/views/call_routes/edit.html.haml @@ -1,3 +1,3 @@ -- title t("call_routes.edit.page_title") +- content_for :title, t("call_routes.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml index 151fc0e..bd4468c 100644 --- a/app/views/call_routes/index.html.haml +++ b/app/views/call_routes/index.html.haml @@ -1,7 +1,7 @@ -- title t("call_routes.index.page_title") +- content_for :title, t("call_routes.index.page_title") - if @call_routes && @call_routes.count > 0 - %table + %table{:class => 'table table-striped'} - @routing_tables.each do |routing_table| %tr %td{:colspan => 3} diff --git a/app/views/call_routes/new.html.haml b/app/views/call_routes/new.html.haml index 0796d7f..28aead9 100644 --- a/app/views/call_routes/new.html.haml +++ b/app/views/call_routes/new.html.haml @@ -1,3 +1,3 @@ -- title t("call_routes.new.page_title") +- content_for :title, t("call_routes.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml index bada227..70fe13e 100644 --- a/app/views/call_routes/show.html.haml +++ b/app/views/call_routes/show.html.haml @@ -1,4 +1,4 @@ -- title t("call_routes.show.page_title") +- content_for :title, t("call_routes.show.page_title") %p %strong= t('call_routes.show.table') + ":" diff --git a/app/views/calls/_index_core.html.haml b/app/views/calls/_index_core.html.haml index ddd0650..b7a25a4 100644 --- a/app/views/calls/_index_core.html.haml +++ b/app/views/calls/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('calls.index.uuid') diff --git a/app/views/calls/index.html.haml b/app/views/calls/index.html.haml index 4ea60a6..be678cd 100644 --- a/app/views/calls/index.html.haml +++ b/app/views/calls/index.html.haml @@ -1,4 +1,4 @@ -- title t("calls.index.page_title") +- content_for :title, t("calls.index.page_title") - if @calls.count > 0 = render "index_core", :calls => @calls 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') + ":" diff --git a/app/views/conference_invitees/_index_core.html.haml b/app/views/conference_invitees/_index_core.html.haml index f84af7d..55d903d 100644 --- a/app/views/conference_invitees/_index_core.html.haml +++ b/app/views/conference_invitees/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('conference_invitees.index.phone_book_entry_id') %th= t('conference_invitees.index.phone_number') diff --git a/app/views/conference_invitees/edit.html.haml b/app/views/conference_invitees/edit.html.haml index ce90bbe..24c843f 100644 --- a/app/views/conference_invitees/edit.html.haml +++ b/app/views/conference_invitees/edit.html.haml @@ -1,3 +1,3 @@ -- title t("conference_invitees.edit.page_title") +- content_for :title, t("conference_invitees.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/conference_invitees/index.html.haml b/app/views/conference_invitees/index.html.haml index 2a0c26c..846be44 100644 --- a/app/views/conference_invitees/index.html.haml +++ b/app/views/conference_invitees/index.html.haml @@ -1,4 +1,4 @@ -- title t("conference_invitees.index.page_title") +- content_for :title, t("conference_invitees.index.page_title") - if @conference_invitees.count > 0 = render "index_core", :conference_invitees => @conference_invitees diff --git a/app/views/conference_invitees/new.html.haml b/app/views/conference_invitees/new.html.haml index 780494e..1957d5d 100644 --- a/app/views/conference_invitees/new.html.haml +++ b/app/views/conference_invitees/new.html.haml @@ -1,3 +1,3 @@ -- title t("conference_invitees.new.page_title") +- content_for :title, t("conference_invitees.new.page_title") = render "form" diff --git a/app/views/conference_invitees/show.html.haml b/app/views/conference_invitees/show.html.haml index 57c5627..12fcbd1 100644 --- a/app/views/conference_invitees/show.html.haml +++ b/app/views/conference_invitees/show.html.haml @@ -1,4 +1,4 @@ -- title t("conference_invitees.show.page_title") +- content_for :title, t("conference_invitees.show.page_title") %p %strong= t('conference_invitees.show.conference_id') + ":" diff --git a/app/views/conferences/_index_core.html.haml b/app/views/conferences/_index_core.html.haml index 4073e83..2a83b29 100644 --- a/app/views/conferences/_index_core.html.haml +++ b/app/views/conferences/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('conferences.index.name') - if !conferences.respond_to?('where') || conferences.where(:start => nil).where(:end => nil).count != conferences.count diff --git a/app/views/conferences/edit.html.haml b/app/views/conferences/edit.html.haml index bc190e7..d5ec058 100644 --- a/app/views/conferences/edit.html.haml +++ b/app/views/conferences/edit.html.haml @@ -1,3 +1,3 @@ -- title t("conferences.edit.page_title") +- content_for :title, t("conferences.edit.page_title") = render "form" diff --git a/app/views/conferences/index.html.haml b/app/views/conferences/index.html.haml index 0324acd..08f5cc1 100644 --- a/app/views/conferences/index.html.haml +++ b/app/views/conferences/index.html.haml @@ -1,4 +1,4 @@ -- title t("conferences.index.page_title") +- content_for :title, t("conferences.index.page_title") - if @conferences.count > 0 = render "index_core", :conferences => @conferences diff --git a/app/views/conferences/new.html.haml b/app/views/conferences/new.html.haml index 102f6a9..2dcb125 100644 --- a/app/views/conferences/new.html.haml +++ b/app/views/conferences/new.html.haml @@ -1,3 +1,3 @@ -- title t("conferences.new.page_title") +- content_for :title, t("conferences.new.page_title") = render "form" diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml index 10ebaed..0afa822 100644 --- a/app/views/conferences/show.html.haml +++ b/app/views/conferences/show.html.haml @@ -1,4 +1,4 @@ -- title t("conferences.show.page_title") +- content_for :title, t("conferences.show.page_title") %p %strong= t('conferences.show.name') + ":" diff --git a/app/views/config_polycom/_call_history.xml.haml b/app/views/config_polycom/_call_history.xml.haml index 7d23edd..4ecb8fe 100644 --- a/app/views/config_polycom/_call_history.xml.haml +++ b/app/views/config_polycom/_call_history.xml.haml @@ -3,7 +3,7 @@ %head %title= @phone_xml_object[:title] %body - %table{ :border => 0 } + %table{:class => 'table table-striped'}{ :border => 0 } %tbody - @phone_xml_object[:entries].each do |entry| %tr diff --git a/app/views/config_polycom/_phone_book.xml.haml b/app/views/config_polycom/_phone_book.xml.haml index 1066695..3867f41 100644 --- a/app/views/config_polycom/_phone_book.xml.haml +++ b/app/views/config_polycom/_phone_book.xml.haml @@ -3,7 +3,7 @@ %head %title= @phone_xml_object[:title] %body - %table{ :border => 0 } + %table{:class => 'table table-striped'}{ :border => 0 } %tbody - @phone_xml_object[:entries].each do |entry| %tr diff --git a/app/views/fax_accounts/_index_core.html.haml b/app/views/fax_accounts/_index_core.html.haml index 50dc2eb..48e4038 100644 --- a/app/views/fax_accounts/_index_core.html.haml +++ b/app/views/fax_accounts/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('fax_accounts.index.name') %th diff --git a/app/views/fax_accounts/edit.html.haml b/app/views/fax_accounts/edit.html.haml index 86f664d..3cdc655 100644 --- a/app/views/fax_accounts/edit.html.haml +++ b/app/views/fax_accounts/edit.html.haml @@ -1,3 +1,3 @@ -- title t("fax_accounts.edit.page_title") +- content_for :title, t("fax_accounts.edit.page_title") = render "form" diff --git a/app/views/fax_accounts/index.html.haml b/app/views/fax_accounts/index.html.haml index 309a10d..9710454 100644 --- a/app/views/fax_accounts/index.html.haml +++ b/app/views/fax_accounts/index.html.haml @@ -1,4 +1,4 @@ -- title t("fax_accounts.index.page_title") +- content_for :title, t("fax_accounts.index.page_title") - if @fax_accounts.count > 0 = render "index_core", {:fax_accounts => @fax_accounts, :fax_accountable => @parent} diff --git a/app/views/fax_accounts/new.html.haml b/app/views/fax_accounts/new.html.haml index 9a67100..eff9347 100644 --- a/app/views/fax_accounts/new.html.haml +++ b/app/views/fax_accounts/new.html.haml @@ -1,3 +1,3 @@ -- title t("fax_accounts.new.page_title") +- content_for :title, t("fax_accounts.new.page_title") = render "form" diff --git a/app/views/fax_accounts/show.html.haml b/app/views/fax_accounts/show.html.haml index 95fb7b2..1a32121 100644 --- a/app/views/fax_accounts/show.html.haml +++ b/app/views/fax_accounts/show.html.haml @@ -1,4 +1,4 @@ -- title t("fax_accounts.show.page_title") +- content_for :title, t("fax_accounts.show.page_title") %p %strong= t('fax_accounts.show.name') + ":" diff --git a/app/views/fax_documents/_index_core.html.haml b/app/views/fax_documents/_index_core.html.haml index 4e15509..747b67f 100644 --- a/app/views/fax_documents/_index_core.html.haml +++ b/app/views/fax_documents/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('fax_documents.index.sent_at') %th= t('fax_documents.index.state') diff --git a/app/views/fax_documents/edit.html.haml b/app/views/fax_documents/edit.html.haml index 5da92c6..239bf8b 100644 --- a/app/views/fax_documents/edit.html.haml +++ b/app/views/fax_documents/edit.html.haml @@ -1,4 +1,4 @@ -- title t("fax_documents.edit.page_title") +- content_for :title, t("fax_documents.edit.page_title") = render "form" diff --git a/app/views/fax_documents/index.html.haml b/app/views/fax_documents/index.html.haml index 11199dd..33c697c 100644 --- a/app/views/fax_documents/index.html.haml +++ b/app/views/fax_documents/index.html.haml @@ -1,4 +1,4 @@ -- title t("fax_documents.index.page_title") +- content_for :title, t("fax_documents.index.page_title") = render "index_core", :fax_documents => @fax_documents diff --git a/app/views/fax_documents/new.html.haml b/app/views/fax_documents/new.html.haml index be02860..8884418 100644 --- a/app/views/fax_documents/new.html.haml +++ b/app/views/fax_documents/new.html.haml @@ -1,3 +1,3 @@ -- title t("fax_documents.new.page_title") +- content_for :title, t("fax_documents.new.page_title") = render "form" diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml index 4703e1d..41d3bff 100644 --- a/app/views/fax_documents/show.html.haml +++ b/app/views/fax_documents/show.html.haml @@ -1,4 +1,4 @@ -- title t("fax_documents.show.page_title") +- content_for :title, t("fax_documents.show.page_title") - child = @fax_document - parent = @fax_document.fax_account diff --git a/app/views/freeswitch_voicemail_msgs/_index_core.html.haml b/app/views/freeswitch_voicemail_msgs/_index_core.html.haml index 58d9944..9d3d554 100644 --- a/app/views/freeswitch_voicemail_msgs/_index_core.html.haml +++ b/app/views/freeswitch_voicemail_msgs/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('freeswitch_voicemail_msgs.index.created_epoch') %th= t('freeswitch_voicemail_msgs.index.message_len') diff --git a/app/views/freeswitch_voicemail_msgs/index.html.haml b/app/views/freeswitch_voicemail_msgs/index.html.haml index 5083c6f..77977c3 100644 --- a/app/views/freeswitch_voicemail_msgs/index.html.haml +++ b/app/views/freeswitch_voicemail_msgs/index.html.haml @@ -1,3 +1,3 @@ -- title t("freeswitch_voicemail_msgs.index.page_title") +- content_for :title, t("freeswitch_voicemail_msgs.index.page_title") = render "index_core", :freeswitch_voicemail_msgs => @freeswitch_voicemail_msgs \ No newline at end of file diff --git a/app/views/gateway_parameters/_index_core.html.haml b/app/views/gateway_parameters/_index_core.html.haml index c22093d..fda01b3 100644 --- a/app/views/gateway_parameters/_index_core.html.haml +++ b/app/views/gateway_parameters/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('gateway_parameters.index.name') %th= t('gateway_parameters.index.value') diff --git a/app/views/gateway_parameters/edit.html.haml b/app/views/gateway_parameters/edit.html.haml index 86fe979..67fb831 100644 --- a/app/views/gateway_parameters/edit.html.haml +++ b/app/views/gateway_parameters/edit.html.haml @@ -1,3 +1,3 @@ -- title t("gateway_parameters.edit.page_title") +- content_for :title, t("gateway_parameters.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gateway_parameters/index.html.haml b/app/views/gateway_parameters/index.html.haml index 14b94b0..9eee4a3 100644 --- a/app/views/gateway_parameters/index.html.haml +++ b/app/views/gateway_parameters/index.html.haml @@ -1,4 +1,4 @@ -- title t("gateway_parameters.index.page_title") +- content_for :title, t("gateway_parameters.index.page_title") - if @gateway_parameters && @gateway_parameters.count > 0 = render "index_core", :gateway_parameters => @gateway_parameters diff --git a/app/views/gateway_parameters/new.html.haml b/app/views/gateway_parameters/new.html.haml index 5844088..5899602 100644 --- a/app/views/gateway_parameters/new.html.haml +++ b/app/views/gateway_parameters/new.html.haml @@ -1,3 +1,3 @@ -- title t("gateway_parameters.new.page_title") +- content_for :title, t("gateway_parameters.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gateway_parameters/show.html.haml b/app/views/gateway_parameters/show.html.haml index 982ffac..9bdad76 100644 --- a/app/views/gateway_parameters/show.html.haml +++ b/app/views/gateway_parameters/show.html.haml @@ -1,4 +1,4 @@ -- title t("gateway_parameters.show.page_title") +- content_for :title, t("gateway_parameters.show.page_title") %p %strong= t('gateway_parameters.show.gateway_id') + ":" diff --git a/app/views/gateway_settings/_index_core.html.haml b/app/views/gateway_settings/_index_core.html.haml index 40946f5..0743bcd 100644 --- a/app/views/gateway_settings/_index_core.html.haml +++ b/app/views/gateway_settings/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('gateway_settings.index.name') %th= t('gateway_settings.index.value') diff --git a/app/views/gateway_settings/edit.html.haml b/app/views/gateway_settings/edit.html.haml index b374f42..464c36e 100644 --- a/app/views/gateway_settings/edit.html.haml +++ b/app/views/gateway_settings/edit.html.haml @@ -1,3 +1,3 @@ -- title t("gateway_settings.edit.page_title") +- content_for :title, t("gateway_settings.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gateway_settings/index.html.haml b/app/views/gateway_settings/index.html.haml index b85ef0a..3f1400e 100644 --- a/app/views/gateway_settings/index.html.haml +++ b/app/views/gateway_settings/index.html.haml @@ -1,4 +1,4 @@ -- title t("gateway_settings.index.page_title") +- content_for :title, t("gateway_settings.index.page_title") - if @gateway_settings && @gateway_settings.count > 0 = render "index_core", :gateway_settings => @gateway_settings diff --git a/app/views/gateway_settings/new.html.haml b/app/views/gateway_settings/new.html.haml index 5399dc3..ec8c346 100644 --- a/app/views/gateway_settings/new.html.haml +++ b/app/views/gateway_settings/new.html.haml @@ -1,3 +1,3 @@ -- title t("gateway_settings.new.page_title") +- content_for :title, t("gateway_settings.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gateway_settings/show.html.haml b/app/views/gateway_settings/show.html.haml index 7a9ecc3..019aec4 100644 --- a/app/views/gateway_settings/show.html.haml +++ b/app/views/gateway_settings/show.html.haml @@ -1,4 +1,4 @@ -- title t("gateway_settings.show.page_title") +- content_for :title, t("gateway_settings.show.page_title") %p %strong= t('gateway_settings.show.gateway_id') + ":" diff --git a/app/views/gateways/_index_core.html.haml b/app/views/gateways/_index_core.html.haml index dd2d1f5..fc03eb1 100644 --- a/app/views/gateways/_index_core.html.haml +++ b/app/views/gateways/_index_core.html.haml @@ -1,5 +1,5 @@ - cache(['gateways_table', gateways.count, gateways.first, gateways.last]) do - %table + %table{:class => 'table table-striped'} %tr %th= t('gateways.index.name') %th= t('gateways.index.technology') diff --git a/app/views/gateways/edit.html.haml b/app/views/gateways/edit.html.haml index 417dd09..238dc3c 100644 --- a/app/views/gateways/edit.html.haml +++ b/app/views/gateways/edit.html.haml @@ -1,3 +1,3 @@ -- title t("gateways.edit.page_title") +- content_for :title, t("gateways.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gateways/index.html.haml b/app/views/gateways/index.html.haml index cec9cd1..f5d3275 100644 --- a/app/views/gateways/index.html.haml +++ b/app/views/gateways/index.html.haml @@ -1,4 +1,4 @@ -- title t("gateways.index.page_title") +- content_for :title, t("gateways.index.page_title") - if @gateways && @gateways.count > 0 = render "index_core", :gateways => @gateways diff --git a/app/views/gateways/new.html.haml b/app/views/gateways/new.html.haml index a2609f3..d17ff6e 100644 --- a/app/views/gateways/new.html.haml +++ b/app/views/gateways/new.html.haml @@ -1,3 +1,3 @@ -- title t("gateways.new.page_title") +- content_for :title, t("gateways.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gateways/show.html.haml b/app/views/gateways/show.html.haml index 9d0ee53..9a3e1c4 100644 --- a/app/views/gateways/show.html.haml +++ b/app/views/gateways/show.html.haml @@ -1,4 +1,4 @@ -- title t("gateways.show.page_title") +- content_for :title, t("gateways.show.page_title") %p %strong= t('gateways.show.id') + ":" diff --git a/app/views/gemeinschaft_setups/new.de.html.haml b/app/views/gemeinschaft_setups/new.de.html.haml index 1afa5d4..b78e278 100644 --- a/app/views/gemeinschaft_setups/new.de.html.haml +++ b/app/views/gemeinschaft_setups/new.de.html.haml @@ -1,4 +1,5 @@ -- title "Konfiguration einer Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} Installation" +- content_for :title, 'Gemeinschaft 5.0' +- content_for :meta_description, "Konfiguration einer Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} Installation" = simple_form_for(@gemeinschaft_setup) do |f| = f.error_notification diff --git a/app/views/gemeinschaft_setups/new.html.haml b/app/views/gemeinschaft_setups/new.html.haml index da3c60e..1b97cc0 100644 --- a/app/views/gemeinschaft_setups/new.html.haml +++ b/app/views/gemeinschaft_setups/new.html.haml @@ -1,4 +1,5 @@ -- title "Configure a new Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} server" +- content_for :title, 'Gemeinschaft 5.0' +- content_for :meta_description, "Configure a new Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} server" = simple_form_for(@gemeinschaft_setup) do |f| = f.error_notification diff --git a/app/views/gs_cluster_sync_log_entries/_index_core.html.haml b/app/views/gs_cluster_sync_log_entries/_index_core.html.haml index 05cbda8..b099b5f 100644 --- a/app/views/gs_cluster_sync_log_entries/_index_core.html.haml +++ b/app/views/gs_cluster_sync_log_entries/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('gs_cluster_sync_log_entries.index.gs_node_id') %th= t('gs_cluster_sync_log_entries.index.class_name') diff --git a/app/views/gs_cluster_sync_log_entries/edit.html.haml b/app/views/gs_cluster_sync_log_entries/edit.html.haml index b0c65f3..856b91f 100644 --- a/app/views/gs_cluster_sync_log_entries/edit.html.haml +++ b/app/views/gs_cluster_sync_log_entries/edit.html.haml @@ -1,3 +1,3 @@ -- title t("gs_cluster_sync_log_entries.edit.page_title") +- content_for :title, t("gs_cluster_sync_log_entries.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gs_cluster_sync_log_entries/index.html.haml b/app/views/gs_cluster_sync_log_entries/index.html.haml index 68be7e0..2e1b248 100644 --- a/app/views/gs_cluster_sync_log_entries/index.html.haml +++ b/app/views/gs_cluster_sync_log_entries/index.html.haml @@ -1,4 +1,4 @@ -- title t("gs_cluster_sync_log_entries.index.page_title") +- content_for :title, t("gs_cluster_sync_log_entries.index.page_title") - if @gs_cluster_sync_log_entries && @gs_cluster_sync_log_entries.count > 0 = render "index_core", :gs_cluster_sync_log_entries => @gs_cluster_sync_log_entries diff --git a/app/views/gs_cluster_sync_log_entries/new.html.haml b/app/views/gs_cluster_sync_log_entries/new.html.haml index 01b795c..ebe03bc 100644 --- a/app/views/gs_cluster_sync_log_entries/new.html.haml +++ b/app/views/gs_cluster_sync_log_entries/new.html.haml @@ -1,3 +1,3 @@ -- title t("gs_cluster_sync_log_entries.new.page_title") +- content_for :title, t("gs_cluster_sync_log_entries.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gs_cluster_sync_log_entries/show.html.haml b/app/views/gs_cluster_sync_log_entries/show.html.haml index 733576d..24dd3d7 100644 --- a/app/views/gs_cluster_sync_log_entries/show.html.haml +++ b/app/views/gs_cluster_sync_log_entries/show.html.haml @@ -1,4 +1,4 @@ -- title t("gs_cluster_sync_log_entries.show.page_title") +- content_for :title, t("gs_cluster_sync_log_entries.show.page_title") %p %strong= t('gs_cluster_sync_log_entries.show.gs_node_id') + ":" diff --git a/app/views/gs_nodes/_index_core.html.haml b/app/views/gs_nodes/_index_core.html.haml index 72633e1..97dc9df 100644 --- a/app/views/gs_nodes/_index_core.html.haml +++ b/app/views/gs_nodes/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('gs_nodes.index.name') %th= t('gs_nodes.index.ip_address') diff --git a/app/views/gs_nodes/edit.html.haml b/app/views/gs_nodes/edit.html.haml index c025b05..55180f3 100644 --- a/app/views/gs_nodes/edit.html.haml +++ b/app/views/gs_nodes/edit.html.haml @@ -1,3 +1,3 @@ -- title t("gs_nodes.edit.page_title") +- content_for :title, t("gs_nodes.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gs_nodes/index.html.haml b/app/views/gs_nodes/index.html.haml index 4670cef..2c4ba0b 100644 --- a/app/views/gs_nodes/index.html.haml +++ b/app/views/gs_nodes/index.html.haml @@ -1,4 +1,4 @@ -- title t("gs_nodes.index.page_title") +- content_for :title, t("gs_nodes.index.page_title") - if @gs_nodes && @gs_nodes.count > 0 = render "index_core", :gs_nodes => @gs_nodes diff --git a/app/views/gs_nodes/new.html.haml b/app/views/gs_nodes/new.html.haml index 230ce33..8425084 100644 --- a/app/views/gs_nodes/new.html.haml +++ b/app/views/gs_nodes/new.html.haml @@ -1,3 +1,3 @@ -- title t("gs_nodes.new.page_title") +- content_for :title, t("gs_nodes.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gs_nodes/show.html.haml b/app/views/gs_nodes/show.html.haml index ca70a50..bccf785 100644 --- a/app/views/gs_nodes/show.html.haml +++ b/app/views/gs_nodes/show.html.haml @@ -1,4 +1,4 @@ -- title t("gs_nodes.show.page_title") +- content_for :title, t("gs_nodes.show.page_title") %p %strong= t('gs_nodes.show.name') + ":" diff --git a/app/views/gs_parameters/edit.html.haml b/app/views/gs_parameters/edit.html.haml index c00c7df..b456f43 100644 --- a/app/views/gs_parameters/edit.html.haml +++ b/app/views/gs_parameters/edit.html.haml @@ -1,4 +1,4 @@ -- title t("gs_parameters.edit.page_title") +- content_for :title, t("gs_parameters.edit.page_title") %p %strong= t('gs_parameters.show.name') + ":" diff --git a/app/views/gs_parameters/index.html.haml b/app/views/gs_parameters/index.html.haml index 3844c3d..9132cdd 100644 --- a/app/views/gs_parameters/index.html.haml +++ b/app/views/gs_parameters/index.html.haml @@ -1,9 +1,9 @@ -- title t("gs_parameters.index.page_title") +- content_for :title, t("gs_parameters.index.page_title") - if @gs_parameters && @gs_parameters.count > 0 - cache(['gs_parameters_table', I18n.locale, @gs_parameters_unordered.reorder(:updated_at).last, @gs_parameters_unordered.count]) do - if @sections - %table + %table{:class => 'table table-striped'} - @sections.each do |section| %tr %td{:colspan => 3} @@ -11,5 +11,5 @@ -# Template Dependency: gs_parameters/_index_core = render "index_core", :gs_parameters => @gs_parameters.where(:section => section) - else - %table + %table{:class => 'table table-striped'} = render "index_core", :gs_parameters => @gs_parameters diff --git a/app/views/gs_parameters/show.html.haml b/app/views/gs_parameters/show.html.haml index 7919f8c..795d09c 100644 --- a/app/views/gs_parameters/show.html.haml +++ b/app/views/gs_parameters/show.html.haml @@ -1,5 +1,5 @@ - cache(@gs_parameter) do - - title t("gs_parameters.show.page_title") + - content_for :title, t("gs_parameters.show.page_title") %p %strong= t('gs_parameters.show.name') + ":" diff --git a/app/views/gui_functions/_index_core.html.haml b/app/views/gui_functions/_index_core.html.haml index 815b9c3..cb53d4f 100644 --- a/app/views/gui_functions/_index_core.html.haml +++ b/app/views/gui_functions/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('gui_functions.index.category') %th= t('gui_functions.index.name') diff --git a/app/views/gui_functions/edit.html.haml b/app/views/gui_functions/edit.html.haml index f43b5bc..a041138 100644 --- a/app/views/gui_functions/edit.html.haml +++ b/app/views/gui_functions/edit.html.haml @@ -1,3 +1,3 @@ -- title t("gui_functions.edit.page_title") +- content_for :title, t("gui_functions.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gui_functions/index.html.haml b/app/views/gui_functions/index.html.haml index 9b53918..b0a7d18 100644 --- a/app/views/gui_functions/index.html.haml +++ b/app/views/gui_functions/index.html.haml @@ -1,4 +1,4 @@ -- title t("gui_functions.index.page_title") +- content_for :title, t("gui_functions.index.page_title") - if @gui_functions && @gui_functions.count > 0 - cache(['gui_functions_table', I18n.locale, @gui_functions.reorder(:updated_at).last, @gui_functions.count]) do diff --git a/app/views/gui_functions/new.html.haml b/app/views/gui_functions/new.html.haml index 6c57e9c..0e3a809 100644 --- a/app/views/gui_functions/new.html.haml +++ b/app/views/gui_functions/new.html.haml @@ -1,3 +1,3 @@ -- title t("gui_functions.new.page_title") +- content_for :title, t("gui_functions.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/gui_functions/show.html.haml b/app/views/gui_functions/show.html.haml index 8af329a..91b9d2e 100644 --- a/app/views/gui_functions/show.html.haml +++ b/app/views/gui_functions/show.html.haml @@ -1,4 +1,4 @@ -- title t("gui_functions.show.page_title") +- content_for :title, t("gui_functions.show.page_title") - cache(['gui_function_show', I18n.locale, @gui_function]) do %p diff --git a/app/views/hunt_group_members/_index_core.html.haml b/app/views/hunt_group_members/_index_core.html.haml index 46b64c8..f9a3d28 100644 --- a/app/views/hunt_group_members/_index_core.html.haml +++ b/app/views/hunt_group_members/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('hunt_group_members.index.name') %th= t('hunt_group_members.index.active') diff --git a/app/views/hunt_group_members/edit.html.haml b/app/views/hunt_group_members/edit.html.haml index 93d7b0a..97e9084 100644 --- a/app/views/hunt_group_members/edit.html.haml +++ b/app/views/hunt_group_members/edit.html.haml @@ -1,3 +1,3 @@ -- title t("hunt_group_members.edit.page_title") +- content_for :title, t("hunt_group_members.edit.page_title") = render "form" diff --git a/app/views/hunt_group_members/index.html.haml b/app/views/hunt_group_members/index.html.haml index 99dc929..4001000 100644 --- a/app/views/hunt_group_members/index.html.haml +++ b/app/views/hunt_group_members/index.html.haml @@ -1,4 +1,4 @@ -- title t("hunt_group_members.index.page_title") +- content_for :title, t("hunt_group_members.index.page_title") - if @hunt_group_members.count > 0 = render "index_core", :hunt_group_members => @hunt_group_members diff --git a/app/views/hunt_group_members/new.html.haml b/app/views/hunt_group_members/new.html.haml index 99f52ad..31dd185 100644 --- a/app/views/hunt_group_members/new.html.haml +++ b/app/views/hunt_group_members/new.html.haml @@ -1,3 +1,3 @@ -- title t("hunt_group_members.new.page_title") +- content_for :title, t("hunt_group_members.new.page_title") = render "form" diff --git a/app/views/hunt_group_members/show.html.haml b/app/views/hunt_group_members/show.html.haml index 80123b8..2056db0 100644 --- a/app/views/hunt_group_members/show.html.haml +++ b/app/views/hunt_group_members/show.html.haml @@ -1,4 +1,4 @@ -- title t("hunt_group_members.show.page_title") +- content_for :title, t("hunt_group_members.show.page_title") %p %strong= t('hunt_group_members.show.name') + ":" diff --git a/app/views/hunt_groups/_index_core.html.haml b/app/views/hunt_groups/_index_core.html.haml index 3000e97..b820ad0 100644 --- a/app/views/hunt_groups/_index_core.html.haml +++ b/app/views/hunt_groups/_index_core.html.haml @@ -1,6 +1,6 @@ - show_seconds = hunt_groups.map{|x| ! x.seconds_between_jumps.nil? }.include?(true) -%table +%table{:class => 'table table-striped'} %tr %th= t('hunt_groups.index.name') %th= t('hunt_groups.index.strategy') diff --git a/app/views/hunt_groups/edit.html.haml b/app/views/hunt_groups/edit.html.haml index f2ef998..5d5b146 100644 --- a/app/views/hunt_groups/edit.html.haml +++ b/app/views/hunt_groups/edit.html.haml @@ -1,3 +1,3 @@ -- title t("hunt_groups.edit.page_title") +- content_for :title, t("hunt_groups.edit.page_title") = render "form" diff --git a/app/views/hunt_groups/index.html.haml b/app/views/hunt_groups/index.html.haml index 62bc2aa..8c6fdf6 100644 --- a/app/views/hunt_groups/index.html.haml +++ b/app/views/hunt_groups/index.html.haml @@ -1,4 +1,4 @@ -- title t("hunt_groups.index.page_title") +- content_for :title, t("hunt_groups.index.page_title") - if @hunt_groups.count > 0 = render "index_core", :hunt_groups => @hunt_groups diff --git a/app/views/hunt_groups/new.html.haml b/app/views/hunt_groups/new.html.haml index a40e579..2c1350e 100644 --- a/app/views/hunt_groups/new.html.haml +++ b/app/views/hunt_groups/new.html.haml @@ -1,3 +1,3 @@ -- title t("hunt_groups.new.page_title") +- content_for :title, t("hunt_groups.new.page_title") = render "form" diff --git a/app/views/hunt_groups/show.html.haml b/app/views/hunt_groups/show.html.haml index 009af50..3ffe4f3 100644 --- a/app/views/hunt_groups/show.html.haml +++ b/app/views/hunt_groups/show.html.haml @@ -1,4 +1,4 @@ -- title t("hunt_groups.show.page_title") +- content_for :title, t("hunt_groups.show.page_title") %p %strong= t('hunt_groups.show.name') + ":" diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml new file mode 100644 index 0000000..dc74275 --- /dev/null +++ b/app/views/layouts/_footer.html.haml @@ -0,0 +1,3 @@ +%footer + %p + \© AMOOMA GmbH 2005 - #{Date.today.year.to_s} · Bachstr. 124 · 56566 Neuwied · Germany · #{mail_to 'info@amooma.de', 'info@amooma.de'} diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml new file mode 100644 index 0000000..4005e28 --- /dev/null +++ b/app/views/layouts/_navbar.html.haml @@ -0,0 +1,21 @@ +.navbar.navbar-inverse.navbar-fixed-top + .navbar-inner + .container-fluid + %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"} + %span.icon-bar + %span.icon-bar + %span.icon-bar + %a.brand{:href => (current_user.nil? ? '/' : tenant_path(current_user.current_tenant))} Gemeinschaft 5 + .nav-collapse.collapse + %p.navbar-text.pull-right + - if current_user + %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} + = current_user + %ul.nav + %li.active + %a{:href => "#"} Home + %li + %a{:href => "#about"} About + %li + %a{:href => "#contact"} Contact + / /.nav-collapse diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index a2afbf8..8caee14 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,48 +1,37 @@ -!!! 5 - - - - -%html.no-js{ :lang => I18n.locale.to_s } - - %header - %meta{ :charset => "utf-8" }/ - ~#OPTIMIZE "/" seems to be supposed to make an empty element tag, but it doesn't work. HAML bug? - %title - = content_for?(:title) ? yield(:title) : "Untitled" - %meta{ :name => "viewport", :content => "width=device-width, initial-scale=1.0" }/ - = stylesheet_link_tag "application" +!!! +%html + %head + %meta{:charset => "utf-8"}/ + %title + = content_for?(:title) ? yield(:title) : "Gemeinschaft 5" + %meta{:name => 'viewport', :content => "width=device-width, initial-scale=1.0"} + - if content_for?(:meta_description) + %meta{:description => yield(:meta_description)}/ + %meta{:author => "AMOOMA GmbH"}/ + = stylesheet_link_tag "application", :media => "all" = javascript_include_tag "application" - = csrf_meta_tag - = yield(:head) - + = csrf_meta_tags + / HTML5 shim, for IE6-8 support of HTML5 elements + /[if lt IE 9] + %body - #container - - cache(['application_header', I18n.locale, current_user]) do - = render :partial => "shared/header" - = render :partial => "shared/flash", :locals => { :flash => flash} + = render 'layouts/navbar' - #content{:role => 'main'} - .light - %header.main - .breadcrumbs= render_breadcrumbs :separator => ' » ' - - if show_title? - %h1= yield(:title) - = yield + = render_breadcrumbs :builder => ::BootstrapBreadcrumbsBuilder, :separator => "/" - - cache(['application_footer', I18n.locale]) do - %footer#main - %ul - %li - %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} - - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) - %li - %a{:href => "http://amooma.de"} Kommerzieller Support und Consulting - - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) - %li - %a{:href => "https://groups.google.com/group/gs5-users/"} Kostenlose Mailingliste + .container + .row + .span12 + - unless response.cache_control[:public] + - flash.each do |name, msg| + %div{:class => "alert alert-#{name == :notice ? "success" : "error"} fade in"} + %a.close{"data-dismiss" => "alert"} × + = msg - .amooma-logo - %span brought to you by - %a{ :target => '_blank', :href => "http://amooma.de/" } Amooma + = yield + .row + .span12 + %hr/ + = render 'layouts/footer' + / /container diff --git a/app/views/layouts/old-application.html.haml b/app/views/layouts/old-application.html.haml new file mode 100644 index 0000000..a2afbf8 --- /dev/null +++ b/app/views/layouts/old-application.html.haml @@ -0,0 +1,48 @@ +!!! 5 + + + + +%html.no-js{ :lang => I18n.locale.to_s } + + %header + %meta{ :charset => "utf-8" }/ + ~#OPTIMIZE "/" seems to be supposed to make an empty element tag, but it doesn't work. HAML bug? + %title + = content_for?(:title) ? yield(:title) : "Untitled" + %meta{ :name => "viewport", :content => "width=device-width, initial-scale=1.0" }/ + = stylesheet_link_tag "application" + = javascript_include_tag "application" + = csrf_meta_tag + = yield(:head) + + %body + #container + - cache(['application_header', I18n.locale, current_user]) do + = render :partial => "shared/header" + = render :partial => "shared/flash", :locals => { :flash => flash} + + #content{:role => 'main'} + .light + %header.main + .breadcrumbs= render_breadcrumbs :separator => ' » ' + - if show_title? + %h1= yield(:title) + = yield + + - cache(['application_footer', I18n.locale]) do + %footer#main + %ul + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) + %li + %a{:href => "http://amooma.de"} Kommerzieller Support und Consulting + - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) + %li + %a{:href => "https://groups.google.com/group/gs5-users/"} Kostenlose Mailingliste + + .amooma-logo + %span brought to you by + %a{ :target => '_blank', :href => "http://amooma.de/" } Amooma + diff --git a/app/views/layouts/old_navbar.html.haml b/app/views/layouts/old_navbar.html.haml new file mode 100644 index 0000000..4d795e4 --- /dev/null +++ b/app/views/layouts/old_navbar.html.haml @@ -0,0 +1,10 @@ +.navbar.navbar-inverse.navbar-fixed-top + .navbar-inner + .container + %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"} + %span.icon-bar + %span.icon-bar + %span.icon-bar + %a.brand{:href => "/"} Gemeinschaft 5 + + / /.nav-collapse diff --git a/app/views/layouts/test.haml b/app/views/layouts/test.haml new file mode 100644 index 0000000..e69de29 diff --git a/app/views/manufacturers/_index_core.html.haml b/app/views/manufacturers/_index_core.html.haml index 8937909..5c80ae9 100644 --- a/app/views/manufacturers/_index_core.html.haml +++ b/app/views/manufacturers/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('manufacturers.index.name') %th= t('manufacturers.index.ieee_name') diff --git a/app/views/manufacturers/edit.html.haml b/app/views/manufacturers/edit.html.haml index 61bcba0..913287a 100644 --- a/app/views/manufacturers/edit.html.haml +++ b/app/views/manufacturers/edit.html.haml @@ -1,3 +1,3 @@ -- title t("manufacturers.edit.page_title") +- content_for :title, t("manufacturers.edit.page_title") = render "form" diff --git a/app/views/manufacturers/index.html.haml b/app/views/manufacturers/index.html.haml index 43fecc6..ccdd44b 100644 --- a/app/views/manufacturers/index.html.haml +++ b/app/views/manufacturers/index.html.haml @@ -1,4 +1,4 @@ -- title t("manufacturers.index.page_title") +- content_for :title, t("manufacturers.index.page_title") = render "index_core", :manufacturers => @manufacturers diff --git a/app/views/manufacturers/new.html.haml b/app/views/manufacturers/new.html.haml index 4fb9dbf..9931242 100644 --- a/app/views/manufacturers/new.html.haml +++ b/app/views/manufacturers/new.html.haml @@ -1,3 +1,3 @@ -- title t("manufacturers.new.page_title") +- content_for :title, t("manufacturers.new.page_title") = render "form" diff --git a/app/views/manufacturers/show.html.haml b/app/views/manufacturers/show.html.haml index 1b8383b..8888402 100644 --- a/app/views/manufacturers/show.html.haml +++ b/app/views/manufacturers/show.html.haml @@ -1,4 +1,4 @@ -- title t("manufacturers.show.page_title") +- content_for :title, t("manufacturers.show.page_title") %p %strong= t('manufacturers.show.name') + ":" diff --git a/app/views/page/beginners_intro.de.html.haml b/app/views/page/beginners_intro.de.html.haml index 4bd5b11..5eef135 100644 --- a/app/views/page/beginners_intro.de.html.haml +++ b/app/views/page/beginners_intro.de.html.haml @@ -1,4 +1,4 @@ -- title "Erste Schritte mit Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}!" +- content_for :title, "Erste Schritte mit Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}!" %p Sie müssen als erstes mindestens zwei neue SIP-Accounts anlegen. Dabei haben Sie die Wahl zwischen folgenden Varianten: diff --git a/app/views/page/beginners_intro.html.haml b/app/views/page/beginners_intro.html.haml index 08af174..dadd99f 100644 --- a/app/views/page/beginners_intro.html.haml +++ b/app/views/page/beginners_intro.html.haml @@ -1,4 +1,4 @@ -- title "First steps with Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}!" +- content_for :title, "First steps with Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}!" %p You have to create at least two new SIP accounts. You have the choice of two different versions: diff --git a/app/views/page/conference.html.haml b/app/views/page/conference.html.haml index 061dfd1..2fdc043 100644 --- a/app/views/page/conference.html.haml +++ b/app/views/page/conference.html.haml @@ -1,5 +1,5 @@ - conf_call_topic = "The next big thing" -- title "Conference Call \u2013 Topic: #{conf_call_topic}" +- content_for :title, "Conference Call \u2013 Topic: #{conf_call_topic}" %section.conference diff --git a/app/views/page/index.de.html.haml b/app/views/page/index.de.html.haml index d5dd096..a3ca83b 100644 --- a/app/views/page/index.de.html.haml +++ b/app/views/page/index.de.html.haml @@ -1,4 +1,4 @@ -- title "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}" +- content_for :title, "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}" %div %h3 Aktueller Mandant diff --git a/app/views/page/index.html.haml b/app/views/page/index.html.haml index f55ab37..178074d 100644 --- a/app/views/page/index.html.haml +++ b/app/views/page/index.html.haml @@ -1,4 +1,4 @@ -- title "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}" +- content_for :title, "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}" %div %h3 Current tenant diff --git a/app/views/phone_book_entries/_index_core.de.html.haml b/app/views/phone_book_entries/_index_core.de.html.haml index 43d62f6..bc8d118 100644 --- a/app/views/phone_book_entries/_index_core.de.html.haml +++ b/app/views/phone_book_entries/_index_core.de.html.haml @@ -4,7 +4,7 @@ .content - cache(['phone_book_entries_table', I18n.locale, current_user, phone_book_entries]) do - reset_cycle - %table + %table{:class => 'table table-striped'} - for entry in phone_book_entries - cache(['phone_book_entries_table_tr', I18n.locale, current_user, entry]) do ~# Dear IE7, diff --git a/app/views/phone_book_entries/_index_core.html.haml b/app/views/phone_book_entries/_index_core.html.haml index e98e8d5..0e687f9 100644 --- a/app/views/phone_book_entries/_index_core.html.haml +++ b/app/views/phone_book_entries/_index_core.html.haml @@ -5,7 +5,7 @@ - cache(['phone_book_entries_table', I18n.locale, current_user, phone_book_entries]) do - reset_cycle - reset_cycle - %table + %table{:class => 'table table-striped'} - for entry in phone_book_entries - cache(['phone_book_entries_table_tr', I18n.locale, current_user, entry]) do ~# Dear IE7, diff --git a/app/views/phone_book_entries/edit.html.haml b/app/views/phone_book_entries/edit.html.haml index d4fad4d..2967366 100644 --- a/app/views/phone_book_entries/edit.html.haml +++ b/app/views/phone_book_entries/edit.html.haml @@ -1,4 +1,4 @@ -- title t("phone_book_entries.edit.page_title") +- content_for :title, t("phone_book_entries.edit.page_title") = render "form" diff --git a/app/views/phone_book_entries/index.html.haml b/app/views/phone_book_entries/index.html.haml index 6a17eb9..10d1ce2 100644 --- a/app/views/phone_book_entries/index.html.haml +++ b/app/views/phone_book_entries/index.html.haml @@ -1,4 +1,4 @@ -- title t("phone_book_entries.index.page_title") +- content_for :title, t("phone_book_entries.index.page_title") - if @phone_books %p diff --git a/app/views/phone_book_entries/new.html.haml b/app/views/phone_book_entries/new.html.haml index d72d1a4..2f3a8be 100644 --- a/app/views/phone_book_entries/new.html.haml +++ b/app/views/phone_book_entries/new.html.haml @@ -1,3 +1,3 @@ -- title t("phone_book_entries.new.page_title") +- content_for :title, t("phone_book_entries.new.page_title") = render "form" diff --git a/app/views/phone_book_entries/show.html.haml b/app/views/phone_book_entries/show.html.haml index ff43b8a..7dd9bcb 100644 --- a/app/views/phone_book_entries/show.html.haml +++ b/app/views/phone_book_entries/show.html.haml @@ -1,4 +1,4 @@ -- title nil +- content_for :title, nil %section.phone-book-entry .content diff --git a/app/views/phone_book_entries/show.html.haml.examlple b/app/views/phone_book_entries/show.html.haml.examlple index 176ad04..980f776 100644 --- a/app/views/phone_book_entries/show.html.haml.examlple +++ b/app/views/phone_book_entries/show.html.haml.examlple @@ -1,4 +1,4 @@ -- title nil +- content_for :title, nil %section.phone-book-entry .content diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml index 5f50675..beed729 100644 --- a/app/views/phone_books/_index_core.html.haml +++ b/app/views/phone_books/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('phone_books.index.name') %th= t('phone_books.index.description') diff --git a/app/views/phone_books/edit.html.haml b/app/views/phone_books/edit.html.haml index 36c945b..e1d4553 100644 --- a/app/views/phone_books/edit.html.haml +++ b/app/views/phone_books/edit.html.haml @@ -1,3 +1,3 @@ -- title t("phone_books.edit.page_title", :resource => @phone_book) +- content_for :title, t("phone_books.edit.page_title", :resource => @phone_book) = render "form" diff --git a/app/views/phone_books/index.html.haml b/app/views/phone_books/index.html.haml index 52b4e9b..e681878 100644 --- a/app/views/phone_books/index.html.haml +++ b/app/views/phone_books/index.html.haml @@ -1,4 +1,4 @@ -- title t("phone_books.index.page_title") +- content_for :title, t("phone_books.index.page_title") - if @phone_books.count > 0 = render "index_core", :phone_books => @phone_books diff --git a/app/views/phone_books/new.html.haml b/app/views/phone_books/new.html.haml index e96ce1e..66d6e99 100644 --- a/app/views/phone_books/new.html.haml +++ b/app/views/phone_books/new.html.haml @@ -1,3 +1,3 @@ -- title t("phone_books.new.page_title") +- content_for :title, t("phone_books.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/phone_books/show.html.haml b/app/views/phone_books/show.html.haml index 047b15e..5140b91 100644 --- a/app/views/phone_books/show.html.haml +++ b/app/views/phone_books/show.html.haml @@ -1,4 +1,4 @@ -- title @phone_book +- content_for :title, @phone_book - if ! @phone_book.description.blank? %p %strong= t('phone_books.show.description') + ":" diff --git a/app/views/phone_models/_index_core.html.haml b/app/views/phone_models/_index_core.html.haml index b07eb68..37cceb8 100644 --- a/app/views/phone_models/_index_core.html.haml +++ b/app/views/phone_models/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('phone_models.index.name') %th= t('phone_models.index.product_manual_homepage_url') diff --git a/app/views/phone_models/edit.html.haml b/app/views/phone_models/edit.html.haml index bf31ffc..ee10d3e 100644 --- a/app/views/phone_models/edit.html.haml +++ b/app/views/phone_models/edit.html.haml @@ -1,3 +1,3 @@ -- title t("phone_models.edit.page_title") +- content_for :title, t("phone_models.edit.page_title") = render "form" diff --git a/app/views/phone_models/index.html.haml b/app/views/phone_models/index.html.haml index 90aa4ce..e37243a 100644 --- a/app/views/phone_models/index.html.haml +++ b/app/views/phone_models/index.html.haml @@ -1,4 +1,4 @@ -- title t("phone_models.index.page_title") +- content_for :title, t("phone_models.index.page_title") - if @phone_models.count > 0 = render "index_core", :phone_models => @phone_models diff --git a/app/views/phone_models/new.html.haml b/app/views/phone_models/new.html.haml index 9e900d4..a60bc68 100644 --- a/app/views/phone_models/new.html.haml +++ b/app/views/phone_models/new.html.haml @@ -1,3 +1,3 @@ -- title t("phone_models.new.page_title") +- content_for :title, t("phone_models.new.page_title") = render "form" diff --git a/app/views/phone_models/show.html.haml b/app/views/phone_models/show.html.haml index 06fae4b..5e16bda 100644 --- a/app/views/phone_models/show.html.haml +++ b/app/views/phone_models/show.html.haml @@ -1,4 +1,4 @@ -- title t("phone_models.show.page_title") +- content_for :title, t("phone_models.show.page_title") %p %strong= t('phone_models.show.name') + ":" diff --git a/app/views/phone_number_ranges/_index_core.html.haml b/app/views/phone_number_ranges/_index_core.html.haml index 24ea96d..fdd9f63 100644 --- a/app/views/phone_number_ranges/_index_core.html.haml +++ b/app/views/phone_number_ranges/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('phone_number_ranges.index.name') %th= t('phone_number_ranges.index.description') diff --git a/app/views/phone_number_ranges/edit.html.haml b/app/views/phone_number_ranges/edit.html.haml index fbf6d12..791be71 100644 --- a/app/views/phone_number_ranges/edit.html.haml +++ b/app/views/phone_number_ranges/edit.html.haml @@ -1,3 +1,3 @@ -- title t("phone_number_ranges.edit.page_title", :resource => @phone_number_range) +- content_for :title, t("phone_number_ranges.edit.page_title", :resource => @phone_number_range) = render "form" diff --git a/app/views/phone_number_ranges/index.html.haml b/app/views/phone_number_ranges/index.html.haml index 56cf137..769dc68 100644 --- a/app/views/phone_number_ranges/index.html.haml +++ b/app/views/phone_number_ranges/index.html.haml @@ -1,4 +1,4 @@ -- title t("phone_number_ranges.index.page_title") +- content_for :title, t("phone_number_ranges.index.page_title") - if @phone_number_ranges.count > 0 = render "index_core", :phone_number_ranges => @phone_number_ranges diff --git a/app/views/phone_number_ranges/new.html.haml b/app/views/phone_number_ranges/new.html.haml index d26b34d..1e5eab0 100644 --- a/app/views/phone_number_ranges/new.html.haml +++ b/app/views/phone_number_ranges/new.html.haml @@ -1,3 +1,3 @@ -- title t("phone_number_ranges.new.page_title") +- content_for :title, t("phone_number_ranges.new.page_title") = render "form" diff --git a/app/views/phone_number_ranges/show.html.haml b/app/views/phone_number_ranges/show.html.haml index 64df556..fdb54a7 100644 --- a/app/views/phone_number_ranges/show.html.haml +++ b/app/views/phone_number_ranges/show.html.haml @@ -1,4 +1,4 @@ -- title t("phone_number_ranges.show.page_title") +- content_for :title, t("phone_number_ranges.show.page_title") %p %strong= t('phone_number_ranges.show.name') + ":" diff --git a/app/views/phone_numbers/_index_core.html.haml b/app/views/phone_numbers/_index_core.html.haml index 06b27c8..c29812b 100644 --- a/app/views/phone_numbers/_index_core.html.haml +++ b/app/views/phone_numbers/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr - if phone_numbers.count > 1 && phone_numbers.first.phone_numberable_type == 'PhoneBookEntry' %th= t('phone_numbers.index.name') diff --git a/app/views/phone_numbers/edit.html.haml b/app/views/phone_numbers/edit.html.haml index d238d3d..14683d2 100644 --- a/app/views/phone_numbers/edit.html.haml +++ b/app/views/phone_numbers/edit.html.haml @@ -1,3 +1,3 @@ -- title t("phone_numbers.edit.page_title", :resource => "" ) +- content_for :title, t("phone_numbers.edit.page_title", :resource => "" ) = render "form" \ No newline at end of file diff --git a/app/views/phone_numbers/index.html.haml b/app/views/phone_numbers/index.html.haml index 2161739..08a2aa3 100644 --- a/app/views/phone_numbers/index.html.haml +++ b/app/views/phone_numbers/index.html.haml @@ -1,4 +1,4 @@ -- title @parent +- content_for :title, @parent - if @phone_numbers.count > 0 = render "index_core", :phone_numbers => @phone_numbers diff --git a/app/views/phone_numbers/new.html.haml b/app/views/phone_numbers/new.html.haml index e91f4f4..364a4bd 100644 --- a/app/views/phone_numbers/new.html.haml +++ b/app/views/phone_numbers/new.html.haml @@ -1,3 +1,3 @@ -- title t("phone_numbers.new.page_title") +- content_for :title, t("phone_numbers.new.page_title") = render "form" diff --git a/app/views/phone_numbers/show.html.haml b/app/views/phone_numbers/show.html.haml index 30c48bc..de6cb1b 100644 --- a/app/views/phone_numbers/show.html.haml +++ b/app/views/phone_numbers/show.html.haml @@ -1,4 +1,4 @@ -- title t("phone_numbers.show.page_title") +- content_for :title, t("phone_numbers.show.page_title") - if @phone_number.phone_numberable.class == PhoneBookEntry %p diff --git a/app/views/phone_sip_accounts/_index_core.html.haml b/app/views/phone_sip_accounts/_index_core.html.haml index 89afb2b..3fed147 100644 --- a/app/views/phone_sip_accounts/_index_core.html.haml +++ b/app/views/phone_sip_accounts/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('phone_sip_accounts.index.phone_id') %th= t('phone_sip_accounts.index.sip_account_id') diff --git a/app/views/phone_sip_accounts/index.html.haml b/app/views/phone_sip_accounts/index.html.haml index a9e3f85..f9ff716 100644 --- a/app/views/phone_sip_accounts/index.html.haml +++ b/app/views/phone_sip_accounts/index.html.haml @@ -1,4 +1,4 @@ -- title t("phone_sip_accounts.index.page_title") +- content_for :title, t("phone_sip_accounts.index.page_title") - if @phone_sip_accounts.count > 0 =render "index_core", :phone_sip_accounts => @phone_sip_accounts diff --git a/app/views/phone_sip_accounts/new.html.haml b/app/views/phone_sip_accounts/new.html.haml index bfe40b8..3ad8895 100644 --- a/app/views/phone_sip_accounts/new.html.haml +++ b/app/views/phone_sip_accounts/new.html.haml @@ -1,3 +1,3 @@ -- title t("phone_sip_accounts.new.page_title") +- content_for :title, t("phone_sip_accounts.new.page_title") = render "form" diff --git a/app/views/phone_sip_accounts/show.html.haml b/app/views/phone_sip_accounts/show.html.haml index 0dd5a9b..54e1e5d 100644 --- a/app/views/phone_sip_accounts/show.html.haml +++ b/app/views/phone_sip_accounts/show.html.haml @@ -1,4 +1,4 @@ -- title t("phone_sip_accounts.show.page_title") +- content_for :title, t("phone_sip_accounts.show.page_title") %p %strong= t('phone_sip_accounts.show.phone_id') + ":" diff --git a/app/views/phones/_index_core.html.haml b/app/views/phones/_index_core.html.haml index c442d7f..8dc875c 100644 --- a/app/views/phones/_index_core.html.haml +++ b/app/views/phones/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('phones.index.mac_address') %th= t('phones.index.phone_model_id') diff --git a/app/views/phones/edit.html.haml b/app/views/phones/edit.html.haml index cdbacac..9452e2a 100644 --- a/app/views/phones/edit.html.haml +++ b/app/views/phones/edit.html.haml @@ -1,3 +1,3 @@ -- title t("phones.edit.page_title", :resource => @phone.mac_address) +- content_for :title, t("phones.edit.page_title", :resource => @phone.mac_address) = render "form" diff --git a/app/views/phones/index.html.haml b/app/views/phones/index.html.haml index 785adf9..4de7919 100644 --- a/app/views/phones/index.html.haml +++ b/app/views/phones/index.html.haml @@ -1,4 +1,4 @@ -- title t("phones.index.page_title") +- content_for :title, t("phones.index.page_title") - if @phones.count > 0 = render "index_core", :phones => @phones diff --git a/app/views/phones/new.html.haml b/app/views/phones/new.html.haml index ae0a539..95fbdf2 100644 --- a/app/views/phones/new.html.haml +++ b/app/views/phones/new.html.haml @@ -1,4 +1,4 @@ -- title t("phones.new.page_title") +- content_for :title, t("phones.new.page_title") - if !@fallback_sip_accounts.any? && can?(:create, current_user.current_tenant.sip_accounts.build) %p diff --git a/app/views/phones/show.html.haml b/app/views/phones/show.html.haml index 0e0dad5..87b8d3d 100644 --- a/app/views/phones/show.html.haml +++ b/app/views/phones/show.html.haml @@ -1,4 +1,4 @@ -- title t("phones.show.page_title") +- content_for :title, t("phones.show.page_title") %p %strong= t('phones.show.mac_address') + ":" diff --git a/app/views/ringtones/_index_core.html.haml b/app/views/ringtones/_index_core.html.haml index c39357a..e01914d 100644 --- a/app/views/ringtones/_index_core.html.haml +++ b/app/views/ringtones/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('ringtones.index.audio') %th= t('ringtones.index.bellcore_id') diff --git a/app/views/ringtones/edit.html.haml b/app/views/ringtones/edit.html.haml index 6779190..341b97f 100644 --- a/app/views/ringtones/edit.html.haml +++ b/app/views/ringtones/edit.html.haml @@ -1,3 +1,3 @@ -- title t("ringtones.edit.page_title") +- content_for :title, t("ringtones.edit.page_title") = render "form" diff --git a/app/views/ringtones/index.html.haml b/app/views/ringtones/index.html.haml index 4da75fa..2eea5fe 100644 --- a/app/views/ringtones/index.html.haml +++ b/app/views/ringtones/index.html.haml @@ -1,4 +1,4 @@ -- title t("ringtones.index.page_title") +- content_for :title, t("ringtones.index.page_title") - if @ringtones.count > 0 = render "index_core", :ringtones => @ringtones diff --git a/app/views/ringtones/new.html.haml b/app/views/ringtones/new.html.haml index 025f440..de0070c 100644 --- a/app/views/ringtones/new.html.haml +++ b/app/views/ringtones/new.html.haml @@ -1,3 +1,3 @@ -- title t("ringtones.new.page_title") +- content_for :title, t("ringtones.new.page_title") = render "form" diff --git a/app/views/ringtones/show.html.haml b/app/views/ringtones/show.html.haml index 408b808..7e0a011 100644 --- a/app/views/ringtones/show.html.haml +++ b/app/views/ringtones/show.html.haml @@ -1,4 +1,4 @@ -- title t("ringtones.show.page_title") +- content_for :title, t("ringtones.show.page_title") - if 1 == 2 %p diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml index 3435686..f769c01 100644 --- a/app/views/route_elements/_index_core.html.haml +++ b/app/views/route_elements/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('route_elements.index.var_in') %th= t('route_elements.index.var_out') diff --git a/app/views/route_elements/edit.html.haml b/app/views/route_elements/edit.html.haml index 770eb6c..c2da3e6 100644 --- a/app/views/route_elements/edit.html.haml +++ b/app/views/route_elements/edit.html.haml @@ -1,3 +1,3 @@ -- title t("route_elements.edit.page_title") +- content_for :title, t("route_elements.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/route_elements/index.html.haml b/app/views/route_elements/index.html.haml index 8a6f7bc..43d47f1 100644 --- a/app/views/route_elements/index.html.haml +++ b/app/views/route_elements/index.html.haml @@ -1,4 +1,4 @@ -- title t("route_elements.index.page_title") +- content_for :title, t("route_elements.index.page_title") - if @route_elements && @route_elements.count > 0 = render "index_core", :route_elements => @route_elements diff --git a/app/views/route_elements/new.html.haml b/app/views/route_elements/new.html.haml index 903e808..2b9b9c1 100644 --- a/app/views/route_elements/new.html.haml +++ b/app/views/route_elements/new.html.haml @@ -1,3 +1,3 @@ -- title t("route_elements.new.page_title") +- content_for :title, t("route_elements.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/route_elements/show.html.haml b/app/views/route_elements/show.html.haml index c637a4d..808f2a0 100644 --- a/app/views/route_elements/show.html.haml +++ b/app/views/route_elements/show.html.haml @@ -1,4 +1,4 @@ -- title t("route_elements.show.page_title") +- content_for :title, t("route_elements.show.page_title") %p %strong= t('route_elements.show.var_in') + ":" diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml index 8ad77b1..f386a5d 100644 --- a/app/views/sessions/new.html.haml +++ b/app/views/sessions/new.html.haml @@ -1,4 +1,4 @@ -- title t("sessions.new.page_title") +- content_for :title, t("sessions.new.page_title") = simple_form_for :sessions, :url => sessions_path do |t| = t.input :login_data, :label => t('sessions.form.email'), :autofocus => true diff --git a/app/views/shared/_create_link.html.haml b/app/views/shared/_create_link.html.haml index 103c82b..e5bc840 100644 --- a/app/views/shared/_create_link.html.haml +++ b/app/views/shared/_create_link.html.haml @@ -2,10 +2,17 @@ - if can? :create, parent.send(child_class.name.underscore.pluralize).build %p - if t("#{child_class.name.underscore.pluralize}.index.actions.create_for").include?('translation missing') || (!(defined? short_link).nil? && short_link == true) - = link_to t("#{child_class.name.underscore.pluralize}.index.actions.create"), method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) + %a.btn.btn-mini.btn-primary{:href => method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) } + %i.icon-plus.icon-white + =t("#{child_class.name.underscore.pluralize}.index.actions.create") - else - = link_to t("#{child_class.name.underscore.pluralize}.index.actions.create_for", :resource => parent.to_s), method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) + %a.btn.btn-mini.btn-primary{:href => method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) } + %i.icon-plus.icon-white + =t("#{child_class.name.underscore.pluralize}.index.actions.create_for", :resource => parent) + - elsif !(defined? child_class).nil? - if can? :create, child_class %p - = link_to t("#{child_class.name.underscore.pluralize}.index.actions.create"), method( :"new_#{child_class.name.underscore}_path" ).() \ No newline at end of file + %a.btn.btn-mini.btn-primary{:href => method( :"new_#{child_class.name.underscore}_path" ).() } + %i.icon-plus.icon-white + =t("#{child_class.name.underscore.pluralize}.index.actions.create") \ No newline at end of file diff --git a/app/views/shared/_flash.html.haml b/app/views/shared/_flash.html.haml deleted file mode 100644 index 320fd15..0000000 --- a/app/views/shared/_flash.html.haml +++ /dev/null @@ -1,19 +0,0 @@ -- flash.each do |type, msg| - .flash{:class => type} - .light - .sign= resolve_flash_sign(type) - .message= msg - - --# These are the available types: --# --# .flash.notice --# .light --# .sign i --# .message Lorem ipsum dolor sit amet, consectetur adipisicing eli.w --# --# .flash.warning --# .light --# .sign ! --# .message Lorem ipsum dolor sit amet, consectetur adipisicing eli.w - diff --git a/app/views/shared/_index_view_edit_destroy_part.html.haml b/app/views/shared/_index_view_edit_destroy_part.html.haml index ff5a988..5bc715b 100644 --- a/app/views/shared/_index_view_edit_destroy_part.html.haml +++ b/app/views/shared/_index_view_edit_destroy_part.html.haml @@ -1,35 +1,39 @@ -- style = 'width:35px' +- style = 'width:70px' - if !(defined? parent).nil? && !(defined? child).nil? - %td{ :style => style } - - if can? :show, child - = link_to t("#{child.class.name.underscore.pluralize}.index.actions.show"), method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) - %td{ :style => style } - - if can? :edit, child - = link_to t("#{child.class.name.underscore.pluralize}.index.actions.edit"), method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) - %td{ :style => style } - - if can? :destroy, child - = link_to t("#{child.class.name.underscore.pluralize}.index.actions.destroy"), method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :method => :delete - - if child.respond_to?(:move_up?) or child and child.respond_to?(:move_down?) + - if can? :show, child %td{ :style => style } - - if can? :move_down, child and child.respond_to?(:move_down?) and child.move_down? - = link_to '⇩'.html_safe, method( :"move_lower_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :method => :put - - if can? :move_up, child and child.respond_to?(:move_up?) and child.move_up? - = link_to '⇧'.html_safe, method( :"move_higher_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :method => :put + %a.btn.btn-mini.btn-success{:href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) } + %i.icon-info-sign.icon-white + =t("#{child.class.name.underscore.pluralize}.actions.show") + + - if can? :edit, child + %td{ :style => style } + %a.btn.btn-mini.btn-warning{:href => method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) } + %i.icon-edit.icon-white + =t("#{child.class.name.underscore.pluralize}.actions.edit") + + - if can? :destroy, child + %td{ :style => style } + %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"} + %i.icon-trash.icon-white + =t("#{child.class.name.underscore.pluralize}.actions.destroy") - elsif !(defined? child).nil? - %td{ :style => style } - - if can? :show, child - = link_to t("#{child.class.name.underscore.pluralize}.index.actions.show"), method( :"#{child.class.name.underscore}_path" ).(child) - %td{ :style => style } - - if can? :edit, child - = link_to t("#{child.class.name.underscore.pluralize}.index.actions.edit"), method( :"edit_#{child.class.name.underscore}_path" ).(child) - %td{ :style => style } - - if can? :destroy, child - = link_to t("#{child.class.name.underscore.pluralize}.index.actions.destroy"), method( :"#{child.class.name.underscore}_path" ).(child), :method => :delete - - if child.respond_to?(:move_up?) or child and child.respond_to?(:move_down?) + - if can? :show, child + %td{ :style => style } + %a.btn.btn-mini.btn-success{:href => method( :"#{child.class.name.underscore}_path" ).(child) } + %i.icon-info-sign.icon-white + =t("#{child.class.name.underscore.pluralize}.actions.show") + + - if can? :edit, child + %td{ :style => style } + %a.btn.btn-mini.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) } + %i.icon-edit.icon-white + =t("#{child.class.name.underscore.pluralize}.actions.edit") + + - if can? :destroy, child %td{ :style => style } - - if can? :move_down, child and child.respond_to?(:move_down?) and child.move_down? - = link_to '⇩'.html_safe, method( :"move_lower_#{child.class.name.underscore}_path" ).(child), :method => :put - - if can? :move_up, child and child.respond_to?(:move_up?) and child.move_up? - = link_to '⇧'.html_safe, method( :"move_higher_#{child.class.name.underscore}_path" ).(child), :method => :put + %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"} + %i.icon-trash.icon-white + =t("#{child.class.name.underscore.pluralize}.actions.destroy") \ No newline at end of file diff --git a/app/views/shared/_show_edit_destroy_part.html.haml b/app/views/shared/_show_edit_destroy_part.html.haml index aff18d1..e82c667 100644 --- a/app/views/shared/_show_edit_destroy_part.html.haml +++ b/app/views/shared/_show_edit_destroy_part.html.haml @@ -1,16 +1,20 @@ %p - if !(defined? parent).nil? && !(defined? child).nil? - if can? :edit, child - = link_to t("#{child.class.name.underscore.pluralize}.show.actions.edit"), method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) + %a.btn.btn-warning{:href => method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) } + %i.icon-edit.icon-white + =t("#{child.class.name.underscore.pluralize}.actions.edit") - if can? :destroy, child - - if can? :edit, child - | - = link_to t("#{child.class.name.underscore.pluralize}.show.actions.destroy"), method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :method => :delete + %a.btn.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"} + %i.icon-trash.icon-white + =t("#{child.class.name.underscore.pluralize}.actions.destroy") - elsif !(defined? child).nil? - if can? :edit, child - = link_to t("#{child.class.name.underscore.pluralize}.show.actions.edit"), method( :"edit_#{child.class.name.underscore}_path" ).(child) + %a.btn.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) } + %i.icon-edit.icon-white + =t("#{child.class.name.underscore.pluralize}.actions.edit") - if can? :destroy, child - - if can? :edit, child - | - = link_to t("#{child.class.name.underscore.pluralize}.show.actions.destroy"), method( :"#{child.class.name.underscore}_path" ).(child), :method => :delete \ No newline at end of file + %a.btn.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"} + %i.icon-trash.icon-white + =t("#{child.class.name.underscore.pluralize}.actions.destroy") \ No newline at end of file diff --git a/app/views/shared/_system_message.html.haml b/app/views/shared/_system_message.html.haml deleted file mode 100644 index 4aabb9c..0000000 --- a/app/views/shared/_system_message.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -- if current_user - .flash.notice#system_message_display - .light - .sign i - .message#system_message This is the place to display incoming calls and other stuff. - - = subscribe_to "/users/#{current_user.id}/system_messages" - - :javascript - $('#system_message_display').hide() \ No newline at end of file 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') + ":" diff --git a/app/views/sip_domains/_index_core.html.haml b/app/views/sip_domains/_index_core.html.haml index 37374f2..873ffc0 100644 --- a/app/views/sip_domains/_index_core.html.haml +++ b/app/views/sip_domains/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('sip_domains.index.host') %th= t('sip_domains.index.realm') diff --git a/app/views/sip_domains/edit.html.haml b/app/views/sip_domains/edit.html.haml index dcf8d6b..adf77ef 100644 --- a/app/views/sip_domains/edit.html.haml +++ b/app/views/sip_domains/edit.html.haml @@ -1,3 +1,3 @@ -- title t("sip_domains.edit.page_title") +- content_for :title, t("sip_domains.edit.page_title") = render "form" diff --git a/app/views/sip_domains/index.html.haml b/app/views/sip_domains/index.html.haml index 6de7f42..3eb0c28 100644 --- a/app/views/sip_domains/index.html.haml +++ b/app/views/sip_domains/index.html.haml @@ -1,4 +1,4 @@ -- title t("sip_domains.index.page_title") +- content_for :title, t("sip_domains.index.page_title") - if @sip_domains.count > 0 = render "index_core", :sip_domains => @sip_domains diff --git a/app/views/sip_domains/new.html.haml b/app/views/sip_domains/new.html.haml index 12ff340..863e680 100644 --- a/app/views/sip_domains/new.html.haml +++ b/app/views/sip_domains/new.html.haml @@ -1,3 +1,3 @@ -- title t("sip_domains.new.page_title") +- content_for :title, t("sip_domains.new.page_title") = render "form" diff --git a/app/views/sip_domains/show.html.haml b/app/views/sip_domains/show.html.haml index e136eaf..b7b74cd 100644 --- a/app/views/sip_domains/show.html.haml +++ b/app/views/sip_domains/show.html.haml @@ -1,4 +1,4 @@ -- title t("sip_domains.show.page_title") +- content_for :title, t("sip_domains.show.page_title") %p %strong= t('sip_domains.show.host') + ":" diff --git a/app/views/softkeys/_index_core.html.haml b/app/views/softkeys/_index_core.html.haml index fd3dca8..ba79d22 100644 --- a/app/views/softkeys/_index_core.html.haml +++ b/app/views/softkeys/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('softkeys.index.function') %th= t('softkeys.index.number') diff --git a/app/views/softkeys/edit.html.haml b/app/views/softkeys/edit.html.haml index 54d53fc..ce45176 100644 --- a/app/views/softkeys/edit.html.haml +++ b/app/views/softkeys/edit.html.haml @@ -1,3 +1,3 @@ -- title t("softkeys.edit.page_title") +- content_for :title, t("softkeys.edit.page_title") = render "form" \ No newline at end of file diff --git a/app/views/softkeys/index.html.haml b/app/views/softkeys/index.html.haml index 8bdc00e..d0b68a9 100644 --- a/app/views/softkeys/index.html.haml +++ b/app/views/softkeys/index.html.haml @@ -1,4 +1,4 @@ -- title t("softkeys.index.page_title") +- content_for :title, t("softkeys.index.page_title") - if @softkeys.count > 0 = render "index_core", :softkeys => @softkeys diff --git a/app/views/softkeys/new.html.haml b/app/views/softkeys/new.html.haml index 593add6..9199a5c 100644 --- a/app/views/softkeys/new.html.haml +++ b/app/views/softkeys/new.html.haml @@ -1,3 +1,3 @@ -- title t("softkeys.new.page_title") +- content_for :title, t("softkeys.new.page_title") = render "form" diff --git a/app/views/softkeys/show.html.haml b/app/views/softkeys/show.html.haml index 9ab4333..d0db111 100644 --- a/app/views/softkeys/show.html.haml +++ b/app/views/softkeys/show.html.haml @@ -1,4 +1,4 @@ -- title t("softkeys.show.page_title") +- content_for :title, t("softkeys.show.page_title") %p %strong= t('softkeys.show.function') + ":" diff --git a/app/views/system_messages/_index_core.html.haml b/app/views/system_messages/_index_core.html.haml index 157d964..7c4485f 100644 --- a/app/views/system_messages/_index_core.html.haml +++ b/app/views/system_messages/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('system_messages.index.created_at') %th= t('system_messages.index.content') diff --git a/app/views/system_messages/index.html.haml b/app/views/system_messages/index.html.haml index da77e18..ffd3fc3 100644 --- a/app/views/system_messages/index.html.haml +++ b/app/views/system_messages/index.html.haml @@ -1,3 +1,3 @@ -- title t("system_messages.index.page_title") +- content_for :title, t("system_messages.index.page_title") = render "index_core", :system_messages => @system_messages \ No newline at end of file diff --git a/app/views/system_messages/new.html.haml b/app/views/system_messages/new.html.haml index 3afdb24..565f5c5 100644 --- a/app/views/system_messages/new.html.haml +++ b/app/views/system_messages/new.html.haml @@ -1,3 +1,3 @@ -- title t("system_messages.new.page_title") +- content_for :title, t("system_messages.new.page_title") = render "form" diff --git a/app/views/system_messages/show.html.haml b/app/views/system_messages/show.html.haml index 694e4c1..70be6f2 100644 --- a/app/views/system_messages/show.html.haml +++ b/app/views/system_messages/show.html.haml @@ -1,4 +1,4 @@ -- title t("system_messages.show.page_title") +- content_for :title, t("system_messages.show.page_title") %p %strong= t('system_messages.show.created_at') + ":" diff --git a/app/views/tenants/_gs_parameter_table.html.haml b/app/views/tenants/_gs_parameter_table.html.haml index 94c44e5..407f6e3 100644 --- a/app/views/tenants/_gs_parameter_table.html.haml +++ b/app/views/tenants/_gs_parameter_table.html.haml @@ -1,6 +1,6 @@ - cache(['gs_parameters_tenant_overview_table', I18n.locale, tenant, GuiFunction.count, GuiFunction.reorder(:updated_at).last, GsParameter.count, GsParameter.reorder(:updated_at).last]) do - %table - %tr{:class => 'even'} + %table{:class => 'table table-striped'} + %tr %th Funktion %th @@ -8,14 +8,14 @@ %th Letztes Update - %tr{:class => 'odd'} + %tr %td = t("gui_functions.name") %td = link_to GuiFunction.count.to_s, gui_functions_path %td = l GuiFunction.reorder(:updated_at).last.updated_at, :format => :short - %tr{:class => 'even'} + %tr %td = t("gs_parameters.name") %td diff --git a/app/views/tenants/_index_core.html.haml b/app/views/tenants/_index_core.html.haml index 60afeee..59d7e6d 100644 --- a/app/views/tenants/_index_core.html.haml +++ b/app/views/tenants/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('tenants.index.name') %th= t('tenants.index.description') diff --git a/app/views/tenants/_sip_accounts_and_phones.html.haml b/app/views/tenants/_sip_accounts_and_phones.html.haml index 4b84b1c..bcc2dd6 100644 --- a/app/views/tenants/_sip_accounts_and_phones.html.haml +++ b/app/views/tenants/_sip_accounts_and_phones.html.haml @@ -1,12 +1,12 @@ -%table - %tr{:class => 'even'} +%table{:class => 'table table-striped'} + %tr %th %th= t("sip_accounts.index.page_title") %th= t("phones.index.page_title") - cache(['tenant_show_admin_area_sip_accounts_and_phones_row', I18n.locale, @tenant, @tenant.sip_accounts.count, @tenant.sip_accounts.reorder(:updated_at).last, @tenant.phones.count, @tenant.phones.reorder(:updated_at).last]) do - %tr{:class => 'odd'} + %tr %td= tenant - cache(['tenant_show_admin_area_sip_accounts_table_cell', I18n.locale, @tenant, @tenant.sip_accounts.count, @tenant.sip_accounts.reorder(:updated_at).last]) do %td @@ -33,7 +33,7 @@ = link_to "#{phone.phone_model.to_s} (#{phone.pretty_mac_address})#{(phone.ip_address.blank? ? '' : " - #{phone.ip_address}")}", tenant_phone_path(tenant, phone) = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Phone} - %tr{:class => 'even'} + %tr %td= t("users.index.page_title") %td - if tenant.users_sip_accounts.any? diff --git a/app/views/tenants/_table_of_functions.html.haml b/app/views/tenants/_table_of_functions.html.haml index 957687b..271bf1e 100644 --- a/app/views/tenants/_table_of_functions.html.haml +++ b/app/views/tenants/_table_of_functions.html.haml @@ -1,13 +1,13 @@ - cache(['table_of_pbx_features', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.reorder(:updated_at).last, tenant.conferences.count, tenant.conferences.reorder(:updated_at).last, tenant.hunt_groups.count, tenant.hunt_groups.reorder(:updated_at).last, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.reorder(:updated_at).last]) do - %table - %tr{:class => 'even'} + %table{:class => 'table table-striped'} + %tr %th Funktion %th Anzahl %th - cache(['table_of_pbx_features_callthroughs_row', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.reorder(:updated_at).last]) do - %tr{:class => 'odd'} + %tr %td = t("callthroughs.name") %td @@ -18,7 +18,7 @@ %td = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Callthrough} - cache(['table_of_pbx_features_conferences_row', I18n.locale, tenant, tenant.conferences.count, tenant.conferences.reorder(:updated_at).last]) do - %tr{:class => 'even'} + %tr %td = t("conferences.name") %td @@ -29,7 +29,7 @@ %td = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Conference} - cache(['table_of_pbx_features_hunt_groups_row', I18n.locale, tenant, tenant.hunt_groups.count, tenant.hunt_groups.reorder(:updated_at).last]) do - %tr{:class => 'odd'} + %tr %td = t("hunt_groups.name") %td @@ -40,7 +40,7 @@ %td = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => HuntGroup} - cache(['table_of_pbx_features_automatic_call_distributors_row', I18n.locale, tenant, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.reorder(:updated_at).last]) do - %tr{:class => 'even'} + %tr %td = t("automatic_call_distributors.name") %td diff --git a/app/views/tenants/edit.html.haml b/app/views/tenants/edit.html.haml index 159f4fd..d2e837d 100644 --- a/app/views/tenants/edit.html.haml +++ b/app/views/tenants/edit.html.haml @@ -1,3 +1,3 @@ -- title t("tenants.edit.page_title", :resource => @tenant ) +- content_for :title, t("tenants.edit.page_title", :resource => @tenant ) = render "form" diff --git a/app/views/tenants/index.html.haml b/app/views/tenants/index.html.haml index 1783825..9404f17 100644 --- a/app/views/tenants/index.html.haml +++ b/app/views/tenants/index.html.haml @@ -1,4 +1,4 @@ -- title t("tenants.index.page_title") +- content_for :title, t("tenants.index.page_title") - if @tenants.count > 0 = render "index_core", :tenants => @tenants diff --git a/app/views/tenants/new.html.haml b/app/views/tenants/new.html.haml index dca3809..d57ae36 100644 --- a/app/views/tenants/new.html.haml +++ b/app/views/tenants/new.html.haml @@ -1,3 +1,3 @@ -- title t("tenants.new.page_title") +- content_for :title, t("tenants.new.page_title") = render "form" diff --git a/app/views/tenants/show.html.haml b/app/views/tenants/show.html.haml index 9b9d4ec..53d3307 100644 --- a/app/views/tenants/show.html.haml +++ b/app/views/tenants/show.html.haml @@ -1,4 +1,4 @@ -- title @tenant.name +- content_for :title, @tenant.name - if !@tenant.description.blank? %p diff --git a/app/views/user_group_memberships/_index_core.html.haml b/app/views/user_group_memberships/_index_core.html.haml index 3c3cebe..801532a 100644 --- a/app/views/user_group_memberships/_index_core.html.haml +++ b/app/views/user_group_memberships/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('user_group_memberships.index.tenant') %th= t('user_group_memberships.index.user_group') diff --git a/app/views/user_group_memberships/edit.html.haml b/app/views/user_group_memberships/edit.html.haml index 2080c87..118aacd 100644 --- a/app/views/user_group_memberships/edit.html.haml +++ b/app/views/user_group_memberships/edit.html.haml @@ -1,3 +1,3 @@ -- title t("user_group_memberships.edit.page_title", :resource => @user_group_membership) +- content_for :title, t("user_group_memberships.edit.page_title", :resource => @user_group_membership) = render "form" diff --git a/app/views/user_group_memberships/index.html.haml b/app/views/user_group_memberships/index.html.haml index 1d7927b..b12e682 100644 --- a/app/views/user_group_memberships/index.html.haml +++ b/app/views/user_group_memberships/index.html.haml @@ -1,4 +1,4 @@ -- title t("user_group_memberships.index.page_title") +- content_for :title, t("user_group_memberships.index.page_title") - if @user_group_memberships.count > 0 = render "index_core", :user_group_memberships => @user_group_memberships diff --git a/app/views/user_group_memberships/new.html.haml b/app/views/user_group_memberships/new.html.haml index 9d59fdd..8901058 100644 --- a/app/views/user_group_memberships/new.html.haml +++ b/app/views/user_group_memberships/new.html.haml @@ -1,3 +1,3 @@ -- title t("user_group_memberships.new.page_title") +- content_for :title, t("user_group_memberships.new.page_title") = render "form" diff --git a/app/views/user_group_memberships/show.html.haml b/app/views/user_group_memberships/show.html.haml index 0e5cfab..418a266 100644 --- a/app/views/user_group_memberships/show.html.haml +++ b/app/views/user_group_memberships/show.html.haml @@ -1,4 +1,4 @@ -- title t("user_group_memberships.show.page_title") +- content_for :title, t("user_group_memberships.show.page_title") %p %strong= t('user_group_memberships.show.user') + ":" diff --git a/app/views/user_groups/_index_core.html.haml b/app/views/user_groups/_index_core.html.haml index 481a507..a12cf96 100644 --- a/app/views/user_groups/_index_core.html.haml +++ b/app/views/user_groups/_index_core.html.haml @@ -1,5 +1,5 @@ - cache(['user_groups_table', I18n.locale, current_user, @user, user_groups, User.order(:updated_at).last, User.count, UserGroupMembership.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do - %table + %table{:class => 'table table-striped'} %tr %th= t('user_groups.index.name') - if user_groups.pluck(:description).uniq != [nil] diff --git a/app/views/user_groups/edit.html.haml b/app/views/user_groups/edit.html.haml index 35514e0..4d263a4 100644 --- a/app/views/user_groups/edit.html.haml +++ b/app/views/user_groups/edit.html.haml @@ -1,3 +1,3 @@ -- title t("user_groups.edit.page_title", :resource => @user_group) +- content_for :title, t("user_groups.edit.page_title", :resource => @user_group) = render "form" diff --git a/app/views/user_groups/index.html.haml b/app/views/user_groups/index.html.haml index 545b838..7240f5f 100644 --- a/app/views/user_groups/index.html.haml +++ b/app/views/user_groups/index.html.haml @@ -1,4 +1,4 @@ -- title t("user_groups.index.page_title") +- content_for :title, t("user_groups.index.page_title") - if @user_groups.count > 0 = render "index_core", :user_groups => @user_groups diff --git a/app/views/user_groups/new.html.haml b/app/views/user_groups/new.html.haml index dfef18e..3c5920f 100644 --- a/app/views/user_groups/new.html.haml +++ b/app/views/user_groups/new.html.haml @@ -1,3 +1,3 @@ -- title t("user_groups.new.page_title") +- content_for :title, t("user_groups.new.page_title") = render "form" diff --git a/app/views/user_groups/show.html.haml b/app/views/user_groups/show.html.haml index 00bdeb7..fe5b745 100644 --- a/app/views/user_groups/show.html.haml +++ b/app/views/user_groups/show.html.haml @@ -1,4 +1,4 @@ -- title t("user_groups.show.page_title") +- content_for :title, t("user_groups.show.page_title") %p %strong= t('user_groups.show.name') + ":" diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index 5f0cb41..b364bd2 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -1,5 +1,5 @@ - cache(['user_table_row_inner_td', I18n.locale, current_user, users.reorder(:updated_at).last, users.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do - %table + %table{:class => 'table table-striped'} %tr %th %th= t('users.index.user_name') diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index 96272f5..ed79b2c 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -1,3 +1,3 @@ -- title t("users.edit.page_title", :resource => @user) +- content_for :title, t("users.edit.page_title", :resource => @user) = render "form" diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml index 892e035..8a3d1fc 100644 --- a/app/views/users/index.html.haml +++ b/app/views/users/index.html.haml @@ -1,4 +1,4 @@ -- title t("users.index.page_title") +- content_for :title, t("users.index.page_title") - if @users.count > 0 = render "index_core", :users => @users diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml index a014611..64fe55f 100644 --- a/app/views/users/new.html.haml +++ b/app/views/users/new.html.haml @@ -1,3 +1,3 @@ -- title t("users.new.page_title") +- content_for :title, t("users.new.page_title") = render "form" diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 9a0ae02..75eaf54 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -1,7 +1,7 @@ -- title "User: #{@user}" +- content_for :title, "User: #{@user}" -#user-show - %aside +.row + .span3 - cache(['user_show_aside', I18n.locale, @user, @user.sip_accounts, @user.conferences]) do = image_tag @user.image_url(:small).to_s, class: 'display' if @user.image? && @user.image_url(:small) %p @@ -40,7 +40,7 @@ =link_to conference, edit_user_conference_path(@user, conference) - %section + .span9 = render :partial => 'phone_books', :locals => {:user => @user, :phone_books => @phone_books} - if current_user.user_groups.where(:name => 'Admins').any? diff --git a/app/views/voicemail_messages/_index_core.html.haml b/app/views/voicemail_messages/_index_core.html.haml index b8e47af..3f7680c 100644 --- a/app/views/voicemail_messages/_index_core.html.haml +++ b/app/views/voicemail_messages/_index_core.html.haml @@ -1,7 +1,7 @@ = form_tag(destroy_multiple_sip_account_voicemail_messages_path(@sip_account), :method => :delete, :id => 'voicemail_message_form') do %header.entries-nav= render :partial => "voicemail_messages/navigation" .content - %table + %table{:class => 'table table-striped'} - reset_cycle - for voicemail_message in voicemail_messages %tr.voicemail-messages-entry{:class => cycle('odd', 'even'), :id => "message_#{voicemail_message.uuid}"} diff --git a/app/views/voicemail_messages/index.html.haml b/app/views/voicemail_messages/index.html.haml index 53f8090..53ff745 100644 --- a/app/views/voicemail_messages/index.html.haml +++ b/app/views/voicemail_messages/index.html.haml @@ -1,6 +1,6 @@ - if @type - - title t("voicemail_messages.index.page_title_#{@type}") + - content_for :title, t("voicemail_messages.index.page_title_#{@type}") - else - - title t("voicemail_messages.index.page_title") + - content_for :title, t("voicemail_messages.index.page_title") = render "index_core", :voicemail_messages => @voicemail_messages diff --git a/app/views/voicemail_settings/edit.html.haml b/app/views/voicemail_settings/edit.html.haml index 6bd7031..56e5765 100644 --- a/app/views/voicemail_settings/edit.html.haml +++ b/app/views/voicemail_settings/edit.html.haml @@ -1,3 +1,3 @@ -- title t("voicemail_settings.edit.page_title") +- content_for :title, t("voicemail_settings.edit.page_title") = render "form" diff --git a/app/views/voicemail_settings/show.html.haml b/app/views/voicemail_settings/show.html.haml index 30e12d0..e156d7b 100644 --- a/app/views/voicemail_settings/show.html.haml +++ b/app/views/voicemail_settings/show.html.haml @@ -1,4 +1,4 @@ -- title t("voicemail_settings.show.page_title") +- content_for :title, t("voicemail_settings.show.page_title") %p %strong= t('voicemail_settings.show.greeting_path') + ":" diff --git a/app/views/whitelists/_index_core.html.haml b/app/views/whitelists/_index_core.html.haml index b4c5b0c..998a681 100644 --- a/app/views/whitelists/_index_core.html.haml +++ b/app/views/whitelists/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('whitelists.index.name') %th= t('whitelists.index.phone_numbers') diff --git a/app/views/whitelists/edit.html.haml b/app/views/whitelists/edit.html.haml index 9f8af90..9adcc58 100644 --- a/app/views/whitelists/edit.html.haml +++ b/app/views/whitelists/edit.html.haml @@ -1,3 +1,3 @@ -- title t("whitelists.edit.page_title") +- content_for :title, t("whitelists.edit.page_title") = render "form" diff --git a/app/views/whitelists/index.html.haml b/app/views/whitelists/index.html.haml index 0873189..52ab453 100644 --- a/app/views/whitelists/index.html.haml +++ b/app/views/whitelists/index.html.haml @@ -1,4 +1,4 @@ -- title t("whitelists.index.page_title") +- content_for :title, t("whitelists.index.page_title") - if @whitelists.count > 0 = render "index_core", :whitelists => @whitelists diff --git a/app/views/whitelists/new.html.haml b/app/views/whitelists/new.html.haml index f1101ad..7086cfd 100644 --- a/app/views/whitelists/new.html.haml +++ b/app/views/whitelists/new.html.haml @@ -1,3 +1,3 @@ -- title t("whitelists.new.page_title") +- content_for :title, t("whitelists.new.page_title") = render "form" diff --git a/app/views/whitelists/show.html.haml b/app/views/whitelists/show.html.haml index 77652f9..054afc5 100644 --- a/app/views/whitelists/show.html.haml +++ b/app/views/whitelists/show.html.haml @@ -1,4 +1,4 @@ -- title t("whitelists.show.page_title") +- content_for :title, t("whitelists.show.page_title") %p %strong= t('whitelists.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. --- .../access_authorizations/_index_core.html.haml | 4 ++-- app/views/acd_agents/_index_core.html.haml | 4 ++-- app/views/acd_callers/_index_core.html.haml | 4 ++-- app/views/addresses/_index_core.html.haml | 4 ++-- .../_form_core.html.haml | 2 +- .../_index_core.html.haml | 4 ++-- app/views/call_forwards/_index_core.html.haml | 4 ++-- app/views/call_histories/_index_core.html.haml | 2 +- app/views/call_routes/_index_core.html.haml | 2 +- app/views/calls/_index_core.html.haml | 4 ++-- app/views/callthroughs/_index_core.html.haml | 4 ++-- app/views/conference_invitees/_index_core.html.haml | 4 ++-- app/views/conferences/_index_core.html.haml | 4 ++-- app/views/fax_accounts/_index_core.html.haml | 4 ++-- app/views/fax_documents/_index_core.html.haml | 2 +- .../freeswitch_voicemail_msgs/_index_core.html.haml | 4 ++-- app/views/gateway_parameters/_index_core.html.haml | 4 ++-- app/views/gateway_settings/_index_core.html.haml | 4 ++-- app/views/gateways/_index_core.html.haml | 4 ++-- .../_index_core.html.haml | 4 ++-- app/views/gs_nodes/_index_core.html.haml | 4 ++-- app/views/gs_parameters/_index_core.html.haml | 4 ++-- app/views/gui_functions/_index_core.html.haml | 4 ++-- app/views/hunt_group_members/_index_core.html.haml | 4 ++-- app/views/hunt_groups/_index_core.html.haml | 4 ++-- app/views/manufacturers/_index_core.html.haml | 4 ++-- .../phone_book_entries/_index_core.de.html.haml | 2 +- app/views/phone_book_entries/_index_core.html.haml | 4 ++-- app/views/phone_books/_index_core.html.haml | 4 ++-- app/views/phone_models/_index_core.html.haml | 4 ++-- app/views/phone_number_ranges/_index_core.html.haml | 4 ++-- app/views/phone_numbers/_index_core.html.haml | 4 ++-- app/views/phone_sip_accounts/_index_core.html.haml | 4 ++-- app/views/phones/_index_core.html.haml | 4 ++-- app/views/ringtones/_index_core.html.haml | 4 ++-- app/views/route_elements/_index_core.html.haml | 4 ++-- app/views/shared/_create_link.html.haml | 3 ++- .../shared/_index_view_edit_destroy_part.html.haml | 21 +++++++++++---------- app/views/sip_accounts/_index_core.html.haml | 9 ++++----- app/views/sip_domains/_index_core.html.haml | 4 ++-- app/views/softkeys/_index_core.html.haml | 4 ++-- app/views/system_messages/_index_core.html.haml | 4 ++-- app/views/tenants/_index_core.html.haml | 4 ++-- app/views/tenants/_table_of_functions.html.haml | 9 +++++---- .../user_group_memberships/_index_core.html.haml | 4 ++-- app/views/user_groups/_index_core.html.haml | 4 ++-- app/views/users/_index_core.html.haml | 4 ++-- app/views/voicemail_messages/_index_core.html.haml | 2 +- app/views/whitelists/_index_core.html.haml | 4 ++-- 49 files changed, 106 insertions(+), 104 deletions(-) (limited to 'app/views') diff --git a/app/views/access_authorizations/_index_core.html.haml b/app/views/access_authorizations/_index_core.html.haml index e195171..7469a1d 100644 --- a/app/views/access_authorizations/_index_core.html.haml +++ b/app/views/access_authorizations/_index_core.html.haml @@ -5,11 +5,11 @@ %th= t('access_authorizations.index.pin') %th= t('callthroughs.index.phone_numbers') - - reset_cycle + - for access_authorization in access_authorizations - show_path_method = method( :"#{access_authorization.access_authorizationable.class.name.underscore}_access_authorization_path" ) - edit_path_method = method( :"edit_#{access_authorization.access_authorizationable.class.name.underscore}_access_authorization_path" ) - %tr{:class => cycle('odd', 'even')} + %tr %td= access_authorization.name %td= access_authorization.login %td= access_authorization.pin diff --git a/app/views/acd_agents/_index_core.html.haml b/app/views/acd_agents/_index_core.html.haml index cc1ca7f..c082fd1 100644 --- a/app/views/acd_agents/_index_core.html.haml +++ b/app/views/acd_agents/_index_core.html.haml @@ -6,9 +6,9 @@ %th= t('acd_agents.index.calls_answered') %th= t('acd_agents.index.destination') - - reset_cycle + - for acd_agent in acd_agents - %tr{:class => cycle('odd', 'even')} + %tr %td= acd_agent.name %td= acd_agent.status %td= acd_agent.last_call diff --git a/app/views/acd_callers/_index_core.html.haml b/app/views/acd_callers/_index_core.html.haml index 6a5f1b0..79aa974 100644 --- a/app/views/acd_callers/_index_core.html.haml +++ b/app/views/acd_callers/_index_core.html.haml @@ -8,9 +8,9 @@ %th= t('acd_callers.index.callback_number') %th= t('acd_callers.index.callback_attempts') - - reset_cycle + - for acd_caller in acd_callers - %tr{:class => cycle('odd', 'even')} + %tr %td= acd_caller.channel_uuid %td= acd_caller.automatic_call_distributor_id %td= acd_caller.status diff --git a/app/views/addresses/_index_core.html.haml b/app/views/addresses/_index_core.html.haml index ab272ab..3645009 100644 --- a/app/views/addresses/_index_core.html.haml +++ b/app/views/addresses/_index_core.html.haml @@ -9,9 +9,9 @@ %th= t('addresses.index.country_id') %th= t('addresses.index.position') - - reset_cycle + - for address in addresses - %tr{:class => cycle('odd', 'even')} + %tr %td= address.phone_book_entry_id %td= address.line1 %td= address.line2 diff --git a/app/views/automatic_call_distributors/_form_core.html.haml b/app/views/automatic_call_distributors/_form_core.html.haml index 77a38a6..d315ff3 100644 --- a/app/views/automatic_call_distributors/_form_core.html.haml +++ b/app/views/automatic_call_distributors/_form_core.html.haml @@ -1,5 +1,5 @@ .inputs - = f.input :name, :label => t('automatic_call_distributors.form.name.label'), :hint => conditional_hint('automatic_call_distributors.form.name.hint') + = f.input :name, :label => t('automatic_call_distributors.form.name.label'), :hint => conditional_hint('automatic_call_distributors.form.name.hint'), :autofocus => true = f.input :strategy, :label => t('automatic_call_distributors.form.strategy.label'), :hint => conditional_hint('automatic_call_distributors.form.strategy.hint'), :include_blank => false, :as => :select, :collection => strategies = f.input :max_callers, :label => t('automatic_call_distributors.form.max_callers.label'), :hint => conditional_hint('automatic_call_distributors.form.max_callers.hint') = f.input :agent_timeout, :label => t('automatic_call_distributors.form.agent_timeout.label'), :hint => conditional_hint('automatic_call_distributors.form.agent_timeout.hint') diff --git a/app/views/automatic_call_distributors/_index_core.html.haml b/app/views/automatic_call_distributors/_index_core.html.haml index 7f27908..50908f4 100644 --- a/app/views/automatic_call_distributors/_index_core.html.haml +++ b/app/views/automatic_call_distributors/_index_core.html.haml @@ -10,9 +10,9 @@ %th= t('automatic_call_distributors.index.phone_numbers') %th= t('automatic_call_distributors.index.acd_agents') - - reset_cycle + - for automatic_call_distributor in automatic_call_distributors - %tr{:class => cycle('odd', 'even')} + %tr %td= automatic_call_distributor.name %td= t("automatic_call_distributors.strategies.#{automatic_call_distributor.strategy}") %td= automatic_call_distributor.max_callers diff --git a/app/views/call_forwards/_index_core.html.haml b/app/views/call_forwards/_index_core.html.haml index 286cdae..27ad86f 100644 --- a/app/views/call_forwards/_index_core.html.haml +++ b/app/views/call_forwards/_index_core.html.haml @@ -10,9 +10,9 @@ %th= t('call_forwards.index.depth') %th= t('call_forwards.index.active') - - reset_cycle + - for call_forward in call_forwards - %tr{:class => cycle('odd', 'even')} + %tr - if !@phone_number %td= call_forward.phone_number %td= t("call_forward_cases.#{call_forward.call_forward_case.value}") diff --git a/app/views/call_histories/_index_core.html.haml b/app/views/call_histories/_index_core.html.haml index f799ead..9a52148 100644 --- a/app/views/call_histories/_index_core.html.haml +++ b/app/views/call_histories/_index_core.html.haml @@ -3,7 +3,7 @@ .content - cache(['call_history_table', I18n.locale, @sip_account, call_histories.first, call_histories.last, call_histories.count]) do %table{:class => 'table table-striped'} - - reset_cycle + - for call_history in call_histories - tr_background_colour = cycle('odd', 'even') - cache(['call_history_table_row', I18n.locale, call_history, tr_background_colour]) do diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml index e0ca39b..222303b 100644 --- a/app/views/call_routes/_index_core.html.haml +++ b/app/views/call_routes/_index_core.html.haml @@ -5,7 +5,7 @@ %th= t('call_routes.index.endpoint_type') %th= t('call_routes.index.endpoint_id') - - reset_cycle + - for call_route in call_routes %tr - cache(['call_route_single_table_row_within_tr', call_route, call_routes.count]) do diff --git a/app/views/calls/_index_core.html.haml b/app/views/calls/_index_core.html.haml index b7a25a4..09b7da6 100644 --- a/app/views/calls/_index_core.html.haml +++ b/app/views/calls/_index_core.html.haml @@ -2,8 +2,8 @@ %tr %th= t('calls.index.uuid') - - reset_cycle + - for call in @calls - %tr{:class => cycle('odd', 'even')} + %tr %td = call.uuid 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 diff --git a/app/views/conference_invitees/_index_core.html.haml b/app/views/conference_invitees/_index_core.html.haml index 55d903d..1d6ab2e 100644 --- a/app/views/conference_invitees/_index_core.html.haml +++ b/app/views/conference_invitees/_index_core.html.haml @@ -6,9 +6,9 @@ %th= t('conference_invitees.index.speaker') %th= t('conference_invitees.index.moderator') - - reset_cycle + - for conference_invitee in conference_invitees - %tr{:class => cycle('odd', 'even')} + %tr %td= conference_invitee.phone_book_entry || '-' %td= conference_invitee.phone_number %td= conference_invitee.pin diff --git a/app/views/conferences/_index_core.html.haml b/app/views/conferences/_index_core.html.haml index 2a83b29..50ea1c8 100644 --- a/app/views/conferences/_index_core.html.haml +++ b/app/views/conferences/_index_core.html.haml @@ -11,10 +11,10 @@ %th= t('conferences.index.number_of_invitees') %th= t('conferences.index.flags') - - reset_cycle + - for conference in conferences - parent = conference.conferenceable - %tr{:class => cycle('odd', 'even')} + %tr %td= conference.name - if !conferences.respond_to?('where') || conferences.where(:start => nil).where(:end => nil).count != conferences.count %td diff --git a/app/views/fax_accounts/_index_core.html.haml b/app/views/fax_accounts/_index_core.html.haml index 48e4038..5a04bf0 100644 --- a/app/views/fax_accounts/_index_core.html.haml +++ b/app/views/fax_accounts/_index_core.html.haml @@ -13,9 +13,9 @@ %small = t('fax_accounts.index.last_update') - - reset_cycle + - for fax_account in fax_accounts - %tr{:class => cycle('odd', 'even')} + %tr %td= truncate(fax_account.name, :length => 15) %td =render 'phone_numbers/listing', :phone_numbers => fax_account.phone_numbers.order(:number) diff --git a/app/views/fax_documents/_index_core.html.haml b/app/views/fax_documents/_index_core.html.haml index 747b67f..d75b80a 100644 --- a/app/views/fax_documents/_index_core.html.haml +++ b/app/views/fax_documents/_index_core.html.haml @@ -9,7 +9,7 @@ = t('fax_documents.index.remote_station_id') %th= t('fax_documents.index.thumbnails') - - reset_cycle + - for fax_document in fax_documents %tr{:class => cycle('odd', 'even'), :id => "fax_document_#{fax_document.id}"} - if fax_document.sent_at diff --git a/app/views/freeswitch_voicemail_msgs/_index_core.html.haml b/app/views/freeswitch_voicemail_msgs/_index_core.html.haml index 9d3d554..2ada034 100644 --- a/app/views/freeswitch_voicemail_msgs/_index_core.html.haml +++ b/app/views/freeswitch_voicemail_msgs/_index_core.html.haml @@ -4,9 +4,9 @@ %th= t('freeswitch_voicemail_msgs.index.message_len') %th= t('freeswitch_voicemail_msgs.index.file_path') - - reset_cycle + - for freeswitch_voicemail_msg in freeswitch_voicemail_msgs - %tr{:class => cycle('odd', 'even')} + %tr %td= freeswitch_voicemail_msg.created_epoch %td= freeswitch_voicemail_msg.message_len %td= freeswitch_voicemail_msg.file_path \ No newline at end of file diff --git a/app/views/gateway_parameters/_index_core.html.haml b/app/views/gateway_parameters/_index_core.html.haml index fda01b3..0d00aaf 100644 --- a/app/views/gateway_parameters/_index_core.html.haml +++ b/app/views/gateway_parameters/_index_core.html.haml @@ -4,9 +4,9 @@ %th= t('gateway_parameters.index.value') %th= t('gateway_parameters.index.description') - - reset_cycle + - for gateway_parameter in gateway_parameters - %tr{:class => cycle('odd', 'even')} + %tr %td= gateway_parameter.name %td= gateway_parameter.value %td= gateway_parameter.description diff --git a/app/views/gateway_settings/_index_core.html.haml b/app/views/gateway_settings/_index_core.html.haml index 0743bcd..ded7eb8 100644 --- a/app/views/gateway_settings/_index_core.html.haml +++ b/app/views/gateway_settings/_index_core.html.haml @@ -4,9 +4,9 @@ %th= t('gateway_settings.index.value') %th= t('gateway_settings.index.description') - - reset_cycle + - for gateway_setting in gateway_settings - %tr{:class => cycle('odd', 'even')} + %tr %td= gateway_setting.name %td= gateway_setting.value %td= gateway_setting.description diff --git a/app/views/gateways/_index_core.html.haml b/app/views/gateways/_index_core.html.haml index fc03eb1..3fcf064 100644 --- a/app/views/gateways/_index_core.html.haml +++ b/app/views/gateways/_index_core.html.haml @@ -7,9 +7,9 @@ %th= t('gateways.index.outbound') %th= t('gateways.index.description') - - reset_cycle + - for gateway in gateways - %tr{:class => cycle('odd', 'even')} + %tr - cache(['gateway_single_table_row_within_tr', gateway, gateways.count]) do %td= gateway.name %td= gateway.technology diff --git a/app/views/gs_cluster_sync_log_entries/_index_core.html.haml b/app/views/gs_cluster_sync_log_entries/_index_core.html.haml index b099b5f..c9a3e50 100644 --- a/app/views/gs_cluster_sync_log_entries/_index_core.html.haml +++ b/app/views/gs_cluster_sync_log_entries/_index_core.html.haml @@ -6,9 +6,9 @@ %th= t('gs_cluster_sync_log_entries.index.content') %th= t('gs_cluster_sync_log_entries.index.status') - - reset_cycle + - for gs_cluster_sync_log_entry in gs_cluster_sync_log_entries - %tr{:class => cycle('odd', 'even')} + %tr %td= gs_cluster_sync_log_entry.gs_node_id %td= gs_cluster_sync_log_entry.class_name %td= gs_cluster_sync_log_entry.action diff --git a/app/views/gs_nodes/_index_core.html.haml b/app/views/gs_nodes/_index_core.html.haml index 97dc9df..0f1a51c 100644 --- a/app/views/gs_nodes/_index_core.html.haml +++ b/app/views/gs_nodes/_index_core.html.haml @@ -7,9 +7,9 @@ %th= t('gs_nodes.index.push_updates_to') %th= t('gs_nodes.index.accepts_updates_from') - - reset_cycle + - for gs_node in gs_nodes - %tr{:class => cycle('odd', 'even')} + %tr %td= gs_node.name %td= gs_node.ip_address %td= gs_node.site diff --git a/app/views/gs_parameters/_index_core.html.haml b/app/views/gs_parameters/_index_core.html.haml index a3f8e1c..3d5f3cf 100644 --- a/app/views/gs_parameters/_index_core.html.haml +++ b/app/views/gs_parameters/_index_core.html.haml @@ -5,10 +5,10 @@ %th= t('gs_parameters.index.section') %th= t('gs_parameters.index.value') - - reset_cycle + - for gs_parameter in gs_parameters - cache(['gs_parameters_table_single_row', gs_parameter]) do - %tr{:class => cycle('odd', 'even')} + %tr %td= gs_parameter.name - if !@sections %td= gs_parameter.section diff --git a/app/views/gui_functions/_index_core.html.haml b/app/views/gui_functions/_index_core.html.haml index cb53d4f..0d9454e 100644 --- a/app/views/gui_functions/_index_core.html.haml +++ b/app/views/gui_functions/_index_core.html.haml @@ -5,9 +5,9 @@ - @user_groups.each do |user_group| %th= user_group - - reset_cycle + - for gui_function in gui_functions - %tr{:class => cycle('odd', 'even')} + %tr - cache(['gui_functions_table_row', I18n.locale, gui_function]) do %td= gui_function.category %td diff --git a/app/views/hunt_group_members/_index_core.html.haml b/app/views/hunt_group_members/_index_core.html.haml index f9a3d28..c6b7e4a 100644 --- a/app/views/hunt_group_members/_index_core.html.haml +++ b/app/views/hunt_group_members/_index_core.html.haml @@ -5,9 +5,9 @@ %th= t('hunt_group_members.index.can_switch_status_itself') %th= t('hunt_group_members.index.phone_numbers') - - reset_cycle + - for hunt_group_member in hunt_group_members - %tr{:class => cycle('odd', 'even')} + %tr %td= hunt_group_member.name %td= hunt_group_member.active %td= hunt_group_member.can_switch_status_itself diff --git a/app/views/hunt_groups/_index_core.html.haml b/app/views/hunt_groups/_index_core.html.haml index b820ad0..16b1b5d 100644 --- a/app/views/hunt_groups/_index_core.html.haml +++ b/app/views/hunt_groups/_index_core.html.haml @@ -9,9 +9,9 @@ %th= t('hunt_groups.index.phone_numbers') %th= t('hunt_groups.index.hunt_group_members') - - reset_cycle + - for hunt_group in hunt_groups - %tr{:class => cycle('odd', 'even')} + %tr %td= hunt_group.name %td= t("hunt_groups.strategies.#{hunt_group.strategy}") - if show_seconds diff --git a/app/views/manufacturers/_index_core.html.haml b/app/views/manufacturers/_index_core.html.haml index 5c80ae9..5efa5d9 100644 --- a/app/views/manufacturers/_index_core.html.haml +++ b/app/views/manufacturers/_index_core.html.haml @@ -5,9 +5,9 @@ %th= t('manufacturers.index.homepage_url') %th= t('manufacturers.index.phone_models') - - reset_cycle + - for manufacturer in manufacturers - %tr{:class => cycle('odd', 'even')} + %tr %td= manufacturer.name %td= manufacturer.ieee_name %td diff --git a/app/views/phone_book_entries/_index_core.de.html.haml b/app/views/phone_book_entries/_index_core.de.html.haml index bc8d118..fb1dd6f 100644 --- a/app/views/phone_book_entries/_index_core.de.html.haml +++ b/app/views/phone_book_entries/_index_core.de.html.haml @@ -3,7 +3,7 @@ %header.entries-nav= render :partial => "phone_book_entries/navigation" .content - cache(['phone_book_entries_table', I18n.locale, current_user, phone_book_entries]) do - - reset_cycle + %table{:class => 'table table-striped'} - for entry in phone_book_entries - cache(['phone_book_entries_table_tr', I18n.locale, current_user, entry]) do diff --git a/app/views/phone_book_entries/_index_core.html.haml b/app/views/phone_book_entries/_index_core.html.haml index 0e687f9..1e24b5d 100644 --- a/app/views/phone_book_entries/_index_core.html.haml +++ b/app/views/phone_book_entries/_index_core.html.haml @@ -3,8 +3,8 @@ %header.entries-nav= render :partial => "phone_book_entries/navigation" .content - cache(['phone_book_entries_table', I18n.locale, current_user, phone_book_entries]) do - - reset_cycle - - reset_cycle + + %table{:class => 'table table-striped'} - for entry in phone_book_entries - cache(['phone_book_entries_table_tr', I18n.locale, current_user, entry]) do diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml index beed729..fdbe864 100644 --- a/app/views/phone_books/_index_core.html.haml +++ b/app/views/phone_books/_index_core.html.haml @@ -4,9 +4,9 @@ %th= t('phone_books.index.description') %th= t('phone_books.index.count') - - reset_cycle + - for phone_book in phone_books - %tr{:class => cycle('odd', 'even')} + %tr %td= phone_book.name %td= phone_book.description %td diff --git a/app/views/phone_models/_index_core.html.haml b/app/views/phone_models/_index_core.html.haml index 37cceb8..b899a5c 100644 --- a/app/views/phone_models/_index_core.html.haml +++ b/app/views/phone_models/_index_core.html.haml @@ -5,9 +5,9 @@ %th= t('phone_models.index.product_homepage_url') %th= t('phone_models.index.number_of_phones') - - reset_cycle + - for phone_model in phone_models - %tr{:class => cycle('odd', 'even')} + %tr %td= phone_model.name %td - if phone_model.product_manual_homepage_url diff --git a/app/views/phone_number_ranges/_index_core.html.haml b/app/views/phone_number_ranges/_index_core.html.haml index fdd9f63..b378be8 100644 --- a/app/views/phone_number_ranges/_index_core.html.haml +++ b/app/views/phone_number_ranges/_index_core.html.haml @@ -5,9 +5,9 @@ %th= t('phone_number_ranges.index.numbers') %th= t('phone_number_ranges.index.amount') - - reset_cycle + - for phone_number_range in phone_number_ranges - %tr{:class => cycle('odd', 'even')} + %tr %td= t("phone_number_ranges.ranges.#{phone_number_range}.label") %td= t("phone_number_ranges.ranges.#{phone_number_range}.description") %td diff --git a/app/views/phone_numbers/_index_core.html.haml b/app/views/phone_numbers/_index_core.html.haml index c29812b..b8540e7 100644 --- a/app/views/phone_numbers/_index_core.html.haml +++ b/app/views/phone_numbers/_index_core.html.haml @@ -4,9 +4,9 @@ %th= t('phone_numbers.index.name') %th= t('phone_numbers.index.number') - - reset_cycle + - for phone_number in phone_numbers.order(:position) - %tr{:class => cycle('odd', 'even')} + %tr - if phone_number.phone_numberable_type == 'PhoneBookEntry' %td= phone_number.name %td= phone_number diff --git a/app/views/phone_sip_accounts/_index_core.html.haml b/app/views/phone_sip_accounts/_index_core.html.haml index 3fed147..5aee417 100644 --- a/app/views/phone_sip_accounts/_index_core.html.haml +++ b/app/views/phone_sip_accounts/_index_core.html.haml @@ -4,9 +4,9 @@ %th= t('phone_sip_accounts.index.sip_account_id') %th= t('phone_sip_accounts.index.position') - - reset_cycle + - for phone_sip_account in phone_sip_accounts - %tr{:class => cycle('odd', 'even')} + %tr %td= phone_sip_account.phone %td= phone_sip_account.sip_account %td= phone_sip_account.position diff --git a/app/views/phones/_index_core.html.haml b/app/views/phones/_index_core.html.haml index 8dc875c..fc1ad19 100644 --- a/app/views/phones/_index_core.html.haml +++ b/app/views/phones/_index_core.html.haml @@ -5,9 +5,9 @@ %th= t('phones.index.hot_deskable') %th= t('phones.index.ip_address') - - reset_cycle + - for phone in phones - %tr{:class => cycle('odd', 'even')} + %tr %td= phone.pretty_mac_address %td= phone.phone_model %td= phone.hot_deskable diff --git a/app/views/ringtones/_index_core.html.haml b/app/views/ringtones/_index_core.html.haml index e01914d..e3b9a32 100644 --- a/app/views/ringtones/_index_core.html.haml +++ b/app/views/ringtones/_index_core.html.haml @@ -3,9 +3,9 @@ %th= t('ringtones.index.audio') %th= t('ringtones.index.bellcore_id') - - reset_cycle + - for ringtone in ringtones - %tr{:class => cycle('odd', 'even')} + %tr %td= ringtone.audio %td= ringtone.bellcore_id =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => ringtone.ringtoneable, :child => ringtone} \ No newline at end of file diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml index f769c01..5336057 100644 --- a/app/views/route_elements/_index_core.html.haml +++ b/app/views/route_elements/_index_core.html.haml @@ -7,9 +7,9 @@ %th= t('route_elements.index.action') %th= t('route_elements.index.mandatory') - - reset_cycle + - for route_element in route_elements - %tr{:class => cycle('odd', 'even')} + %tr %td= route_element.var_in %td= route_element.var_out %td= route_element.pattern diff --git a/app/views/shared/_create_link.html.haml b/app/views/shared/_create_link.html.haml index e5bc840..0711ddf 100644 --- a/app/views/shared/_create_link.html.haml +++ b/app/views/shared/_create_link.html.haml @@ -8,7 +8,8 @@ - else %a.btn.btn-mini.btn-primary{:href => method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) } %i.icon-plus.icon-white - =t("#{child_class.name.underscore.pluralize}.index.actions.create_for", :resource => parent) + / =t("#{child_class.name.underscore.pluralize}.index.actions.create_for", :resource => parent.to_s) + =t("#{child_class.name.underscore.pluralize}.index.actions.create") - elsif !(defined? child_class).nil? - if can? :create, child_class diff --git a/app/views/shared/_index_view_edit_destroy_part.html.haml b/app/views/shared/_index_view_edit_destroy_part.html.haml index 5bc715b..00b9e8a 100644 --- a/app/views/shared/_index_view_edit_destroy_part.html.haml +++ b/app/views/shared/_index_view_edit_destroy_part.html.haml @@ -1,39 +1,40 @@ -- style = 'width:70px' +- style = 'width:90px' +- style = '' - if !(defined? parent).nil? && !(defined? child).nil? - if can? :show, child %td{ :style => style } %a.btn.btn-mini.btn-success{:href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) } %i.icon-info-sign.icon-white - =t("#{child.class.name.underscore.pluralize}.actions.show") + =t("#{child.class.name.underscore.pluralize}.index.actions.show") - if can? :edit, child %td{ :style => style } %a.btn.btn-mini.btn-warning{:href => method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) } %i.icon-edit.icon-white - =t("#{child.class.name.underscore.pluralize}.actions.edit") + =t("#{child.class.name.underscore.pluralize}.index.actions.edit") - if can? :destroy, child %td{ :style => style } - %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"} - %i.icon-trash.icon-white - =t("#{child.class.name.underscore.pluralize}.actions.destroy") + %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"} + %i.icon-remove.icon-white + =t("#{child.class.name.underscore.pluralize}.index.actions.destroy") - elsif !(defined? child).nil? - if can? :show, child %td{ :style => style } %a.btn.btn-mini.btn-success{:href => method( :"#{child.class.name.underscore}_path" ).(child) } %i.icon-info-sign.icon-white - =t("#{child.class.name.underscore.pluralize}.actions.show") + =t("#{child.class.name.underscore.pluralize}.index.actions.show") - if can? :edit, child %td{ :style => style } %a.btn.btn-mini.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) } %i.icon-edit.icon-white - =t("#{child.class.name.underscore.pluralize}.actions.edit") + =t("#{child.class.name.underscore.pluralize}.index.actions.edit") - if can? :destroy, child %td{ :style => style } - %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"} + %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"} %i.icon-trash.icon-white - =t("#{child.class.name.underscore.pluralize}.actions.destroy") \ No newline at end of file + =t("#{child.class.name.underscore.pluralize}.index.actions.destroy") \ No newline at end of file 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 diff --git a/app/views/sip_domains/_index_core.html.haml b/app/views/sip_domains/_index_core.html.haml index 873ffc0..d26fd1b 100644 --- a/app/views/sip_domains/_index_core.html.haml +++ b/app/views/sip_domains/_index_core.html.haml @@ -3,9 +3,9 @@ %th= t('sip_domains.index.host') %th= t('sip_domains.index.realm') - - reset_cycle + - for sip_domain in sip_domains - %tr{:class => cycle('odd', 'even')} + %tr %td= sip_domain.host %td= sip_domain.realm =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => sip_domain} \ No newline at end of file diff --git a/app/views/softkeys/_index_core.html.haml b/app/views/softkeys/_index_core.html.haml index ba79d22..7194379 100644 --- a/app/views/softkeys/_index_core.html.haml +++ b/app/views/softkeys/_index_core.html.haml @@ -4,9 +4,9 @@ %th= t('softkeys.index.number') %th= t('softkeys.index.label') - - reset_cycle + - for softkey in softkeys.order(:position) - %tr{:class => cycle('odd', 'even')} + %tr %td =softkey.to_s %td= softkey.number diff --git a/app/views/system_messages/_index_core.html.haml b/app/views/system_messages/_index_core.html.haml index 7c4485f..361eb5f 100644 --- a/app/views/system_messages/_index_core.html.haml +++ b/app/views/system_messages/_index_core.html.haml @@ -3,9 +3,9 @@ %th= t('system_messages.index.created_at') %th= t('system_messages.index.content') - - reset_cycle + - for system_message in system_messages - %tr{:class => cycle('odd', 'even')} + %tr %td= system_message.created_at %td= system_message.content =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => system_message} \ No newline at end of file diff --git a/app/views/tenants/_index_core.html.haml b/app/views/tenants/_index_core.html.haml index 59d7e6d..721d624 100644 --- a/app/views/tenants/_index_core.html.haml +++ b/app/views/tenants/_index_core.html.haml @@ -3,9 +3,9 @@ %th= t('tenants.index.name') %th= t('tenants.index.description') - - reset_cycle + - for tenant in tenants - %tr{:class => cycle('odd', 'even')} + %tr %td= tenant.name %td= tenant.description %td diff --git a/app/views/tenants/_table_of_functions.html.haml b/app/views/tenants/_table_of_functions.html.haml index 271bf1e..d7af224 100644 --- a/app/views/tenants/_table_of_functions.html.haml +++ b/app/views/tenants/_table_of_functions.html.haml @@ -12,7 +12,7 @@ = t("callthroughs.name") %td - if tenant.callthroughs.any? - = link_to tenant.callthroughs.count.to_s, tenant_callthroughs_path(tenant) + = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.callthroughs.count.to_s, tenant_callthroughs_path(tenant) - else = '-' %td @@ -23,7 +23,8 @@ = t("conferences.name") %td - if tenant.conferences.any? - = link_to tenant.conferences.count.to_s, tenant_conferences_path(tenant) + + = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.conferences.count.to_s, tenant_conferences_path(tenant) - else = '-' %td @@ -34,7 +35,7 @@ = t("hunt_groups.name") %td - if tenant.hunt_groups.any? - = link_to tenant.hunt_groups.count.to_s, tenant_hunt_groups_path(tenant) + = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.hunt_groups.count.to_s, tenant_hunt_groups_path(tenant) - else = '-' %td @@ -45,7 +46,7 @@ = t("automatic_call_distributors.name") %td - if tenant.automatic_call_distributors.any? - = link_to tenant.automatic_call_distributors.count.to_s, tenant_automatic_call_distributors_path(tenant) + = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.automatic_call_distributors.count.to_s, tenant_automatic_call_distributors_path(tenant) - else = '-' %td diff --git a/app/views/user_group_memberships/_index_core.html.haml b/app/views/user_group_memberships/_index_core.html.haml index 801532a..5e6536b 100644 --- a/app/views/user_group_memberships/_index_core.html.haml +++ b/app/views/user_group_memberships/_index_core.html.haml @@ -4,9 +4,9 @@ %th= t('user_group_memberships.index.user_group') %th= t('user_group_memberships.index.user') - - reset_cycle + - for user_group_membership in user_group_memberships - %tr{:class => cycle('odd', 'even')} + %tr %td= user_group_membership.user_group.tenant %td= user_group_membership.user_group %td= user_group_membership.user diff --git a/app/views/user_groups/_index_core.html.haml b/app/views/user_groups/_index_core.html.haml index a12cf96..49cd858 100644 --- a/app/views/user_groups/_index_core.html.haml +++ b/app/views/user_groups/_index_core.html.haml @@ -9,9 +9,9 @@ - else %th= t('user_groups.index.members') - - reset_cycle + - for user_group in user_groups - %tr{:class => cycle('odd', 'even')} + %tr %td= user_group.name - if user_groups.pluck(:description).uniq != [nil] %td= user_group.description diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index b364bd2..b492a1d 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -7,9 +7,9 @@ %th= t('users.index.first_name') %th= t('users.index.last_name') - - reset_cycle + - for user in users - %tr{:class => cycle('odd', 'even')} + %tr - cache(['user_table_row_inner_td', I18n.locale, current_user, user]) do %td = image_tag user.image_url(:mini).to_s if user.image_url(:mini) diff --git a/app/views/voicemail_messages/_index_core.html.haml b/app/views/voicemail_messages/_index_core.html.haml index 3f7680c..e6e6398 100644 --- a/app/views/voicemail_messages/_index_core.html.haml +++ b/app/views/voicemail_messages/_index_core.html.haml @@ -2,7 +2,7 @@ %header.entries-nav= render :partial => "voicemail_messages/navigation" .content %table{:class => 'table table-striped'} - - reset_cycle + - for voicemail_message in voicemail_messages %tr.voicemail-messages-entry{:class => cycle('odd', 'even'), :id => "message_#{voicemail_message.uuid}"} %td.select_box= check_box_tag("selected_uuids[]", voicemail_message.uuid, false, :uuid => "select_item_#{voicemail_message.uuid}", :class => 'select_item') diff --git a/app/views/whitelists/_index_core.html.haml b/app/views/whitelists/_index_core.html.haml index 998a681..3333169 100644 --- a/app/views/whitelists/_index_core.html.haml +++ b/app/views/whitelists/_index_core.html.haml @@ -3,9 +3,9 @@ %th= t('whitelists.index.name') %th= t('whitelists.index.phone_numbers') - - reset_cycle + - for whitelist in whitelists - %tr{:class => cycle('odd', 'even')} + %tr %td= whitelist.name || '-' %td = render 'phone_numbers/listing', :phone_numbers => whitelist.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/call_routes/_index_core.html.haml | 16 +++++++++++----- app/views/fax_documents/_index_core.html.haml | 2 +- app/views/gateways/_index_core.html.haml | 2 +- app/views/phone_book_entries/_index_core.de.html.haml | 2 +- app/views/phone_book_entries/_index_core.html.haml | 2 +- app/views/phone_books/_index_core.html.haml | 11 +++++++---- app/views/sip_accounts/_index_core.html.haml | 1 + app/views/tenants/_admin_area.html.haml | 6 +++--- app/views/tenants/_call_routes.html.haml | 2 +- app/views/tenants/_gs_parameter_table.html.haml | 4 ++-- app/views/user_groups/_index_core.html.haml | 2 +- app/views/users/_index_core.html.haml | 8 ++++---- app/views/voicemail_messages/_index_core.html.haml | 3 ++- 13 files changed, 36 insertions(+), 25 deletions(-) (limited to 'app/views') diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml index 222303b..5dc7c21 100644 --- a/app/views/call_routes/_index_core.html.haml +++ b/app/views/call_routes/_index_core.html.haml @@ -2,14 +2,20 @@ %table{:class => 'table table-striped'} %tr %th= t('call_routes.index.name') + %th= t('route_elements.index.pattern') %th= t('call_routes.index.endpoint_type') - %th= t('call_routes.index.endpoint_id') - + %th{:colspan => '3'} - for call_route in call_routes - %tr - - cache(['call_route_single_table_row_within_tr', call_route, call_routes.count]) do + - cache(['call_route_single_table_row', call_route, call_routes.count]) do + %tr %td= call_route.name + %td + - if call_route.route_elements.any? + = call_route.route_elements.first.pattern + - if call_route.route_elements.count > 1 + = ', ...' + - else + = '-' %td= call_route.endpoint_type - %td= call_route.endpoint_id =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route} \ No newline at end of file diff --git a/app/views/fax_documents/_index_core.html.haml b/app/views/fax_documents/_index_core.html.haml index d75b80a..1265716 100644 --- a/app/views/fax_documents/_index_core.html.haml +++ b/app/views/fax_documents/_index_core.html.haml @@ -11,7 +11,7 @@ - for fax_document in fax_documents - %tr{:class => cycle('odd', 'even'), :id => "fax_document_#{fax_document.id}"} + %tr{:id => "fax_document_#{fax_document.id}"} - if fax_document.sent_at %td= "#{fax_document.inbound ? '⇨' : '⇦'} #{fax_document.sent_at}".html_safe %td= t("fax_documents.states.#{fax_document.state}") diff --git a/app/views/gateways/_index_core.html.haml b/app/views/gateways/_index_core.html.haml index 3fcf064..0eec67f 100644 --- a/app/views/gateways/_index_core.html.haml +++ b/app/views/gateways/_index_core.html.haml @@ -6,7 +6,7 @@ %th= t('gateways.index.inbound') %th= t('gateways.index.outbound') %th= t('gateways.index.description') - + %th{:colspan => '3'} - for gateway in gateways %tr diff --git a/app/views/phone_book_entries/_index_core.de.html.haml b/app/views/phone_book_entries/_index_core.de.html.haml index fb1dd6f..fe72d26 100644 --- a/app/views/phone_book_entries/_index_core.de.html.haml +++ b/app/views/phone_book_entries/_index_core.de.html.haml @@ -11,7 +11,7 @@ ~# Because of you we have to do this with a table. ~# With Love, ~# Mario. - %tr.phone-book-entry{:class => cycle('odd', 'even'), :"itemscope itemtype" => "http://schema.org/Person"} + %tr.phone-book-entry{:"itemscope itemtype" => "http://schema.org/Person"} %td.thumbnail = image_tag(entry.image_url(:small).to_s, :itemprop => 'image') %td.user diff --git a/app/views/phone_book_entries/_index_core.html.haml b/app/views/phone_book_entries/_index_core.html.haml index 1e24b5d..6e35221 100644 --- a/app/views/phone_book_entries/_index_core.html.haml +++ b/app/views/phone_book_entries/_index_core.html.haml @@ -12,7 +12,7 @@ ~# Because of you we have to do this with a table. ~# With Love, ~# Mario. - %tr.phone-book-entry{:class => cycle('odd', 'even'), :"itemscope itemtype" => "http://schema.org/Person"} + %tr.phone-book-entry{:"itemscope itemtype" => "http://schema.org/Person"} %td.thumbnail = image_tag(entry.image_url(:small).to_s, :itemprop => 'image') %td.user diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml index fdbe864..4763155 100644 --- a/app/views/phone_books/_index_core.html.haml +++ b/app/views/phone_books/_index_core.html.haml @@ -1,14 +1,17 @@ %table{:class => 'table table-striped'} %tr %th= t('phone_books.index.name') - %th= t('phone_books.index.description') %th= t('phone_books.index.count') - + %th{:colspan => '3'} - for phone_book in phone_books %tr - %td= phone_book.name - %td= phone_book.description + %td + - if phone_book.description.blank? + = phone_book.name + - else + %a.brand{:rel => 'tooltip', :title => phone_book.description} + = phone_book.name %td = number_with_delimiter( phone_book.phone_book_entries.count ) = render :partial => 'shared/create_link', :locals => {:parent => phone_book, :child_class => PhoneBookEntry, :short_link => true} 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 diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index 7e7e46b..627f221 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -19,13 +19,13 @@ - Manufacturer.all.each do |manufacturer| - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last = succeed ', ' do - =link_to manufacturer, manufacturer_path(manufacturer) + =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer) - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last = succeed ' und ' do - =link_to manufacturer, manufacturer_path(manufacturer) + =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer) - else = succeed '.' do - =link_to manufacturer, manufacturer_path(manufacturer) + =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer) = render :partial => 'call_routes', :locals => {:tenant => tenant} diff --git a/app/views/tenants/_call_routes.html.haml b/app/views/tenants/_call_routes.html.haml index 41066ae..28f84bf 100644 --- a/app/views/tenants/_call_routes.html.haml +++ b/app/views/tenants/_call_routes.html.haml @@ -5,4 +5,4 @@ = render :partial => 'shared/create_link', :locals => {:child_class => CallRoute} - else %p - = link_to t("call_routes.index.page_title"), call_routes_path \ No newline at end of file + = link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + t("call_routes.index.page_title"), call_routes_path \ No newline at end of file diff --git a/app/views/tenants/_gs_parameter_table.html.haml b/app/views/tenants/_gs_parameter_table.html.haml index 407f6e3..8afdb0e 100644 --- a/app/views/tenants/_gs_parameter_table.html.haml +++ b/app/views/tenants/_gs_parameter_table.html.haml @@ -12,13 +12,13 @@ %td = t("gui_functions.name") %td - = link_to GuiFunction.count.to_s, gui_functions_path + = link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + GuiFunction.count.to_s, gui_functions_path %td = l GuiFunction.reorder(:updated_at).last.updated_at, :format => :short %tr %td = t("gs_parameters.name") %td - = link_to GsParameter.count.to_s, gs_parameters_path + = link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + GsParameter.count.to_s, gs_parameters_path %td = l GsParameter.reorder(:updated_at).last.updated_at, :format => :short diff --git a/app/views/user_groups/_index_core.html.haml b/app/views/user_groups/_index_core.html.haml index 49cd858..941f9fa 100644 --- a/app/views/user_groups/_index_core.html.haml +++ b/app/views/user_groups/_index_core.html.haml @@ -8,7 +8,7 @@ %th= t('user_groups.index.tenant_id') - else %th= t('user_groups.index.members') - + %th{:colspan => '3'} - for user_group in user_groups %tr diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index b492a1d..b0efaef 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -6,11 +6,11 @@ %th= t('users.index.email') %th= t('users.index.first_name') %th= t('users.index.last_name') - - + %th{:colspan => '3'} + - for user in users - %tr - - cache(['user_table_row_inner_td', I18n.locale, current_user, user]) do + - cache(['user_table_row', I18n.locale, current_user, user]) do + %tr %td = image_tag user.image_url(:mini).to_s if user.image_url(:mini) %td= user.user_name diff --git a/app/views/voicemail_messages/_index_core.html.haml b/app/views/voicemail_messages/_index_core.html.haml index e6e6398..ded7ea0 100644 --- a/app/views/voicemail_messages/_index_core.html.haml +++ b/app/views/voicemail_messages/_index_core.html.haml @@ -4,7 +4,7 @@ %table{:class => 'table table-striped'} - for voicemail_message in voicemail_messages - %tr.voicemail-messages-entry{:class => cycle('odd', 'even'), :id => "message_#{voicemail_message.uuid}"} + %tr.voicemail-messages-entry{:id => "message_#{voicemail_message.uuid}"} %td.select_box= check_box_tag("selected_uuids[]", voicemail_message.uuid, false, :uuid => "select_item_#{voicemail_message.uuid}", :class => 'select_item') %td.time .voicemail-received @@ -40,5 +40,6 @@ = link_to t('voicemail_messages.index.actions.destroy'), sip_account_voicemail_message_path(@sip_account, voicemail_message), :method => :delete %footer.entries-nav= render :partial => "voicemail_messages/navigation" + = link_to Haml::Engine.new("%i.icon-remove").render + ' test ', root_url = image_submit_tag('icons/cross-16x.png', :confirm => t("voicemail_messages.index.actions.confirm_selected")) = t("voicemail_messages.index.actions.destroy_multiple") -- cgit v1.2.3 From 2ff26eb7e2649b15cac850bc0c4c0363211d3379 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 22:41:02 +0100 Subject: Footer --- app/views/layouts/_footer.html.haml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'app/views') diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index dc74275..a0f2940 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,3 +1,13 @@ -%footer - %p - \© AMOOMA GmbH 2005 - #{Date.today.year.to_s} · Bachstr. 124 · 56566 Neuwied · Germany · #{mail_to 'info@amooma.de', 'info@amooma.de'} +- cache(['application_footer', I18n.locale]) do + %footer + %ul{:class => 'nav nav-pills'} + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) + %li + %a{:href => "http://amooma.de"} Support und Consulting + - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) + %li + %a{:href => "https://groups.google.com/group/gs5-users/"} Mailingliste + %li{:class => 'pull-right'} + = link_to 'brought to you by AMOOMA GmbH', 'http://amooma.de' \ No newline at end of file -- cgit v1.2.3 From 25f7eec8c93630650c2b5f980712261a14b00def Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 23:44:19 +0100 Subject: Avatar --- app/views/layouts/_navbar.html.haml | 43 +++++++++++++++++++++------------ app/views/layouts/application.html.haml | 9 ++++--- app/views/users/_index_core.html.haml | 14 ++++++++--- 3 files changed, 44 insertions(+), 22 deletions(-) (limited to 'app/views') diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml index 4005e28..d6a8422 100644 --- a/app/views/layouts/_navbar.html.haml +++ b/app/views/layouts/_navbar.html.haml @@ -1,21 +1,34 @@ .navbar.navbar-inverse.navbar-fixed-top .navbar-inner - .container-fluid + .container + %a.brand{:href => (current_user.nil? ? '/' : tenant_path(current_user.current_tenant))} + Gemeinschaft 5 + %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"} %span.icon-bar %span.icon-bar - %span.icon-bar - %a.brand{:href => (current_user.nil? ? '/' : tenant_path(current_user.current_tenant))} Gemeinschaft 5 - .nav-collapse.collapse - %p.navbar-text.pull-right - - if current_user - %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} - = current_user - %ul.nav - %li.active - %a{:href => "#"} Home - %li - %a{:href => "#about"} About + %span.icon-bar + + - if current_user + .nav-collapse.collapse + %ul.nav + %li + %a{:href => "#about"} About + %li.pull_right + %a{:href => "#contact"} Contact + + - if current_user + %ul.nav.pull-right + - if current_page?(tenant_user_path(current_user.current_tenant, current_user)) + %li.active + %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} + = current_user + - else + %li + %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} + = current_user + %li - %a{:href => "#contact"} Contact - / /.nav-collapse + %a.navbar-link{:href => log_out_path} + %i.icon-off.icon-white + diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 8caee14..74331af 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -15,10 +15,6 @@ /[if lt IE 9] %body - = render 'layouts/navbar' - - = render_breadcrumbs :builder => ::BootstrapBreadcrumbsBuilder, :separator => "/" - .container .row .span12 @@ -28,6 +24,11 @@ %a.close{"data-dismiss" => "alert"} × = msg + - if current_user + = render_breadcrumbs :builder => ::BootstrapBreadcrumbsBuilder, :separator => "/" + + = render 'layouts/navbar' + = yield .row diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index b0efaef..7f2251a 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -11,10 +11,18 @@ - for user in users - cache(['user_table_row', I18n.locale, current_user, user]) do %tr - %td - = image_tag user.image_url(:mini).to_s if user.image_url(:mini) + %td + - if user.image? + =image_tag(user.image_url(:mini).to_s, :class => 'img-rounded') + - else + - if user.male? + = image_tag 'icons/user-male-16x.png', :class => 'img-rounded' + - else + = image_tag 'icons/user-female-16x.png', :class => 'img-rounded' %td= user.user_name - %td= user.email + %td + - if !user.email.blank? + = mail_to user.email, (Haml::Engine.new("%i.icon-envelope").render + ' ' + user.email) %td= user.first_name %td= user.last_name =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @tenant, :child => user} \ No newline at end of file -- cgit v1.2.3 From f8bc860750f06ab95f9ced8e919e846d3e589819 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 00:02:03 +0100 Subject: Icons --- app/views/layouts/_navbar.html.haml | 9 +++++++++ app/views/users/show.html.haml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml index d6a8422..d6f08cb 100644 --- a/app/views/layouts/_navbar.html.haml +++ b/app/views/layouts/_navbar.html.haml @@ -19,6 +19,15 @@ - if current_user %ul.nav.pull-right + %li + - if current_user.image? + =image_tag(current_user.image_url(:mini).to_s, :class => 'img-rounded') + - else + - if current_user.male? + = image_tag 'icons/user-male-16x.png', :class => 'img-rounded' + - else + = image_tag 'icons/user-female-16x.png', :class => 'img-rounded' + - if current_page?(tenant_user_path(current_user.current_tenant, current_user)) %li.active %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 75eaf54..4c39fd1 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -3,7 +3,7 @@ .row .span3 - cache(['user_show_aside', I18n.locale, @user, @user.sip_accounts, @user.conferences]) do - = image_tag @user.image_url(:small).to_s, class: 'display' if @user.image? && @user.image_url(:small) + = image_tag @user.image_url(:small).to_s, :class => 'img-rounded' if @user.image? && @user.image_url(:small) %p %strong= t('users.show.user_name') + ":" = @user.user_name -- cgit v1.2.3 From 186ce80e7b22920ea7d54c579f635eec2d1ee98f Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 12:14:46 +0100 Subject: Added a voicemail and fax trigger. #127 --- app/views/trigger/fax.html.erb | 2 ++ app/views/trigger/voicemail.html.erb | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 app/views/trigger/fax.html.erb create mode 100644 app/views/trigger/voicemail.html.erb (limited to 'app/views') diff --git a/app/views/trigger/fax.html.erb b/app/views/trigger/fax.html.erb new file mode 100644 index 0000000..822b2cb --- /dev/null +++ b/app/views/trigger/fax.html.erb @@ -0,0 +1,2 @@ +

Trigger#fax

+

Find me in app/views/trigger/fax.html.erb

diff --git a/app/views/trigger/voicemail.html.erb b/app/views/trigger/voicemail.html.erb new file mode 100644 index 0000000..9bafe17 --- /dev/null +++ b/app/views/trigger/voicemail.html.erb @@ -0,0 +1,4 @@ +

Trigger#voicemail

+

Find me in app/views/trigger/voicemail.html.erb

+ +<%= debug(params) %> -- cgit v1.2.3 From 5d15c975b7d4509d786ab7b95ec61ed7ad166b14 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Tue, 22 Jan 2013 12:15:48 +0100 Subject: add GS_BUILDNAME as tooltip in the footer --- app/views/layouts/_footer.html.haml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/views') diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index a0f2940..73f12e0 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,8 +1,12 @@ - cache(['application_footer', I18n.locale]) do %footer %ul{:class => 'nav nav-pills'} - %li - %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil? + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5", :ref => 'tooltip', :title => "Gemeinschaft Version " + GsParameter.get('GEMEINSCHAFT_VERSION') + "\nBuild #" + GsParameter.get('GEMEINSCHAFT_BUILDNAME')} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - else + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) %li %a{:href => "http://amooma.de"} Support und Consulting -- cgit v1.2.3 From ee6b680da282d9fe4d630ba27d9f9c646eed24dc Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 12:16:29 +0100 Subject: Fix for #117 --- app/views/tenants/_user_groups_table.de.html.haml | 4 ---- app/views/tenants/_user_groups_table.html.haml | 4 ++++ app/views/tenants/_users_table.de.html.haml | 7 ------- app/views/tenants/_users_table.html.haml | 7 +++++++ 4 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 app/views/tenants/_user_groups_table.de.html.haml create mode 100644 app/views/tenants/_user_groups_table.html.haml delete mode 100644 app/views/tenants/_users_table.de.html.haml create mode 100644 app/views/tenants/_users_table.html.haml (limited to 'app/views') diff --git a/app/views/tenants/_user_groups_table.de.html.haml b/app/views/tenants/_user_groups_table.de.html.haml deleted file mode 100644 index 61b3e3d..0000000 --- a/app/views/tenants/_user_groups_table.de.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -- if @tenant.user_groups.any? - %h2= t("user_groups.index.page_title") - = render "user_groups/index_core", :user_groups => tenant.user_groups - = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => UserGroup} diff --git a/app/views/tenants/_user_groups_table.html.haml b/app/views/tenants/_user_groups_table.html.haml new file mode 100644 index 0000000..61b3e3d --- /dev/null +++ b/app/views/tenants/_user_groups_table.html.haml @@ -0,0 +1,4 @@ +- if @tenant.user_groups.any? + %h2= t("user_groups.index.page_title") + = render "user_groups/index_core", :user_groups => tenant.user_groups + = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => UserGroup} diff --git a/app/views/tenants/_users_table.de.html.haml b/app/views/tenants/_users_table.de.html.haml deleted file mode 100644 index 850ea5e..0000000 --- a/app/views/tenants/_users_table.de.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -%h2= t("users.index.page_title") -- if @tenant.users.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') - = render "users/index_core", :users => tenant.users - = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => User} -- else - %p - = link_to "Liste aller User.", tenant_users_path(tenant) \ No newline at end of file diff --git a/app/views/tenants/_users_table.html.haml b/app/views/tenants/_users_table.html.haml new file mode 100644 index 0000000..850ea5e --- /dev/null +++ b/app/views/tenants/_users_table.html.haml @@ -0,0 +1,7 @@ +%h2= t("users.index.page_title") +- if @tenant.users.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') + = render "users/index_core", :users => tenant.users + = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => User} +- else + %p + = link_to "Liste aller User.", tenant_users_path(tenant) \ No newline at end of file -- 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/call_histories/_index_core.html.haml | 124 ++++++++++----------- app/views/call_histories/_navigation.html.haml | 23 ++-- app/views/layouts/_footer.html.haml | 32 +++--- app/views/phone_books/_index_core.html.haml | 1 - app/views/phone_numbers/_index_core.html.haml | 1 + app/views/phone_sip_accounts/_index_core.html.haml | 2 +- app/views/phones/show.html.haml | 10 +- app/views/sip_accounts/_index_core.html.haml | 2 - 8 files changed, 97 insertions(+), 98 deletions(-) (limited to 'app/views') diff --git a/app/views/call_histories/_index_core.html.haml b/app/views/call_histories/_index_core.html.haml index 9a52148..f9d2150 100644 --- a/app/views/call_histories/_index_core.html.haml +++ b/app/views/call_histories/_index_core.html.haml @@ -1,68 +1,58 @@ -= form_tag(destroy_multiple_sip_account_call_histories_path(@sip_account), :method => :delete, :id => 'call_history_form') do - %header.entries-nav= render :partial => "call_histories/navigation" - .content - - cache(['call_history_table', I18n.locale, @sip_account, call_histories.first, call_histories.last, call_histories.count]) do - %table{:class => 'table table-striped'} - - - for call_history in call_histories - - tr_background_colour = cycle('odd', 'even') - - cache(['call_history_table_row', I18n.locale, call_history, tr_background_colour]) do - - phone_number = call_history.display_number - - voicemail_message = call_history.voicemail_message - - if phone_number - - phone_book_entry = call_history.phone_book_entry_by_number(phone_number) - %tr.call-history-entry{:class => tr_background_colour} - %td.select_box= check_box_tag("selected_ids[]", call_history.id, false, :id => "select_item_#{call_history.id}", :class => 'select_item') - %td.thumbnail - - image = call_history.display_image(:small, phone_book_entry) - - if image - = image_tag(image, :itemprop => 'image') - %td.time - - if voicemail_message - .voicemail-message - %a{:href => sip_account_voicemail_messages_path(@sip_account, :anchor => "message_#{voicemail_message.id}")} - = image_tag('icons/gs_envelope_16x.png', :class => 'display') - = call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - elsif call_history.entry_type == 'forwarded' - .call-forwarded= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - if call_history.callee_account_type.to_s.downcase == 'voicemail' - = t("call_histories.index.voicemail") - - else - = call_history.destination_number - - elsif call_history.entry_type == 'dialed' - .call-placed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - elsif call_history.entry_type == 'received' - .call-received= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - elsif call_history.entry_type == 'missed' - .call-missed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - else - .call-unknown - = t("call_histories.index.#{call_history.entry_type}") - = call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - if call_history.forwarding_service && call_history.entry_type != 'forwarded' - = t("call_histories.index.forwarded_by") - = call_history.display_auth_account_name - %td.user - - display_name = call_history.display_name - - if display_name.blank? - - display_name = phone_book_entry.to_s - - if phone_book_entry - %a.name{:href => phone_book_phone_book_entry_path(phone_book_entry.phone_book, phone_book_entry), :itemprop => "name"}= display_name - - else - .name= display_name - .phone= phone_number - %td.status - - if call_history.display_duration - .duration= call_history.display_duration - - else - .disposition= t("call_histories.call_results.#{call_history.result}") - %td.actions - - if @sip_account.registration && can?(:call, call_history) - = link_to t('call_histories.index.actions.call'), call_sip_account_call_history_path(@sip_account, call_history), :method => :put - %td.actions - - if can? :destroy, call_history - = link_to t('call_histories.index.actions.destroy'), sip_account_call_history_path(@sip_account, call_history), :method => :delete += render :partial => "call_histories/navigation" - %footer.entries-nav= render :partial => "call_histories/navigation" - = image_submit_tag('icons/cross-16x.png', :confirm => t("call_histories.index.actions.confirm_selected")) - = t("call_histories.index.actions.destroy_multiple") +%table{:class => 'table table-striped'} + - for call_history in call_histories + - phone_number = call_history.display_number + - voicemail_message = call_history.voicemail_message + - if phone_number + - phone_book_entry = call_history.phone_book_entry_by_number(phone_number) + %tr.call-history-entry + %td.thumbnail + - image = call_history.display_image(:small, phone_book_entry) + - if image + = image_tag(image, :itemprop => 'image') + %td.time + - if voicemail_message + .voicemail-message + %a{:href => sip_account_voicemail_messages_path(@sip_account, :anchor => "message_#{voicemail_message.id}")} + = image_tag('icons/gs_envelope_16x.png', :class => 'display') + = call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - elsif call_history.entry_type == 'forwarded' + .call-forwarded= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - if call_history.callee_account_type.to_s.downcase == 'voicemail' + = t("call_histories.index.voicemail") + - else + = call_history.destination_number + - elsif call_history.entry_type == 'dialed' + .call-placed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - elsif call_history.entry_type == 'received' + .call-received= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - elsif call_history.entry_type == 'missed' + .call-missed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - else + .call-unknown + = t("call_histories.index.#{call_history.entry_type}") + = call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - if call_history.forwarding_service && call_history.entry_type != 'forwarded' + = t("call_histories.index.forwarded_by") + = call_history.display_auth_account_name + %td.user + - display_name = call_history.display_name + - if display_name.blank? + - display_name = phone_book_entry.to_s + - if phone_book_entry + %a.name{:href => phone_book_phone_book_entry_path(phone_book_entry.phone_book, phone_book_entry), :itemprop => "name"}= display_name + - else + .name= display_name + .phone= phone_number + %td.status + - if call_history.display_duration + .duration= call_history.display_duration + - else + .disposition= t("call_histories.call_results.#{call_history.result}") + %td.actions + - if @sip_account.registration && can?(:call, call_history) + = link_to t('call_histories.index.actions.call'), call_sip_account_call_history_path(@sip_account, call_history), :method => :put + %td.actions + - if can? :destroy, call_history + = link_to t('call_histories.index.actions.destroy'), sip_account_call_history_path(@sip_account, call_history), :method => :delete diff --git a/app/views/call_histories/_navigation.html.haml b/app/views/call_histories/_navigation.html.haml index a1999d9..d72ad64 100644 --- a/app/views/call_histories/_navigation.html.haml +++ b/app/views/call_histories/_navigation.html.haml @@ -1,11 +1,14 @@ -%nav - %ol.abc - %li - %a{ :href => "?type=" }= t("call_histories.index.navigation.all", :calls => @calls_count) - %a{ :href => "?type=missed" }= t("call_histories.index.navigation.missed", :calls => @calls_missed_count) - %a{ :href => "?type=received" }= t("call_histories.index.navigation.received", :calls => @calls_received_count) - %a{ :href => "?type=dialed" }= t("call_histories.index.navigation.dialed", :calls => @calls_dialed_count) - %a{ :href => "?type=forwarded" }= t("call_histories.index.navigation.forwarded", :calls => @calls_forwarded_count) +%ul{:class => 'nav nav-pills'} + %li + %a{ :href => "?type=" }= t("call_histories.index.navigation.all", :calls => @calls_count) + %li + %a{ :href => "?type=missed" }= t("call_histories.index.navigation.missed", :calls => @calls_missed_count) + %li + %a{ :href => "?type=received" }= t("call_histories.index.navigation.received", :calls => @calls_received_count) + %li + %a{ :href => "?type=dialed" }= t("call_histories.index.navigation.dialed", :calls => @calls_dialed_count) + %li + %a{ :href => "?type=forwarded" }= t("call_histories.index.navigation.forwarded", :calls => @calls_forwarded_count) -.pagination - = will_paginate @call_histories +/ .pagination +/ = will_paginate @call_histories diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index 73f12e0..61ea546 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,17 +1,17 @@ - cache(['application_footer', I18n.locale]) do - %footer - %ul{:class => 'nav nav-pills'} - - if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil? - %li - %a{:href => "http://amooma.de/gemeinschaft/gs5", :ref => 'tooltip', :title => "Gemeinschaft Version " + GsParameter.get('GEMEINSCHAFT_VERSION') + "\nBuild #" + GsParameter.get('GEMEINSCHAFT_BUILDNAME')} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} - - else - %li - %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} - - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) - %li - %a{:href => "http://amooma.de"} Support und Consulting - - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) - %li - %a{:href => "https://groups.google.com/group/gs5-users/"} Mailingliste - %li{:class => 'pull-right'} - = link_to 'brought to you by AMOOMA GmbH', 'http://amooma.de' \ No newline at end of file + %footer + %ul{:class => 'nav nav-pills'} + - if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil? + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5", :ref => 'tooltip', :title => "Gemeinschaft Version " + GsParameter.get('GEMEINSCHAFT_VERSION') + "\nBuild #" + GsParameter.get('GEMEINSCHAFT_BUILDNAME')} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - else + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) + %li + %a{:href => "http://amooma.de"} Support und Consulting + - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) + %li + %a{:href => "https://groups.google.com/group/gs5-users/"} Mailingliste + %li{:class => 'pull-right'} + = link_to 'brought to you by AMOOMA GmbH', 'http://amooma.de' \ No newline at end of file diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml index 4763155..accded6 100644 --- a/app/views/phone_books/_index_core.html.haml +++ b/app/views/phone_books/_index_core.html.haml @@ -14,6 +14,5 @@ = phone_book.name %td = number_with_delimiter( phone_book.phone_book_entries.count ) - = render :partial => 'shared/create_link', :locals => {:parent => phone_book, :child_class => PhoneBookEntry, :short_link => true} =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_book.phone_bookable, :child => phone_book} \ No newline at end of file diff --git a/app/views/phone_numbers/_index_core.html.haml b/app/views/phone_numbers/_index_core.html.haml index b8540e7..f41c949 100644 --- a/app/views/phone_numbers/_index_core.html.haml +++ b/app/views/phone_numbers/_index_core.html.haml @@ -3,6 +3,7 @@ - if phone_numbers.count > 1 && phone_numbers.first.phone_numberable_type == 'PhoneBookEntry' %th= t('phone_numbers.index.name') %th= t('phone_numbers.index.number') + %th{:colspan => '3'} - for phone_number in phone_numbers.order(:position) diff --git a/app/views/phone_sip_accounts/_index_core.html.haml b/app/views/phone_sip_accounts/_index_core.html.haml index 5aee417..1e6d3ca 100644 --- a/app/views/phone_sip_accounts/_index_core.html.haml +++ b/app/views/phone_sip_accounts/_index_core.html.haml @@ -3,7 +3,7 @@ %th= t('phone_sip_accounts.index.phone_id') %th= t('phone_sip_accounts.index.sip_account_id') %th= t('phone_sip_accounts.index.position') - + %th{:colspan => '3'} - for phone_sip_account in phone_sip_accounts %tr diff --git a/app/views/phones/show.html.haml b/app/views/phones/show.html.haml index 87b8d3d..faf4061 100644 --- a/app/views/phones/show.html.haml +++ b/app/views/phones/show.html.haml @@ -31,9 +31,17 @@ - if @phone.ip_address.blank? && @phone.phone_model.manufacturer.ieee_name == 'SNOM Technology AG' %p - Sollten Sie Ihren DHCP-Server noch nicht für das automatische Konfigurieren der GS5 Provisionierungs-URL konfiguriert haben, können Sie manuell in Ihrem Telefon die folgende Provisionierungs-URL eingeben. Das "{mac}" bitte genau so eingeben, es wird vom Telefon automatisch mit der eigenen MAC-Adresse befüllt: + Sollten Sie Ihren DHCP-Server noch nicht für das automatische Konfigurieren der GS5 Provisionierungs-URL konfiguriert haben, können Sie manuell in Ihrem Telefon die folgende Provisionierungs-URL eingeben. + %p + Das entsprechende Eingabefeld finden Sie unter + %br + Advanced -> Update -> Setting URL + %p + Das "{mac}" bitte genau so eingeben, es wird vom Telefon automatisch mit der eigenen MAC-Adresse befüllt: %pre = "http://#{GemeinschaftSetup.first.sip_domain.host}/settings-{mac}" + %p + Danach müssen Sie die Konfiguration abspeichern und das Telefon booten. = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @phone.phoneable, :child => @phone } 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