diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 00:04:03 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 00:04:03 +0100 |
commit | ab63774d954fe1f967a97ffe5a0a66016eca2257 (patch) | |
tree | b3974a58deabe6a989ad7352f10e75d7495cb0c5 /app/views/phone_numbers | |
parent | 495bbfdf78206c8adaec057e83900dda6754092c (diff) | |
parent | f8bc860750f06ab95f9ced8e919e846d3e589819 (diff) |
Merge branch 'tb-css' into develop
Diffstat (limited to 'app/views/phone_numbers')
-rw-r--r-- | app/views/phone_numbers/_index_core.html.haml | 6 | ||||
-rw-r--r-- | app/views/phone_numbers/edit.html.haml | 2 | ||||
-rw-r--r-- | app/views/phone_numbers/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/phone_numbers/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/phone_numbers/show.html.haml | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/app/views/phone_numbers/_index_core.html.haml b/app/views/phone_numbers/_index_core.html.haml index 06b27c8..b8540e7 100644 --- a/app/views/phone_numbers/_index_core.html.haml +++ b/app/views/phone_numbers/_index_core.html.haml @@ -1,12 +1,12 @@ -%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') %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_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 |