Commit 1ba4f50b authored by Tyler Hallada's avatar Tyler Hallada
Browse files

Merge branch 'master' of github.com:thallada/whats-open

parents dfd53081 ce8fa106
...@@ -55,3 +55,12 @@ div.container{ ...@@ -55,3 +55,12 @@ div.container{
text-align:center; text-align:center;
} }
.phone-footer{
text-align: center;
}
.clock{
text-align: center;
font-size: 25px;
font-family:"Courier New", Courier, monospace;
}
...@@ -31,10 +31,15 @@ ...@@ -31,10 +31,15 @@
<a href="http://whatsopen.gmu.edu">What's Open</a> <a href="http://whatsopen.gmu.edu">What's Open</a>
</div> </div>
</div> </div>
<div class = clock>
{% now "H:i" %}
<!--All nice and static... this will too will likely be changing soon. -->
</div>
{% block content%} {% block content%}
{% endblock %} {% endblock %}
<div class = "navbar"> <div class = "navbar">
...@@ -44,10 +49,17 @@ ...@@ -44,10 +49,17 @@
</div> </div>
<div class = "left-footer"> <div class = "left-footer hidden-phone">
A project of <a href="http://srct.gmu.edu">GMU SRCT</a>. Some rights reserved.
</div>
<div class = "offset5 right-footer hidden-phone">
George Mason University <a href="http://dining.gmu.edu">Dining Services</a>
</div>
<div class = "phone-footer visible-phone">
A project of <a href="http://srct.gmu.edu">GMU SRCT</a>. Some rights reserved. A project of <a href="http://srct.gmu.edu">GMU SRCT</a>. Some rights reserved.
</div> </div>
<div class = "offset5 right-footer"> <div class = "phone-footer visible-phone">
George Mason University <a href="http://dining.gmu.edu">Dining Services</a> George Mason University <a href="http://dining.gmu.edu">Dining Services</a>
</div> </div>
......
{% extends 'base.html' %}
<!-- Grid with restaurants sorted by location -->
<!-- New revisions pending major revisions (whoo JavaScript!) by Tyler -->
{% block content %}
{% now "jS F Y H:i" %}
<div id="grid">
{% for list in restRows %}
<div class = "row">
{% for restaurant in list %}
<div class = "span3 {% if restaurant.isOpen %}open{% else %}closed{% endif %}">
{{ restaurant.name }}
</div>
{% endfor %}
</div>
{% empty %}
There aren't any restaurants.
{% endfor %}
</div>
{% endblock %}
{% extends 'base.html' %} {% extends 'base.html' %}
{% block content %} {% block content %}
<!-- Generated: {% now "jS F Y H:i" %} -->
<div id="grid"> <div id="grid">
</div> </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