Merge branch 'develop'5.1-beta1

6 files changed, 8 insertions, 8 deletions

diff --git a/app/views/conferences/_form_core.html.haml b/app/views/conferences/_form_core.html.haml
index 04754de..f8d6c8e 100644
--- a/app/views/conferences/_form_core.html.haml
+++ b/app/views/conferences/_form_core.html.haml
@@ -5,7 +5,7 @@
     = f.input :end, :label => t('conferences.form.end.label'), :hint => conditional_hint('conferences.form.end.hint'), :include_blank => true, :start_year => Time.now.year, :end_year => Time.now.year + 2
   = f.input :description, :label => t('conferences.form.description.label'), :hint => conditional_hint('conferences.form.description.hint')
   = f.input :pin, :label => t('conferences.form.pin.label'), :hint => conditional_hint('conferences.form.pin.hint')
-  = f.input :max_members, :collection => 1..MAXIMUM_NUMBER_OF_PEOPLE_IN_A_CONFERENCE, :include_blank => false, :label => t('conferences.form.max_members.label'), :hint => conditional_hint('conferences.form.max_members.hint')
+  = f.input :max_members, :collection => 1..GsParameter.get('MAXIMUM_NUMBER_OF_PEOPLE_IN_A_CONFERENCE'), :include_blank => false, :label => t('conferences.form.max_members.label'), :hint => conditional_hint('conferences.form.max_members.hint')
   = f.input :open_for_anybody, :label => t('conferences.form.open_for_anybody.label'), :hint => conditional_hint('conferences.form.open_for_anybody.hint')
   = f.input :announce_new_member_by_name, :label => t('conferences.form.announce_new_member_by_name.label'), :hint => conditional_hint('conferences.form.announce_new_member_by_name.hint')
   = f.input :announce_left_member_by_name, :label => t('conferences.form.announce_left_member_by_name.label'), :hint => conditional_hint('conferences.form.announce_left_member_by_name.hint')
\ No newline at end of file
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') + ":"