eryn/rogueojiiofwales
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'fork/feature/ui' into feature/ui

Browse source 
Conflicts:
	templates/graph_base.html
	templates/navbar.html
	urls.py
	views.py
This commit is contained in:
Eryn Wells 2012-08-18 16:12:56 -07:00
commit c389dc5581
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
templates/graph_base.html
View file

@ -17,8 +17,11 @@ h1.placeholder {
{% block graph %}<h1 class="placeholder">PUT A GRAPH HERE</h1>{% endblock %} {% block graph %}<h1 class="placeholder">PUT A GRAPH HERE</h1>{% endblock %}
</div> </div>
{% endblock container %} {% endblock container %}
<<<<<<< HEAD
{% block body_js %} {% block body_js %}
<script src="{{ STATIC_URL }}js/jquery.js"></script> <script src="{{ STATIC_URL }}js/jquery.js"></script>
<script src="{{ STATIC_URL }}bootstrap/js/bootstrap-dropdown.js"></script> <script src="{{ STATIC_URL }}bootstrap/js/bootstrap-dropdown.js"></script>
{% endblock %} {% endblock %}
=======
>>>>>>> fork/feature/ui

7
templates/navbar.html
View file

@ -4,6 +4,7 @@
<div class="container-fluid"> <div class="container-fluid">
<a class="brand" href="">Cool name</a> <a class="brand" href="">Cool name</a>
<ul class="nav"> <ul class="nav">
<<<<<<< HEAD
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">My Repos</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown">My Repos</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@ -23,6 +24,12 @@
<li><a href="#">Logout</a></li> <li><a href="#">Logout</a></li>
</ul> </ul>
</li> </li>
=======
<li><a href="{% url index %}">Followers</a></li>
</ul>
<ul class="nav pull-right">
<li><a href="">Logout</a></li>
>>>>>>> fork/feature/ui
</ul> </ul>
</div> </div>
</div> </div>