Skip to content

Commit

Permalink
new header and footer
Browse files Browse the repository at this point in the history
  • Loading branch information
@hakonhjaltalin
hakonhjaltalin committed Mar 13, 2024
1 parent 08513a4 commit af44178
Show file tree
Hide file tree
Showing 12 changed files with 8,992 additions and 6,836 deletions.
8 changes: 6 additions & 2 deletions _includes/components/language-toggle.html
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{%- for language in site.languages -%}
{%- assign language_abbreviation = site.languages_public[language] | default: language -%}
{%- if language != page.language -%}
<a href="{{ page.url_by_language[language] }}">
{{ page.t.languages[language] }}
<a
id="link-button-language"
class="link-button"
href="{{ page.url_by_language[language] }}"
>
<i class="picon-tungumal"></i>{{ page.t.languages[language] }}
</a>
{%- endif -%}
{%- endfor -%}
138 changes: 62 additions & 76 deletions _includes/footer-en.html
View file
Original file line number Diff line number Diff line change
@@ -1,81 +1,67 @@
<footer>
<div class="footer-bottom">
<div class="fp-container">
<div class="row">
<div class="col-sm-4" id="footer-contact-info">
<ul>
<li>
<i class="fa fa-phone fa-fw"></i>
<a href="tel:+354 528 1000">Tel: +354 528 1000</a>
</li>
<li>
<i class="fa fa-map-marker fa-fw"></i>
Borgartún 21A, 105 Reykjavík
</li>
<li>
<i class="fa fa-clock-o fa-fw"></i>
Open Mon-Thu 9:00-16:00 and Fri 9:00-12:00
</li>
<li>
<i class="fa fa-book fa-fw"></i>
<a href="/services/contact-us/">Contact us</a>
</li>
<li>
<i class="fa fa-envelope fa-fw"></i>
[email protected]
</li>
<li>
<i class="fa fa-facebook-square fa-fw"></i>
<a href="https://facebook.com/hagstofan">facebook.com/hagstofan</a>
</li>
</ul>
</div>
<div class="col-sm-4 col-sm-offset-4 hidden-xs" id="footer-branding">
<span class="addr-title">
<img
src="//hagstofan.s3.amazonaws.com/static/img/hagstofa_1_en_footer.png"
alt="Hagstofa Íslands"
/>
</span>
<hr />
<footer class="hagstofa">
<div class="footer-bottom">
<div class="container">
<div class="row">
<div class="col-md-4">
<img
src="//hagstofas3bucket.hagstofa.is/haxdev/static/img/Statistics_Iceland_-_Logo_-_RGB_-_White.png"
alt="Statistics Iceland"
/>
<ul>
<li id="footer-phone-number">
<span class="footer-icon-span"><i class="picon-simanumer"></i></span>
<a href="tel:+354 528 1000">
<b>+354 528 1000</b>
</a>
</li>
<li>
<span class="footer-icon-span"><i class="picon-heimilisfang"></i></span>Borgartún 21A, 105 Reykjavík
</li>
<li>
<span class="footer-icon-span"><i class="picon-opnunartimi"></i></span>Mon-Thu 9:00-16:00 / Fri 9:00-12:00
</li>
<li>
<span class="footer-icon-span">
<i class="picon-netfang"></i>
</span><a href="mailto:[email protected]">[email protected]</a>
</li>
</ul>

<div id="footer-logos">
<img id="eurostat-logo" src="//hagstofan.s3.amazonaws.com/static/img/eurostat_1.png" alt="Eurostat" />
<img
id="carbon-fund-logo"
src="//hagstofan.s3.amazonaws.com/static/img/kolvidur_1.png"
alt="Iceland Carbon Fund"
/>
<img
id="green-steps-logo"
src="//hagstofan.s3.amazonaws.com/static/img/hvitt_graen_skref_logo.png"
alt="Græn skref"
/>
</div>
<div id="footer-social-media">
<a href="https://facebook.com/hagstofan">
<i class="picon-facebook"></i>
</a>
<a href="https://twitter.com/hagstofan">
<i class="picon-twitter"></i>
</a>
<a href="https://www.linkedin.com/company/hagstofa-islands">
<i class="picon-linkedin"></i>
</a>
<a href="https://www.youtube.com/@hagstofaislands2013">
<i class="picon-youtube"></i>
</a>
</div>

<div class="cert-item">
<img
class="cert-img"
src="//hagstofan.s3.amazonaws.com/static/img/EQP_ISO27001_mark_white.png"
alt="EQP ISO/IEC 27001 mark"
/>
<span id="cert-numbers">
<span class="cert-number">IS 643927</span>
<span class="cert-number">EQ 717464</span>
</span>
<a class="link-button" href="https://hagstofa.is/utgafur/frettasafn/frettaaskrift/">
<i class="picon-frettaaskrift"></i>News subscription
</a>
</div>
<div class="col-md-8">
&nbsp;
</div>
</div>
</div>

<div id="equal-pay">
<img
src="//hagstofan.s3.amazonaws.com/static/img/EqualPay_2020_2023_secondaryUse_on_dark_background.png"
alt="Equal pay 2020-2023 mark"
/>
</div>
<div id="certs" class="hide-small-screen">
<div class="container">
<div class="row">
<div class="col-xs-12">
<img
src="http://haxdev.s3.amazonaws.com/static/img/statice_all_certs.png"
alt="Statistics Iceland certification"
/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

{% include scripts.html %}

</footer>
</footer>
128 changes: 56 additions & 72 deletions _includes/footer-is.html
View file
Original file line number Diff line number Diff line change
@@ -1,83 +1,67 @@
<footer>
<footer class="hagstofa">
<div class="footer-bottom">
<div class="fp-container">
<div class="container">
<div class="row">
<div class="col-sm-4" id="footer-contact-info">
<div class="col-md-4">
<img
src="//hagstofas3bucket.hagstofa.is/haxdev/static/img/hagstofa_white_logo_2023.png"
alt="Hagstofa Íslands"
/>
<ul>
<li>
<i class="fa fa-phone fa-fw"></i>
<a href="tel:+354 528 1000">Sími: +354 528 1000</a>
</li>
<li>
<i class="fa fa-map-marker fa-fw"></i>
Borgartún 21A, 105 Reykjavík
</li>
<li>
<i class="fa fa-clock-o fa-fw"></i>
Opið mán-fim kl. 9.00-16.00 og fös kl. 9.00-12.00
</li>
<li>
<i class="fa fa-book fa-fw"></i>
<a href="https://hagstofa.is/thjonusta/hafa-samband/">Hafa samband</a>
</li>
<li>
<i class="fa fa-envelope fa-fw"></i>
[email protected]
</li>
<li>
<i class="fa fa-facebook-square fa-fw"></i>
<a href="https://facebook.com/hagstofan">facebook.com/hagstofan</a>
</li>
<li id="footer-phone-number">
<span class="footer-icon-span"><i class="picon-simanumer"></i></span>
<a href="tel:+354 528 1000">
<b>528 1000</b>
</a>
</li>
<li>
<span class="footer-icon-span"><i class="picon-heimilisfang"></i></span>Borgartún 21A, 105 Reykjavík
</li>
<li>
<span class="footer-icon-span"><i class="picon-opnunartimi"></i></span>Mán-fim kl. 9.00-16.00 / Fös kl. 9.00-12.00
</li>
<li>
<span class="footer-icon-span">
<i class="picon-netfang"></i>
</span><a href="mailto:[email protected]">[email protected]</a>
</li>
</ul>
</div>
<div class="col-sm-4 col-sm-offset-4 hidden-xs" id="footer-branding">
<span class="addr-title">
<img
src="//hagstofan.s3.amazonaws.com/static/img/hagstofa_1_footer.png"
alt="Hagstofa Íslands"
/>
</span>
<hr />

<div id="footer-logos">
<img id="eurostat-logo" src="//hagstofan.s3.amazonaws.com/static/img/eurostat_1.png" alt="Eurostat" />
<img
id="carbon-fund-logo"
src="//hagstofan.s3.amazonaws.com/static/img/kolvidur_1.png"
alt="Kolefnisvottorð"
/>
<img
id="green-steps-logo"
src="//hagstofan.s3.amazonaws.com/static/img/hvitt_graen_skref_logo.png"
alt="Græn skref"
/>
</div>

<div class="cert-item">
<img
class="cert-img"
src="//hagstofan.s3.amazonaws.com/static/img/EQP_ISO27001_mark_white.png"
alt="EQP ISO/IEC 27001 merki"
/>
<span id="cert-numbers">
<span class="cert-number">IS 643927</span>
<span class="cert-number">EQ 717464</span>
</span>
<div id="footer-social-media">
<a href="https://facebook.com/hagstofan">
<i class="picon-facebook"></i>
</a>
<a href="https://twitter.com/hagstofan">
<i class="picon-twitter"></i>
</a>
<a href="https://www.linkedin.com/company/hagstofa-islands">
<i class="picon-linkedin"></i>
</a>
<a href="https://www.youtube.com/@hagstofaislands2013">
<i class="picon-youtube"></i>
</a>
</div>

<div id="equal-pay">
<img
src="//hagstofan.s3.amazonaws.com/static/img/Jafnlaunavottun_2020_2023_f_dokkan_grunn.png"
alt="Jafnlaunavottun 2020-2023 merki"
/>
</div>
<a class="link-button" href="https://hagstofa.is/utgafur/frettasafn/frettaaskrift/">
<i class="picon-frettaaskrift"></i>Fréttaáskrift
</a>
</div>
<div class="col-md-8">
&nbsp;
</div>
</div>
</div>
</div>
</footer>

{% include scripts.html %}

</body>
</html>
<div id="certs" class="hide-small-screen">
<div class="container">
<div class="row">
<div class="col-xs-12">
<img
src="http://haxdev.s3.amazonaws.com/static/img/statice_all_certs.png"
alt="Hagstofa Íslands vottanir"
/>
</div>
</div>
</div>
</div>
</footer>
4 changes: 4 additions & 0 deletions _includes/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@
{% include footer-is.html %}

{%- endif -%}

{% include scripts.html %}

</body></html>
32 changes: 14 additions & 18 deletions _includes/head.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Title and meta description
================================================== -->

{% include title-tag.html %}

{% if site.environment == 'staging' or include.noindex %}
Expand All @@ -29,9 +29,6 @@
{% include components/favicons.html %}

{% assign cache_bust = site.time | date: "%Y%m%d%H%M%S" %}
<link rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Lato:300,400,700,900"
type="text/css">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
<link res="stylesheet" href="https://cdn.datatables.net/1.11.5/css/dataTables.bootstrap5.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css" integrity="sha512-5A8nwdMOWrSz20fDsjczgUidUBR8liPYU+WymTZP1lmY9G6Oc7HlZv156XqnsgNUzTyMefFTcsFH/tnJE/+xBg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
Expand All @@ -40,6 +37,7 @@
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
integrity="sha512-puBpdR0798OZvTTbP4A8Ix/l+A4dHDD0DGqYW6RQ+9jxkRFclaxxQb/SJAWZfWAkuyeQUytO7+7N4QKrDh+drA=="
crossorigin=""/>
<link rel="stylesheet" href="https://use.typekit.net/ewh2tqd.css">
<link rel="stylesheet" href="https://cdn.rawgit.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.control.min.css" crossorigin=""/>
<link rel="stylesheet" href='https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css' crossorigin=""/>
<link rel="stylesheet" href="https://bowercdn.net/c/leaflet.zoomhome-latest/dist/leaflet.zoomhome.css" crossorigin=""/>
Expand All @@ -51,21 +49,19 @@
{%- endfor -%}
{%- endif -%}

<!-- Matomo -->
<script>
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="https://hagstofa.matomo.cloud/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '5']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src='//cdn.matomo.cloud/hagstofa.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
})();
<script>
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="https://hagstofa.matomo.cloud/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '1']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src='//cdn.matomo.cloud/hagstofa.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Matomo Code -->

{% include meta-tags.html %}

Expand Down
Loading

0 comments on commit af44178

Please sign in to comment.