aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/email/fixamingata/submit.txt10
-rwxr-xr-xtemplates/web/fixamingata/about/council.html4
-rwxr-xr-xtemplates/web/fixamingata/about/faq-sv.html2
-rw-r--r--templates/web/fixamingata/footer.html19
-rw-r--r--templates/web/fixamingata/front/recent.html2
-rw-r--r--templates/web/fixamingata/report/new/inline-tips.html2
-rw-r--r--templates/web/fixamingata/report/new/notes.html10
-rw-r--r--templates/web/fixamingata/report/new/sidebar.html5
-rw-r--r--templates/web/stevenage/footer.html56
-rw-r--r--templates/web/stevenage/header.html56
-rw-r--r--templates/web/stevenage/header_logo.html2
11 files changed, 80 insertions, 88 deletions
diff --git a/templates/email/fixamingata/submit.txt b/templates/email/fixamingata/submit.txt
index eab487051..4704cbd56 100644
--- a/templates/email/fixamingata/submit.txt
+++ b/templates/email/fixamingata/submit.txt
@@ -12,17 +12,15 @@ tror medborgaren behöver er uppmärksamhet.
[% url %]
-[% has_photo %]
-
** Uppgiftslämnare
Namn: [% name %]
Epost: [% email %]
-[% phone_line %]
+[% phone_line %]** Information om ärendet
-** Information om ärendet
+ID: [% id %]
[% category_line %]Ärende: [% title %]
@@ -34,7 +32,9 @@ Epost: [% email %]
Longitude: [% longitude %]
-[% closest_address %]----------
+** Övrigt
+
+[% has_photo %][% closest_address %]----------
Svar på det här brevet kommer att skickas till den person som lämnade
rapporten.
diff --git a/templates/web/fixamingata/about/council.html b/templates/web/fixamingata/about/council.html
index 8d968f695..3019f79ff 100755
--- a/templates/web/fixamingata/about/council.html
+++ b/templates/web/fixamingata/about/council.html
@@ -185,9 +185,7 @@ bäst.
verksamhetssystem för att höra dig för.
</p>
<p>
- Vi har också tagit fram en sida med
- <a href="https://wiki.ffkp.se/index.php?title=Open311_och_annan_integration_mot_FixaMinGata">teknisk information om integration av FixaMinGata</a> som
- kan vara lämplig att titta på för mer information.
+ Kontakta gärna oss för teknisk information kring integration av FixaMinGata.
</p>
<h2><a name="kostnader"></a>Kostnader för medverkan</h2>
diff --git a/templates/web/fixamingata/about/faq-sv.html b/templates/web/fixamingata/about/faq-sv.html
index 05ffdaddc..aea90743b 100755
--- a/templates/web/fixamingata/about/faq-sv.html
+++ b/templates/web/fixamingata/about/faq-sv.html
@@ -21,6 +21,8 @@ markera problemen på en karta. Tjänsten bygger på en förlaga från Storbrita
där tjänsten lanserades i Februari 2007. I Norge lanserades den 2011 och i
Sverige 2013.
</dd>
+ <dt>Hur kan jag lämna ett förbättringsförslag kring FixaMinGata?</dt>
+ <dd>Lämna ditt förslag <a href="javascript:UserVoice.showPopupWidget();">här</a>.</dd>
<dt>Hur kommer jag i kontakt med FixaMinGata?</dt>
<dd>Använd vårt <a href="/contact">kontaktformulär</a>.</dd>
<dt>Vilken typ av problem ska jag rapportera i FixaMinGata?</dt>
diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html
index 376d79ff4..a3cf589b9 100644
--- a/templates/web/fixamingata/footer.html
+++ b/templates/web/fixamingata/footer.html
@@ -21,7 +21,7 @@
%]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
%]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
- <li><a href="javascript:UserVoice.showPopupWidget();">Lämna förslag</a></li>
+ <!-- <li><a href="javascript:UserVoice.showPopupWidget();">Lämna förslag</a></li> -->
</ul>
</div>
</div>
@@ -39,21 +39,4 @@
</script>
</body>
-<!-- Piwik -->
-<script type="text/javascript">
- var _paq = _paq || [];
- _paq.push(['trackPageView']);
- _paq.push(['enableLinkTracking']);
- (function() {
- var u=(("https:" == document.location.protocol) ? "https" : "http") + "://stats.jonkri.com/";
- _paq.push(['setTrackerUrl', u+'piwik.php']);
- _paq.push(['setSiteId', 4]);
- var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
- g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
- })();
-</script>
-<noscript><p><img src="http://stats.jonkri.com/piwik.php?idsite=4" style="border:0;" alt="" /></p></noscript>
-<!-- End Piwik Code -->
-<!-- Note, Piwik really should be changed so that we have one for beta and one for www -->
-
</html>
diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html
index 255882f41..f3126c6c3 100644
--- a/templates/web/fixamingata/front/recent.html
+++ b/templates/web/fixamingata/front/recent.html
@@ -13,7 +13,7 @@
}(document, 'script', 'facebook-jssdk'));</script>
<link rel="canonical" href="https://plus.google.com/105025269316032228481" />
<div style="height: 50px; position: relative;"><div class="fb-like" data-href="https://www.facebook.com/fixamingata" data-layout="button_count" data-action="like" data-show-faces="true" data-share="true" style="float: left;"></div>&nbsp;&nbsp;&nbsp;<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script><div style="float: left; padding-left: 20px; padding-top: 2px;"><g:plusone></g:plusone></div></div>
- <div style="padding-bottom: 14px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMin Gata på Google Play" style="height: 45px; width: 129px;" src="/cobrands/fixmystreet/images/google_play_logo.png" /></a></div>
+ <div style="padding-bottom: 14px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMin Gata på Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" style="height: 45px; width: 129px;" /></a><a href="http://appstore.com/fixamingata"><img alt="FixaMin Gata på App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" style="height: 40px; padding-left: 19px; padding-top: 1px; vertical-align: top; width: 135px;" /></a></div>
[% IF recent_photos.size %]
<h2>
[% loc('Recently reported problems') %]
diff --git a/templates/web/fixamingata/report/new/inline-tips.html b/templates/web/fixamingata/report/new/inline-tips.html
index 90bb4f975..4fab9c81c 100644
--- a/templates/web/fixamingata/report/new/inline-tips.html
+++ b/templates/web/fixamingata/report/new/inline-tips.html
@@ -4,8 +4,10 @@
<li>Var trevlig</li>
<li>Ange platser noggrant</li>
<li>Skriv hur gammalt problemet är</li>
+ <li>Fyll i tillräckligt med detaljer för att mottagaren skall kunna hjälpa till</li>
</ul>
<ul class="dont">
+ <li>Vid akut situation används inte FixaMinGata (ex. vattenläckor)</li>
<li>Använd inte FixaMinGata för rena synpunkter och förslag</li>
<li>Inkludera inte privata kontaktdetaljer i beskrivningen</li>
</ul>
diff --git a/templates/web/fixamingata/report/new/notes.html b/templates/web/fixamingata/report/new/notes.html
index 8f081f637..9ec6b0e29 100644
--- a/templates/web/fixamingata/report/new/notes.html
+++ b/templates/web/fixamingata/report/new/notes.html
@@ -1,14 +1,8 @@
-<p>[% loc("Please note:") %]</p>
-
<ul class="plain-list">
- <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li>
- <li>[% loc("Please be polite, concise and to the point.") %]</li>
- <li>[% loc("Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users.") %]</li>
- <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li>
[% IF all_councils.items.first > 0 %]
- <li>[% id = all_councils.items.first;
+ <li style="margin-bottom: 0em;">[% id = all_councils.items.first;
tprintf("Kom ihåg att FixaMinGata primärt är avsett för att rapportera fysiska problem som kan åtgärdas. Om ditt problem inte lämpar sig för att rapportera via den här webbsidan kan du kontakta din kommun direkt via <a href='%s'>deras webbsida</a>.", all_body_urls.$id); %]</li>
[% ELSE %]
- <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li>
+ <li style="margin-bottom: 0em;">[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li>
[% END %]
</ul>
diff --git a/templates/web/fixamingata/report/new/sidebar.html b/templates/web/fixamingata/report/new/sidebar.html
new file mode 100644
index 000000000..972fccf53
--- /dev/null
+++ b/templates/web/fixamingata/report/new/sidebar.html
@@ -0,0 +1,5 @@
+<div id="report-a-problem-sidebar">
+ <div class="sidebar-notes">
+ [% INCLUDE 'report/new/notes.html' %]
+ </div>
+</div>
diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html
index f9bf63fb6..b81a949a1 100644
--- a/templates/web/stevenage/footer.html
+++ b/templates/web/stevenage/footer.html
@@ -32,6 +32,62 @@
</div><!-- .table-cell -->
<div class="nav-wrapper">
+
+
+ <header id="stevenage_cc_header" role="banner">
+ <div id="stv-headerWrapper">
+ <div id="stv-header">
+ <div class="stv-inner">
+
+ <div id="stv-logo">
+ <h1><a href="/"><img src="http://www.stevenage.gov.uk/Images/logo.gif" alt="Stevenage Borough Council"></a></h1>
+ </div>
+
+ <div class="stv-mapLogo">
+ <img src="http://www.stevenage.gov.uk/Images/mapLogo.gif" alt="">
+ </div>
+
+ <div id="stv-pageTools" class="stv-floatHolder">
+ <div id="stv-searchStatic">
+ <label for="search">Search</label> <input type="hidden" name="view" value="Search results"> <input name="search" type="text" value="" placeholder="Search for..." id="stv-search" class="stv-searchInput"> <input type="submit" value="GO">
+ </div>
+ </div>
+
+ <div class="stv-parf stv-floatHolder">
+ <a href="http://www.stevenage.gov.uk/pay/"><span class="stv-title">Pay</span> your Council Tax bill and more</a> <a href="http://www.stevenage.gov.uk/apply/"><span class="stv-title">Apply</span> for planning permission and more</a> <a href="http://www.stevenage.gov.uk/report/"><span class="stv-title">Report</span> a missed bin and more</a> <a href="http://www.stevenage.gov.uk/find/" class="stv-find"><span class="stv-title">Find</span> your local councillor and more</a>
+ </div>
+
+ </div>
+ </div>
+ <div id="stv-menu">
+ <div id="stv-primaryNavigation">
+ <ul id="stv-ctl00_ctl00_PrimaryNavigationLinks" class="stv-floatHolder">
+ <li>
+ <a href="http://www.stevenage.gov.uk/council-services/">Council Services</a>
+ </li>
+ <li>
+ <a href="http://www.stevenage.gov.uk/about-the-council/">About the Council</a>
+ </li>
+ <li>
+ <a href="http://www.stevenage.gov.uk/about-stevenage/">About Stevenage</a>
+ </li>
+ <li>
+ <a href="http://www.stevenage.gov.uk/news-and-events/">News and Events</a>
+ </li>
+ <li>
+ <a href="http://www.stevenage.gov.uk/links/">Popular Links</a>
+ </li>
+ <li>
+ <a href="http://www.stevenage.gov.uk/have-your-say/">Have Your Say</a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </header>
+
+
+
<div class="nav-wrapper-2">
<div id="main-nav" role="navigation">
<ul class="nav-menu nav-menu--main">
diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html
index 11e362612..ffcc9ec86 100644
--- a/templates/web/stevenage/header.html
+++ b/templates/web/stevenage/header.html
@@ -22,7 +22,7 @@
<script src="[% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
[% INCLUDE 'common_header_tags.html' %]
[% extra_js %]
-
+
[% INCLUDE 'tracking_code.html' %]
[% PROCESS 'header_extra.html' %]
</head>
@@ -30,59 +30,9 @@
<div class="wrapper">
<div class="table-cell">
- <header id="stevenage_cc_header" role="banner">
- <div id="stv-headerWrapper">
- <div id="stv-header">
- <div class="stv-inner">
-
- <div id="stv-logo">
- <h1><a href="/"><img src="http://www.stevenage.gov.uk/Images/logo.gif" alt="Stevenage Borough Council"></a></h1>
- </div>
-
- <div class="stv-mapLogo">
- <img src="http://www.stevenage.gov.uk/Images/mapLogo.gif" alt="">
- </div>
-
- <div id="stv-pageTools" class="stv-floatHolder">
- <div id="stv-searchStatic">
- <label for="search">Search</label> <input type="hidden" name="view" value="Search results"> <input name="search" type="text" value="" placeholder="Search for..." id="stv-search" class="stv-searchInput"> <input type="submit" value="GO">
- </div>
- </div>
-
- <div class="stv-parf stv-floatHolder">
- <a href="http://www.stevenage.gov.uk/pay/"><span class="stv-title">Pay</span> your Council Tax bill and more</a> <a href="http://www.stevenage.gov.uk/apply/"><span class="stv-title">Apply</span> for planning permission and more</a> <a href="http://www.stevenage.gov.uk/report/"><span class="stv-title">Report</span> a missed bin and more</a> <a href="http://www.stevenage.gov.uk/find/" class="stv-find"><span class="stv-title">Find</span> your local councillor and more</a>
- </div>
-
- </div>
- </div>
- <div id="stv-menu">
- <div id="stv-primaryNavigation">
- <ul id="stv-ctl00_ctl00_PrimaryNavigationLinks" class="stv-floatHolder">
- <li>
- <a href="http://www.stevenage.gov.uk/council-services/">Council Services</a>
- </li>
- <li>
- <a href="http://www.stevenage.gov.uk/about-the-council/">About the Council</a>
- </li>
- <li>
- <a href="http://www.stevenage.gov.uk/about-stevenage/">About Stevenage</a>
- </li>
- <li>
- <a href="http://www.stevenage.gov.uk/news-and-events/">News and Events</a>
- </li>
- <li>
- <a href="http://www.stevenage.gov.uk/links/">Popular Links</a>
- </li>
- <li>
- <a href="http://www.stevenage.gov.uk/have-your-say/">Have Your Say</a>
- </li>
- </ul>
- </div>
- </div>
- </div>
- </header>
<header id="site-header">
<div class="container">
+ [% INCLUDE 'header_logo.html' %]
<a href="#main-nav" id="nav-link">Main Navigation</a>
</div>
</header>
@@ -90,7 +40,7 @@
[% IF c.user_exists %]
<div id="user-meta">
<p>
- [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
+ [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
<a href="/auth/sign_out">[% loc('sign out') %]</a>
</p>
</div>
diff --git a/templates/web/stevenage/header_logo.html b/templates/web/stevenage/header_logo.html
new file mode 100644
index 000000000..b30c1d811
--- /dev/null
+++ b/templates/web/stevenage/header_logo.html
@@ -0,0 +1,2 @@
+ <a href="[% c.cobrand.base_url IF admin %]/" id="site-logo"><img src="http://www.stevenage.gov.uk/Images/logo.gif" width="82" height="45"></a>
+ <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-05 02:16:16 +0000