11 files changed, 108 insertions, 9 deletions
diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html
index 669f137f9..75d915a29 100644
--- a/templates/web/default/admin/council_contacts.html
+++ b/templates/web/default/admin/council_contacts.html
@@ -12,6 +12,13 @@
 <a href="[% c.uri_for( 'council_contacts', area_id, { text => 1 } ) %]">[% loc('Text only version') %]</a>
 </p>
 
+[% IF open311.count > 0 %]
+    <h2>
+    Council contacts configured via Open311
+    </h2>
+
+[% END %]
+
 <form method="post" action="[% c.uri_for('council_contacts', area_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
 
     <table cellspacing="0" cellpadding="2" border="1">
@@ -86,4 +93,31 @@
         </div>
     </form>
 
+    <h2>[% loc('Configure Open311 integration') %]</h2>
+    <form method="post" action="[% c.uri_for('council_contacts', area_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+    [% conf = open311.next %]
+    <p>
+        <label for="endpoint">Endpoint</label>: 
+        <input type="text" name="endpoint" id="endpoint" value="[% conf.endpoint %]" size="50">
+    </p>
+
+    <p>
+        <label for="jurisdiction">Jurisdiction</label>: 
+        <input type="text" name="jurisdiction" id="jurisdiction" value="[% conf.jurisdiction %]" size="50">
+    </p>
+
+    <p>
+        <label for="api_key">Api Key</label>: 
+        <input type="text" name="api_key" id="api_key" value="[% conf.api_key %]" size="25">
+    </p>
+
+    <p>
+    <input type="hidden" name="open311_id" value="[% conf.id %]">
+    <input type="hidden" name="area_id" value="[% area_id %]">
+    <input type="hidden" name="posted" value="open311">
+    <input type="hidden" name="token" value="[% token %]">
+    <input type="submit" name="Configure Open311" value="[% loc('Configure Open311') %]">
+    </p>
+    </form>
+
 [% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html
index 8c9047bb2..3d9c82187 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/default/around/display_location.html
@@ -53,7 +53,7 @@
     [% ELSE %]
         <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 1 } ) %]'>[% loc('Hide pins') %]</a>
     [% END %]
-    [% IF c.cobrand.country == 'GB' %]
+    [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %]
         |
         [% IF c.req.params.all_pins %]
             <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide stale reports') %]</a>
diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index fb1d559b8..d24ee1a5f 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/default/common_header_tags.html
@@ -8,6 +8,12 @@
 
 [% map_js %]
 
+[% IF category_extras_json && category_extras_json != '{}' %]
+<script type="text/javascript">
+    category_extras = [% category_extras_json %];
+</script>
+[% END %]
+
 [% IF robots %]
     <meta name="robots" content="[% robots %]">
 [% ELSIF c.config.STAGING_SITE %]
diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html
index b1f22da2c..38e83c1c2 100644
--- a/templates/web/default/footer.html
+++ b/templates/web/default/footer.html
@@ -10,9 +10,25 @@
 <li><a href="/faq">[% loc("Help") %]</a></li>
 </ul>
 
-[% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %]
+[% IF ! c.cobrand.moniker %]
+  <!-- winter 2011 promotion for unbranded site only -->
+  <div id="promo">
+    <a href="http://www.mysociety.org/2011/11/02/fix-before-the-freeze/" 
+      title="Fix Before the Freeze - report those dangerous potholes and  broken streetlights before winter hits"><img 
+      src="/i/promo-fb4tf.gif" 
+      alt="Fix Before the Freeze - report those dangerous potholes and  broken streetlights before winter hits" ></a>
+  </div>
+  [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="159" height="39" src="/i/mysociety-on-white.gif" alt="View mySociety.org"><span id="logoie"></span></a>') %]
+  
+[% ELSE %]
+
+  [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %]
+
+[% END %]
+
+</div>
+<div id="footer">  
 
-<div id="footer">
     <p>[% loc('Built by <a href="http://www.mysociety.org/">mySociety</a>') %]
     | <a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', '&nbsp;') %]</a></p>
 
@@ -22,13 +38,15 @@
     | <a href="https://market.android.com/details?id=com.android.fixmystreet">Android</a>
     | <a href="http://store.ovi.com/content/107557">Nokia</a>
     </p>
-
+      
     <p class="l">[% loc('Are you from a council? Would you like better integration with FixMyStreet?') %]
-    <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">[% loc('Find out about FixMyStreet for councils') %]</a>.
-
+      <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">[% loc('Find out about FixMyStreet for councils') %]</a>.
+    </p>
+  
     <p class="r">[% loc('Are you a developer? Would you like to contribute to FixMyStreet?') %]
     [% loc('Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]
     </p>
+
 </div>
 
 [% INCLUDE 'debug_footer.html' %]
diff --git a/templates/web/default/header.html b/templates/web/default/header.html
index 54aa3f342..1a3324952 100644
--- a/templates/web/default/header.html
+++ b/templates/web/default/header.html
@@ -32,6 +32,7 @@
             [%- loc('Fix<span id="my">My</span>Street') %]
         [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %]
 
+      <div [% IF ! c.cobrand.moniker %]class="promo-background"[% END %] >
         <ul id="meta">
             [% IF c.user_exists %]
                 <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %]
@@ -40,7 +41,10 @@
                 <li>&nbsp;</li>
             [% END %]
         </ul>
-
         <div id="wrapper"><div id="mysociety">
+          
+          [% IF ! c.cobrand.moniker %]
+          
+          [% END %]
 
     [% INCLUDE 'debug_header.html' %]
diff --git a/templates/web/default/report/new/category_extras.html b/templates/web/default/report/new/category_extras.html
new file mode 100644
index 000000000..479b9f46c
--- /dev/null
+++ b/templates/web/default/report/new/category_extras.html
@@ -0,0 +1,26 @@
+<div id="category_meta">
+    [%- IF report_meta %]
+    [%- category = report.category %]
+    <h4>Additional Information</h4>
+        [%- FOR meta IN category_extras.$category %]
+        [%- meta_name = meta.code -%]
+
+[% IF field_errors.$meta_name %]
+    <div class='form-error'>[% field_errors.$meta_name %]</div>
+[% END -%]
+
+    <div class="form-field">
+        <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label>
+        [% IF meta.exists('values') %]
+        <select name="[% meta_name %]" id="form_[% meta_name %]">
+            [% FOR option IN meta.values.value.keys %]
+                <option value="[% meta.values.value.$option.key %]">[% option %]</option>
+            [% END %]
+        </select>
+        [% ELSE %]
+        <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]">
+        [% END %]
+    </div>
+        [%- END %]
+    [%- END %]
+</div>
diff --git a/templates/web/default/report/new/councils_text_none.html b/templates/web/default/report/new/councils_text_none.html
index f991e031f..06a4bbe49 100644
--- a/templates/web/default/report/new/councils_text_none.html
+++ b/templates/web/default/report/new/councils_text_none.html
@@ -7,9 +7,11 @@
         "We do not yet have details for the councils that cover this location.",
         all_councils.size
     );
-    
+%]
+[%
     loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council.");
-    
+%]
+[%
     tprintf(
         loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."),
         all_council_names.join( loc(' or ') ),
diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html
index c428df514..b6b77c75a 100644
--- a/templates/web/default/report/new/fill_in_details_form.html
+++ b/templates/web/default/report/new/fill_in_details_form.html
@@ -79,6 +79,10 @@
     [% END %]
 [% END %]
 
+[%- IF category_extras %]
+[% PROCESS "report/new/category_extras.html" %]
+[%- END %]
+
 [% IF c.cobrand.allow_photo_upload %]
     [% IF field_errors.photo %]
         <div class='form-error'>[% field_errors.photo %]</div>
diff --git a/templates/web/default/report/new/fill_in_details_text.html b/templates/web/default/report/new/fill_in_details_text.html
index 9ebb8107b..5d9716915 100644
--- a/templates/web/default/report/new/fill_in_details_text.html
+++ b/templates/web/default/report/new/fill_in_details_text.html
@@ -4,6 +4,9 @@
 to help unless you leave as much detail as you can, so please describe the exact location of
 the problem (e.g. on a wall), what it is, how long it has been there, a description (and a
 photo of the problem if you have one), etc.');
+        IF category_extras;
+            ' ' _ loc('Some categories may require additional information.');
+        END;
     ELSE;
         loc('Please fill in details of the problem below.');
     END;
diff --git a/templates/web/default/reports/cobrand_stats.html b/templates/web/default/reports/cobrand_stats.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/default/reports/cobrand_stats.html
diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html
index 0739e84e8..44f0040cb 100755
--- a/templates/web/default/reports/council.html
+++ b/templates/web/default/reports/council.html
@@ -75,6 +75,8 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a
 
 <h2>[% name %]</h2>
 
+[% INCLUDE 'reports/cobrand_stats.html' %]
+
 [% IF c.cobrand.moniker == '' %]
 <p class="promo">
     FixMyStreet is now available for local council websites.