Commit 6680e475 authored by Jean Michel Rouly's avatar Jean Michel Rouly
Browse files

Centered everything in 10 wide grid.

parent 5b46c236
......@@ -6,44 +6,39 @@ HNRS 110 • Homepage
{% block content %}
<div class="container">
<a name="top"></a>
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-12">
<h1>Research Question Review</h1>
<p class="lead">Description</p>
</div>
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-12">
<h1>Research Question Review</h1>
<p class="lead">Description</p>
</div>
</div>
</div>
{% for question in questions %}
{% for question in questions %}
<div id="question{{ question.pk }}" class="question-box">
<div id="question{{ question.pk }}" class="question-box">
<div class="question-box-title">
<div class="question-box-title-left">
{{question.user.first_name}} {{question.user.last_name}}
</div>
<div class="question-box-title-right">
{{question.rating}}
</div>
<div class="question-box-title">
<div class="question-box-title-left">
{{question.user.first_name}} {{question.user.last_name}}
</div>
<div class="question-text" id="question-text{{question.pk}}">
{{question.text}}
</div>
<div class="question-box-footer">
Toggle Comments
<div class="question-box-title-right">
{{question.rating}}
</div>
</div>
<div class="question-text" id="question-text{{question.pk}}">
{{question.text}}
</div>
<div class="question-box-footer">
Toggle Comments
</div>
{% endfor %}
</div>
</div>
{% endfor %}
{% endblock %}
......@@ -5,6 +5,7 @@
{% load staticfiles %}
<link href="/static/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/css/bootswatch.css" rel="stylesheet">
<link href="/static/css/extensions.css" rel="stylesheet">
<script src="/static/js/jquery-1.10.2.min.js"></script>
<script src="/static/js/bootstrap.min.js"></script>
......@@ -15,11 +16,15 @@
{% include 'layouts/navbar.html' %}
{% block content %}
<div class="container">
<a name="top"></a>
{% endblock %}
{% block content %}
{% include 'layouts/footer.html' %}
{% endblock %}
{% include 'layouts/footer.html' %}
</div>
</body>
</html>
<p><a href="#top">Return to top.</a></p>
<div id="footer">
By <a href="http://michel.rouly.net">Michel Rouly</a> |
For <a href="http://gmu.edu">George Mason University</a> |
With <a href="http://www.apache.org/licenses/LICENSE-2.0">some rights reserved</a>
</div>
<footer>
<div class="row">
<div class="col-lg-10 col-lg-offset-1">
<span class="pull-right">
<a href="#top">Return to top</a>
</span>
<p class="text-center">
Built by <a href="http://michel.rouly.net">Michel Rouly</a>
for <a href="http://gmu.edu">George Mason University</a>
with <a href="http://www.apache.org/licenses/LICENSE-2.0">some rights reserved</a>.
</p>
</div>
</div>
</footer>
......@@ -2,41 +2,36 @@
{% block content %}
<div class="container">
<a name="top"></a>
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-12">
<h1>Login</h1>
<p class="lead">Description</p>
</div>
</div>
</div>
{% if form.errors %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-12">
<p>Your username and password didn't match. Please try again.</p>
<h1>Login</h1>
<p class="lead">Description</p>
</div>
</div>
{% endif %}
<p>Please log in using your GMU NetID.</p>
<form id="login-form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
{% csrf_token %}
<label for="username">user</label>
<br />
<input type="username" name="username" id="username" placeholder="Username" />
<br /><br />
<label for="password">password</label>
<br />
<input type="password" name="password" id="password" placeholder="Password" />
<br /><br />
<input type="submit" value="Sign in" />
</form>
</div>
{% if form.errors %}
<div class="row">
<div class="col-lg-12">
<p>Your username and password didn't match. Please try again.</p>
</div>
</div>
{% endif %}
<p>Please log in using your GMU NetID.</p>
<form id="login-form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
{% csrf_token %}
<label for="username">user</label>
<br />
<input type="username" name="username" id="username" placeholder="Username" />
<br /><br />
<label for="password">password</label>
<br />
<input type="password" name="password" id="password" placeholder="Password" />
<br /><br />
<input type="submit" value="Sign in" />
</form>
{% endblock %}
......@@ -6,56 +6,48 @@ HNRS 110 &bull; Submit Question
{% block content %}
<div class="container">
<a name="top"></a>
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-12">
<h1>Submit a Research Question</h1>
<p class="lead">Use this form to submit your tentative research
question for peer review.</p>
</div>
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-10 col-lg-offset-1">
<h1>Submit a Research Question</h1>
<p class="lead">Use this form to submit your tentative research
question for peer review.</p>
</div>
</div>
</div>
<p>
</p>
<div class="row">
<div class="col-lg-12">
<div class="well">
<form class="form-horizontal" action="/submit" method="post">{% csrf_token %}
<legend>Research Question</legend>
{% if form.text.errors %}
<div class="form-group has-error">
<div class="col-lg-12">
<label class="control-label">{{form.text.errors}}</label>
{% else %}
<div class="form-group">
<div class="col-lg-12">
{% endif %}
{{ form.text }}
<span class="help-block">
Please only include the question text, there is no need to
include your name or any other information.
</span>
</div>
<div class="row">
<div class="col-lg-10 col-lg-offset-1">
<div class="well">
<form class="form-horizontal" action="/submit" method="post">{% csrf_token %}
<legend>Research Question</legend>
{% if form.text.errors %}
<div class="form-group has-error">
<div class="col-lg-12">
<label class="control-label">{{form.text.errors}}</label>
{% else %}
<div class="form-group">
<div class="col-lg-12">
{% endif %}
{{ form.text }}
<span class="help-block">
Please only include the question text, there is no need to
include your name or any other information.
</span>
</div>
</div>
<div class="form-group">
<div class="col-lg-12">
<input type="submit" class="btn btn-primary" value="Submit Question" />
</div>
<div class="form-group">
<div class="col-lg-12">
<input type="submit" class="btn btn-primary" value="Submit Question" />
</div>
</form>
</div>
</div>
</form>
</div>
</div>
</div>
{% endblock %}
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