summaryrefslogtreecommitdiff
path: root/app/views/conference_invitees
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 00:04:03 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 00:04:03 +0100
commitab63774d954fe1f967a97ffe5a0a66016eca2257 (patch)
treeb3974a58deabe6a989ad7352f10e75d7495cb0c5 /app/views/conference_invitees
parent495bbfdf78206c8adaec057e83900dda6754092c (diff)
parentf8bc860750f06ab95f9ced8e919e846d3e589819 (diff)
Merge branch 'tb-css' into develop
Diffstat (limited to 'app/views/conference_invitees')
-rw-r--r--app/views/conference_invitees/_index_core.html.haml6
-rw-r--r--app/views/conference_invitees/edit.html.haml2
-rw-r--r--app/views/conference_invitees/index.html.haml2
-rw-r--r--app/views/conference_invitees/new.html.haml2
-rw-r--r--app/views/conference_invitees/show.html.haml2
5 files changed, 7 insertions, 7 deletions
diff --git a/app/views/conference_invitees/_index_core.html.haml b/app/views/conference_invitees/_index_core.html.haml
index f84af7d..1d6ab2e 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')
@@ -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/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') + ":"