Merge branch 'master' of github.com:econchick/rogueojiiofwales into crazy

Conflicts:
	urls.py
This commit is contained in:
Jonas Obrist 2012-08-19 03:01:47 +02:00
commit 0ab9f790fe
7 changed files with 91 additions and 6 deletions

24
templates/graph_base.html Normal file
View file

@ -0,0 +1,24 @@
{# vim: set ft=htmldjango #}
{% extends "base.html" %}
{% block head_css %}
<style text="text/css">
h1.placeholder {
margin-top: 80px;
text-align: center;
color: #ccc;
}
</style>
{% endblock %}
{% block container %}
{% include "navbar.html" %}
<div class="container-fluid">
{% block graph %}<h1 class="placeholder">PUT A GRAPH HERE</h1>{% endblock %}
</div>
{% endblock container %}
{% block body_js %}
<script src="{{ STATIC_URL }}js/jquery.js"></script>
<script src="{{ STATIC_URL }}bootstrap/js/bootstrap-dropdown.js"></script>
{% endblock %}

View file

@ -0,0 +1,2 @@
{# vim: set ft=htmldjango #}
{% extends "graph_base.html" %}

View file

@ -0,0 +1,6 @@
{# vim: set ft=htmldjango #}
{% extends "graph_base.html" %}
{% block graph %}
<h1 class="placeholder">PUT A GRAPH OF<br/>{{ username }}'s<br/>{{ repo }} REPO<br/>HERE</h1>
{% endblock %}

33
templates/navbar.html Normal file
View file

@ -0,0 +1,33 @@
{# vim: set ft=htmldjango #}
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
<a class="brand" href="">Cool name</a>
<ul class="nav">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">My Repos</a>
<ul class="dropdown-menu">
{% for r in repos %}
<li><a href="#">{{ r.name }}</a></li>
{% endfor %}
</ul>
</li>
<li><a href="{% url index %}">Followers</a></li>
</ul>
<ul class="nav pull-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
{{ request.user.username }}
</a>
<ul class="dropdown-menu">
<li><a href="#">Logout</a></li>
</ul>
</li>
<li><a href="{% url index %}">Followers</a></li>
</ul>
<ul class="nav pull-right">
<li><a href="">Logout</a></li>
</ul>
</div>
</div>
</div>