From b596364cf3f871887cce519291b684341cc5c014 Mon Sep 17 00:00:00 2001
From: Jayaram Pai
Date: Sun, 8 Dec 2013 20:43:40 +0530
Subject: added nicEdit / on-the-fly question edit
---
static/website/templates/base.html | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
(limited to 'static/website/templates/base.html')
diff --git a/static/website/templates/base.html b/static/website/templates/base.html
index 8d95162..f7e2ac5 100644
--- a/static/website/templates/base.html
+++ b/static/website/templates/base.html
@@ -24,7 +24,6 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
- <li><a href="{% url 'website:home' %}">Home</a></li>
<li><a href="{% url 'website:new_question' %}">Ask Question</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
@@ -35,7 +34,7 @@
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
- </li>
+ </li> <!-- /li.dropdown -->
</ul>
</div> <!-- /.navbar-collapse -->
</div> <!-- /.container -->
@@ -45,18 +44,10 @@
<div id="content-wrapper">
<div id="content-inner" class="container">
- <div id="content" class="col-lg-10 col-md-10 col-sm-10">
+ <div id="content" class="col-lg-12 col-md-12 col-sm-12">
{% block content %}
{% endblock %}
</div> <!-- /#content -->
-
- <div id="sidebar" class="col-lg-2 col-md-2 col-sm-2">
- {% block sidebar %}
- <h4>Recent Posts</h4>
- {% load sidebar_tags %}
- {% recent_questions %}
- {% endblock %}
- </div> <!-- /#sidebar -->
</div> <!-- /#content-inner -->
</div> <!-- /#content-wrapper -->
@@ -72,5 +63,8 @@
<script src="{% static 'website/js/jquery.min.js' %}"></script>
<script src="{% static 'website/js/bootstrap.min.js' %}"></script>
<script src="{% static 'website/js/custom.js' %}"></script>
+ {% block javascript %}
+ <!-- overide with custom javascript -->
+ {% endblock %}
</body>
</html>
--
cgit