Merge pull request #1 from jrhackett/fix-typos-and-cleanup-html

fixing some typos and wording, cleaning up html
This commit is contained in:
binamkayastha 2017-12-11 23:56:45 -05:00 committed by GitHub
commit 658e63c1c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 65 additions and 60 deletions

View file

@ -74,4 +74,4 @@
}
</script>
{% include 'footer.html' %}
{% include 'footer.html' %}

View file

@ -1,7 +1,7 @@
<script src="../static/js/jquery-2.2.4.min.js"></script>
<script src="../static/js/jquery.easing.min.js"></script>
<script src="../static/js/materialize.min.js"></script>
<script src="../static/js/init.js"></script>
<script src="../static/js/jquery-2.2.4.min.js"></script>
<script src="../static/js/jquery.easing.min.js"></script>
<script src="../static/js/materialize.min.js"></script>
<script src="../static/js/init.js"></script>
</body>
</html>
</body>
</html>

View file

@ -1,22 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Hack @ WPI</title>
<link rel="icon" href="../static/favicon.png" type="image/png">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="https://opensource.keycdn.com/fontawesome/4.7.0/font-awesome.min.css" integrity="sha384-dNpIIXE8U05kAbPhy3G1cz+yZmTzA6CY8Vg/u2L9xRnHjJiAK76m2BIEaSEV+/aU" crossorigin="anonymous">
<link href="../static/css/materialize.min.css" rel="stylesheet">
<link href="../static/css/style.css" rel="stylesheet">
<!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]--><script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
</head>
<body>
<nav class="white" role="navigation" style="height: 80px">
<div class="nav-wrapper container">
<a id="logo-container" href="#" class="red-text text-darken-4 brand-logo">
<img src="../static/img/hackwpi_longlogo.png" alt="hack@WPI" height="100%">
</a>
</div>
<a id="mlh-trust-badge" style="display:block;max-width:100px;min-width:60px;position:fixed;right:50px;top:0;width:10%;z-index:10000" href="https://mlh.io/seasons/na-2018/events?utm_source=na-2018&utm_medium=TrustBadge&utm_campaign=na-2018&utm_content=black" target="_blank"><img src="https://s3.amazonaws.com/logged-assets/trust-badge/2018/black.svg" alt="Major League Hacking 2018 Hackathon Season" style="width:100%"></a>
</nav>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Hack @ WPI</title>
<link rel="icon" href="../static/favicon.png" type="image/png">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="https://opensource.keycdn.com/fontawesome/4.7.0/font-awesome.min.css" integrity="sha384-dNpIIXE8U05kAbPhy3G1cz+yZmTzA6CY8Vg/u2L9xRnHjJiAK76m2BIEaSEV+/aU" crossorigin="anonymous">
<link href="../static/css/materialize.min.css" rel="stylesheet">
<link href="../static/css/style.css" rel="stylesheet">
<!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]-->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
</head>
<body>
<nav class="white" role="navigation" style="height: 80px">
<div class="nav-wrapper container">
<a id="logo-container" href="#" class="red-text text-darken-4 brand-logo">
<img src="../static/img/hackwpi_longlogo.png" alt="hack@WPI" height="100%">
</a>
</div>
<a id="mlh-trust-badge" style="display:block;max-width:100px;min-width:60px;position:fixed;right:50px;top:0;width:10%;z-index:10000" href="https://mlh.io/seasons/na-2018/events?utm_source=na-2018&utm_medium=TrustBadge&utm_campaign=na-2018&utm_content=black" target="_blank"><img src="https://s3.amazonaws.com/logged-assets/trust-badge/2018/black.svg" alt="Major League Hacking 2018 Hackathon Season" style="width:100%"></a>
</nav>

View file

@ -32,12 +32,12 @@
</div>
<div class="row center">
<div class="col s12 m6">
<a class="sub-button col s6 push-s3 m4 push-m4 btn waves-effect waves-light grey darken-1"
href="" data-mode="1" target="_blank">Slack Chatroom (TBA)</a>
<!-- <a class="sub-button col s6 push-s3 m4 push-m4 btn waves-effect waves-light grey darken-1"
href="" data-mode="1" target="_blank">Slack Chatroom (TBA)</a> -->
</div>
<div class="col s12 m6">
<a class="sub-button col s6 push-s3 m4 push-m4 btn waves-effect waves-light grey darken-1"
href="" data-mode="1" target="_blank">Devpost Link (TBA)</a>
<!-- <a class="sub-button col s6 push-s3 m4 push-m4 btn waves-effect waves-light grey darken-1"
href="" data-mode="1" target="_blank">Devpost Link (TBA)</a> -->
</div>
</div>
<br>
@ -141,7 +141,7 @@
</div>
<div class="col l6 s6">
<h5 class="white-text">Will there be travel reimbursements?</h5>
<p class="grey-text text-lighten-4">We are attempting to partner with some nearby schools to run a bus from there's to ours, but may not have the budget. If you're interested in providing a bus to our hackathon, let us know. At the moment we cannot provide travel reimburstments.</p>
<p class="grey-text text-lighten-4">We are attempting to partner with some nearby schools to run a bus from their's to ours, but may not have the budget. If you're interested in providing a bus to our hackathon, let us know. At the moment we cannot provide travel reimbursments.</p>
</div>
<div class="col l6 s6">
<h5 class="white-text">How do I know I'm registered?</h5>
@ -149,7 +149,7 @@
</div>
<div class="col l6 s6">
<h5 class="white-text">I am officially registered but now I want to unregister, how do I do that?</h5>
<p class="grey-text text-lighten-4">Go to hack.wpi.edu/dashboard, there is a link on the bottom to drop your registration</p>
<p class="grey-text text-lighten-4">Go to hack.wpi.edu/dashboard. There is a link on the bottom to drop your registration.</p>
</div>
</div>
</div>

View file

@ -11,33 +11,37 @@
<a id="mlh-trust-badge" href="https://mlh.io/seasons/na-2017/events?utm_source=na-2017&utm_medium=TrustBadge&utm_campaign=na-2017&utm_content=black" target="_blank"><img src="https://s3.amazonaws.com/logged-assets/trust-badge/2017/black.svg" alt="Major League Hacking 2017 Hackathon Season" style="width:100%"></a>
<div class="container">
<h1>Hi {{ name }}, thanks for logging in with MyMLH!</h1>
<h2>If you'd like, add your resume to send to sponsors... </h2>
<div class="section">
<form method="post" action="/register" enctype="multipart/form-data">
<div class="file-field input-field">
<div class="btn">
<span>File</span>
<input id="resume" name="resume" type="file"/>
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
</div>
<p>By registering & attending, you agree to the following policies:</p>
<p><a href="https://github.com/MLH/mlh-policies/blob/master/data-sharing.md">MLH's Data Sharing
Notice</a>
</p>
<p><a href="https://mlh.io/privacy">MLH's Privacy Policy</a></p>
<p>
<a href="https://github.com/MLH/mlh-policies/blob/master/prize-terms-and-conditions/contest-terms.md">MLH's
Contest Terms and Conditions</a></p>
<p><a href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">MLH's Code of Conduct</a></p>
<br>
<input type="checkbox" id="checkboxid" required><label for="checkboxid">Do you agree with MLH Rules?</label><br>
<input name="submit" class="btn btn-lg btn-primary btn-invert" type="submit" value="Submit"/>
</form>
<h1>Hi {{ name }}, thanks for logging in with MyMLH!</h1>
<h2>We will be sending resumes to sponsoring companies. If you would like us to send your resume, please upload it here:</h2>
<div class="section">
<form method="post" action="/register" enctype="multipart/form-data">
<div class="file-field input-field">
<div class="btn">
<span>File</span>
<input id="resume" name="resume" type="file"/>
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
</div>
<p>By registering & attending, you agree to the following policies:</p>
<p>
<a href="https://github.com/MLH/mlh-policies/blob/master/data-sharing.md">MLH's Data Sharing Notice</a>
</p>
<p>
<a href="https://mlh.io/privacy">MLH's Privacy Policy</a>
</p>
<p>
<a href="https://github.com/MLH/mlh-policies/blob/master/prize-terms-and-conditions/contest-terms.md">MLH's Contest Terms and Conditions</a>
</p>
<p>
<a href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">MLH's Code of Conduct</a>
</p>
<br>
<input type="checkbox" id="checkboxid" required><label for="checkboxid">Do you agree with MLH Rules?</label><br>
<input name="submit" class="btn btn-lg btn-primary btn-invert" type="submit" value="Submit"/>
</form>
</div>
</div>
</div>
{% include 'footer.html' %}
{% include 'footer.html' %}