Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update: Data and Tools Sections #855

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
a0dab28
Tools and data new layout
Claurt07 Apr 9, 2024
783be8e
Created tech suite page
Claurt07 Apr 10, 2024
c2e4abe
added screen size to main css
Claurt07 Apr 10, 2024
cce149c
Merge branch 'hotosm:gh-pages' into enhance-data-and-tools
Claurt07 Apr 10, 2024
537d20c
Merge branch 'hotosm:gh-pages' into enhance-data-and-tools
Claurt07 Apr 11, 2024
36e7bf1
removed deployment banner
Claurt07 Apr 16, 2024
e5b24b5
Created product pages
Claurt07 Apr 16, 2024
1316d11
Created tasking manger page
Claurt07 Apr 16, 2024
989137a
Merge branch 'hotosm:gh-pages' into enhance-data-and-tools
Claurt07 Apr 16, 2024
5ff4c10
Created product pages and linked them to website
Claurt07 Apr 17, 2024
32efb8a
Merge branch 'hotosm:gh-pages' into enhance-data-and-tools
Claurt07 Apr 17, 2024
2687ccf
Merge branch 'hotosm:gh-pages' into enhance-data-and-tools
Claurt07 Apr 18, 2024
e036740
created open mapping tools section
Claurt07 Apr 18, 2024
ee0f2af
Merge branch 'hotosm:gh-pages' into enhance-data-and-tools
Claurt07 Apr 21, 2024
29f1647
added accordeon to the open mapping tools section
Claurt07 Apr 21, 2024
d44bd0e
filled content on tools
Claurt07 Apr 22, 2024
2c6579b
updated contentn in "tools and data" section
Claurt07 Apr 24, 2024
15b6ad4
updated tool content
Claurt07 Apr 25, 2024
e48a33e
Updating content
Claurt07 Apr 27, 2024
751e9ae
Updated HOT Tools content
Claurt07 Apr 28, 2024
0793d0c
Updated Open Mapping Tools Content
Claurt07 Apr 28, 2024
b74efc3
Updated Tech Suite Content
Claurt07 Apr 28, 2024
b174473
Updated Tools and Data
Claurt07 Apr 28, 2024
d133354
Merge branch 'hotosm:gh-pages' into update-data--tools-sections
Claurt07 Apr 28, 2024
3da326d
Merge branch 'hotosm:gh-pages' into update-data--tools-sections
Claurt07 Apr 30, 2024
0db690f
changed icons
Claurt07 Apr 30, 2024
3c2cd09
Updated content
Claurt07 Apr 30, 2024
a1d6403
Merge branch 'hotosm:gh-pages' into update-data--tools-sections
Claurt07 Apr 30, 2024
0288c23
Merge branch 'hotosm:gh-pages' into update-data--tools-sections
Claurt07 Apr 30, 2024
9984067
Merge branch 'hotosm:gh-pages' into update-data--tools-sections
Claurt07 May 1, 2024
22ba5a4
created post on e2e blog
Claurt07 May 1, 2024
cacdb5e
Merge branch 'update-data--tools-sections' of https://github.com/Clau…
Claurt07 May 1, 2024
e3ab7ae
updated tools headers
Claurt07 May 1, 2024
b6f29ce
updated header display
Claurt07 May 1, 2024
59b9eb4
changed header for fair
Claurt07 May 1, 2024
5b0170d
updated css to better display header of product pages
Claurt07 May 1, 2024
372abee
changed "open mapping tools" for "open mapping solutions"
Claurt07 May 1, 2024
899a0a7
fixed issue of naming and related projects
Claurt07 May 2, 2024
4d9564b
Merge branch 'hotosm:gh-pages' into update-data--tools-sections
Claurt07 May 2, 2024
83aeef3
moved open-data-solutions css out
Claurt07 May 2, 2024
aec3031
Merge branch 'update-data--tools-sections' of https://github.com/Clau…
Claurt07 May 2, 2024
3a6bf96
deleted mapbox
Claurt07 May 2, 2024
cd6f36e
fixed typo
Claurt07 May 2, 2024
045ca6f
cleaned comments
Claurt07 May 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ collections:
title: Impact Areas
output: true
permalink: "/impact-areas/:path/"
product-pages:
title: Product Pages
output: true
permalink: "/tech-suite/:path/"
jobs:
title: Jobs
output: true
Expand Down Expand Up @@ -181,6 +185,12 @@ defaults:
values:
permalink: "/impact-areas/:path/"
layout: impact-area-item
- scope:
path: ''
type: product-pages
values:
permalink: "/tech-suite/:path/"
layout: product-pages
- scope:
path: ''
type: docs
Expand Down
36 changes: 36 additions & 0 deletions _includes/blocks/news-overflow.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<a class="project-archived" href="{{ project.url }}">

<div class="module-details">

<div class="module-text">

<h3 style="font-weight:900; text-transform: capitalize; font-size: 1.15rem; font-family: Archivo, sans-serif;">{{ project.title }}</h3>

<p style="display: inline-block;">
{% capture project.Person %}{% endcapture %}
{% if project.Person %}
{% for person in project.Person %}
{% assign author = site.people | where: "title", person | first %}
{% if person == author.title %}
<span class="project-involvement" style="color: grey;">{{ author.title }}</span>
{% endif %}
{% endfor %}
{% endif %}
</p>


<p class="project-involvement" style="color: rgba(214, 63, 63, 1); font-weight: 400;">
{{ project.date | date:'%e %B, %Y' }}
</p>

</div>

</div>

<!-- <div class="module-image">
{% if project['Feature Image'] %}
<img src="{{ project['Feature Image']}}">
{% endif %}
</div> -->

</a>
2 changes: 1 addition & 1 deletion _layouts/country.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ <h4 id="contact-header">{{ page.title }} has {{ projectcount }} HOT project{% if
<p>Read more about each project below or learn more about <a href="/get-involved">getting involved</a>.</p>
</div>

<h4>Travelling to {{ page.title }} or want to get in touch about a collaboration?</h4>
<!-- <h4>Travelling to {{ page.title }} or want to get in touch about a collaboration?</h4> -->
<div class="country-content">
<p>Get in touch with HOT or reach out to the
<a href="https://wiki.openstreetmap.org/wiki/Mailing_lists#Country-Specific_Lists"
Expand Down
1,594 changes: 1,594 additions & 0 deletions _layouts/open-data-solutions.html

Large diffs are not rendered by default.

220 changes: 220 additions & 0 deletions _layouts/product-pages.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
---
layout: default
---
<head>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
</head>
<div class="tools">


<!-- Banner -->

<a class="home-highlight4" style="padding-bottom: 2%;">
<div>
<img src="{{ page['Block 0'].Image }}" style="max-width: 140%; filter: brightness(70%);">
</div>
<div class="home-highlight-title2" style="bottom: 50px; left: 100px;">
<div class="container">
<header class="tools-header header-subnav home-highlight-title3">
<h1 style="color: white; font-family: Barlow Condensed, sans-serif; font-weight: bold; letter-spacing: .045em; line-height: 1.15; font-size: 4rem; text-transform: none;">{{ page.title }}</h1>
<p style="font-size: 1.375rem;" >{{ page['Block 0'].Text }}</p>
</header>
</div>
</div>
</a>






<div class="program-body" style="padding-top: 1px">
<section class="article">
<h2 style="font-family: Barlow Condensed, sans-serif; font-size: 2.5rem;font-weight: bold; text-transform: uppercase; letter-spacing: .045em; line-height: 1.15;color: #D73F3F;" >{{ page['Block 1'].Section }}</h2>

<!-- Intro -->
<div style="padding-right: 35%;">

<h1 style="font-weight: bold; color: black; font-size: 1.25rem; line-height: 1.3;">{{ page['Block 1'].Header }}</h1>
<br>
<br>
<p>{{ page['Block 1'].Text | markdownify }}</p>
<br>
</div>
<!-- Uses and Icons -->

<div style="margin: 30px 0 0px; padding-top: 1px "></div>
<h2 style="font-family: Barlow Condensed, sans-serif; font-weight: bold; text-transform: uppercase; letter-spacing: .045em; line-height: 1.15; font-size: 2.5rem;">MAIN FEATURES</h2>
<div class="hr-h" style="margin: 10px 0 40px "></div>




<div class="project-index-all">

<div>
<h1 style="color: black; font-weight: bolder;"><i class="{{ page['Block 2'].Rectangle-1.Icon }}" style="color: #D73F3F;"></i>&nbsp; {{ page['Block 2'].Rectangle-1.Header }} </h1>
<br>
<p>{{ page['Block 2'].Rectangle-1.Highlight | markdownify}}</p>
</div>
<div>
<h1 style="color: black; font-weight: bolder;"><i class="{{ page['Block 2'].Rectangle-2.Icon }}" style="color: #D73F3F;"></i>&nbsp; {{ page['Block 2'].Rectangle-2.Header }} </h1>
<br>
<p>{{ page['Block 2'].Rectangle-2.Highlight | markdownify}}</p>
</div>
<div>
<h1 style="color: black; font-weight: bolder;"><i class="{{ page['Block 2'].Rectangle-3.Icon }}" style="color: #D73F3F;"></i>&nbsp; {{ page['Block 2'].Rectangle-3.Header }} </h1>
<br>
<p>{{ page['Block 2'].Rectangle-3.Highlight | markdownify}}</p>
</div>

</div>

</section>
</div>

<!-- <div class="hr-h"></div> -->

<div class="module">

<div class="container container-tools" >

<div class="half-block-tools right" style="background-color: white;">
<div class="block-details">

<div class="block-info">
<h2 style="font-size: 2.5rem;" >{{ page['Block 3'].Header }}</h2>
<h4 style="font-weight: bolder; font-size: 1.25rem;">{{ page['Block 3'].Highlight }}</h4>
<br>
<p>{{ page['Block 3'].Text | markdownify }}</p>
</div>
<div class="block-options">
<ul>
{% for tool in page['Block 3'].Tools %}
<li><a class="external" href="{{ tool.URL }}" style="color: black;">{{ tool.Name }}</a></li>
{% endfor %}
</ul>
</div>
</div>
<div class="" style="padding: 5%; background-color: white;">
<div class="block-screenshot-wrap" >
<img style="display: block; height: 110%; width: 100%; object-fit: cover;" src="{{ page['Block 3'].Image }}">
</div>
</div>

</div>
</div>
</div>
</div>


<div class="program-body" style="padding-top: 0.1px">
<section class="article">


<div style="margin: 30px 0 0px "></div>
<h2 style="font-family: Barlow Condensed, sans-serif; font-weight: bold; text-transform: uppercase; letter-spacing: .045em; line-height: 1.15; font-size: 1.25rem; color: black;">HIGHLITED PROJECTS</h2>
<div class="hr-h" style="margin: 10px 0 40px "></div>

<div class="project-index-all">




{% assign recent_projects = site.projects | sort:"date" | reverse %}
{% assign page_title = page.Tool-name %}
{% assign project_count1 = 0 %}
{% for project in recent_projects %}

{% if project.Tools[0].tool %}
{% for tool in project.Tools %}
{% if tool.tool contains page_title %}
{% assign project_count1 = project_count1 | plus: 1 %}


{% unless project.title == sorted_projects[0].title or project.title == sorted_projects[1].title or project.title == sorted_projects[2].title %}

{% include blocks/project-thumb.html %}

{% endunless %}

{% endif %}

{% endfor %}
{% if project_count1 > 2 %}
{% break %}
{% endif %}
{% endif %}
{% endfor %}

</div>

<article class="container-body-program project-item" style="padding-top: 1%; padding-bottom: 0%;">

<div class="next"><a href="/our-work" style=" text-align: right; font-weight: bolder; font-size: large;">Explore Other Projects →</a></div>

</article>


</section>
</div>



<!-- Tech blog and news -->


<div class="program-body" style="padding-top: 0px">
<section class="article">


<!-- <div style="margin: 30px 0 0px "></div> -->
<h2 style="font-family: Barlow Condensed, sans-serif; font-weight: bold; text-transform: uppercase; letter-spacing: .045em; line-height: 1.15; font-size: 1.25rem; color: black;">RELATED NEWS</h2>
<div class="hr-h" style="margin: 10px 0 40px "></div>

<div class="project-index-all" style="background-color: whitesmoke; padding-left: 2%; padding-bottom: 1%;">




{% assign recent_projects = site.tech-blog | concat: site.posts | sort: 'date' | reverse %}
{% assign project_count = 0 %}
{% assign page_title = page.Tool-name %}
{% for project in recent_projects %}
{% if project.title contains page_title %}

{% unless project.title == sorted_projects[0].title or project.title == sorted_projects[1].title or project.title == sorted_projects[2].title %}

{% assign project_count = project_count | plus: 1 %}

{% include blocks/news-overflow.html %}

{% if project_count > 8 %}

{% break %}

{% endif %}


{% endunless %}
{% endif %}

{% endfor %}

</div>

<article class="container-body-program project-item" style="padding-top: 1%; padding-bottom: 1%;">

<div class="next"><a href="/tech-blog/index.html" style="text-align: right; font-weight: bolder; font-size: large;">Tech News Archive →</a></div>

</article>

<div class="hr-h"></div>

</section>
</div>


</div>

<script src="https://kit.fontawesome.com/aa48057ccd.js" crossorigin="anonymous"></script>
2 changes: 1 addition & 1 deletion _layouts/program-item.html
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ <h2 style="font-family: Barlow Condensed, sans-serif; font-weight: bold; text-tr
<html>
<head>
<meta charset="UTF-8" />
<link href="_sass/flowbite.min.css" rel="stylesheet" />
<!-- <link href="_sass/flowbite.min.css" rel="stylesheet" /> -->
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script src="/js/tailwindcss-js-carrousel.js"></script>
</head>
Expand Down