From 65c809b3396a99782b18d70ad793e950bc65795e Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 19:13:08 +0100 Subject: Removed UUID from the show view. --- app/views/automatic_call_distributors/show.html.haml | 3 --- 1 file changed, 3 deletions(-) (limited to 'app/views') diff --git a/app/views/automatic_call_distributors/show.html.haml b/app/views/automatic_call_distributors/show.html.haml index e5bf785..53ce127 100644 --- a/app/views/automatic_call_distributors/show.html.haml +++ b/app/views/automatic_call_distributors/show.html.haml @@ -1,9 +1,6 @@ - title t("automatic_call_distributors.show.page_title") %table - %tr - %th= t('automatic_call_distributors.show.uuid') + ":" - %td= @automatic_call_distributor.uuid %tr %th= t('automatic_call_distributors.show.name') + ":" %td= @automatic_call_distributor.name -- cgit v1.2.3 From 9cbab740703bf01382431004b59ddf4cd60041be Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 20:04:36 +0100 Subject: Moved assets to the right directory and fixed a view. --- app/views/sip_accounts/_index_core.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views') diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml index 7f8dcd2..69c9302 100644 --- a/app/views/sip_accounts/_index_core.html.haml +++ b/app/views/sip_accounts/_index_core.html.haml @@ -10,9 +10,9 @@ %tr{:class => cycle('odd', 'even')} %td - if sip_account.registration - %img{:src => '/assets/icons/phone-down-green-32x.png'} + =image_tag 'icons/phone-down-green-32x.png' - else - %img{:src => '/assets/icons/phone-down-grey-32x.png'} + =image_tag 'icons/phone-down-grey-32x.png' %td = sip_account.caller_name - phone_numbers = sip_account.phone_numbers -- cgit v1.2.3 From 50dfb97590e30fd7d6fa24d6c7afd65d04fa60d8 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 20:28:23 +0100 Subject: Fixed links in phone_book_entry#show --- .../phone_book_entries/_index_core.de.html.haml | 6 ++++- app/views/phone_book_entries/_index_core.html.haml | 6 ++++- app/views/phone_book_entries/show.html.haml | 26 +++++----------------- 3 files changed, 15 insertions(+), 23 deletions(-) (limited to 'app/views') 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 01be65f..0c6e74b 100644 --- a/app/views/phone_book_entries/_index_core.de.html.haml +++ b/app/views/phone_book_entries/_index_core.de.html.haml @@ -28,7 +28,11 @@ %td.extra - if !entry.description.blank? %strong Beschreibung: - %div= entry.description + %div + = entry.description + - if !entry.homepage_organization.blank? + %br + =link_to entry.homepage_organization, entry.homepage_organization - if can? :edit, entry %td= link_to t('phone_book_entries.index.actions.edit'), edit_phone_book_phone_book_entry_path( entry.phone_book, entry ) - if can? :destroy, entry diff --git a/app/views/phone_book_entries/_index_core.html.haml b/app/views/phone_book_entries/_index_core.html.haml index d9cfe10..9054833 100644 --- a/app/views/phone_book_entries/_index_core.html.haml +++ b/app/views/phone_book_entries/_index_core.html.haml @@ -28,7 +28,11 @@ %td.extra - if !entry.description.blank? %strong Description: - %div= entry.description + %div + = entry.description + - if !entry.homepage_organization.blank? + %br + =link_to entry.homepage_organization, entry.homepage_organization - if can? :edit, entry %td= link_to t('phone_book_entries.index.actions.edit'), edit_phone_book_phone_book_entry_path( entry.phone_book, entry ) - if can? :destroy, entry diff --git a/app/views/phone_book_entries/show.html.haml b/app/views/phone_book_entries/show.html.haml index b6e8c6e..a9e1e8f 100644 --- a/app/views/phone_book_entries/show.html.haml +++ b/app/views/phone_book_entries/show.html.haml @@ -114,33 +114,17 @@ .widget.social - if !@phone_book_entry.homepage_organization.blank? .home - %a= @phone_book_entry.homepage_organization + =link_to @phone_book_entry.homepage_organization, @phone_book_entry.homepage_organization %span www - if !@phone_book_entry.homepage_personal.blank? .home - %a= @phone_book_entry.homepage_personal + =link_to @phone_book_entry.homepage_personal, @phone_book_entry.homepage_personal %span www - if !@phone_book_entry.twitter_account.blank? .twitter - %a= @phone_book_entry.twitter_account + =link_to @phone_book_entry.twitter_account, "https://twitter.com/#{@phone_book_entry.twitter_account}" %span Twitter - - if !@phone_book_entry.google_plus_account.blank? - .google_plus - %a= @phone_book_entry.google_plus_account - %span Google+ - if !@phone_book_entry.facebook_account.blank? .facebook - %a= @phone_book_entry.facebook_account - %span Facebook - - if !@phone_book_entry.xing_account.blank? - .xing - %a= @phone_book_entry.xing_account - %span Xing - - if !@phone_book_entry.linkedin_account.blank? - .linkedin - %a= @phone_book_entry.linkedin_account - %span LinkedIn - - if !@phone_book_entry.mobileme_account.blank? - .mobileme - %a= @phone_book_entry.mobileme_account - %span MobileMe + =link_to @phone_book_entry.facebook_account, "https://www.facebook.com/#{@phone_book_entry.facebook_account}" + %span Facebook \ No newline at end of file -- cgit v1.2.3 From b5c6d666f03b98f131fad7aa1ca13846eef5fc90 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Tue, 18 Dec 2012 22:42:49 +0100 Subject: fix language --- app/views/shared/_header.de.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/shared/_header.de.html.haml b/app/views/shared/_header.de.html.haml index c6205ae..10ad2a0 100644 --- a/app/views/shared/_header.de.html.haml +++ b/app/views/shared/_header.de.html.haml @@ -37,5 +37,5 @@ - else .user-context = link_to "Registrieren", sign_up_path - oder + or = link_to "Anmelden", log_in_path -- cgit v1.2.3