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.

Sign up for GitHub

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

Jump to bottom

Update styles #12

Merged
merged 3 commits into from
Sep 3, 2023
Merged

Update styles #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f4fabc
Update page styles
johnpeart Aug 16, 2023
c2b5e76
Remove templates and update routes
johnpeart Aug 16, 2023
0265462
Change http:// to https://
johnpeart Aug 20, 2023
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
4 changes: 2 additions & 2 deletions mentor_match_web/app/main/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ def index():

@main_bp.route("/cookies")
def cookies():
return redirect("http://docs.mentoring.service.civilservice.lgbt/cookies/")
return redirect("https://mentormatching.online/cookies/")


@main_bp.route("/privacy-and-data")
def privacy():
return redirect("http://docs.mentoring.service.civilservice.lgbt/privacy/")
return redirect("https://mentormatching.online/privacy/")


@main_bp.route("/upload", methods=["GET", "POST"])
Expand Down
272 changes: 147 additions & 125 deletions mentor_match_web/app/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,133 +1,155 @@
<!DOCTYPE html>
<html lang="en">
<head>
{% block head %}
<link rel="stylesheet" href="https://www.civilservice.lgbt/assets/styles/styles.css">
<title>Mentor matcher • {% block title %}{% endblock %}</title>
{% endblock %}
</head>
<body>
<header class="header" role="banner">
<div class="header--container width-container">
<div class="header--logo">
<a href="https://www.civilservice.lgbt" class="header--logotype--link">
<span class="header--logotype--text">Civil Service</span>
<span class="header--logotype--text">LGBT+ Network</span>
</a>
</div>
</div>
</header>

<div class="width-container">
<div class="breadcrumbs breadcrumbs--collapse-on-mobile">
<ol class="breadcrumbs--list">
<li class="breadcrumbs--list-item">
<a class="breadcrumbs--link" href="https://www.civilservice.lgbt">Home</a>
</li>
<li class="breadcrumbs--list-item">
<a class="breadcrumbs--link" href="https://www.civilservice.lgbt/tools">Tools</a>
</li>
{% block breadcrumbs %}{% endblock %}
</ol>
</div>
<main class="main-wrapper main-wrapper--auto-spacing" id="main-content" role="main">

<article class="article--page">

{% block header %}{% endblock %}

{% block content %}{% endblock %}

</article>
</main>
</div>



<footer class="footer" role="contentinfo">
<div class="width-container">

<div class="grid-row">
<div id="footer" class="grid-column-full">
{% block footer %}
{% endblock %}
</div>
</div>

<div class="grid-row">
<div class="grid-column-one-third">
<h2 class="footer--wordmark">Civil Service LGBT+ Network</h2>
<head>
{% block head %}
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->

<title>Mentor Matching Online • {% block title %}{% endblock %}</title>

<!-- Short description of the page (limit to 150 characters). In *some* situations this description is used as a part of the snippet shown in the search results. -->
<meta name="description" content="Mentoring, made easy. Use these guides, resources and tools to deliver a large scale, mentoring programme." />
<meta name="author" content="Jonathan Kerr, John Peart" />
<meta name="author" content="Mentor Matching Online" />

<!-- Control the behaviour of search engine crawling and indexing -->
<!-- Change 'noindex' to 'index,follow' to allow search scraping -->
<meta name="robots" content="noindex"><!-- All Search Engines -->
<meta name="googlebot" content="noindex"><!-- Google Specific -->

<!-- Verify ownership (placeholder) -->
<meta name="google-site-verification" content=""><!-- Google Search Console -->

<!-- Schema.org social media placeholders -->
<!-- These should be sufficient to show social images on various sites -->
<meta itemprop="name" content="Mentoring, made easy. • Mentor matching tool">
<meta itemprop="description" content="Use this online tool to help match mentors and mentees as part of a large scale mentoring programme.">
<meta itemprop="image" content="https://assets.mentormatching.online/images/site/social-media.png">

<!-- Favicons -->
<!-- Place favicon.ico in the root directory - no tag necessary -->
<meta name="theme-color" content="#373151">
<link rel="icon" href="https://assets.mentormatching.online/images/site/favicon-pinned-svg.svg">
<link rel="mask-icon" href="https://assets.mentormatching.online/images/site/favicon-pinned-svg.svg" color="#373151">
<link rel="apple-touch-icon" href="https://assets.mentormatching.online/images/site/favicon-large-png.png">

<!-- Scripts and styles -->
<link rel="stylesheet" href="https://assets.mentormatching.online/styles/styles.css">
<script type="text/javascript" src="https://assets.mentormatching.online/scripts/scripts.js"></script>

<!-- Cloudflare Web Analytics -->
<script defer="" src="https://static.cloudflareinsights.com/beacon.min.js" data-cf-beacon="{'token': ''}"></script>
<!-- End Cloudflare Web Analytics -->
{% endblock %}
</head>
<body>
<header class="header" role="banner">
<div class="header--container width-container">
<div class="header--logo">
<a href="//mentormatching.online" class="header--logotype--link">
<span class="header--logotype--text">Mentor Matching Online</span>
</a>
</div>

<div class="grid-column-one-third">
<h2 class="footer--heading">Related links</h2>
<ul class="footer--list">
<li class="footer--list-item">
<a class="footer--link" href="https://www.civilservice.lgbt/mentoring" title="Find out more about our mentoring programme">
Our mentoring programme
</a>
</li>
<li class="footer--list-item">
<a class="footer--link" href="/privacy-and-data" title="Read the privacy and data policy">
Privacy and data
</a>
</li>
<li class="footer--list-item">
<a class="footer--link" href="/cookies" title="Read the cookies policy">
Cookies
</a>
</li>
</ul>
</div>

<div class="grid-column-one-third">
<h2 class="footer--heading">Social media</h2>
<ul class="footer--list">


<li class="footer--list-item">
<a class="footer--link" href="//facebook.com/civilservicelgbt" title="Visit our Facebook profile page (Opens in new window)" rel="noreferrer noopener" target="_blank">
Like us on Facebook
</a>
</li>



<li class="footer--list-item">
<a class="footer--link" href="//twitter.com/cslgbt" title="Visit our Twitter profile page (Opens in new window)" rel="noreferrer noopener" target="_blank">
Follow us on Twitter
</a>
</li>

<li class="footer--list-item">
<a class="footer--link" href="//www.flickr.com/photos/civilservicelgbt/" title="Visit our Flickr profile page (Opens in new window)" rel="noreferrer noopener" target="_blank">
Find us on Flickr
</a>
</li>

<li class="footer--list-item">
<a class="footer--link" href="//www.instagram.com/civilservicelgbt" title="Visit our Instagram profile page (Opens in new window)" rel="noreferrer noopener" target="_blank">
Follow us on Instagram
</a>
</li>

</ul>
<div class="header--content">

<button type="button" id="menu-button" class="header--menu-button js-header-toggle" aria-controls="navigation" aria-label="Show or hide navigation menu" onclick="toggleMenu()">Menu</button>

<nav>
<ul id="navigation" class="header--navigation" aria-label="Navigation menu">

<li class="header--navigation-item">
<a class="header--link" href="//mentormatching.online" title="Visit the home page">
Home
</a>
</li>

<li class="header--navigation-item header--navigation-item--active">
<a class="header--link" href="//mentormatching.online/mentor-matcher" title="Use our mentor matching software">
Software
</a>
</li>

<li class="header--navigation-item">
<a class="header--link" href="//mentormatching.online/about" title="Find out more about this project">
About
</a>
</li>

</ul>
</nav>

</div>
</div>
<hr class="footer--section-break">
<div class="footer--meta">
<div class="footer--meta-item">
<p>Mentor matcher developed by <a href="https://www.twitter.com/jonodrew" title="Jonathan's Twitter (Opens in new window)" target="_blank" rel="noopener noreferrer">Jonathan Kerr</a>.</p>

</div>
<div class="footer--meta-item">
<p>All content is released under the <a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" title="Read more about the Open Government License. (Opens in new window)" target="_blank">Open Government License</a> unless otherwise stated. Please attribute our work.</p>

</header>

<div class="width-container">
<main class="main-wrapper main-wrapper--auto-spacing" id="main-content" role="main">
<article class="article--page">

{% block header %}{% endblock %}

{% block content %}{% endblock %}

</article>
</main>
</div>


<footer class="footer" role="contentinfo">
<div class="width-container">
<div class="grid-row">
<div class="grid-column-two-thirds">
<h2 class="footer--wordmark">Mentor Matching Online</h2>
</div>
<div class="grid-column-one-third">
<ul class="footer--list">

<li class="footer--list-item">
<a class="footer--link" href="//mentormatching.online/software/privacy" title="Read the Privacy policy for this software">
Privacy
</a>
</li>

<li class="footer--list-item">
<a class="footer--link" href="//mentormatching.online/software/cookies" title="Read the Cookie policy for this software">
Cookies
</a>
</li>

<li class="footer--list-item">
<a class="footer--link" href="https://github.com/mentor-matching-online/mentor-match" title="View the source code for the mentor matching software">
Source code
</a>
</li>

<hr>

<li class="footer--list-item">
<a class="footer--link" href="//mentormatching.online/" title="Visit the home page">
Home
</a>
</li>

<li class="footer--list-item">
<a class="footer--link" href="//mentormatching.online/mentor-matcher" title="View the source code for the mentor matching software">
Software
</a>
</li>

<li class="footer--list-item">
<a class="footer--link" href="//mentormatching.online/about" title="Find out more about this project">
About
</a>
</li>

</ul>
</div>
</div>
</div>
</div>
</footer>
<script src="{{url_for('static', filename='main.js')}}" type="text/javascript"></script>
{% block js %}{% endblock %}
</body>
</footer>
<script src="{{url_for('static', filename='main.js')}}" type="text/javascript"></script>
{% block js %}{% endblock %}
</body>
</html>
42 changes: 0 additions & 42 deletions mentor_match_web/app/templates/cookies.html
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions mentor_match_web/app/templates/done.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
{{ super() }}
{% endblock %}

{% block breadcrumbs %}
<li class="breadcrumbs--list-item">
<a class="breadcrumbs--link" href="/mentor_match_web/app/static">Mentor matcher</a>
</li>
{% endblock %}

{% block paneltitle %}Download complete{% endblock %}
{% block panelmessage %}
<p>You can safely close this window.</p>
Expand Down
8 changes: 4 additions & 4 deletions mentor_match_web/app/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
{{ super() }}
{% endblock %}

{% block pagecaption %}Tools{% endblock %}
{% block pageheading %}Mentor matcher{% endblock %}
{% block pagecaption %}Mentor matcher{% endblock %}
{% block pageheading %}Get started{% endblock %}
{% block pageexcerpt %}This tool helps you to match mentors to mentees as part of the Civil Service LGBT+ mentoring programme.{% endblock %}

{% block content %}

<div class="grid-row">
<div class="grid-column-two-thirds">
<div class="page--content">
<h2 class="heading-md">Before you start</h2>
<h2 class="heading-lg">Before you start</h2>
<ol>
<li><strong>This tool will only work with data in specific formats.</strong> You must have two files – <code>mentees.csv</code> and <code>mentors.csv</code> – to start the matching process. Those files need to be formatted with specific column headings. You can <a href="https://github.com/jonodrew/mentor-match-package/blob/main/templates/participant.csv">download a template</a> from this website.</li>
<li><strong>This tool will only work with data in specific formats.</strong> You must have two files – <code>mentees.csv</code> and <code>mentors.csv</code> – to start the matching process. Those files need to be formatted with specific column headings. You can <a href="https://www.mentormatching.online/guide/11-1-format-the-data/" title="Read the 'format the data' guidance">find out more about formatting your data</a> and <a href="https://www.mentormatching.online/documents/example-output-data.zip" title="download a ZIP file containing the templates">download a template</a> from this website.</li>
<li><strong>Do not close your browser window during the matching process.</strong> Doing this may cause the matching process to fail and you to lose your matches.</li>
<li><strong>The larger the number of matches you need, the longer this takes.</strong> Matching mentors to mentees takes around 10 minutes to match 500 participants.</li>
</ol>
Expand Down