Commit 09e0a5ab authored by Daniel W Bond's avatar Daniel W Bond
Browse files

Merge branch 'master' into auth

parents 3905cbb3 97f43875
......@@ -4,63 +4,63 @@
{% get_social_accounts student.user as accounts %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-8 col-md-offset-2 text-center">
<div class="col-md-2 col-md-offset-1 text-center">
<img class="img-circle img-responsive center center-block" src="{{ student.profile_image_url }}" alt="{{ student.user.first_name }} Gravatar picture">
<h1>{{ student.user.first_name }} {{ student.user.last_name }}</h1>
</div>
<div class="col-md-6 text-center">
<h1><strong>{{ student.user.first_name }} {{ student.user.last_name }}</strong></h1>
<p class="lead"><strong>{{ student.room }}</strong></p>
<p><em>shared with</em>: <span class="label label-default">campus</span></p>
</div>
</div>
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-body">
<table class="table table-hover text-center">
<tbody>
<tr>
<td><strong>Room</strong>: {{ student.room }}</td>
</tr>
<div class="col-md-5 col-md-offset-1">
<table class="table table-hover text-center">
<tbody>
<tr>
<td><h4><strong>Major</strong>: {{ student.major.major_name }}</h4></td>
</tr>
<tr>
<td><strong>Major</strong>: {{ student.major.major_name }}</td>
</tr>
<tr>
<td><h4><strong>Email</strong>: {{ student.user.email }}</h4></td>
</tr>
</tbody>
</table>
</div>
<tr>
<td><strong>Email</strong>: {{ student.user.email }}</td>
</tr>
<div class="col-md-5">
<table class="table table-hover text-center">
<tbody>
<tr>
<td>
<h4><i class="fa fa-facebook fa-lg"></i></h4>
</td>
<td>
<!-- {% if accounts.facebook %} <h4><a href="http://www.facebook.com/{{ accounts.facebook.0.uid }}" target="_blank">Facebook</a></h4> {% endif %} -->
<h4>A Facebook account link</h4>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<tr>
<td>
<h4><i class="fa fa-google fa-lg"></i></h4>
</td>
<td>{% if accounts.google %} <h4><a href="https://plus.google.com/{{ accounts.google.0.uid }}" target="_blank">Google+</a></h4> {% endif %}
</td>
</tr>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-body">
<table class="table table-hover text-center">
<tbody>
<tr>
<td><i class="fa fa-facebook fa-lg"></i>
</td>
<td>{% if accounts.facebook %} <a href="http://www.facebook.com/{{ accounts.facebook.0.uid }}" target="_blank">Facebook</a> {% endif %}</td>
</tr>
<tr>
<td><i class="fa fa-google fa-lg"></i>
</td>
<td>{% if accounts.google %} <a href="https://plus.google.com/{{ accounts.google.0.uid }}" target="_blank">Google+</a> {% endif %}</td>
</tr>
<tr>
<td><i class="fa fa-twitter fa-lg"></i>
</td>
<td>{% if accounts.twitter %} <a href="https://twitter.com/intent/user?user_id={{ accounts.twitter.0.uid }}" target="_blank">Twitter</a> {% endif %}</td>
</tr>
</tbody>
</table>
</div>
</div>
<tr>
<td>
<h4><i class="fa fa-twitter fa-lg"></i></h4>
</td>
<td>
{% if accounts.twitter %} <h4><a href="https://twitter.com/intent/user?user_id={{ accounts.twitter.0.uid }}" target="_blank">Twitter</a></h4> {% endif %}
</td>
</tr>
</tbody>
</table>
</div>
</div>
......
/* Sticky footer styles */
html,
body {
height: 95%;
}
#contentcontain {
padding-top: 45px;
display: inline-block;
vertical-align: top;
}
/* Wrapper for page content to push down footer */
#wrap {
min-height: 100%;
height: auto;
/* Negative indent footer by its height */
margin: 0 auto -30px;
/* Pad bottom by footer height */
padding: 0 0 30px;
}
/* Set the fixed height of the footer here */
#footer {
height: 30px;
}
.jumboindex {
background: url(/static/img/North_Section_of_Presidents_Park_Dorms.jpg) no-repeat;
background-size: cover;
background-position: center;
box-shadow: inset 0px 0px 20px #333;
color: white;
text-shadow:
2px 2px 4px #000;
text-shadow: 2px 2px 4px #000;
padding-top: 75px;
padding-bottom: 75px;
}
.jumboabout {
background: url(/static/img/Campus_Dorms_East_side_of_Campus.jpg) no-repeat;
background-size: cover;
background-position: bottom;
box-shadow: inset 0px 0px 20px #333;
color: white;
text-shadow:
2px 2px 4px #000;
text-shadow: 2px 2px 4px #000;
padding-top: 75px;
padding-bottom: 75px;
}
.license img {
position: absolute;
bottom: 8px;
right: 15px;
}
.container-padding {
padding-top: 75px;
padding-top: 30px;
}
#get-started {
border-radius: 10px;
margin-top: 9%;
width: 250px;
height: 75px;
font-size: 20pt;
border-bottom: 5px solid #005030;
box-shadow: 0px 0px 8px #222;
outline: none;
}
#get-started:hover,#get-started.active:focus, #get-started:focus {
color: #fff;
background-color: #005937;
outline: none;
}
#get-started:active, #get-started.active {
color: #fff;
background-color: #005030;
border-top:5px solid #005030;
box-shadow: 0px 0px 6px #222;
outline-offset: none;
}
#get-started:focus,
#get-started:active:focus,
#get-started.active:focus {
outline: none;
outline-offset: 0px;
}
{% extends 'layouts/base.html' %}
{% block title %}
GMU RoomList &bull; Homepage
{% endblock %}
{% block content %}
{% extends 'layouts/base.html' %} {% block title %} GMU RoomList &bull; Homepage {% endblock %} {% block content %}
<div class="container container-padding">
<div class="row">
<div class="col-md-12 license">
<div class="jumbotron jumboindex">
<h1 class="text-center"><strong>GMU</strong>&#8203;ROOMLIST</h1>
<p class="text-center">Find your on-campus neighbors.</p>
<h3 class="text-center">Find your on-campus neighbors.</h3>
</div>
<a href="https://creativecommons.org/licenses/by-nc/2.0/" target="_blank"><img alt="Creative Commons License" style="border-width:0" src="https://licensebuttons.net/l/by-nc/2.0/80x15.png" title="'North Section of President's Park Dorms' by Flickr user cgs_gmu2005 is licensed under a Creative Commons Attribution-NonCommercial 2.0 Generic License."/></a>
<a href="https://creativecommons.org/licenses/by-nc/2.0/" target="_blank"><img alt="Creative Commons License" style="border-width:0" src="https://licensebuttons.net/l/by-nc/2.0/80x15.png" title="'North Section of President's Park Dorms' by Flickr user cgs_gmu2005 is licensed under a Creative Commons Attribution-NonCommercial 2.0 Generic License."
/>
</a>
</div>
</div>
</div>
......@@ -21,7 +17,27 @@ GMU RoomList &bull; Homepage
<legend></legend>
<div class="row">
<div class="row">
<div class="col-md-3 text-center">
<h4><i class="fa fa-key fa-lg"></i></h4>
<h4>Log in with your Mason credentials</h4>
</div>
<div class="col-md-3 text-center">
<h4><i class="fa fa-group fa-lg"></i></h4>
<h4>See who else lives on your floor</h4>
</div>
<div class="col-md-3 text-center">
<h4><i class="fa fa-facebook fa-lg"></i></h4>
<h4>Link to your social media accounts</h4>
</div>
<div class="col-md-3 text-center">
<h4><i class="fa fa-lock fa-lg"></i></h4>
<h4>Choose to share by floor, building, or campus</h4>
</div>
</div>
<div class="row">
<div class=".col-md-12 text-center">
<button type="button" class="btn btn-primary" id="get-started">Get Started</button>
</div>
</div>
......
......@@ -14,9 +14,9 @@
</head>
<body>
<div id="wrap">
<div id="wrap" style="display: flex;">
{% include 'layouts/navbar.html' %}
<div class="container">
<div id="contentcontain" class="container">
{% block content %} {% endblock %}
</div>
</div>
......
......@@ -4,9 +4,9 @@
<div class="col-lg-12">
<div class="col-md-8">
<a href="{% url 'about' %}" target="_blank">About</a> &middot;
<a href="http://srct.gmu.edu/contact/" target="_blank">Contact</a> &middot;
<a href="{% url 'privacy' %}" target="_blank">Privacy</a> &middot;
<a href="http://srct.gmu.edu/documents/usage_policy" target="_blank">Terms of Service</a> &middot;
<a href="{% url 'privacy' %}" target="_blank">Privacy</a>
<a href="http://srct.gmu.edu/contact/" target="_blank">Contact</a>
</div>
<div class="col-md-4">
<p class="muted pull-right">A <a href="http://srct.gmu.edu/projects" target="_blank">project</a> of <a href="http://www.gmu.edu/" target="_blank">Mason</a> <a href="http://srct.gmu.edu/" target="_blank"><strong>SRCT</strong></a>. <a href="https://www.gnu.org/licenses/gpl-3.0.html"
......
......@@ -106,7 +106,7 @@ GMU Roomlist &bull; Privacy Policy
We may revice this policy; when we make, at our discretion, a
significant change, we will display a prominent link to the change on
the front page of the site. Please
<a href="{% url 'contact' %}">contact us</a> with any questions,
<a href="//srct.gmu.edu/contact/">contact us</a> with any questions,
comments, or concerns.
</p>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment