Links are in https rather than http
This commit is contained in:
parent
6a6ab40fe4
commit
e010bdf69c
@ -5,8 +5,8 @@ $(document).on 'turbolinks:load', ->
|
|||||||
$('#map.list').each ->
|
$('#map.list').each ->
|
||||||
map = L.map 'map'
|
map = L.map 'map'
|
||||||
|
|
||||||
L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
|
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
|
||||||
attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a>'
|
attribution: '© <a href="https://osm.org/copyright">OpenStreetMap</a>'
|
||||||
).addTo map
|
).addTo map
|
||||||
|
|
||||||
controls = L.control.layers(null, null, collapsed: false).addTo map
|
controls = L.control.layers(null, null, collapsed: false).addTo map
|
||||||
@ -48,8 +48,8 @@ $(document).on 'turbolinks:load', ->
|
|||||||
|
|
||||||
map = L.map('map').setView [coord[0], coord[1]], 16
|
map = L.map('map').setView [coord[0], coord[1]], 16
|
||||||
|
|
||||||
L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
|
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
|
||||||
attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a>'
|
attribution: '© <a href="https://osm.org/copyright">OpenStreetMap</a>'
|
||||||
).addTo map
|
).addTo map
|
||||||
|
|
||||||
url = $(this).data 'url'
|
url = $(this).data 'url'
|
||||||
|
@ -26,12 +26,12 @@
|
|||||||
%hr
|
%hr
|
||||||
|
|
||||||
:markdown
|
:markdown
|
||||||
* [April](http://april.org)
|
* [April](https://april.org)
|
||||||
* [Agenda du Libre](http://www.agendadulibre.org)
|
* [Agenda du Libre](https://www.agendadulibre.org)
|
||||||
* [Carte des événements](#{maps_url future: false, period:
|
* [Carte des événements](#{maps_url future: false, period:
|
||||||
{ year: @week.year, week: @week.cweek }})
|
{ year: @week.year, week: @week.cweek }})
|
||||||
* [Proposer un événement](http://www.agendadulibre.org/events/new)
|
* [Proposer un événement](https://www.agendadulibre.org/events/new)
|
||||||
* [Annuaire des organisations](http://www.agendadulibre.org/orgas)
|
* [Annuaire des organisations](https://www.agendadulibre.org/orgas)
|
||||||
* [Agenda pour la semaine précédente](#{digest_url :markdown,
|
* [Agenda pour la semaine précédente](#{digest_url :markdown,
|
||||||
future: false, period: { year: @week.year, week: (@week - 1.week).cweek }})
|
future: false, period: { year: @week.year, week: (@week - 1.week).cweek }})
|
||||||
|
|
||||||
@ -66,14 +66,14 @@
|
|||||||
%input(type='hidden' name='news[links_attributes][0][title]'
|
%input(type='hidden' name='news[links_attributes][0][title]'
|
||||||
value='April')
|
value='April')
|
||||||
%input(type='hidden' name='news[links_attributes][0][url]'
|
%input(type='hidden' name='news[links_attributes][0][url]'
|
||||||
value='http://april.org')
|
value='https://april.org')
|
||||||
%input(type='hidden' name='news[links_attributes][0][lang]'
|
%input(type='hidden' name='news[links_attributes][0][lang]'
|
||||||
value='fr')
|
value='fr')
|
||||||
|
|
||||||
%input(type='hidden' name='news[links_attributes][1][title]'
|
%input(type='hidden' name='news[links_attributes][1][title]'
|
||||||
value='Agenda du Libre')
|
value='Agenda du Libre')
|
||||||
%input(type='hidden' name='news[links_attributes][1][url]'
|
%input(type='hidden' name='news[links_attributes][1][url]'
|
||||||
value='http://www.agendadulibre.org')
|
value='https://www.agendadulibre.org')
|
||||||
%input(type='hidden' name='news[links_attributes][1][lang]'
|
%input(type='hidden' name='news[links_attributes][1][lang]'
|
||||||
value='fr')
|
value='fr')
|
||||||
|
|
||||||
@ -88,14 +88,14 @@
|
|||||||
%input(type='hidden' name='news[links_attributes][3][title]'
|
%input(type='hidden' name='news[links_attributes][3][title]'
|
||||||
value='Proposer un événement')
|
value='Proposer un événement')
|
||||||
%input(type='hidden' name='news[links_attributes][3][url]'
|
%input(type='hidden' name='news[links_attributes][3][url]'
|
||||||
value='http://www.agendadulibre.org/events/new')
|
value='https://www.agendadulibre.org/events/new')
|
||||||
%input(type='hidden' name='news[links_attributes][3][lang]'
|
%input(type='hidden' name='news[links_attributes][3][lang]'
|
||||||
value='fr' size='2')
|
value='fr' size='2')
|
||||||
|
|
||||||
%input(type='hidden' name='news[links_attributes][4][title]'
|
%input(type='hidden' name='news[links_attributes][4][title]'
|
||||||
value='Annuaire des organisations')
|
value='Annuaire des organisations')
|
||||||
%input(type='hidden' name='news[links_attributes][4][url]'
|
%input(type='hidden' name='news[links_attributes][4][url]'
|
||||||
value="http://www.agendadulibre.org/orgas")
|
value="https://www.agendadulibre.org/orgas")
|
||||||
%input(type='hidden' name='news[links_attributes][4][lang]'
|
%input(type='hidden' name='news[links_attributes][4][lang]'
|
||||||
value='fr' size='2')
|
value='fr' size='2')
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@
|
|||||||
|
|
||||||
.field.url{ title: t('.url_helper') }
|
.field.url{ title: t('.url_helper') }
|
||||||
= f.label :url
|
= f.label :url
|
||||||
= f.url_field :url, placeholder: 'Ex: http://april.org'
|
= f.url_field :url, placeholder: 'Ex: https://april.org'
|
||||||
.field.contact.required{ title: t('.contact_helper') }
|
.field.contact.required{ title: t('.contact_helper') }
|
||||||
= f.label :contact
|
= f.label :contact
|
||||||
= f.email_field :contact, required: true
|
= f.email_field :contact, required: true
|
||||||
|
@ -51,13 +51,13 @@
|
|||||||
%em.fa.fa-filter
|
%em.fa.fa-filter
|
||||||
= t '.filter'
|
= t '.filter'
|
||||||
|
|
||||||
%a#banner(href='http://april.org/campagne')
|
%a#banner(href='https://april.org/campagne')
|
||||||
= image_tag 'priorite-logiciel-libre-je-soutiens-april_2_m.png',
|
= image_tag 'priorite-logiciel-libre-je-soutiens-april_2_m.png',
|
||||||
width: '374', height: '48',
|
width: '374', height: '48',
|
||||||
alt: 'Priorité au Logiciel Libre! Je soutiens l\'April.'
|
alt: 'Priorité au Logiciel Libre! Je soutiens l\'April.'
|
||||||
|
|
||||||
/
|
/
|
||||||
%a#banner(href='http://www.libre-en-fete.net')
|
%a#banner(href='https://www.libre-en-fete.net')
|
||||||
= image_tag 'lef.png', width: '180', height: '60', alt: 'Libre en Fete'
|
= image_tag 'lef.png', width: '180', height: '60', alt: 'Libre en Fete'
|
||||||
|
|
||||||
- set_events_meta
|
- set_events_meta
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
- if @event.tags.any? { |t| t.name.include? 'libre-en-fete' }
|
- if @event.tags.any? { |t| t.name.include? 'libre-en-fete' }
|
||||||
Cet événement s'inscrit dans le cadre de
|
Cet événement s'inscrit dans le cadre de
|
||||||
%a(href='http://www.libre-en-fete.net')
|
%a(href='https://www.libre-en-fete.net')
|
||||||
= image_tag 'lef.png', width: '180', height: '60', alt: 'Libre en Fete',
|
= image_tag 'lef.png', width: '180', height: '60', alt: 'Libre en Fete',
|
||||||
style: 'vertical-align: middle'
|
style: 'vertical-align: middle'
|
||||||
|
|
||||||
@ -72,9 +72,9 @@
|
|||||||
- if @event.address.present?
|
- if @event.address.present?
|
||||||
%span= @event.address
|
%span= @event.address
|
||||||
%span= link_to @event.city,
|
%span= link_to @event.city,
|
||||||
"http://fr.wikipedia.org/wiki/#{url_encode @event.city}"
|
"https://fr.wikipedia.org/wiki/#{url_encode @event.city}"
|
||||||
%span= link_to @event.region.try(:name),
|
%span= link_to @event.region.try(:name),
|
||||||
"http://fr.wikipedia.org/wiki/#{url_encode @event.region.try :name}"
|
"https://fr.wikipedia.org/wiki/#{url_encode @event.region.try :name}"
|
||||||
|
|
||||||
- if @event.latitude && @event.longitude
|
- if @event.latitude && @event.longitude
|
||||||
.event#map{ data: { url: maps_path(format: :json),
|
.event#map{ data: { url: maps_path(format: :json),
|
||||||
@ -84,8 +84,8 @@
|
|||||||
%em.fa.fa-compress
|
%em.fa.fa-compress
|
||||||
%em
|
%em
|
||||||
= raw t '.noMap'
|
= raw t '.noMap'
|
||||||
%a{ href: 'http://osm.org/search?query=' + @event.full_address }
|
%a{ href: 'https://osm.org/search?query=' + @event.full_address }
|
||||||
%img(src='http://www.openstreetmap.org/assets/osm_logo.png'
|
%img(src='https://www.openstreetmap.org/assets/osm_logo.png'
|
||||||
alt='OSM logo' width='22px')
|
alt='OSM logo' width='22px')
|
||||||
|
|
||||||
%h3= t '.description'
|
%h3= t '.description'
|
||||||
|
@ -47,13 +47,13 @@
|
|||||||
|
|
||||||
.field.url{ title: t('.url_helper') }
|
.field.url{ title: t('.url_helper') }
|
||||||
= f.label :url
|
= f.label :url
|
||||||
= f.url_field :url, placeholder: 'Ex: http://april.org'
|
= f.url_field :url, placeholder: 'Ex: https://april.org'
|
||||||
.field.diaspora
|
.field.diaspora
|
||||||
= f.label :diaspora
|
= f.label :diaspora
|
||||||
= f.url_field :diaspora
|
= f.url_field :diaspora
|
||||||
.field.feed{ title: t('.feed_helper') }
|
.field.feed{ title: t('.feed_helper') }
|
||||||
= f.label :feed
|
= f.label :feed
|
||||||
= f.url_field :feed, placeholder: 'Ex: http://april.org/index.rss'
|
= f.url_field :feed, placeholder: 'Ex: https://april.org/index.rss'
|
||||||
.field.contact{ title: t('.contact_helper') }
|
.field.contact{ title: t('.contact_helper') }
|
||||||
= f.label :contact
|
= f.label :contact
|
||||||
= f.email_field :contact
|
= f.email_field :contact
|
||||||
|
@ -64,9 +64,9 @@
|
|||||||
- if @orga.address.present?
|
- if @orga.address.present?
|
||||||
%span= @orga.address
|
%span= @orga.address
|
||||||
%span= link_to @orga.city,
|
%span= link_to @orga.city,
|
||||||
"http://fr.wikipedia.org/wiki/#{url_encode @orga.city}"
|
"https://fr.wikipedia.org/wiki/#{url_encode @orga.city}"
|
||||||
%span= link_to @orga.region.try(:name),
|
%span= link_to @orga.region.try(:name),
|
||||||
"http://fr.wikipedia.org/wiki/#{url_encode @orga.region.try :name}"
|
"https://fr.wikipedia.org/wiki/#{url_encode @orga.region.try :name}"
|
||||||
|
|
||||||
- if @orga.latitude && @orga.longitude
|
- if @orga.latitude && @orga.longitude
|
||||||
.orga#map{ data: { url: "#{maps_path format: :json}",
|
.orga#map{ data: { url: "#{maps_path format: :json}",
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
:markdown
|
:markdown
|
||||||
#{sanitize t '.content'}
|
#{sanitize t '.content'}
|
||||||
|
|
||||||
%a(href="http://validator.w3.org/unicorn/check?ucn_uri=#{root_url}"
|
%a(href="https://validator.w3.org/unicorn/check?ucn_uri=#{root_url}"
|
||||||
style="text-decoration:none;")
|
style="text-decoration:none;")
|
||||||
%img(src="http://www.w3.org/html/logo/badge/html5-badge-h-css3-graphics-semantics.png"
|
%img(src="https://www.w3.org/html/logo/badge/html5-badge-h-css3-graphics-semantics.png"
|
||||||
width="197" height="64"
|
width="197" height="64"
|
||||||
alt="HTML5 Powered with CSS3 / Styling, Graphics, 3D & Effects, and Semantics"
|
alt="HTML5 Powered with CSS3 / Styling, Graphics, 3D & Effects, and Semantics"
|
||||||
title="HTML5 Powered with CSS3 / Styling, Graphics, 3D & Effects, and Semantics")
|
title="HTML5 Powered with CSS3 / Styling, Graphics, 3D & Effects, and Semantics")
|
||||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
Loading…
Reference in New Issue
Block a user