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. --- 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 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views/conferences') 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') + ":" -- 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. --- app/views/conferences/_index_core.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/conferences') 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 -- cgit v1.2.3