From ab3d6f7de2c41e97cd2a561662de306446a933eb Mon Sep 17 00:00:00 2001 From: Joe Siltberg Date: Thu, 9 Jan 2020 16:46:58 +0100 Subject: [FixaMinGata] New video for the front page --- templates/web/fixamingata/front/tips.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/web/fixamingata/front/tips.html b/templates/web/fixamingata/front/tips.html index 11a9abfc2..cfa2c36f7 100644 --- a/templates/web/fixamingata/front/tips.html +++ b/templates/web/fixamingata/front/tips.html @@ -1,8 +1,8 @@

Så här enkelt används FixaMinGata

-
-- cgit v1.2.3 From a28c6c2e76b6c1ec23b3b81b2a935f727e708b5f Mon Sep 17 00:00:00 2001 From: Joe Siltberg Date: Thu, 9 Jan 2020 17:06:32 +0100 Subject: [FixaMinGata] Removes old video for the front page --- web/cobrands/fixamingata/videos/fixamingata.mp4 | Bin 5600425 -> 0 bytes web/cobrands/fixamingata/videos/fixamingata.webm | Bin 6580431 -> 0 bytes web/cobrands/fixamingata/videos/poster.jpg | Bin 218837 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 web/cobrands/fixamingata/videos/fixamingata.mp4 delete mode 100644 web/cobrands/fixamingata/videos/fixamingata.webm delete mode 100644 web/cobrands/fixamingata/videos/poster.jpg diff --git a/web/cobrands/fixamingata/videos/fixamingata.mp4 b/web/cobrands/fixamingata/videos/fixamingata.mp4 deleted file mode 100644 index 44e047033..000000000 Binary files a/web/cobrands/fixamingata/videos/fixamingata.mp4 and /dev/null differ diff --git a/web/cobrands/fixamingata/videos/fixamingata.webm b/web/cobrands/fixamingata/videos/fixamingata.webm deleted file mode 100644 index 1f44c5c55..000000000 Binary files a/web/cobrands/fixamingata/videos/fixamingata.webm and /dev/null differ diff --git a/web/cobrands/fixamingata/videos/poster.jpg b/web/cobrands/fixamingata/videos/poster.jpg deleted file mode 100644 index a1f568d1e..000000000 Binary files a/web/cobrands/fixamingata/videos/poster.jpg and /dev/null differ -- cgit v1.2.3 From 650ffe9c50309161d54f193b3343902a09584a09 Mon Sep 17 00:00:00 2001 From: Joe Siltberg Date: Wed, 19 Feb 2020 14:31:18 +0100 Subject: [FixaMinGata] Clean-up in the templates. Removed needless differences, or files where there weren't really any differences between fixamingata and base. Also made our site more like base by moving stuff we had in footer.html to footer_extra.html and stuff we had in front/recent.html to front/footer-marketing.html. Should hopefully make the templates easier to maintain. --- templates/web/fixamingata/footer.html | 33 ---------------------- templates/web/fixamingata/footer_extra.html | 28 ++++++++++++++++++ .../web/fixamingata/front/footer-marketing.html | 27 ++---------------- templates/web/fixamingata/front/recent.html | 21 -------------- templates/web/fixamingata/header_opengraph.html | 6 ---- 5 files changed, 30 insertions(+), 85 deletions(-) delete mode 100644 templates/web/fixamingata/footer.html create mode 100644 templates/web/fixamingata/footer_extra.html delete mode 100644 templates/web/fixamingata/front/recent.html delete mode 100644 templates/web/fixamingata/header_opengraph.html diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html deleted file mode 100644 index ad4d6c4a6..000000000 --- a/templates/web/fixamingata/footer.html +++ /dev/null @@ -1,33 +0,0 @@ - [% IF pagefooter %] -
- [% INCLUDE 'front/footer-marketing.html' %] -
- [% END %] - - - - -
-
- -
-
- - - [% INCLUDE 'common_footer_tags.html' %] - - - diff --git a/templates/web/fixamingata/footer_extra.html b/templates/web/fixamingata/footer_extra.html new file mode 100644 index 000000000..0a9ad84d1 --- /dev/null +++ b/templates/web/fixamingata/footer_extra.html @@ -0,0 +1,28 @@ + diff --git a/templates/web/fixamingata/front/footer-marketing.html b/templates/web/fixamingata/front/footer-marketing.html index a597ae85a..f8c497a22 100644 --- a/templates/web/fixamingata/front/footer-marketing.html +++ b/templates/web/fixamingata/front/footer-marketing.html @@ -1,26 +1,3 @@ -
- - - +
+
FixaMinGata på Google PlayFixaMinGata på App StoreFixaMinGata på TwitterFixaMinGata på Facebook
diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html deleted file mode 100644 index 4cff9eba9..000000000 --- a/templates/web/fixamingata/front/recent.html +++ /dev/null @@ -1,21 +0,0 @@ - [% - recent_photos = c.cobrand.recent_photos('front', 5); - %] - -
-
FixaMinGata på Google PlayFixaMinGata på App StoreFixaMinGata på TwitterFixaMinGata på Facebook
- [% IF recent_photos.size %] -

- [% loc('Recently reported problems') %] -

- -
-
    - [% FOREACH problem IN recent_photos %] - [% INCLUDE 'report/_item.html', no_fixed = 1 %] - [% END %] -
-
- - [% END %] -
diff --git a/templates/web/fixamingata/header_opengraph.html b/templates/web/fixamingata/header_opengraph.html deleted file mode 100644 index 7d09d6009..000000000 --- a/templates/web/fixamingata/header_opengraph.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - [% IF c.req.uri.path == '/' %][% END %] - - [% INCLUDE 'header_opengraph_image.html' %] -- cgit v1.2.3 From b32b8a99541198928d03865d32203d6520852fa0 Mon Sep 17 00:00:00 2001 From: Joe Siltberg Date: Tue, 25 Feb 2020 15:11:54 +0100 Subject: [FixaMinGata] Removes another unused and unmaintained template. --- templates/web/fixamingata/open311/index.html | 143 --------------------------- 1 file changed, 143 deletions(-) delete mode 100644 templates/web/fixamingata/open311/index.html diff --git a/templates/web/fixamingata/open311/index.html b/templates/web/fixamingata/open311/index.html deleted file mode 100644 index 6e86a933b..000000000 --- a/templates/web/fixamingata/open311/index.html +++ /dev/null @@ -1,143 +0,0 @@ -[% INCLUDE 'header.html', title => 'Open311' %] - -

[% loc('Open311 API for the mySociety FixMyStreet server') %]

- -[% IF error %] -

[% tprintf( loc('Note: %s'), error ) %]

-[% END %] - -

[% loc('At the moment only searching for and looking at reports work.') %]

-

[% loc('This API implementation is work in progress and not yet stabilized. It will change without warnings in the future.') %]

- - - -

[% tprintf( loc('At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date.'), c.config.OPEN311_LIMIT ) %]

- -

[% loc('The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name.') %]

- -

[% loc('In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site).') %]

- -

[% loc('The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification.') %]

- -

[% tprintf( loc('With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit.'), c.config.MAPIT_URL ) %]

- -

[% loc('Examples:') %]

- -
    - -[% jurisdiction_id = 'fixamingata.se' %] -[% examples = [ - { - url = c.cobrand.base_url _ "/open311/v2/discovery.xml?jurisdiction_id=$jurisdiction_id", - info = 'discovery-information', - }, - { - url = c.cobrand.base_url _ "/open311/v2/services.xml?jurisdiction_id=$jurisdiction_id", - info = 'Lista alla feltyper, t ex Trasig lampa, hål i gatan osv', - }, - { - url = c.cobrand.base_url _ "/open311/v2/services.xml?jurisdiction_id=$jurisdiction_id&lat=59&long=18", - info = 'Lista feltyper för WGS84 koordinater latityd 59 longityd 18', - }, - { - url = c.cobrand.base_url _ "/open311/v2/requests/1.xml?jurisdiction_id=$jurisdiction_id", - info = 'Felrapport nummer 1', - }, - { - url = c.cobrand.base_url _ "/open311/v2/requests.xml?jurisdiction_id=$jurisdiction_id&status=open&agency_responsible=37&end_date=2013-04-10", - info = 'Alla öppna felrapporter innan 2013-04-10 för Stockholm (kommun-id 37)', - }, - { - url = c.cobrand.base_url _ "/open311/v2/requests.xml?jurisdiction_id=$jurisdiction_id&status=open&agency_responsible=37|38", - info = 'Alla öppna felrapporter för Stockholm (id 37) och Järfälla (id 38)', - }, - { - url = c.cobrand.base_url _ "/open311/v2/requests.xml?jurisdiction_id=$jurisdiction_id&service_code=Hål i gatan", - info = "Alla felrapporter av typen 'Hål i gatan'", - }, - { - url = c.cobrand.base_url _ "/open311/v2/requests.xml?jurisdiction_id=$jurisdiction_id&status=closed", - info = 'Alla stängda felrapporter', - }, -] %] -[% FOREACH examples %] -
  • [% info %] -
    [% url | html %]
    • -[% END %] - -
- -

Searching

- -

The following search parameters can be used:

- -
- -
service_request_id
-
Search for numeric ID of specific request. - Using this is identical to asking for a individual request using - the /requests/number.format URL.
-
service_code
-
Search for the given category / service type string.
- -
status
-
Search for open or closed (fixed) requests.
- -
start_date
-
Only return requests with requested_datetime set after or at the - date and time specified. The format is YYYY-MM-DDTHH:MM:SS+TZ:TZ.
- -
end_date
-
Only return requests with requested_datetime set before the date - and time specified. Same format as start_date.
- -
agency_responsible
-
ID of government body receiving the request. Several IDs can be - specified with | as a separator.
- -
interface_used
-
Name / identifier of interface used.
- -
has_photo
-
Search for entries with or without photos. Use value 'true' to -only get requests created with images, and 'false' to get those -created without images.
- -
max_requests
-
Max number of requests to return from the search. If it is larger -than the site specific max_requests value specified in the discovery -call, the value provided is ignored.
- -
- -

The search result might look like this:

- -
[% "
-  
-    
-      
-        Stockholm
-      
-      2012-11-16T10:35:12,534712Z
-      Test: Test
-      Test
-      Web interface
-      59.336044310435
-      18.05058735521
-      2012-11-16T10:31:30,702990Z
-      Jonas Öberg
-      Trasig gatubelysning
-      Trasig gatubelysning
-      10
-      open
-      Test
-      2012-11-16T10:35:12,534712Z
-    
-  
-" | html %]
- -[% INCLUDE 'footer.html' %] - -- cgit v1.2.3 From ff0d95217256a4d00945a2cef348a085d6acb97b Mon Sep 17 00:00:00 2001 From: Joe Siltberg Date: Tue, 3 Mar 2020 09:50:17 +0100 Subject: [FixaMinGata] Updates the link in the footer to information for councils. For some unknown reason the redirect we've had sometimes fails. --- templates/web/fixamingata/footer_extra.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/fixamingata/footer_extra.html b/templates/web/fixamingata/footer_extra.html index 0a9ad84d1..260b3af2f 100644 --- a/templates/web/fixamingata/footer_extra.html +++ b/templates/web/fixamingata/footer_extra.html @@ -20,7 +20,7 @@

  • Är du anställd i en kommun?

    -

    Vill du veta mer om FixaMinGata eller hur det kan fungera för er kommun? Läs mer om FixaMinGata för kommuner.

    +

    Vill du veta mer om FixaMinGata eller hur det kan fungera för er kommun? Läs mer om FixaMinGata för kommuner.

    • -- cgit v1.2.3