Skip to content
This repository has been archived by the owner on Jun 26, 2018. It is now read-only.

Commit

Permalink
Merge branch '108-rbwm-reskin'
Browse files Browse the repository at this point in the history
  • Loading branch information
davea committed Jan 6, 2016
2 parents d001e14 + bcb1134 commit 383f739
Show file tree
Hide file tree
Showing 35 changed files with 4,955 additions and 418 deletions.
5 changes: 5 additions & 0 deletions phplib/microsites.php
Expand Up @@ -189,7 +189,12 @@ function microsites_navigation_menu($contact_ref) {
debug_timestamp(true, "retrieved person record");

$menu = array();
$menu[_('Start a Pledge')] = "/new";
$menu[_('All Pledges')] = "/list";
if ($P)
$menu[_('My Pledges')] = "/my";
else
$menu[_('Login')] = "/my";
$menu[_('About')] = "/faq";

return $menu;
Expand Down
5 changes: 4 additions & 1 deletion phplib/pledge.php
Expand Up @@ -1136,7 +1136,10 @@ function send_announce_token($pledge_id) {
Print relevant advertising */
function post_confirm_advertise() {
if (!microsites_local_alerts()) return;
return;
print _("<p>PledgeBank can send you email alerts when people
create local pledges in your area. Sign up - you don't know
what interesting things people might be getting up to.</p>");
pb_view_local_alert_quick_signup("localsignupfrontpage", array());
}

/* post_confirm_advertise_flyers PLEDGE_ROW
Expand Down
4 changes: 4 additions & 0 deletions templates/emails/succeeded-signer
Expand Up @@ -14,3 +14,7 @@ plan some next steps. And while you're at it, Why not take some photos of you
fulfilling your pledge - we love pics :) Do send any pictures to us.

<?=$values['signature']?>

KEEP UP TO DATE - Sign up to get emails when people create new pledges in your
area (max one email a day). Click here and enter your postcode:
<?=$values['local_alert_url']?>
4 changes: 4 additions & 0 deletions templates/emails/succeeded-signer-byarea
Expand Up @@ -16,3 +16,7 @@ plan some next steps. And, while you're at it, why not take some photos of you
fulfilling your pledge - we love pics :) Do send any pictures to us.

<?=$values['signature']?>

KEEP UP TO DATE - Sign up to get emails when people create new pledges in your
area (max one email a day). Click here and enter your postcode:
<?=$values['local_alert_url']?>
266 changes: 83 additions & 183 deletions templates/rbwm/footer.php
@@ -1,186 +1,86 @@


<!-- start of foot -->
<br class="clearer">
<!-- WebMetric snippet starts here -->
<form method="post" action="http://www.govmetric.com/WebMetric/websatisfaction.aspx" id="govmetric">
<div class="outline noprint" style="text-align: center;">
<div>
How do you rate this information/service?
</div>
<input type="hidden" value="409" name="organisationid"> <input type="image" value="1" name="metric1" alt="Rate as Good" src="http://www.rbwm.gov.uk/graphics/med_greenface.jpg"> <input type="image" value="2" name="metric2" alt="Rate as Average" src="http://www.rbwm.gov.uk/graphics/med_orangeface.jpg"> <input type="image" value="3" name="metric3" alt="Rate as Poor" src="http://www.rbwm.gov.uk/graphics/med_redface.jpg"> <a href="/web/csc_website_feedback.htm"><img src="http://www.rbwm.gov.uk/graphics/med_purplehelp.jpg" alt="Help - What does this mean?"></a>
</div>
</form>
<!-- WebMetric snippet ends here -->
<div class="clearer">
</div>
</div>
<div class="clearer">
</div>
<div class="center noprint">
Find us on:&#160;
<br>
<a href="http://www.facebook.com/pages/Maidenhead-United-Kingdom/RBWM/118508024841691"><img src="http://www.rbwm.gov.uk/graphics/facebook_62x78.png" alt="RBWM on Facebook"></a><span class="hidden">|</span> <a href="http://twitter.com/rbwm"><img src="http://www.rbwm.gov.uk/graphics/twitter_62x78.png" alt="RBWM on Twitter"></a><span class="hidden">|</span> <a href="http://www.youtube.com/user/WindsorMaidenhead"><img src="http://www.rbwm.gov.uk/graphics/youtube_62x78.png" alt="RBWM on YouTube"></a><span class="hidden">|</span>
</div>
<!-- START: Footer-->
<div id="rbwm-footer">
<div class="lite">
<a href="http://www.rbwm.gov.uk/copyrite.htm#Disclaimer">Disclaimer</a> |
<a href="http://www.rbwm.gov.uk/copyrite.htm#Privacy">Privacy</a> |
<a href="http://www.rbwm.gov.uk/forms/af3/an/default.aspx/RenderForm/?F.Name=complaints">Complaints</a>
<hr class="hidden">
</div>
<div class="strapline">
<a href="http://www.direct.gov.uk/"><img src="http://www.rbwm.gov.uk/graphics/direct_gov_logo.gif"
alt="[External Link] Directgov - public services all in one place" class="flrhs"></a>
<hr class="hidden">
<address>
<a href="http://www.rbwm.gov.uk/copyrite.htm" accesskey="8" title="Access key: 8">Copyright &#169; 2014
The Royal Borough of Windsor and Maidenhead</a>, Town Hall, St Ives Road, Maidenhead, Berkshire SL6 1RF
</address>
Email: <a href="mailto:customer.service@rbwm.gov.uk"><b>customer.service@rbwm.gov.uk</b></a><br>
Tel: <b>01628 683800</b> |
Fax: <b>01628 685757</b> |
</div>
</div>
<!-- END: Footer -->
<div class="clearer"></div>
<!-- START: Internal System Use Only -->
<div class="noprint internal-systems smalltext">
Validate: <a href="http://validator.w3.org/check?uri=referer"><img
src="http://www.w3.org/Icons/valid-html401"
alt="Valid HTML 4.01 Transitional" height="31" width="88"></a>
<br>
<!--ZOOMSTOP-->
Modified: 2014-09-24
<br>
Author: Simon Arthur
<br>
<!--ZOOMRESTART-->
<!-- SITESTAT4 - BEGIN -->
<script type='text/javascript'>
<!--
// S.Arthur - 2007-09-14
var locHost = location.host
var locPath = location.pathname
var myCount = 0
// ASP QS EXTRA CODE
var locQuery2 = new String();
var locQuery = location.search.substring(1).toLowerCase();
var locQueryArray = new Array();
locQueryArray = locQuery.split('&');
myCount = locQueryArray.length
var x = 0;
while (x < myCount) { locQuery2 += ("." + locQueryArray[x]); x++; }
regexp = /=/g; // REPLACE EQUALS WITH HYTHEN
locQuery = locQuery2.replace(regexp, "-");
// NORMAL HTML CODE
var iLen = locPath.length;
var myLastChar = locPath.substring(iLen, iLen -1);
if (myLastChar == "/") {
locPath += "index.htm";
}
var myPathArray = locPath.split("/")
myCount = myPathArray.length
myCount = (myCount -1)
var NScounter = "";
var x = 1;
if (myCount <= x) { NScounter == "main."; }
else { while (x < myCount) { NScounter += (myPathArray[x] + "."); x++; } }
var locFile = myPathArray[myCount]
var myFileString = locFile.toLowerCase()
var regexp
var myFileArray
regexp = /.htm$/;
myFileArray = locFile.split(regexp);
locFile = myFileArray[0];
regexp = /.asp$/;
myFileArray = locFile.split(regexp);
locFile = myFileArray[0];
regexp = /^[0-9]*_*/;
myFileArray = locFile.split(regexp);
regexp = /_{1}/;
myFileArray = locFile.replace(regexp, ".");
NScounter += (myFileArray);
document.write("<div class=\"smltxt\">SiteStat: " + NScounter + locQuery + "<\/div>")
// END
function sitestat(ns_l){
ns_l+='&amp;ns__t='+(new Date()).getTime();
ns_pixelUrl=ns_l;
ns_0=document.referrer;
ns_0=(ns_0.lastIndexOf('/')==ns_0.length-1)?ns_0.substring(ns_0.lastIndexOf('/'),0):ns_0;
if(ns_0.length>0)ns_l+='&amp;ns_referrer='+escape(ns_0);
if(document.images){
ns_1=new Image();ns_1.src=ns_l;
} else {
document.write('<img src="'+ns_l+'" width="1" height="1" alt="">');
}
}
sitestat('http://uk.sitestat.com/rbwm/rbwm/s?name=' + NScounter + locQuery + "&amp;ns_search_term&ns_search_result);
//-->
</script>
<noscript>
<img src="http://uk.sitestat.com/rbwm/rbwm/s?name=index.htm" width="1" height="1" alt="">
</noscript>
<!-- SITESTAT4 - END -->
<!-- START: SiteStat4 Technical Code -->
<script type="text/javascript" src="http://www.rbwm.gov.uk/_sitestat.js"></script>
<!-- END: SiteStat4 Technical Code -->
<!-- MAIN CONTENT END -->
</div>
</article>
</main>

<footer class="site-footer" role="contentinfo">
<div class="trim">
<span class="one"></span>
<span class="two"></span>
<span class="thr"></span>
</div>
<!-- END: Internal System Use Only -->
</div>
<!-- END: Container -->
</div>
<!--
// // // // //
//
// The Royal Borough of Windsor and Maidenhead
// The Townhall, St Ives Road, Maidenhead, SL6 1RF United Kingdom
//
// Tel: +44 (0)1628 683800
// Fax: +44 (0)1628 685757
//
// DX 6422 Maidenhead 1
//
// Email: mailto:customer.service@rbwm.gov.uk
//
// // // // //
-->
<div class="container">
<div class="left column">
<ul>
<li>
<a href="http://www3.rbwm.gov.uk/terms">Disclaimer</a>
</li>
<li>
<a href="http://www3.rbwm.gov.uk/privacy">Privacy &amp; Cookies</a>
</li>
<li>
<a href="http://www3.rbwm.gov.uk/complaints">Complaints</a>
</li>
</ul>
<p>Copyright &copy; The Royal Borough of Windsor and Maidenhead, Town Hall, St Ives Road, Maidenhead SL6 1RF</p>
<p>
<span class="row"><abbr title="Email">E</abbr>: <a href="mailto:customer.service@rbwm.gov.uk">customer.service@rbwm.gov.uk</a></span>
<span class="divide"> | </span>
<span class="row"><abbr title="Telephone">T</abbr>: 01628 683800</span>
<span class="divide"> | </span>
<span class="row"><abbr title="Fax">F</abbr>: 01628 685757</span>
</p>
</div>
<div class="right column">
<div class="social">
<ul>
<li>
<a href="http://www3.rbwm.gov.uk/facebook">
<i class="icon-facebook-sign" title="Facebook"></i>
<span class="visually-hidden">Facebook</span>
</a>
</li>
<li>
<a href="http://www3.rbwm.gov.uk/twitter">
<i class="icon-twitter-sign" title="Twitter"></i>
<span class="visually-hidden">Twitter</span>
</a>
</li>
<li>
<a href="http://www3.rbwm.gov.uk/youtube">
<i class="icon-youtube-sign" title="YouTube"></i>
<span class="visually-hidden">YouTube</span>
</a>
</li>
<li>
<a href="http://www3.rbwm.gov.uk/rssnews">
<i class="icon-rss-sign" title="RSS Feed"></i>
<span class="visually-hidden">RSS Feed</span>
</a>
</li>
</ul>
</div>
<a class="logo" href="http://www3.rbwm.gov.uk/">
<img src="/microsites/rbwm/img/logo.png" alt="The Royal Borough of Windsor and Maidenhead">
</a>
</div>
<div class="back-top">
<a href="#main">
<span>Back to the top</span>
<i class="icon-arrow-up"></i>
</a>
</div>
</div>
</footer>
<script src="/microsites/rbwm/js/jquery.js"></script>
<script src="/microsites/rbwm/js/main.js"></script>
<!--[if lte IE 8]>
<script src="/microsites/rbwm/js/main-oldie.js"></script>
<![endif]-->
<!--[if gt IE 8]><!-->
<script src="/microsites/rbwm/js/main-rwd.js"></script>
<!--<![endif]-->
</div>
</div>
</body>
</html>
</html>

0 comments on commit 383f739

Please sign in to comment.