Skip to content

Commit

Permalink
Merge pull request #4 from findsorguk/staging
Browse files Browse the repository at this point in the history 
Merge Cookiebot changes into master
  • Loading branch information
@s-moon
s-moon authored Feb 6, 2024
2 parents 005f0e0 + d50dde4 commit 9d73d7c
Show file tree
Hide file tree
Showing 5 changed files with 113 additions and 47 deletions.
52 changes: 28 additions & 24 deletions findsorguk-footer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,26 @@
<div class="row-fluid ">
<div class="span3">
<a href="http://www.britishmuseum.org" title="The British Museum website">
<img class="sponsors" src="https://finds.org.uk/assets/logos/bm_logo.png" width="150" height="60"
<img class="sponsors" src="<?= get_base_url(); ?>/assets/logos/bm_logo.png" width="150" height="60"
alt="The British Museum logo"/></a>
<a href="http://www.hlf.org.uk" title="The Heritage Lottery Fund website">
<img class="sponsors sponsors-hlf" src="https://finds.org.uk/assets/logos/HLF_english_compact_pantone_150px.jpg"
<a href="https://www.heritagefund.org.uk" title="The Heritage Lottery Fund website">
<img class="sponsors sponsors-hlf" src="<?= get_base_url(); ?>/assets/logos/HLF_english_compact_pantone_150px.jpg"
alt="The Heritage Lottery Fund logo"/></a>
</div>
<div class="span3">
<h4 class="lead">About Us</h4>
<ul>
<li>
<a href="https://finds.org.uk/about"
<a href="<?= get_base_url(); ?>/about"
title="More information about the Portable Antiquities Scheme">About the Scheme</a></li>
<li>
<a href="https://finds.org.uk/about/vacancies"
<a href="<?= get_base_url(); ?>/about/vacancies"
title="See all current job vacancies">Vacancies</a></li>
<li>
<a href="https://finds.org.uk/about/logoandbranding"
<a href="<?= get_base_url(); ?>/about/logoandbranding"
title="Scheme logo and branding guidelines">Logo and branding</a></li>
<li>
<a href="https://finds.org.uk/about/contactus"
<a href="<?= get_base_url(); ?>/about/contactus"
title="Contact the Scheme regarding our work" accesskey="9">Contact Us</a></li>

</ul>
Expand All @@ -47,37 +47,41 @@
<h4 class="lead">About our Site</h4>
<ul>
<li>
<a href="https://finds.org.uk/info"
<a href="<?= get_base_url(); ?>/info"
title="Information about this website">About our site</a></li>
<li>
<a href="https://finds.org.uk/info/accessibility"
<a href="<?= get_base_url(); ?>/info/accessibility"
title="Information about our site's accessibility" accesskey="0">Accessibility</a></li>
<li>
<a href="https://finds.org.uk/info/termsandconditions"
<a href="<?= get_base_url(); ?>/info/termsandconditions"
title="Read about our terms and conditions - nothing onerous" accesskey="8">Terms of Use</a></li>
<li>
<a href="https://finds.org.uk/info/privacy"
<a href="<?= get_base_url(); ?>/info/privacy"
title="Read about our privacy policy">Privacy &amp; Cookies</a></li>
</li>
<li>
<a href="https://www.britishmuseum.org/cookies" target="_blank"
title="Information about our site's cookies">Cookie information</a></li>
<li>
<a href="https://finds.org.uk/info/foi"
<a href="<?= get_base_url(); ?>/info/foi"
title="Freedom of information requests and how to submit one">Freedom of Information</a></li>
<li>
<a href="https://finds.org.uk/help/database"
<a href="<?= get_base_url(); ?>/help/database"
title="Find helpful information about using our site" accesskey="6">Help</a></li>
</ul>
</div>

<div class="span3 ">
<h4 class="lead">Join the conversation</h4>
<ul>
<li><a href="http://www.twitter.com/#!/findsorguk" title="Our social media presence on Twitter">Twitter</a>
<li><a href="https://www.twitter.com/#!/findsorguk" title="Our social media presence on Twitter">Twitter</a>
</li>
<li><a href="http://facebook.com/portableantiquitiesscheme" title="Our social media presence on Facebook">Facebook</a>
<li><a href="https://facebook.com/portableantiquitiesscheme" title="Our social media presence on Facebook">Facebook</a>
</li>
<li><a href="http://flickr.com/finds" title="Our social media presence on Flickr">Flickr</a></li>
<li><a href="http://www.youtube.com/user/portableantiquities" title="Our social media presence on Youtube">YouTube</a>
<li><a href="https://flickr.com/finds" title="Our social media presence on Flickr">Flickr</a></li>
<li><a href="https://www.youtube.com/user/portableantiquities" title="Our social media presence on Youtube">YouTube</a>
</li>
<li><a href="http://pinterest.com/findsorguk/" title="Our social media presence on Pinterst">Pinterest</a>
<li><a href="https://pinterest.com/findsorguk/" title="Our social media presence on Pinterst">Pinterest</a>
</li>
</ul>
</div>
Expand All @@ -87,25 +91,25 @@
<div class="row-fluid ">

<div class="span3">
<a href="http://www.culture.gov.uk" title="The Department of Culture, Media and Sport website"><img
src="https://finds.org.uk/assets/logos/dcms.png" width="80" height="70" alt="DCMS logo"
<a href="https://www.culture.gov.uk" title="The Department of Culture, Media and Sport website"><img
src="<?= get_base_url(); ?>/assets/logos/dcms.png" width="80" height="70" alt="DCMS logo"
class="sponsors"/></a>
</div>

<div class="span3">
<h4 class="lead">Data Labs</h4>
<ul>
<li>
<a href="https://finds.org.uk/datalabs">Linked
<a href="<?= get_base_url(); ?>/datalabs">Linked
open data policy</a></li>
<li>
<a href="https://finds.org.uk/datalabs/terminology/objects"
<a href="<?= get_base_url(); ?>/datalabs/terminology/objects"
title="Learn about object terms in use">Controlled vocabulary</a></li>
<li>
<a href="https://finds.org.uk/datalabs/oai">OAI
<a href="<?= get_base_url(); ?>/datalabs/oai">OAI
interface</a></li>
<li>
<a href="https://finds.org.uk/datalabs/rss">RSS
<a href="<?= get_base_url(); ?>/datalabs/rss">RSS
feeds</a></li>
</ul>
</div>
Expand Down
16 changes: 8 additions & 8 deletions findsorguk-navbar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@
<ul class="nav">
<li><a href="/"
title="The Scheme's homepage" accesskey="1">Home <i class="icon-home icon-white"></i></a></li>
<li><a href="https://finds.org.uk/contacts"
<li><a href="<?= get_base_url(); ?>/contacts"
title="Who to contact at the Scheme">Contacts</a></li>
<li><a href="https://finds.org.uk/getinvolved"
<li><a href="<?= get_base_url(); ?>/getinvolved"
title="How to get involved with the largest public archaeology project">Get Involved</a></li>
<li><a href="https://finds.org.uk/database"
<li><a href="<?= get_base_url(); ?>/database"
title="Search our database for artefacts and coins">Database</a></li>
<li><a href="https://finds.org.uk/treasure"
<li><a href="<?= get_base_url(); ?>/treasure"
title="Learn about the Treasure Act">Treasure</a></li>

<li><a href="https://finds.org.uk/guides"
<li><a href="<?= get_base_url(); ?>/guides"
title="View guides to artefacts, coins and periods">Guides</a></li>
<li><a href="https://finds.org.uk/news"
<li><a href="<?= get_base_url(); ?>/news"
title="Keep up to date with the latest news and events">News &amp; Events</a></li>
<li><a href="https://finds.org.uk/publications"
<li><a href="<?= get_base_url(); ?>/publications"
title="Publications and reports">Publications</a></li>
<li><a href="https://finds.org.uk/research"
<li><a href="<?= get_base_url(); ?>/research"
title="Academic research using our data">Research</a></li>
<li><a class="active" href="/counties"
title="Finds in your local community">Counties</a></li>
Expand Down
29 changes: 18 additions & 11 deletions functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
* @package countypages
*/

if ( ! function_exists( 'get_base_url' ) ) {
function get_base_url() : string {
$url = parse_url(network_site_url()); // Returns URL of counties page e.g.training.finds.org.uk/counties
return $url['scheme'] . '://' . $url['host'];
}
}

/**
* Set the content width based on the theme's design and stylesheet.
*/
Expand Down Expand Up @@ -124,13 +131,13 @@ function countypages_scripts() {
wp_enqueue_style( 'countypages-style', get_stylesheet_uri() );

// Include CSS files from finds.org.uk
wp_enqueue_style( 'countypages-bootstrap.min', 'https://finds.org.uk/css/bootstrap.min.css', false, '', 'screen' );
wp_enqueue_style( 'countypages-custom-bootstrap', 'https://finds.org.uk/css/custom-bootstrap.css', false, '', 'screen' );
wp_enqueue_style( 'countypages-lightbox', 'https://finds.org.uk/css/lightbox.css', 'screen', false, '', 'screen' );
wp_enqueue_style( 'countypages-jquery.reject', 'https://finds.org.uk/css/jquery.reject.css', false, '', 'screen' );
wp_enqueue_style( 'countypages-bootstrap-responsive.min', 'https://finds.org.uk/css/bootstrap-responsive.min.css', false, '', 'screen' );
wp_enqueue_style( 'countypages-bootstrap.min', get_base_url() . '/css/bootstrap.min.css', false, '', 'screen' );
wp_enqueue_style( 'countypages-custom-bootstrap', get_base_url() . '/css/custom-bootstrap.css', false, '', 'screen' );
wp_enqueue_style( 'countypages-lightbox', get_base_url() . '/css/lightbox.css', 'screen', false, '', 'screen' );
wp_enqueue_style( 'countypages-jquery.reject', get_base_url() . '/css/jquery.reject.css', false, '', 'screen' );
wp_enqueue_style( 'countypages-bootstrap-responsive.min', get_base_url() . '/css/bootstrap-responsive.min.css', false, '', 'screen' );
wp_enqueue_style( 'countypages-open-sans', '//fonts.googleapis.com/css?family=Open+Sans', false, '', 'screen');
wp_enqueue_style( 'countypages-print', 'https://finds.org.uk/css/print.css', false, '', 'print' );
wp_enqueue_style( 'countypages-print', get_base_url() . '/css/print.css', false, '', 'print' );

wp_enqueue_script( 'countypages-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '20120206', true );

Expand All @@ -139,11 +146,11 @@ function countypages_scripts() {
// Include JS files from finds.org.uk
wp_enqueue_script( 'countypages-jquery.min', '//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js', array(), '', true );
wp_enqueue_script( 'countypages-jquery-ui.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.0/jquery-ui.min.js', array(), '', true );
wp_enqueue_script( 'countypages-global-functions', 'https://finds.org.uk/js/globalFunctions.js', array(), '', true );
wp_enqueue_script( 'countypages-jquery-lightbox', 'https://finds.org.uk/js/JQuery/jquery.lightbox.js', array(), '', true );
wp_enqueue_script( 'countypages-bootstrap.min', 'https://finds.org.uk/js/bootstrap.min.js', array(), '', true );
wp_enqueue_script( 'countypages-cookiesdirective', 'https://finds.org.uk/js/JQuery/jquery.cookiesdirective.js', array(), '', true );
wp_enqueue_script( 'countypages-jquery-reject', 'https://finds.org.uk/js/jquery.reject.js', array(), '', true );
wp_enqueue_script( 'countypages-global-functions', get_base_url() . '/js/globalFunctions.js', array(), '', true );
wp_enqueue_script( 'countypages-jquery-lightbox', get_base_url() . '/js/JQuery/jquery.lightbox.js', array(), '', true );
wp_enqueue_script( 'countypages-bootstrap.min', get_base_url() . '/js/bootstrap.min.js', array(), '', true );
wp_enqueue_script( 'countypages-cookiesdirective', get_base_url() . '/js/JQuery/jquery.cookiesdirective.js', array(), '', true );
wp_enqueue_script( 'countypages-jquery-reject', get_base_url() . '/js/jquery.reject.js', array(), '', true );
wp_enqueue_script( 'countypages-font-awesome', 'https://use.fontawesome.com/0932d3bb80.js', array(), '', true );

if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
Expand Down
46 changes: 43 additions & 3 deletions header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,46 @@
?><!DOCTYPE html>
<html <?php language_attributes(); ?>>
<head>
<!-- Google Consent mode -->
<script data-cookieconsent="ignore">
window.dataLayer = window.dataLayer || [];
function gtag() {
dataLayer.push(arguments);
}
gtag("consent", "default", {
ad_storage: "denied",
analytics_storage: "denied",
functionality_storage: "denied",
personalization_storage: "denied",
security_storage: "granted",
wait_for_update: 2000,
});
gtag("set", "ads_data_redaction", true);
</script>
<!-- End Google Consent mode -->

<script data-cookieconsent="ignore">
(function (w, d, s, l, i) {
w[l] = w[l] || [];
w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
j.async = true;
j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
f.parentNode.insertBefore(j, f);
})(window, document, 'script', 'dataLayer', 'GTM-WZBKMJP');
</script>
<!-- End Google Tag Manager -->

<!-- Cookiebot -->
<script
id="Cookiebot"
src="https://consent.cookiebot.com/uc.js"
data-cbid="ec5f4b04-e699-4bea-a9de-eda95d4d9fb7"
data-blockingmode="auto"
type="text/javascript"
></script>
<!-- End Cookiebot -->

<meta charset="<?php bloginfo( 'charset' ); ?>">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="profile" href="http://gmpg.org/xfn/11">
Expand All @@ -34,7 +74,7 @@
<!-- WordPress HTML -->
<header id="masthead" class="site-header" role="banner">
<div class="site-branding">
<a href="https://finds.org.uk" title="Go to the homepage"><img src="https://finds.org.uk/assets/logos/pas.jpg"
<a href="<?= get_base_url(); ?>" title="Go to the homepage"><img src="<?= get_base_url(); ?>/assets/logos/pas.jpg"
alt="The Scheme's logo"
width="213" height="104"/></a>
<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
Expand Down Expand Up @@ -64,8 +104,8 @@
echo

'<div class="site-sponsorship">
<a href="http://www.hlf.org.uk" title="The Heritage Lottery Fund website"><img class="sponsors-hlf"
src="https://finds.org.uk/assets/logos/HLF_english_compact_pantone_150px.jpg"
<a href="https://www.heritagefund.org.uk" title="The Heritage Lottery Fund website"><img class="sponsors-hlf"
src="' . get_base_url() . '/assets/logos/HLF_english_compact_pantone_150px.jpg"
alt="The Heritage Lottery Fund logo"/></a>
</div><!-- .site-sponsorship -->';
}
Expand Down
17 changes: 16 additions & 1 deletion style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1072,5 +1072,20 @@ object {
list-style: none;
}


/*--------------------------------------------------------------
14.0 Cookiebot
--------------------------------------------------------------*/
/*Make element 16-9 ratio*/
.video-container {
position: relative;
padding-bottom: 56.25%;
}
/*Force iframe to take up as much space as the parent*/
.video-container iframe {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}

0 comments on commit 9d73d7c

Please sign in to comment.