Links are in https rather than http

rails5
echarp 5 years ago
parent 6a6ab40fe4
commit e010bdf69c
  1. 8
      app/assets/javascripts/maps.js.coffee
  2. 16
      app/views/digests/markdown.html.haml
  3. 2
      app/views/events/_form.html.haml
  4. 4
      app/views/events/index.html.haml
  5. 10
      app/views/events/show.html.haml
  6. 4
      app/views/orgas/_form.html.haml
  7. 4
      app/views/orgas/show.html.haml
  8. 4
      app/views/pages/infos.haml
  9. 2
      public/assets/.sprockets-manifest-d66893f1fe62a081525d8463c9642047.json
  10. 93560
      public/assets/application-a3e14c617593fb4bc194d8021b38514c9b130e782e45cf92a07e546d36602c13.js
  11. BIN
      public/assets/application-a3e14c617593fb4bc194d8021b38514c9b130e782e45cf92a07e546d36602c13.js.gz

@ -5,8 +5,8 @@ $(document).on 'turbolinks:load', ->
$('#map.list').each ->
map = L.map 'map'
L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a>'
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
attribution: '&copy; <a href="https://osm.org/copyright">OpenStreetMap</a>'
).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
L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a>'
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
attribution: '&copy; <a href="https://osm.org/copyright">OpenStreetMap</a>'
).addTo map
url = $(this).data 'url'

@ -26,12 +26,12 @@
%hr
:markdown
* [April](http://april.org)
* [Agenda du Libre](http://www.agendadulibre.org)
* [April](https://april.org)
* [Agenda du Libre](https://www.agendadulibre.org)
* [Carte des événements](#{maps_url future: false, period:
{ year: @week.year, week: @week.cweek }})
* [Proposer un événement](http://www.agendadulibre.org/events/new)
* [Annuaire des organisations](http://www.agendadulibre.org/orgas)
* [Proposer un événement](https://www.agendadulibre.org/events/new)
* [Annuaire des organisations](https://www.agendadulibre.org/orgas)
* [Agenda pour la semaine précédente](#{digest_url :markdown,
future: false, period: { year: @week.year, week: (@week - 1.week).cweek }})
@ -66,14 +66,14 @@
%input(type='hidden' name='news[links_attributes][0][title]'
value='April')
%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]'
value='fr')
%input(type='hidden' name='news[links_attributes][1][title]'
value='Agenda du Libre')
%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]'
value='fr')
@ -88,14 +88,14 @@
%input(type='hidden' name='news[links_attributes][3][title]'
value='Proposer un événement')
%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]'
value='fr' size='2')
%input(type='hidden' name='news[links_attributes][4][title]'
value='Annuaire des organisations')
%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]'
value='fr' size='2')

@ -60,7 +60,7 @@
.field.url{ title: t('.url_helper') }
= 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') }
= f.label :contact
= f.email_field :contact, required: true

@ -51,13 +51,13 @@
%em.fa.fa-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',
width: '374', height: '48',
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'
- set_events_meta

@ -2,7 +2,7 @@
- if @event.tags.any? { |t| t.name.include? 'libre-en-fete' }
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',
style: 'vertical-align: middle'
@ -72,9 +72,9 @@
- if @event.address.present?
%span= @event.address
%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),
"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
.event#map{ data: { url: maps_path(format: :json),
@ -84,8 +84,8 @@
%em.fa.fa-compress
%em
= raw t '.noMap'
%a{ href: 'http://osm.org/search?query=' + @event.full_address }
%img(src='http://www.openstreetmap.org/assets/osm_logo.png'
%a{ href: 'https://osm.org/search?query=' + @event.full_address }
%img(src='https://www.openstreetmap.org/assets/osm_logo.png'
alt='OSM logo' width='22px')
%h3= t '.description'

@ -47,13 +47,13 @@
.field.url{ title: t('.url_helper') }
= f.label :url
= f.url_field :url, placeholder: 'Ex: http://april.org'
= f.url_field :url, placeholder: 'Ex: https://april.org'
.field.diaspora
= f.label :diaspora
= f.url_field :diaspora
.field.feed{ title: t('.feed_helper') }
= 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') }
= f.label :contact
= f.email_field :contact

@ -64,9 +64,9 @@
- if @orga.address.present?
%span= @orga.address
%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),
"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
.orga#map{ data: { url: "#{maps_path format: :json}",

@ -1,9 +1,9 @@
:markdown
#{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;")
%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"
alt="HTML5 Powered with CSS3 / Styling, Graphics, 3D &amp; Effects, and Semantics"
title="HTML5 Powered with CSS3 / Styling, Graphics, 3D &amp; Effects, and Semantics")

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save