From e4c19ab1f6c94f83b29da16720e549bef6e10dd1 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Tue, 13 May 2014 14:17:39 +0200
Subject: [PATCH] Fix the callforpapers routing and some styling issues

---
 .../admin/callforpapers_controller.rb           |  2 +-
 app/helpers/application_helper.rb               | 16 ++++++++++++++++
 .../{index.html.haml => show.html.haml}         |  2 +-
 app/views/layouts/_messages.html.haml           | 11 ++++++-----
 app/views/layouts/application.html.haml         |  1 -
 config/routes.rb                                | 17 ++++++++++++++++-
 6 files changed, 40 insertions(+), 9 deletions(-)
 rename app/views/admin/callforpapers/{index.html.haml => show.html.haml} (92%)

diff --git a/app/controllers/admin/callforpapers_controller.rb b/app/controllers/admin/callforpapers_controller.rb
index 3d8f8768..83624d08 100644
--- a/app/controllers/admin/callforpapers_controller.rb
+++ b/app/controllers/admin/callforpapers_controller.rb
@@ -1,7 +1,7 @@
 class Admin::CallforpapersController < ApplicationController
   before_filter :verify_organizer
 
-  def index
+  def show
     @cfp = @conference.call_for_papers
     if @cfp.nil?
       @cfp = CallForPapers.new
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0765d9ae..af1ddc06 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,5 +1,21 @@
 module ApplicationHelper
 
+  def bootstrap_class_for(flash_type)
+    logger.debug "flash_type is #{flash_type}"
+    case flash_type
+    when 'success'
+      'alert-success'
+    when 'error'
+      'alert-error'
+    when 'alert'
+      'alert-block'
+    when 'notice'
+      'alert-info'
+    else
+      flash_type.to_s
+    end
+  end
+
   def active_nav_li(link)
     if current_page?(link)
       return 'active'
diff --git a/app/views/admin/callforpapers/index.html.haml b/app/views/admin/callforpapers/show.html.haml
similarity index 92%
rename from app/views/admin/callforpapers/index.html.haml
rename to app/views/admin/callforpapers/show.html.haml
index 79ce99dc..e13ffeab 100644
--- a/app/views/admin/callforpapers/index.html.haml
+++ b/app/views/admin/callforpapers/show.html.haml
@@ -2,7 +2,7 @@
   .col-md-3
     = render 'admin/conference/sidebar'
   .col-md-9
-    = semantic_form_for(@cfp, :url => admin_conference_callforpaper_path(@conference.short_title, @conference.call_for_papers),:html => {:multipart => true}) do |f|
+    = semantic_form_for(@cfp, :url => admin_conference_callforpapers_path(@conference.short_title),:html => {:multipart => true}) do |f|
       = f.input :start_date, :as => :string, :input_html => { :id => "conference-start-datepicker", :readonly => "readonly"  }
       = f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly"  }
       = f.input :hard_deadline, :as => :string, :input_html => { :id => "cfp-hard-datepicker", :readonly => "readonly"  }
diff --git a/app/views/layouts/_messages.html.haml b/app/views/layouts/_messages.html.haml
index fd8e69a8..7fe9cd02 100644
--- a/app/views/layouts/_messages.html.haml
+++ b/app/views/layouts/_messages.html.haml
@@ -1,5 +1,6 @@
-- flash.each do |name, msg|
-  - if msg.is_a?(String)
-    %div{:class => "alert alert-#{name == :notice ? "success" : "error"}"}
-      %a.close{"data-dismiss" => "alert"} ×
-      = content_tag :div, msg, :id => "flash_#{name}"
\ No newline at end of file
+- flash.each do |type, message|
+  %div{:class=>"alert alert-dismissable #{bootstrap_class_for(type)}", :id=>"flash"}
+    .button.close{"data-dismiss" => "alert", "aria-hidden"=>"true"}
+      &times;
+    %p
+      = message
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e9e9e0af..1baf93ad 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,5 +1,4 @@
 %html{:xmlns => "http://www.w3.org/1999/html"}
-%html
   %head
     %meta{:charset => "utf-8"}
     %meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"}
diff --git a/config/routes.rb b/config/routes.rb
index 1fdcc96f..78e9d930 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -25,19 +25,33 @@ Osem::Application.routes.draw do
       patch "/volunteers" => "volunteers#update", :as => "volunteers_update"
 
       resources :difficulty_levels, only: [:show, :update, :index]
+
       resources :rooms, only: [:show, :update, :index]
+
       resources :tracks, only: [:show, :update, :index]
+
       resources :eventtypes, only: [:show, :index] do
         collection do
           patch :update
         end
       end
+
       resources :social_events, only: [:show, :update, :index]
+
       resources :supporter_levels, only: [:show, :update, :index]
+
       resources :emails, only: [:show, :update, :index]
-      resources :callforpapers, only: [:show, :update, :index]
+
+      resources :callforpapers, only: [:create] do
+        collection do
+          patch :update
+          get :show
+        end
+      end
+
       patch "/questions/update_conference" => "questions#update_conference"
       resources :questions
+
       resources :events do
         member do
           post :comment
@@ -47,6 +61,7 @@ Osem::Application.routes.draw do
         end
         resource :speaker, :only => [:edit, :update]
       end
+
       resources :supporters
     end
   end