aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po2
-rw-r--r--perllib/FixMyStreet/Map/OSM/MapQuest.pm10
-rw-r--r--templates/email/fixamingata/alert-problem-nearby.txt2
-rw-r--r--templates/email/fixamingata/alert-problem.txt2
-rw-r--r--templates/email/fixamingata/reply-autoresponse2
-rw-r--r--templates/email/fixamingata/submit.txt4
-rw-r--r--templates/web/fixamingata/header_opengraph.html6
-rw-r--r--templates/web/fixamingata/header_opengraph_image.html4
-rw-r--r--web/cobrands/fixamingata/images/fms-og_image.jpgbin0 -> 107909 bytes
-rw-r--r--web/cobrands/fixamingata/layout.scss6
-rw-r--r--web/js/map-OpenStreetMap.js8
11 files changed, 31 insertions, 15 deletions
diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
index 4dee6dbcb..2bae9864a 100644
--- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -2014,7 +2014,7 @@ msgstr "Skriv in din titel"
#: templates/web/base/auth/sign_out.html:5
#: templates/web/zurich/auth/sign_out.html:5
msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>."
-msgstr "Välkommen att <a href=\"&s\">logga in igen</a>, eller gå tillbaka till <a href=\"/\">startsidan</a>."
+msgstr "Välkommen att <a href=\"%s\">logga in igen</a>, eller gå tillbaka till <a href=\"/\">startsidan</a>."
#: templates/web/base/report/new/fill_in_details_text.html:1
#: templates/web/base/report/new/fill_in_details_text.html:8
diff --git a/perllib/FixMyStreet/Map/OSM/MapQuest.pm b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
index 4fc8ba57d..3b0df14b1 100644
--- a/perllib/FixMyStreet/Map/OSM/MapQuest.pm
+++ b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
@@ -22,10 +22,10 @@ sub map_tiles {
my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} );
my $tile_url = $self->base_tile_url();
return [
- "http://otile1.$tile_url/$z/" . ($x - 1) . "/" . ($y - 1) . ".png",
- "http://otile2.$tile_url/$z/$x/" . ($y - 1) . ".png",
- "http://otile3.$tile_url/$z/" . ($x - 1) . "/$y.png",
- "http://otile4.$tile_url/$z/$x/$y.png",
+ "https://otile1-s.$tile_url/$z/" . ($x - 1) . "/" . ($y - 1) . ".png",
+ "https://otile2-s.$tile_url/$z/$x/" . ($y - 1) . ".png",
+ "https://otile3-s.$tile_url/$z/" . ($x - 1) . "/$y.png",
+ "https://otile4-s.$tile_url/$z/$x/$y.png",
];
}
@@ -34,7 +34,7 @@ sub base_tile_url {
}
sub copyright {
- 'Data, imagery and map information provided by <a href="http://www.mapquest.com/">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />, <a href="http://openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a>'
+ 'Data, imagery and map information provided by <a href="https://www.mapquest.com/">MapQuest</a> <img src="https://developer.mapquest.com/sites/default/files/mapquest/osm/mq_logo.png" />, <a href="https://openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="https://opendatacommons.org/licenses/odbl/">ODbL</a>'
}
1;
diff --git a/templates/email/fixamingata/alert-problem-nearby.txt b/templates/email/fixamingata/alert-problem-nearby.txt
index 657ef820a..e278e0b7b 100644
--- a/templates/email/fixamingata/alert-problem-nearby.txt
+++ b/templates/email/fixamingata/alert-problem-nearby.txt
@@ -1,4 +1,4 @@
-Subject: Nya rapporter på FixMyStreet
+Subject: Nya rapporter på FixaMinGata
Följande rapporter har nyligen lagts till på:
diff --git a/templates/email/fixamingata/alert-problem.txt b/templates/email/fixamingata/alert-problem.txt
index 657ef820a..e278e0b7b 100644
--- a/templates/email/fixamingata/alert-problem.txt
+++ b/templates/email/fixamingata/alert-problem.txt
@@ -1,4 +1,4 @@
-Subject: Nya rapporter på FixMyStreet
+Subject: Nya rapporter på FixaMinGata
Följande rapporter har nyligen lagts till på:
diff --git a/templates/email/fixamingata/reply-autoresponse b/templates/email/fixamingata/reply-autoresponse
index 0ff06dd78..7935b1717 100644
--- a/templates/email/fixamingata/reply-autoresponse
+++ b/templates/email/fixamingata/reply-autoresponse
@@ -16,7 +16,7 @@ Om du vill avbryta en prenumeration finns det en länk sist i
varje brev som du kan klicka på för att avbryta en prenumeration.
Om du har frågor eller kommenterar på tjänsten kan du lämna dina
-kommenterar på http://fixamingata.se/contact
+kommenterar på https://fixamingata.se/contact
Vänligen,
FixaMinGata
diff --git a/templates/email/fixamingata/submit.txt b/templates/email/fixamingata/submit.txt
index 009ac9c6a..95365b87e 100644
--- a/templates/email/fixamingata/submit.txt
+++ b/templates/email/fixamingata/submit.txt
@@ -51,11 +51,11 @@ mot system som Open311.
Om ni vill läsa mer om FixaMinGata och vad det innebär för er som kommun
kan ni hitta ytterligare information på vår informationssida för kommuner:
- <http://fixamingata.se/kommun>
+ <https://fixamingata.se/kommun>
Kontakta Föreningen Sambruk via:
- <http://fixamingata.se/contact>
+ <https://fixamingata.se/contact>
[% signature %]
diff --git a/templates/web/fixamingata/header_opengraph.html b/templates/web/fixamingata/header_opengraph.html
new file mode 100644
index 000000000..7d09d6009
--- /dev/null
+++ b/templates/web/fixamingata/header_opengraph.html
@@ -0,0 +1,6 @@
+ <meta property="og:url" content="[% c.cobrand.base_url %][% c.req.uri.path %]">
+ <meta property="og:title" content="[% title || site_name %]">
+ <meta property="og:site_name" content="[% site_name %]">
+ [% IF c.req.uri.path == '/' %]<meta property="og:description" content="Rapportera, visa, eller diskutera lokala problem.">[% END %]
+ <meta property="og:type" content="website">
+ [% INCLUDE 'header_opengraph_image.html' %]
diff --git a/templates/web/fixamingata/header_opengraph_image.html b/templates/web/fixamingata/header_opengraph_image.html
new file mode 100644
index 000000000..7ec1aabb0
--- /dev/null
+++ b/templates/web/fixamingata/header_opengraph_image.html
@@ -0,0 +1,4 @@
+ <meta property="og:image" content="[% c.cobrand.base_url %]/cobrands/fixmystreet/images/fms-og_image.jpg">
+ <meta property="og:image:type" content="image/jpeg">
+ <meta property="og:image:width" content="1200">
+ <meta property="og:image:height" content="630">
diff --git a/web/cobrands/fixamingata/images/fms-og_image.jpg b/web/cobrands/fixamingata/images/fms-og_image.jpg
new file mode 100644
index 000000000..896b2e87c
--- /dev/null
+++ b/web/cobrands/fixamingata/images/fms-og_image.jpg
Binary files differ
diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index 2d4ab90cf..bd1cab41a 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/web/cobrands/fixamingata/layout.scss
@@ -114,3 +114,9 @@ h3, h4,
#postcodeForm { margin-left: -1em !important; margin-right: -1em !important; }
body.fullwidthpage .container .content footer .tablewrapper { background: #fff; }
+
+body.frontpage #site-logo { top: 0em; }
+
+body.frontpage #site-header { height: 85px; }
+
+body.frontpage #user-meta { margin-top: 1.2em; } \ No newline at end of file
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index b2d6a4f8b..a742e61ba 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -63,10 +63,10 @@ OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, {
*/
initialize: function(name, options) {
var url = [
- "http://otile1.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
- "http://otile2.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
- "http://otile3.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
- "http://otile4.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png"
+ "https://otile1-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+ "https://otile2-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+ "https://otile3-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+ "https://otile4-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png"
];
options = OpenLayers.Util.extend({
/* Below line added to OSM's file in order to allow minimum zoom level */
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 21:37:24 +0000