Skip to content

Commit

Permalink
Work on Rules, Privacy, Terms pages
Browse files Browse the repository at this point in the history
  • Loading branch information
@pbombo
pbombo committed Feb 14, 2015
1 parent e9b43db commit d5dc77b
Show file tree
Hide file tree
Showing 10 changed files with 287 additions and 62 deletions.
12 changes: 11 additions & 1 deletion assets/stylesheet/_guide.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.content > section .main {

.guide, .terms {
.guide, .terms, .privacy {

max-width: 640px;

Expand Down Expand Up @@ -31,6 +31,16 @@
font-size: 1em;
font-weight: 400;
}

a {
text-decoration: none;
color: $blue;
border-bottom: 1px solid transparent;

&:hover {
border-bottom-color: $usiu_yellow;
}
}

ul {

Expand Down
18 changes: 12 additions & 6 deletions assets/stylesheet/main.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/stylesheet/main.css.map
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions views/guide.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
<header role="header">
<a href="/" class="logo"><img src="/images/logo_black.png"></a>
<nav role="navigation">
<a href="" title="">Register</a>
<a href="" title="">Schedule</a>
<a href="" title="">Rules</a>
<a href="" title="" class="active">Guide</a>
<a href="" title="">Contact</a>
<a href="/register" title="">Register</a>
<a href="/schedule" title="">Schedule</a>
<a href="/rules" title="">Rules</a>
<a href="/guide" title="" class="active">Guide</a>
<a href="/contact" title="">Contact</a>
</nav>
</header>
<div class="content page guide" role="main">
Expand All @@ -56,7 +56,7 @@
<div class="half">
<h3>Got questions?</h3>
<a href="mailto:mailto:[email protected]">Email</a>
<a href="">Twitter</a>
<a href="http://twitter.com/USIUHackathon">Twitter</a>
<a href="">Facebook</a>

<br>
Expand Down
27 changes: 19 additions & 8 deletions views/page.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
<header role="header">
<a href="/" class="logo"><img src="/images/logo_black.png"></a>
<nav role="navigation">
<a href="" title="">Register</a>
<a href="" title="">Schedule</a>
<a href="" title="">Rules</a>
<a href="" title="">Guide</a>
<a href="" title="">Contact</a>
<a href="/register" title="">Register</a>
<a href="/schedule" title="">Schedule</a>
<a href="/rules" title="">Rules</a>
<a href="/guide" title="">Guide</a>
<a href="/contact" title="">Contact</a>
</nav>
</header>
<div class="content page" role="main">
Expand All @@ -54,19 +54,30 @@

<footer class="clearfix" role="footer">
<div class="half">
<!-- <h3>Presented By</h3> -->
<h3>Got questions?</h3>
<a href="mailto:[email protected]">Email</a>
<a href="">Twitter</a>
<a href="mailto:mailto:[email protected]">Email</a>
<a href="http://twitter.com/USIUHackathon">Twitter</a>
<a href="">Facebook</a>

<br>
<p class="privacy-terms-links"><a href="/terms">Terms and Conditions</a> <a href="/privacy">Privacy Policy</a></p>

</div>

<div class="half">
<h3>Presented By</h3>
<img src="/images/usiu_it_club_logo.jpg">
</div>

<div class="credits">
<h3>Designed &amp; Developed <br>(with <3 and lots of Tea &amp; Coffee)</h3>
<a href="http://twitter.com/IanJuma" title="Ian Juma">@IanJuma</a>
<a href="http://twitter.com/pbombo">@pbombo</a>
</div>

</footer>


<script src="/javascript/vendor/jquery-2.1.0.min.js"></script>
<script src="/javascript/helper.js"></script>
<script src="/javascript/main.js"></script>
Expand Down
156 changes: 156 additions & 0 deletions views/privacy.handlebars
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
<!DOCTYPE html>
<html class="no-js">
<head>
<meta charset="utf-8">
<title>{{ title }} &mdash; USIU-A Hackathon March 2015</title>
<meta name="description" content="">
<meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui">
<meta http-equiv="cleartype" content="on">

<link rel="apple-touch-icon-precomposed" sizes="144x144" href="/images/touch/apple-touch-icon-144x144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/images/touch/apple-touch-icon-114x114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/images/touch/apple-touch-icon-72x72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="/images/touch/apple-touch-icon-57x57-precomposed.png">
<link rel="shortcut icon" sizes="196x196" href="/images/touch/touch-icon-196x196.png">
<link rel="shortcut icon" href="/images/touch/apple-touch-icon.png">

<!-- Tile icon for Win8 (144x144 + tile color) -->
<meta name="msapplication-TileImage" content="/images/touch/apple-touch-icon-144x144-precomposed.png">
<meta name="msapplication-TileColor" content="#222222">

<link rel="stylesheet" href="/stylesheet/normalize.css">
<link rel="stylesheet" href="/stylesheet/main.css">
<script src="/javascript/vendor/modernizr-2.7.1.min.js"></script>
</head>
<body>

<!-- Add your site or application content here -->
<header role="header">
<a href="/" class="logo"><img src="/images/logo_black.png"></a>
<nav role="navigation">
<a href="/register" title="">Register</a>
<a href="/schedule" title="">Schedule</a>
<a href="/rules" title="">Rules</a>
<a href="/guide" title="">Guide</a>
<a href="/contact" title="">Contact</a>
</nav>
</header>
<div class="content page privacy" role="main">
<section>
<div>
<header>
<h1>Privacy Policy</h1>
</header>
<div class="main">
<article class="privacy">
<p>This Privacy Policy governs the manner in which USIU Hackathon collects, uses, maintains and discloses information collected from users (each, a "User") of the https://www.usiuhackathon.me/ website ("Site"). This privacy policy applies to the Site and all products and services offered by USIU Hackathon.</p>

<h5>Personal identification information</h5>

<p>We may collect personal identification information from Users in a variety of ways, including, but not limited to, when Users visit our site, fill out a form, and in connection with other activities, services, features or resources we make available on our Site. Users may be asked for, as appropriate, email address, phone number. Users may, however, visit our Site anonymously. We will collect personal identification information from Users only if they voluntarily submit such information to us. Users can always refuse to supply personally identification information, except that it may prevent them from engaging in certain Site related activities.</p>

<h5>Non-personal identification information</h5>

<p>We may collect non-personal identification information about Users whenever they interact with our Site. Non-personal identification information may include the browser name, the type of computer and technical information about Users means of connection to our Site, such as the operating system and the Internet service providers utilized and other similar information.</p>

<h5>Web browser cookies</h5>

<p>Our Site may use "cookies" to enhance User experience. User's web browser places cookies on their hard drive for record-keeping purposes and sometimes to track information about them. User may choose to set their web browser to refuse cookies, or to alert you when cookies are being sent. If they do so, note that some parts of the Site may not function properly.</p>

<h5>How we use collected information</h5>

<p>USIU Hackathon may collect and use Users personal information for the following purposes:
- To improve customer service
Information you provide helps us respond to your customer service requests and support needs more efficiently.
<br>
- To improve our Site
We may use feedback you provide to improve our products and services.
<br>
- To send periodic emails
<br>
</p>
<p>We may use the email address to respond to their inquiries, questions, and/or other requests. If User decides to opt-in to our mailing list, they will receive emails that may include company news, updates, related product or service information, etc. If at any time the User would like to unsubscribe from receiving future emails, we include detailed unsubscribe instructions at the bottom of each email.
How we protect your information</p>

<p>We adopt appropriate data collection, storage and processing practices and security measures to protect against unauthorized access, alteration, disclosure or destruction of your personal information, username, password, transaction information and data stored on our Site.</p>

<p>Sensitive and private data exchange between the Site and its Users happens over a SSL secured communication channel and is encrypted and protected with digital signatures.</p>

<h5>Sharing your personal information</h5>

<p>We do not sell, trade, or rent Users personal identification information to others. We may share generic aggregated demographic information not linked to any personal identification information regarding visitors and users with our business partners, trusted affiliates and advertisers for the purposes outlined above.</p>

<h5>Changes to this privacy policy</h5>

<p>USIU Hackathon has the discretion to update this privacy policy at any time. When we do, we will send you an email. We encourage Users to frequently check this page for any changes to stay informed about how we are helping to protect the personal information we collect. You acknowledge and agree that it is your responsibility to review this privacy policy periodically and become aware of modifications.</p>

<h5>Your acceptance of these terms</h5>

<p>By using this Site, you signify your acceptance of this policy and terms of service. If you do not agree to this policy, please do not use our Site. Your continued use of the Site following the posting of changes to this policy will be deemed your acceptance of those changes.</p>

<h5>Contacting us</h5>

<p>If you have any questions about this Privacy Policy, the practices of this site, or your dealings with this site, please contact us at:
USIU Hackathon
<br>
https://www.usiuhackathon.me/
877100200
<br>
+254701435178
<br>
<a href="mailto:[email protected]">[email protected]</a>
</p>

This document was last updated on February 14, 2015
<br>
Privacy policy created by Generate Privacy Policy
</article>
</div>
</div>
</section>
</div>

<footer class="clearfix" role="footer">
<div class="half">
<h3>Got questions?</h3>
<a href="mailto:mailto:[email protected]">Email</a>
<a href="http://twitter.com/USIUHackathon">Twitter</a>
<a href="">Facebook</a>

<br>
<p class="privacy-terms-links"><a href="/terms">Terms and Conditions</a> <a href="/privacy">Privacy Policy</a></p>

</div>

<div class="half">
<h3>Presented By</h3>
<img src="/images/usiu_it_club_logo.jpg">
</div>

<div class="credits">
<h3>Designed &amp; Developed <br>(with <3 and lots of Tea &amp; Coffee)</h3>
<a href="http://twitter.com/IanJuma" title="Ian Juma">@IanJuma</a>
<a href="http://twitter.com/pbombo">@pbombo</a>
</div>

</footer>


<script src="/javascript/vendor/jquery-2.1.0.min.js"></script>
<script src="/javascript/helper.js"></script>
<script src="/javascript/main.js"></script>

<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
<script>
(function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
e=o.createElement(i);r=o.getElementsByTagName(i)[0];
e.src='//www.google-analytics.com/analytics.js';
r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
ga('create','UA-59739884-1');ga('send','pageview');
</script>

</body>
</html>
15 changes: 12 additions & 3 deletions views/register.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,29 @@
<footer class="clearfix" role="footer">
<div class="half">
<h3>Got questions?</h3>
<a href="mailto:[email protected]">Email</a>
<a href="">Twitter</a>
<a href="mailto:mailto:[email protected]">Email</a>
<a href="http://twitter.com/USIUHackathon">Twitter</a>
<a href="">Facebook</a>

<br>
<p class="privacy-terms-links"><a href="/terms">Terms and Conditions</a> | <a href="/privacy">Privacy Policy</a></p>
<p class="privacy-terms-links"><a href="/terms">Terms and Conditions</a> <a href="/privacy">Privacy Policy</a></p>

</div>

<div class="half">
<h3>Presented By</h3>
<img src="/images/usiu_it_club_logo.jpg">
</div>

<div class="credits">
<h3>Designed &amp; Developed <br>(with <3 and lots of Tea &amp; Coffee)</h3>
<a href="http://twitter.com/IanJuma" title="Ian Juma">@IanJuma</a>
<a href="http://twitter.com/pbombo">@pbombo</a>
</div>

</footer>


<script src="/javascript/vendor/jquery-2.1.0.min.js"></script>
<script src="/javascript/helper.js"></script>
<script src="/javascript/main.js"></script>
Expand Down
Loading

0 comments on commit d5dc77b

Please sign in to comment.