Merge branch 'warwickshire-https'

5 files changed, 50 insertions, 50 deletions

diff --git a/templates/web/warwickshire/around/intro.html b/templates/web/warwickshire/around/intro.html
index 41e5088ad..03786e2e7 100644
--- a/templates/web/warwickshire/around/intro.html
+++ b/templates/web/warwickshire/around/intro.html
@@ -3,5 +3,5 @@
             <p>
                Please use this form for defect reporting except for Street Lighting.
             <br /> For Street Lighting defects please click here: 
-            <a href="http://www.warwickshire.gov.uk/streetlightingfault">Reporting Street Lighting Faults</a>
+            <a href="https://www.warwickshire.gov.uk/streetlightingfault">Reporting Street Lighting Faults</a>
             </p>
diff --git a/templates/web/warwickshire/footer.html b/templates/web/warwickshire/footer.html
index d6d88535c..6f4007781 100644
--- a/templates/web/warwickshire/footer.html
+++ b/templates/web/warwickshire/footer.html
@@ -37,7 +37,7 @@
                 <div class="span2">
                     <aside class="widget widget_text" id="text-13">
                         <div class="textwidget">
-                            <a href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new"><img src="http://www.warwickshire.gov.uk/wp-content/uploads/2016/05/keep-me-posted-white-on-trans-155x39.png"></a>
+                            <a href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new"><img src="https://www.warwickshire.gov.uk/wp-content/uploads/2016/05/keep-me-posted-white-on-trans-155x39.png"></a>
                         </div>
                     </aside>
                 </div>
diff --git a/templates/web/warwickshire/warwickshire_masthead.html b/templates/web/warwickshire/warwickshire_masthead.html
index 1c87d3e89..11afec135 100644
--- a/templates/web/warwickshire/warwickshire_masthead.html
+++ b/templates/web/warwickshire/warwickshire_masthead.html
@@ -15,13 +15,13 @@
             </a>
             <a href="#maincontent" id="skiptomain">Skip to main content</a>
             <a alt="Warwickshire County Council logo" class="brand" href="//www.warwickshire.gov.uk/">
-                <img alt="Warwickshire County Council" src="http://www.warwickshire.gov.uk/wp-content/themes/gamma/images/corpwhitelogo.png" style="width:85px;">
+                <img alt="Warwickshire County Council" src="https://www.warwickshire.gov.uk/wp-content/themes/gamma/images/corpwhitelogo.png" style="width:85px;">
             </a>
             <a alt="Gov Delivery logo" class="gdslogo" href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new">
-                <img alt="GDSl" src="http://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;">
+                <img alt="GDSl" src="https://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;">
             </a>
             <a alt="Gov Delivery logo" class="govdelmobile pull-right" href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new">
-                <img alt="GDSl" src="http://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;">
+                <img alt="GDSl" src="https://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;">
             </a>
             <a class="gdstext" href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new">Email alerts</a>
             <div class="nav-collapse collapse pull-left" id="right-topbar">
@@ -64,34 +64,34 @@
                             <a class="dropdown-toggle" data-toggle="dropdown" href="//www.warwickshire.gov.uk">Residents<b class="caret"></b></a>
                             <ul class="dropdown-menu">
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/">Residents - home</a>
+                                    <a href="//www.warwickshire.gov.uk/">Residents - home</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/environment">Environment</a>
+                                    <a href="//www.warwickshire.gov.uk/environment">Environment</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/health">Health</a>
+                                    <a href="//www.warwickshire.gov.uk/health">Health</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/librariesandleisure">Libraries and leisure</a>
+                                    <a href="//www.warwickshire.gov.uk/librariesandleisure">Libraries and leisure</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/roadsandtravel">Roads and travel</a>
+                                    <a href="//www.warwickshire.gov.uk/roadsandtravel">Roads and travel</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/registrations">Registrations</a>
+                                    <a href="//www.warwickshire.gov.uk/registrations">Registrations</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/safetyandcrime">Safety and crime</a>
+                                    <a href="//www.warwickshire.gov.uk/safetyandcrime">Safety and crime</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/schoolsandlearning">Schools and learning</a>
+                                    <a href="//www.warwickshire.gov.uk/schoolsandlearning">Schools and learning</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/socialcareandhealth">Social care and support</a>
+                                    <a href="//www.warwickshire.gov.uk/socialcareandhealth">Social care and support</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/contactus">Customer service and contacts</a>
+                                    <a href="//www.warwickshire.gov.uk/contactus">Customer service and contacts</a>
                                 </li>
                             </ul>
                         </li>
@@ -99,28 +99,28 @@
                             <a class="dropdown-toggle" data-toggle="dropdown" href="//www.warwickshire.gov.uk/business">Business <b class="caret"></b></a>
                             <ul class="dropdown-menu">
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/business">Business - home</a>
+                                    <a href="//www.warwickshire.gov.uk/business">Business - home</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/businesssupportorganisations">Business support organisations</a>
+                                    <a href="//www.warwickshire.gov.uk/businesssupportorganisations">Business support organisations</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/growingyourbusiness">Growing your business</a>
+                                    <a href="//www.warwickshire.gov.uk/growingyourbusiness">Growing your business</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/businesshealthandsafety">Health and safety for businesses</a>
+                                    <a href="//www.warwickshire.gov.uk/businesshealthandsafety">Health and safety for businesses</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/locatingyourbusiness">Locating your business</a>
+                                    <a href="//www.warwickshire.gov.uk/locatingyourbusiness">Locating your business</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/otherbusinessservices">Other business services</a>
+                                    <a href="//www.warwickshire.gov.uk/otherbusinessservices">Other business services</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/businessadvice">Regulatory business service and advice</a>
+                                    <a href="//www.warwickshire.gov.uk/businessadvice">Regulatory business service and advice</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/startingabusiness">Starting a business</a>
+                                    <a href="//www.warwickshire.gov.uk/startingabusiness">Starting a business</a>
                                 </li>
                             </ul>
                         </li>
@@ -128,40 +128,40 @@
                             <a class="dropdown-toggle" data-toggle="dropdown" href="//www.warwickshire.gov.uk/corporate">The council <b class="caret"></b></a>
                             <ul class="dropdown-menu">
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/corporate">The council - home</a>
+                                    <a href="//www.warwickshire.gov.uk/corporate">The council - home</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/democracy">Democracy</a>
+                                    <a href="//www.warwickshire.gov.uk/democracy">Democracy</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/financeandsuppliers">Finance and suppliers</a>
+                                    <a href="//www.warwickshire.gov.uk/financeandsuppliers">Finance and suppliers</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/jobs">Jobs</a>
+                                    <a href="//www.warwickshire.gov.uk/jobs">Jobs</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/listsanddata">Lists, data and information</a>
+                                    <a href="//www.warwickshire.gov.uk/listsanddata">Lists, data and information</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/news">News</a>
+                                    <a href="//www.warwickshire.gov.uk/news">News</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/organisation">Organisation</a>
+                                    <a href="//www.warwickshire.gov.uk/organisation">Organisation</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/performance">Our performance</a>
+                                    <a href="//www.warwickshire.gov.uk/performance">Our performance</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/partnerships">Partnerships</a>
+                                    <a href="//www.warwickshire.gov.uk/partnerships">Partnerships</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/policies">Policies, standards and legislation</a>
+                                    <a href="//www.warwickshire.gov.uk/policies">Policies, standards and legislation</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/projects">Projects</a>
+                                    <a href="//www.warwickshire.gov.uk/projects">Projects</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/strategies">Strategies and priorities</a>
+                                    <a href="//www.warwickshire.gov.uk/strategies">Strategies and priorities</a>
                                 </li>
                             </ul>
                         </li>
@@ -181,10 +181,10 @@
                                     <a href="http://invest.warwickshire.gov.uk/">Invest in Warwickshire</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.warwickshire.gov.uk/jobs">Jobs</a>
+                                    <a href="//www.warwickshire.gov.uk/jobs">Jobs</a>
                                 </li>
                                 <li>
-                                    <a href="http://www.livingwellwithdementia.org/">Living well with dementia</a>
+                                    <a href="https://dementia.warwickshire.gov.uk/">Living well with dementia</a>
                                 </li>
                                 <li>
                                     <a href="http://laf.warwickshire.gov.uk/">Local Access Forum</a>
@@ -216,4 +216,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/web/cobrands/warwickshire/vendor/gamma/print.css b/web/cobrands/warwickshire/vendor/gamma/print.css
index ac40d74d3..089386cae 100644
--- a/web/cobrands/warwickshire/vendor/gamma/print.css
+++ b/web/cobrands/warwickshire/vendor/gamma/print.css
@@ -12,7 +12,7 @@
   }
 /* header image added DJ - 17-02-2016 */
 header:before { 
-    content: url(http://www.warwickshire.gov.uk/wp-content/uploads/2016/02/WCC-Logo.gif);
+    content: url(https://www.warwickshire.gov.uk/wp-content/uploads/2016/02/WCC-Logo.gif);
 
 } 
         /*header.entry-header {left:none;}*/
@@ -66,7 +66,7 @@ header:before {
 
 }
 /*footer { 
-    content: url(http://www.warwickshire.gov.uk/wp-content/uploads/2016/02/footer-text.jpg);
+    content: url(https://www.warwickshire.gov.uk/wp-content/uploads/2016/02/footer-text.jpg);
 
  }
  */
diff --git a/web/cobrands/warwickshire/vendor/gamma/style.css b/web/cobrands/warwickshire/vendor/gamma/style.css
index a558d761f..d9090a888 100644
--- a/web/cobrands/warwickshire/vendor/gamma/style.css
+++ b/web/cobrands/warwickshire/vendor/gamma/style.css
@@ -8913,7 +8913,7 @@ border-radius:5px;
   font-weight:500;
   color:white;
   text-decoration:none;
- /* background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);*/
+ /* background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);*/
   background-size:25px 20px;
   background-repeat:no-repeat;
   background-position: 130px 15px;
@@ -8936,7 +8936,7 @@ border-radius:5px;
   font-weight:500;
   color:white;
   text-decoration:none;
-  background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
+  background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
   background-size:25px 20px;
   background-repeat:no-repeat;
   background-position: 155px 15px;
@@ -8960,7 +8960,7 @@ border-radius:5px;
 /*  background: -ms-linear-gradient(left, #0F7C4B 39%,#0F8E50 100%); /* IE10+ */
 /*  background: linear-gradient(to right, #0F7C4B 39%,#0F8E50 100%); /* W3C */
 /*  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0F7C4B', endColorstr='#0F8E50',GradientType=1 );
-/*  background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);
+/*  background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);
   background-size:25px 20px;
     background-position: 130px 15px;*/
   /*  background-repeat:no-repeat; */
@@ -8969,7 +8969,7 @@ border-radius:5px;
 
 .style-2 ul#super-menu li a:hover {
   background: rgb(0, 85, 161);
- /* background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);*/
+ /* background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);*/
   background-repeat: no-repeat;
   background-size:25px 20px;
   background-position: 155px 15px;
@@ -8982,7 +8982,7 @@ border-radius:5px;
   background-color: #F2F5F2;
   background: #F2F5F2;
   background-image: url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/menu-arrow1.png);
-  /*  background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png); */
+  /*  background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png); */
   background-size: 25px 20px;
   background-repeat: no-repeat;
   background-position: 130px 15px;
@@ -9272,15 +9272,15 @@ border-bottom: solid 1px #FFFFFF;
 
 /*.style-5 ul#super-menu li a:hover, .style-4 ul#super-menu li a:hover {
   .style-5 ul#super-menu li a:hover {
-background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
+background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
 }*/
 .style-4 ul#super-menu li.active a{
-background-image: url(http://www.warwickshire.gov.uk/wp-content/uploads/2014/10/menu-arrow4.png);
+background-image: url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/menu-arrow4.png);
 color:#666666;
 }
 
 .style-5 ul#super-menu li.active a{
-background-image: url(http://www.warwickshire.gov.uk/wp-content/uploads/2013/06/menu-arrow5.png);
+background-image: url(//www.warwickshire.gov.uk/wp-content/uploads/2013/06/menu-arrow5.png);
 color:#666666;
 }
 
@@ -10777,7 +10777,7 @@ h3.home-header {
 #home-social    {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-socialcare.png);}
 #home-events    {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-events.png);}
 #home-council     {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-council.png);}
-#home-audience    {background-image:url(http://www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-volunteering.png);}
+#home-audience    {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-volunteering.png);}
 #home-a-z    {background-image:none; margin-left: -1.5em;}
 
 
@@ -11543,4 +11543,4 @@ font-family:helvetica!important;
 font-size:14px;
 }
 
-}
\ No newline at end of file
+}