diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 23b1b96..febabf4 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -58,11 +58,14 @@ -Menu.all.each do |menu| = link_to "Pages", admin_menu_items_path(:menu_id => menu.id) %li.divider - %li= link_to "Articles", admin_articles_path - %li= link_to "Evénements", admin_events_path + %li= link_to "Actualité", admin_articles_path + %li= link_to "Agenda", admin_events_path %li.divider %li= link_to "Images", admin_image_files_path %li= link_to "Fichiers", admin_data_files_path + %li.divider + %li= link_to "Contributeurs", admin_authors_path + %li.dropdown %a{:href => "#", :class => "dropdown-toggle", :data => {:toggle => "dropdown"}} diff --git a/config/environments/production.rb b/config/environments/production.rb index 1793b39..1dea390 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,5 +1,5 @@ # -*- encoding : utf-8 -*- -HOSTNAME = 'http://lepicvert.org' +HOSTNAME = 'lepicvert.org' Survey::Application.configure do # Settings specified here will take precedence over those in config/application.rb. @@ -96,7 +96,8 @@ Survey::Application.configure do config.action_mailer.delivery_method = :smtp config.action_mailer.smtp_settings = { :address => "localhost", - :port => 25 + :port => 25, + :openssl_verify_mode => 'none' }