Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthewandrews
matthewandrews committed Nov 9, 2020
2 parents 828368f + 58e6a70 commit b6ff063
Show file tree
Hide file tree
Showing 5 changed files with 219 additions and 72 deletions.
28 changes: 20 additions & 8 deletions banner.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,26 @@
class="dropdown-item">Discover citizen science projects</a></li>
</ul>
</li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown nav-item">
<a title="About" href="#" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false" class="dropdown-toggle nav-link">Resources
<span class="caret"></span></a>
<ul class="dropdown-menu" aria-labelledby="menu-item-dropdown-199" role="menu">
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" class="menu-item menu-item-type-post_type menu-item-object-page nav-item">
<a href="https://www.ala.org.au/publications/" class="dropdown-item">Brochures and reports</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" class="menu-item menu-item-type-post_type menu-item-object-page nav-item">
<a href="https://www.ala.org.au/ala-logo-and-identity/" class="dropdown-item">ALA logo and identity</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" class="menu-item menu-item-type-post_type menu-item-object-page nav-item">
<a href="https://www.ala.org.au/ala-cited-publications/" class="dropdown-item">ALA-cited publications</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
class="menu-item menu-item-type-post_type menu-item-object-page nav-item">
<a title="Education resources"
href="https://www.ala.org.au/education-resources/" class="dropdown-item">Education
resources</a></li>
</ul>
</li>

<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
id="menu-item-178"
class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-178 nav-item">
Expand All @@ -185,8 +205,6 @@
class="menu-item menu-item-type-post_type menu-item-object-page current_page_parent menu-item-40734 nav-item">
<a title="News &amp; media" href="https://www.ala.org.au/blog/"
class="dropdown-item">News &amp; media</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" class="menu-item menu-item-type-post_type menu-item-object-page nav-item">
<a href="https://www.ala.org.au/publications/" class="dropdown-item">Publications</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
id="menu-item-175"
class="menu-item menu-item-type-post_type menu-item-object-page menu-item-175 nav-item">
Expand All @@ -201,12 +219,6 @@
class="menu-item menu-item-type-custom menu-item-object-custom menu-item-40731 nav-item">
<a title="International Living Atlases" href="https://living-atlases.gbif.org/"
class="dropdown-item">International Living Atlases</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
id="menu-item-40730"
class="menu-item menu-item-type-post_type menu-item-object-page menu-item-40730 nav-item">
<a title="Education resources"
href="https://www.ala.org.au/education-resources/" class="dropdown-item">Education
resources</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
id="menu-item-177"
class="menu-item menu-item-type-post_type menu-item-object-page menu-item-177 nav-item">
Expand Down
28 changes: 20 additions & 8 deletions build/banner.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,26 @@
class="dropdown-item">Discover citizen science projects</a></li>
</ul>
</li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown nav-item">
<a title="About" href="#" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false" class="dropdown-toggle nav-link">Resources
<span class="caret"></span></a>
<ul class="dropdown-menu" aria-labelledby="menu-item-dropdown-199" role="menu">
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" class="menu-item menu-item-type-post_type menu-item-object-page nav-item">
<a href="https://www.ala.org.au/publications/" class="dropdown-item">Brochures and reports</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" class="menu-item menu-item-type-post_type menu-item-object-page nav-item">
<a href="https://www.ala.org.au/ala-logo-and-identity/" class="dropdown-item">ALA logo and identity</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" class="menu-item menu-item-type-post_type menu-item-object-page nav-item">
<a href="https://www.ala.org.au/ala-cited-publications/" class="dropdown-item">ALA-cited publications</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
class="menu-item menu-item-type-post_type menu-item-object-page nav-item">
<a title="Education resources"
href="https://www.ala.org.au/education-resources/" class="dropdown-item">Education
resources</a></li>
</ul>
</li>

<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
id="menu-item-178"
class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-178 nav-item">
Expand All @@ -185,8 +205,6 @@
class="menu-item menu-item-type-post_type menu-item-object-page current_page_parent menu-item-40734 nav-item">
<a title="News &amp; media" href="https://www.ala.org.au/blog/"
class="dropdown-item">News &amp; media</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" class="menu-item menu-item-type-post_type menu-item-object-page nav-item">
<a href="https://www.ala.org.au/publications/" class="dropdown-item">Publications</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
id="menu-item-175"
class="menu-item menu-item-type-post_type menu-item-object-page menu-item-175 nav-item">
Expand All @@ -201,12 +219,6 @@
class="menu-item menu-item-type-custom menu-item-object-custom menu-item-40731 nav-item">
<a title="International Living Atlases" href="https://living-atlases.gbif.org/"
class="dropdown-item">International Living Atlases</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
id="menu-item-40730"
class="menu-item menu-item-type-post_type menu-item-object-page menu-item-40730 nav-item">
<a title="Education resources"
href="https://www.ala.org.au/education-resources/" class="dropdown-item">Education
resources</a></li>
<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"
id="menu-item-177"
class="menu-item menu-item-type-post_type menu-item-object-page menu-item-177 nav-item">
Expand Down
69 changes: 53 additions & 16 deletions build/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ <h4 class="h4"><a href="https://spatial.ala.org.au/" class="underline">Explore t
<div class="footer-middle">
<div class="container">
<div class="row">
<div class="col-md-4 col-lg-6">
<div class="col-md-6 col-lg-3">

<div class="footer-menu">
<ul id="menu-search-analyse" class="menu menu-2-col">
<ul id="menu-search-analyse" class="menu">
<li id="menu-item-208"
class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children">
<a title="Search &amp; analyse" href="#">Search &amp; analyse</a>
Expand Down Expand Up @@ -116,7 +116,7 @@ <h4 class="h4"><a href="https://spatial.ala.org.au/" class="underline">Explore t
</ul>
</div>
</div><!--col end -->
<div class="col-md-4 col-lg-3">
<div class="col-md-6 col-lg-3">

<div class="footer-menu">
<ul id="menu-contribute" class="menu">
Expand Down Expand Up @@ -159,7 +159,28 @@ <h4 class="h4"><a href="https://spatial.ala.org.au/" class="underline">Explore t
</ul>
</div>
</div><!--col end -->
<div class="col-md-4 col-lg-3">
<div class="col-md-6 col-lg-3">
<div class="footer-menu">
<ul id="menu-resources" class="menu">
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children">
<a title="About" href="#">Resources</a>
<ul class="sub-menu">
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a
+ href="https://www.ala.org.au/publications/">Brochures and reports</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a
+ href="https://www.ala.org.au/ala-logo-and-identity/">ALA logo and identity</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a
+ href="https://www.ala.org.au/ala-cited-publications/">ALA-cited publications</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a
title="Education resources"
href="https://www.ala.org.au/education-resources/">Education
resources</a></li>
</ul>
</li>
</ul>
</div>
</div><!--col end -->
<div class="col-md-6 col-lg-3">

<div class="footer-menu">
<ul id="menu-about" class="menu">
Expand All @@ -174,8 +195,6 @@ <h4 class="h4"><a href="https://spatial.ala.org.au/" class="underline">Explore t
<li id="menu-item-41965"
class="menu-item menu-item-type-custom menu-item-object-custom"><a
title="News &amp; media" href="https://www.ala.org.au/blog/">News &amp; media</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a
+ href="https://www.ala.org.au/publications/">Publications</a></li>
<li id="menu-item-226"
class="menu-item menu-item-type-post_type menu-item-object-page"><a
title="Contact us" href="https://www.ala.org.au/contact-us/">Contact
Expand All @@ -187,11 +206,6 @@ <h4 class="h4"><a href="https://spatial.ala.org.au/" class="underline">Explore t
title="International Living Atlases"
href="https://living-atlases.gbif.org/">International Living Atlases</a>
</li>
<li id="menu-item-40720"
class="menu-item menu-item-type-post_type menu-item-object-page"><a
title="Education resources"
href="https://www.ala.org.au/education-resources/">Education
resources</a></li>
<li id="menu-item-229"
class="menu-item menu-item-type-post_type menu-item-object-page"><a
title="Indigenous ecological knowledge"
Expand All @@ -206,10 +220,12 @@ <h4 class="h4"><a href="https://spatial.ala.org.au/" class="underline">Explore t
</ul>
</div>
</div><!--col end -->
<div class="col-md-4 col-lg-6">
</div><!--row end -->
<div class="row">
<div class="col-md-6 col-lg-3">

<div class="footer-menu">
<ul id="menu-tools" class="menu menu-2-col">
<ul id="menu-tools" class="menu">
<li id="menu-item-41579"
class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children">
<a title="Tools" href="#">Tools</a>
Expand Down Expand Up @@ -254,7 +270,7 @@ <h4 class="h4"><a href="https://spatial.ala.org.au/" class="underline">Explore t
</ul>
</div>
</div><!--col end -->
<div class="col-md-4 col-lg-3">
<div class="col-md-6 col-lg-3">

<div class="footer-menu">
<ul id="menu-community-hubs" class="menu">
Expand Down Expand Up @@ -286,13 +302,13 @@ <h4 class="h4"><a href="https://spatial.ala.org.au/" class="underline">Explore t
</ul>
</div>
</div><!--col end -->
<div class="col-md-4 col-lg-3">
<div class="col-md-6 col-lg-3">

<div class="footer-menu">
<ul id="menu-ala-for" class="menu">
<li id="menu-item-41868"
class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children">
<a title="ALA for..." href="#">ALA for…</a>
<a title="ALA for..." href="#">ALA for...</a>
<ul class="sub-menu">
<li id="menu-item-41867"
class="menu-item menu-item-type-custom menu-item-object-custom"><a
Expand All @@ -313,6 +329,27 @@ <h4 class="h4"><a href="https://spatial.ala.org.au/" class="underline">Explore t
</ul>
</div>
</div><!--col end -->
<div class="col-md-6 col-lg-3">
<div class="footer-menu">
<ul id="menu-about" class="menu">
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children">
<a title="About" href="#">Help</a>
<ul class="sub-menu">
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a
+ href="https://support.ala.org.au/support/home">Browse all articles (FAQs)</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a
+ href="https://support.ala.org.au/support/solutions/6000137994">ALA Data help</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a
href="https://support.ala.org.au/support/solutions/6000138053">ALA Tools &amp; Apps help</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a
href="https://support.ala.org.au/support/solutions/6000138349">ALA Spatial Portal help</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a
href="https://www.ala.org.au/contact-us/">Contact us</a></li>
</ul>
</li>
</ul>
</div>
</div><!--col end -->
<div class="col-md-12">

<div class="footer-menu-horizontal">
Expand Down
Loading

0 comments on commit b6ff063

Please sign in to comment.