From 275da73e92d547afb9805032ae028870a8cdcbf0 Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 24 Aug 2014 14:24:53 +0200 Subject: [PATCH] =?UTF-8?q?On=20peut=20maintenant=20int=C3=A9grer=20l'adl?= =?UTF-8?q?=20dans=20une=20iframe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/all.css.sass | 12 ++++++++++-- app/controllers/events_controller.rb | 6 ++---- app/views/layouts/iframe.html.haml | 23 +++++++++++++++++++++++ public/iframeSample.html | 16 ++++++++++++++++ 4 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 app/views/layouts/iframe.html.haml create mode 100644 public/iframeSample.html diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass index a5f06978..31d3011c 100644 --- a/app/assets/stylesheets/all.css.sass +++ b/app/assets/stylesheets/all.css.sass @@ -12,14 +12,22 @@ html color: black + height: 100% line-height: 1.3em font-family: georgia, serif - padding-bottom: 6px background-color: #9CC5EE + // Integrating adl in another website + &.iframe + background-color: transparent + body + border: none + background-color: transparent + .region_selector, .lug_search, .formats, #banner + display: none body border: 1px solid #68A6E5 - margin: 5px 5px 0 + margin: 0.3em padding: 0 10px 10px 10px text-align: center border-bottom: 0px diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 2d78c86f..9b96eeba 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -10,10 +10,8 @@ class EventsController < ApplicationController def index respond_to do |format| - format.html - format.rss do - @events = @events.future_in params[:daylimit] - end + format.html { render layout: 'iframe' if params[:iframe] } + format.rss { @events = @events.future_in params[:daylimit] } format.ics { @events = @events.last_year.order :id } format.xml { @events = @events.includes(:related_region).order :id } end diff --git a/app/views/layouts/iframe.html.haml b/app/views/layouts/iframe.html.haml new file mode 100644 index 00000000..5767b9e5 --- /dev/null +++ b/app/views/layouts/iframe.html.haml @@ -0,0 +1,23 @@ +!!! 5 +/[if IE] +%html.iframe.no-js(lang="#{I18n.locale}") + %head + = display_meta_tags site: t('.title') + + %meta(http-equiv='Content-Type' content='text/html; charset=utf-8') + %meta(name='viewport' content='width=device-width, initial-scale=1.0') + %meta(name='robots' content='index, follow') + + = favicon_link_tag '/favicon.ico' + = auto_discovery_link_tag :rss, { controller: '/events', format: :rss } + + = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true + = javascript_include_tag 'application', 'data-turbolinks-track' => true + = csrf_meta_tags + + %body(class="#{controller.controller_name} #{controller.action_name}") + = render 'layouts/flash', flash: flash if flash.present? + + %main= yield + + %em#loading.fa.fa-spin.fa-circle-o-notch diff --git a/public/iframeSample.html b/public/iframeSample.html new file mode 100644 index 00000000..5ed08985 --- /dev/null +++ b/public/iframeSample.html @@ -0,0 +1,16 @@ + + + + + + +