diff --git a/app/views/public/menu_items/show.html.haml b/app/views/public/menu_items/show.html.haml index 8cdfac1..3752174 100644 --- a/app/views/public/menu_items/show.html.haml +++ b/app/views/public/menu_items/show.html.haml @@ -17,12 +17,16 @@ -@sidebar = false --if @menu_item_lang.permalink == "index" +-if true or @menu_item_lang.permalink == "index" .render_block.home_render_block =render :partial => "public/blocks/block", :locals => {:block => @menu_item.menu_content.blocks.find_by_lang_site_id(@lang.id)} - + -if current_admin + .admin_panel + =link_to i(:pencil), edit_admin_menu_item_path(:id => @menu_item.menu_content.menu_item.id, :lang => @lang.slug), :class => "btn btn-primary" + +-else %h1=@lang_page.title .menu_content_inner{:class => @menu_item_lang.slug} diff --git a/config/environments/development.rb b/config/environments/development.rb index 0d8cc37..06b30e0 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -49,6 +49,5 @@ Rails.application.configure do config.action_mailer.default_url_options = { :host => HOSTNAME } Rails.application.routes.default_url_options = config.action_mailer.default_url_options = { :host => HOSTNAME, :protocol => 'http' } - ANGORA_HOSTNAME = "angora.local:3000" end diff --git a/config/environments/production.rb b/config/environments/production.rb index 892bc15..c0c9bea 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -77,7 +77,7 @@ Rails.application.configure do # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false - HOSTNAME="irrisud.payresas.quartz.xyz" + HOSTNAME="musifrat-festival.com" #config.action_mailer.delivery_method = :file config.action_mailer.default_url_options = { :host => HOSTNAME } @@ -91,7 +91,7 @@ Rails.application.configure do Rails.application.routes.default_url_options = config.action_mailer.default_url_options = { :host => HOSTNAME, :protocol => 'http' } - ANGORA_HOSTNAME = "stop-angora.fr" + end