diff options
author | Struan Donald <struan@exo.org.uk> | 2011-07-26 14:41:44 +0100 |
---|---|---|
committer | Struan Donald <struan@exo.org.uk> | 2011-07-26 14:41:44 +0100 |
commit | 198fcef62892fe0b2fbb3ea8a080fca87843445e (patch) | |
tree | ccc334ee22b6a84739e6da607648f3276cb4d3b3 | |
parent | 5ddd2845a2310f65cb5b971bbe2963d67e463cee (diff) | |
parent | 55e82f319b15a2f9504cb83cf32d7cc357948f14 (diff) |
Merge branch 'lichfield-cobrand'
-rw-r--r-- | perllib/FixMyStreet/Cobrand/Lichfield.pm | 81 | ||||
-rw-r--r-- | templates/web/lichfield/footer.html | 128 | ||||
-rw-r--r-- | templates/web/lichfield/header.html | 190 | ||||
-rw-r--r-- | web/cobrands/lichfield/css/layout.css | 61 |
4 files changed, 460 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Lichfield.pm b/perllib/FixMyStreet/Cobrand/Lichfield.pm new file mode 100644 index 000000000..9865bfa7b --- /dev/null +++ b/perllib/FixMyStreet/Cobrand/Lichfield.pm @@ -0,0 +1,81 @@ +package FixMyStreet::Cobrand::Lichfield; +use base 'FixMyStreet::Cobrand::Default'; + +use strict; +use warnings; + +use Carp; +use URI::Escape; +use mySociety::VotingArea; + +sub site_restriction { + return ( "and council like '%2434%'", 'lichfield', { council => '2434' } ); +} + +sub problems_clause { + return { council => { like => '%2434%' } }; +} + +sub problems { + my $self = shift; + return $self->{c}->model('DB::Problem')->search( $self->problems_clause ); +} + +sub base_url { + my $base_url = mySociety::Config::get('BASE_URL'); + if ( $base_url !~ /lichfield/ ) { + $base_url =~ s{http://(?!www\.)}{http://lichfield.}g; + $base_url =~ s{http://www\.}{http://lichfield.}g; + } + return $base_url; +} + +sub site_title { + my ($self) = @_; + return 'Lichfield Council FixMyStreet'; +} + +sub enter_postcode_text { + my ($self) = @_; + return 'Enter a Lichfield postcode, or street name and area'; +} + +sub council_check { + my ( $self, $params, $context ) = @_; + + my $councils = $params->{all_councils}; + my $council_match = defined $councils->{2434}; + if ($council_match) { + return 1; + } + my $url = 'http://www.fixmystreet.com/'; + $url .= 'alert' if $context eq 'alert'; + $url .= '?pc=' . URI::Escape::uri_escape( $self->{c}->req->param('pc') ) + if $self->{c}->req->param('pc'); + my $error_msg = "That location is not covered by Lichfield. +Please visit <a href=\"$url\">the main FixMyStreet site</a>."; + return ( 0, $error_msg ); +} + +# All reports page only has the one council. +sub all_councils_report { + return 0; +} + +# FIXME - need to double check this is all correct +sub disambiguate_location { + return { + centre => '52.688198,-1.804966', + span => '0.1196,0.218675', + bounds => [ '52.807793,-1.586291', '52.584891,-1.963232' ], + }; +} + +sub recent_photos { + my ( $self, $num, $lat, $lon, $dist ) = @_; + $num = 2 if $num == 3; + return $self->problems->recent_photos( $num, $lat, $lon, $dist ); +} + +1; + diff --git a/templates/web/lichfield/footer.html b/templates/web/lichfield/footer.html new file mode 100644 index 000000000..2a0fee889 --- /dev/null +++ b/templates/web/lichfield/footer.html @@ -0,0 +1,128 @@ + </div> + <br class="cl"> + </div><!-- end content --> + </div><!-- end wrap --> + + </div><!-- End content --> + + <div class="colinfo"> + <form action="http://www.lichfielddc.gov.uk/site/scripts/documents.php" method="get" class="catNav" name="catNav"> + <h2>Information on...</h2> + <select name="categoryID" onchange="submitform('catNav')"> + <option value="100001">Advice and benefits</option> + <option value="100002">Business</option> + + <option value="100003">Community and living</option> + <option value="100004">Council and democracy</option> + <option value="100005">Education and learning</option> + <option value="100006">Environment and planning</option> + <option value="100007">Housing</option> + <option value="100008">Jobs and careers</option> + + <option value="100009">Leisure and culture</option> + <option value="100010">Health and social care</option> + <option value="100011">Transport and streets</option> + </select> + <noscript><input type="submit" value="Go" class="button" id="go"/></noscript> + </form> + </div> + +<ul id="column_nav"> + <li class="column_widget"> + <h2>FixMyStreet</h2> + <ul> + [% IF c.user_exists %] + <li class="section">[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %]</li> + <li class="section"><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> + [% END %] + <li class="section"><a href="/">Report a problem</a></li> + <li class="section"><a href="/reports/Lichfield">All reports</a></li> + <li class="section"><a href="/my">Your reports</a></li> + <li class="section"><a href="/alert">Local alerts</a></li> + <li class="section"><a href="/faq">Help</a></li> + <li class="section"><a href="/contact">Contact</a></li> + </ul> + </li> + <!-- End left-hand supplements --> + +</ul> + <br class="clear" /> + </div> + + </div> + <br class="clear" /> + <br class="clear" /> + + <ul class="contactbox"> + <li class="taxonomy"> + <h2>Browse council information on...</h2> + <ul> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100001">Advice and benefits</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100002">Business</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100003">Community and living</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100004">Council and democracy</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100005">Education and learning</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100006">Environment and planning</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100007">Housing</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100008">Jobs and careers</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100009">Leisure and culture</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100010">Health and social care</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100011">Transport and streets</a></li> + </ul> + </li> + <li class="contact vcard"> + <a href="http://www.lichfielddc.gov.uk/site/scripts/location.php"><img src="http://www.lichfielddc.gov.uk/site/images/map.gif" alt="" /></a> + <h2>Get in touch or visit...</h2> + <ul> + <li><a href="http://www.lichfielddc.gov.uk/site/custom_scripts/feedback2.php">Your feedback or comments</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/faqs_ask.php">Ask a question about our services</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/location.php">Our location and travel details</a></li> + </ul> + <p class="fn councilName">Lichfield District Council</p> + <p class="phone tel">Phone our call centre: <span>01543 308 000</span></p> + <p class="adr">District Council House, Frog Lane, Lichfield, Staffs, WS13 6YY</p> + </li> + <li class="focus"> + <h2>Our focus and priorities...</h2> + <ul> + <li><h3><a href="http://www.lichfielddc.gov.uk/people">Centred on people</a></h3> + <a href="http://www.lichfielddc.gov.uk/people"><img src="http://www.lichfielddc.gov.uk/site/images/people.gif" alt="" /></a> + </li> + <li><h3><a href="http://www.lichfielddc.gov.uk/place">Focused on place</a></h3> + <a href="http://www.lichfielddc.gov.uk/place"><img src="http://www.lichfielddc.gov.uk/site/images/place.gif" alt="" /></a> + </li> + <li><h3><a href="http://www.lichfielddc.gov.uk/improvement">Delivering through improvement</a></h3> + <a href="http://www.lichfielddc.gov.uk/improvement"><img src="http://www.lichfielddc.gov.uk/site/images/improvement.gif" alt="" /></a> + </li> + </ul> + </li> + </ul><!-- end contactbox --> + <div id="footer"> + <img src="http://www.lichfielddc.gov.uk/site/images/footer-logo.gif" alt="Lichfield District Council" /> + <p class="addNav"><a href="http://www.lichfielddc.gov.uk/site/custom_scripts/mysociety/footer.php?#mast">Jump to the top</a></p> + <p class="addNav"><a href="http://www.lichfielddc.gov.uk/site/scripts/terms.php">Terms and Disclaimer</a> - <a href="http://www.lichfielddc.gov.uk/site/scripts/accessibility.php">Accessibility Statement</a> - <a href="http://www.lichfielddc.gov.uk/site/scripts/website_statistics.php">Websites statistics</a> - <a accesskey="3" href="http://www.lichfielddc.gov.uk/site/scripts/site_map.php">Site map</a> - Lichfield District Council © 2010</p> + + <p class="addNav">Made with <a href="http://validator.w3.org/">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/">CSS</a> to <a href="http://www.w3.org/WAI/WCAG1AA-Conformance">WAI-AA</a>. <a href="http://www.icra.org">ICRA</a> rated. Powered by Jadu <a href="http://www.jadu.co.uk" >Content Management</a>.</p> + + <p class="addNav"><a href="http://www.direct.gov.uk">www.direct.gov.uk</a> - A Beacon Authority</p> + +<p class="hidden"> + <a accesskey="1" href="http://www.lichfielddc.gov.uk">Homepage</a> / + <a accesskey="2" href="http://www.lichfielddc.gov.uk/site/scripts/whats_new_index.php">Whats new </a> / + <a accesskey="3" href="http://www.lichfielddc.gov.uk/site/scripts/site_map.php">Site map</a> / + <a accesskey="4" href="http://www.lichfielddc.gov.uk/site/scripts/search_index.php">Search facility </a> / + <a accesskey="5" href="http://www.lichfielddc.gov.uk/site/scripts/faqs_index.php">Frequently asked questions</a> / + <a accesskey="7" href="http://www.lichfielddc.gov.uk/site/scripts/contact.php">Complaints procedure (Contacting the Council page)</a> / + <a accesskey="8" href="http://www.lichfielddc.gov.uk/site/scripts/terms.php">Terms and Privacy</a> / + <a accesskey="9" href="http://www.lichfielddc.gov.uk/site/scripts/feedback.php">Feedback</a> / + <a accesskey="0" href="http://www.lichfielddc.gov.uk/site/scripts/accessibility.php">Access key details</a> / + <a accesskey="/" href="#mast">Top of the page</a> +</p> + + +</div> +</div> +<!-- #################################### --> +<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script><script type="text/javascript"> _uacct = "UA-511839-1"; urchinTracker(); </script> +</body> +</html> diff --git a/templates/web/lichfield/header.html b/templates/web/lichfield/header.html new file mode 100644 index 000000000..7b414159a --- /dev/null +++ b/templates/web/lichfield/header.html @@ -0,0 +1,190 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="[% lang_code %]"> +<head> + +<style type="text/css"> + @import url(/css/core.css); + @import url(/cobrands/lichfield/css/layout.css); +</style> + + <link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/standard.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/style.php" media="screen" /> + +<!--[if lte IE 6]> + <link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/ie_special.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/ie_special_print.css" media="print" /> +<![endif]--> +<!--[if IE 7]> + <link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/ie-seven.css" media="screen" /> +<![endif]--> + +<link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/print.css" media="print" /> +<link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/handheld.css" media="handheld" /> +<link rel="stylesheet" type="text/css" href="/assets/lichfielddc/reset.css"> +<link rel="stylesheet" type="text/css" href="/pet.css"> +<link rel="stylesheet" type="text/css" href="/assets/lichfielddc/css.css"> + +<link rel="Shortcut Icon" type="image/x-icon" href="http://www.lichfielddc.gov.uk/site/favicon.ico" /> +<link rel="ToC" href="http://www.lichfielddc.gov.uk/site/scripts/site_map.php" /> + + <link rel="search" type="application/opensearchdescription+xml" href="http://www.lichfielddc.gov.uk/openSearch.php" title="Lichfield District Council" /> + + <!-- general metadata --> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <meta http-equiv="content-language" content="en" /> + <meta name="generator" content="http://www.jadu.co.uk" /> + <meta name="robots" content="index,follow" /> + <meta name="revisit-after" content="2 days" /> + <meta name="Author-Template" content="Jadu CSS design" /> + <meta name="Author" content="Lichfield District Council" /> + <meta name="Publisher" content="Lichfield District Council, District Council House, Frog Lane, Lichfield, Staffordshire. WS13 6YY" /> + <meta name="Publisher-Email" content="webmaster@lichfielddc.gov.uk" /> + <meta name="Coverage" content="Worldwide" /> + + <!-- ICRA PICS label --> + <link rel="meta" href="http://www.lichfielddc.gov.uk/labels.rdf" type="application/rdf+xml" title="ICRA labels" /> + <!-- Dublin Core Metadata --> + <meta name="DC.creator" lang="en" content="Lichfield District Council" /> + <meta name="DC.date.created" lang="en" content="PARAM_DATE" /> + <meta name="DC.format" lang="en" content="text/html" /> + <meta name="DC.language" content="en" /> + <meta name="DC.publisher" lang="en" content="Lichfield District Council, District Council House, Frog Lane, Lichfield, Staffordshire. WS13 6YY" /> + <meta name="DC.rights.copyright" lang="en" content="Copyright 2010 Lichfield District Council" /> + <meta name="DC.coverage" lang="en" content="Worldwide" /> + <meta name="DC.identifier" content="PARAM_DC_IDENTIFIER" /> + + <!-- eGMS Metadata --> + <meta name="eGMS.status" lang="en" content="V1.0 Public Consumption" /> + <meta name="eGMS.accessibility" scheme="WCAG" content="Double-A" /> + + <!-- javascript --> + <script type="text/javascript" src="http://www.lichfielddc.gov.uk/site/javascript/prototype.js"></script> + <script type="text/javascript" src="http://www.lichfielddc.gov.uk/site/javascript/scriptaculous.js"></script> + <script type="text/javascript" src="http://www.lichfielddc.gov.uk/site/custom_scripts/lightbox/js/lightbox.js"></script> + <script type="text/javascript" src="http://www.lichfielddc.gov.uk/site/javascript/global.js"></script> + + + <meta name="Keywords" content="home, homepage, index, root, Lichfield, UK, England, local authority, council, local government, services, citizen, councillor, community, leisure, tourist, tourism, social services, education, enviroment, fire, emergency planning, road safety, transport, motorways, library, libraries, archive, public record, record office, parish councils, county councillors" /> + <meta name="Description" content="Lichfield District Council: PARAM_DESCRIPTION" /> + + <meta name="DC.title" lang="en" content="Lichfield District Council: PARAM_TITLE" /> + <meta name="DC.description" lang="en" content="Lichfield District Council: PARAM_DESCRIPTION" /> + + <meta name="DC.subject" lang="en" scheme="eGMS.IPSV" content="Local government;Government, politics and public administration" /> + <meta name="DC.subject" lang="en" content="Council, government and democracy" /> + +[% INCLUDE 'common_header_tags.html' %] +</head> +<body PARAM_BODYID> +<!-- ########## MAIN STRUCTURE ######### --> +<div id="container"> +<div id="mobile_name">Lichfield District Council</div> +<div id="mast"> + <p class="skip"> + <a accesskey="s" title="Skip to page content, access key S" href="http://www.lichfielddc.gov.uk/site/custom_scripts/mysociety/header.php?#main" rel="nofollow">Jump to content</a> - + <a accesskey="n" title="Skip to main navigation, access key N" href="http://www.lichfielddc.gov.uk/site/custom_scripts/mysociety/header.php?#main-nav" rel="nofollow">Jump to navigation</a> - + + <a class="access" title="Change font size, colour and contrast of this site" href="http://www.lichfielddc.gov.uk/site/scripts/user_settings.php">Accessibility Settings</a> + </p> + <!--<form action="http://www.lichfielddc.gov.uk/site/scripts/search_results.php" method="get" id="search"> + <fieldset><a title="Create a specific detailed search" href="http://www.lichfielddc.gov.uk/site/scripts/search_index.php">Need help finding something?</a> + <label for="SearchSite">Search this site</label> + <input type="text" size="18" maxlength="40" class="field" name="searchQuery" id="SearchSite" value="" /> + <input type="submit" value="Search" class="button" /></fieldset> + </form>--> + <form action="http://www.lichfielddc.gov.uk/site/scripts/google_results.php" method="get" name="search" id="search"> + <fieldset><a title="Create a specific detailed search" href="http://www.lichfielddc.gov.uk/site/scripts/search_index.php">Need help finding something?</a> + <label for="SearchSite">Search this site</label> + <input type="text" name="q" size="18" maxlength="40" class="field" id="SearchSite" value=""/> + <input type="hidden" name="site" value="ldc"/> + <input type="hidden" name="client" value="ldc"/> + <input type="hidden" name="output" value="xml"/> + <input type="submit" value="Search" class="button" /></fieldset> + </form> + <div class="pseudoH1"> + <a href="http://www.lichfielddc.gov.uk/site/index.php"><span>Lichfield District Council</span></a> + </div> + + <p class="about"> + Making it easy to <a href="http://www.lichfielddc.gov.uk/site/scripts/az_home.php" class="tt">access council services</a>, <a href="http://www.lichfielddc.gov.uk/reportit" class="tt">report problems</a> in your area, view <a href="http://www.lichfielddc.gov.uk/planning" class="tt">planning applications</a>, find out <a href="http://www.lichfielddc.gov.uk/whatsgoingon" class="tt">what's going on locally</a>, <a href="http://www.lichfielddc.gov.uk/voiceit" class="tt">have your say</a> on local issues, and much more. + </p> + + <a name="main-nav"></a> + <h2>Navigation</h2> + <ul> + <li><a href="http://www.lichfielddc.gov.uk" title="View the home page">Home</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/az_home.php">A-Z of services</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents_index.php">Council services</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/custom_scripts/newsblogindex.php">News</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/contact.php">Contacts</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/scripts/location.php">Opening hours and location</a></li> + <li><a href="http://www.lichfielddc.gov.uk/site/custom_scripts/myareasearch.php" id="myarea">My area</a> + </li> + <li><a href="http://www.lichfielddc.gov.uk/site/custom_scripts/map.php" >Online map</a></li> + <!-- <li class="sign-in"><a href="http://www.lichfielddc.gov.uk/site/index.php?sign_in=true">Sign-in</a> or <a href="http://www.lichfielddc.gov.uk/site/scripts/register.php">Register</a></li> --> + <li class="sign-in"> + + <a href="http://www.lichfielddc.gov.uk/site/index.php?sign_in=true">Sign in</a> or + + + <a href="http://www.lichfielddc.gov.uk/site/scripts/register.php">Register</a> + </li> + + </ul><!-- end navigation --> + <!-- + <span id="postcodebox" style="display: none;"> +<form action="http://www.lichfielddc.gov.uk/site/custom_scripts/myarea.php" method="get" id="pcodeform"> +<label for="postcode">Your Postcode: </label><input name="postcode" id="postcode" class="text" /> <input value="Go!" name="submit" class="pbutton" type="submit" /> +</form> +</span> --> + + + <div class="clear"></div> +</div> + +<div id="suggest"></div> +<script type="text/javascript" src="http://www.lichfielddc.gov.uk/site/javascript/effects.js"></script> +<script type="text/javascript"> + new Ajax.Autocompleter('SearchSite', 'suggest', 'http://www.lichfielddc.gov.uk/site/custom_scripts/autocomplete.php', { + paramName: 'search', + minChars: 1, + afterUpdateElement : goTo + }); + + function goTo(text, li) { + var url = li.title; + window.location = url; + } + +/* document.observe("dom:loaded", function() { + Event.observe($('myarea'), 'click', function(event) { + $('postcodebox').appear(); + event.stop(event); + }); + }); */ + </script> <div id="page_wrap"> + <div id="mainContent"> + <div id="content" class="withWidth"> + <a name="main"></a> + + <!-- BREAD CRUMB NAVIGATION --> + + <!-- Breadcrumb --><!-- googleoff:all --> + <ul id="breadcrumb"> + <li><a href="http://www.lichfielddc.gov.uk/site/">Home</a></li><li><a href="http://lichfield.fixmystreet.com/">FixMyStreet</a></li> + <li class="bc_end"> + [% SWITCH c.req.uri.path %]Report a problem + [% CASE '/' %]Report a problem + [% CASE '/reports/Lichfield' %]All reports + [% CASE '/my' %]Your reports + [% CASE '/alert' %]Local alerts + [% CASE '/faq' %]Help + [% CASE '/contact' %] Contact + [% END %] + </li></ul> + <!-- END Breadcrumb --><!-- googleon:all --> + <!-- END BREAD CRUMB --> + <div id="wrap"> + <div id="content"> + <div id="mysociety"> + diff --git a/web/cobrands/lichfield/css/layout.css b/web/cobrands/lichfield/css/layout.css new file mode 100644 index 000000000..9485985eb --- /dev/null +++ b/web/cobrands/lichfield/css/layout.css @@ -0,0 +1,61 @@ +#mysociety #postcodeForm { + padding: 0.8em; + background-color: #F3F4F4; +} + +#mysociety #postcodeForm label { + float: none; + margin-bottom: 5px; + width: auto !important; +} + +#mysociety #map_box { + width: 380px; +} + +#mysociety #map, #mysociety #drag { + width: 378px; + height: 378px; +} + +#mysociety p { + margin: 1em 0px; + padding: 0px; +} + +#mysociety #update_form { + clear: both; +} + +#mysociety #form_sign_in { + padding-top: 2em; +} + +#mysociety form label { + width: 6em; + display: inline; + margin-right: 0px; +} + +#mysociety div.checkbox { + padding-left: 6.5em; +} + +#mysociety textarea, +#mysociety input { + background-color: #f9f9f1; + margin: 4px; +} + +#mysociety #fileupload_normalUI input { + background-color: white; +} + +#mysociety input[type='submit']{ + border: 0px; + color: white; + padding: 3px; + vertical-align: top; + font:150%/1.4em "Trebuchet MS", Helvetica, Arial, Sans-serif; + background:url(http://www.lichfielddc.gov.uk/site/styles/css_img/nav-bg.png) top repeat-x; +} |