summaryrefslogtreecommitdiff
path: root/app/views/conferences
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/conferences
parent495bbfdf78206c8adaec057e83900dda6754092c (diff)
parentf8bc860750f06ab95f9ced8e919e846d3e589819 (diff)
Merge branch 'tb-css' into develop
Diffstat (limited to 'app/views/conferences')
-rw-r--r--app/views/conferences/_index_core.html.haml6
-rw-r--r--app/views/conferences/edit.html.haml2
-rw-r--r--app/views/conferences/index.html.haml2
-rw-r--r--app/views/conferences/new.html.haml2
-rw-r--r--app/views/conferences/show.html.haml2
5 files changed, 7 insertions, 7 deletions
diff --git a/app/views/conferences/_index_core.html.haml b/app/views/conferences/_index_core.html.haml
index 4073e83..50ea1c8 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
@@ -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/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') + ":"