diff --git a/app/assets/stylesheets/all.sass b/app/assets/stylesheets/all.sass index bd5ee1e6..5b17002e 100644 --- a/app/assets/stylesheets/all.sass +++ b/app/assets/stylesheets/all.sass @@ -24,8 +24,11 @@ html margin: 0 padding: 0 background-color: transparent + & > header, & > footer, h2, nav, .region_selector, .orga_search, .formats, #banner display: none + ul + margin: 0 body border: 1px solid #68A6E5 diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index fdc9bc3a..7a022609 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -13,7 +13,7 @@ class EventsController < ApplicationController def index respond_to do |format| - format.html { render layout: 'iframe' if params[:iframe] } + format.html format.json { @events = @events.future } format.rss { @events = @events.future.order('id desc').limit 20 } format.ics { @events = @events.last_year } diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb index 3547eabb..94a5e0bc 100644 --- a/app/controllers/maps_controller.rb +++ b/app/controllers/maps_controller.rb @@ -9,7 +9,7 @@ class MapsController < ApplicationController def index respond_to do |format| - format.html { render layout: 'iframe' if params[:iframe] } + format.html format.json { render json: apply_scopes(Event.moderated.geo) } end end @@ -17,9 +17,9 @@ class MapsController < ApplicationController def show @kind = Kind.find_by_name params[:id] respond_to do |format| - format.html { render layout: 'iframe' if params[:iframe] } + format.html format.json do - render json: apply_scopes(Orga.moderated.geo).where(kind: @kind) + render json: apply_scopes(Orga.moderated.active.geo).where(kind: @kind) end end end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index d477df47..fc12d9b2 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,6 +1,6 @@ !!! 5 /[if IE] -%html.no-js{ lang: I18n.locale } +%html.no-js{ lang: I18n.locale, class: params[:iframe] ? 'iframe' : '' } %head %meta(charset='utf-8') %meta(name='viewport' content='width=device-width, initial-scale=1.0') diff --git a/app/views/layouts/iframe.html.haml b/app/views/layouts/iframe.html.haml deleted file mode 100644 index 5767b9e5..00000000 --- a/app/views/layouts/iframe.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -!!! 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