diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:59:27 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:59:27 -0500 |
| commit | 02fdb37d55ec1158162d4c35c3b43d1bcd4e58fa (patch) | |
| tree | 45ac74e9bf50a787f0dd37250b82ce406654f53e | |
| parent | 785ca5da915b5edc3123dcdeb4994fdfca7e416d (diff) | |
| parent | 60c8c00c4f7c2deddcfb1cade8e48d56dca2e9ad (diff) | |
Merge commit '60c8c00' (update)
Conflicts:
templates/base.html
| -rw-r--r-- | templates/base.html | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/templates/base.html b/templates/base.html index 6a874b78..f4284e2d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -11,7 +11,6 @@ {% block head %}{% endblock %} </head> <body class="{% if user.is_authenticated %}devmode {% endif %}{% block bodyclass %}{% endblock %}"> - <div id="archnavbar" class="{% block navbarclass %}anb-home{% endblock %}"> <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Parabola</a></h1></div> <div id="archnavbarmenu"> @@ -24,8 +23,7 @@ <li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get Parabola">Download</a></li> </ul> </div> - </div><!-- #archnavbar --> - + </div> <div id="content"> <div id="archdev-navbar"> {% if user.is_authenticated %} @@ -47,8 +45,7 @@ <li><a href="/logout/" title="Logout of the developer interface">Logout</a></li> </ul> {% endif %} - </div><!-- #archdev-navbar --> - + </div> {% if messages %} <div id="sys-message" class="box"> {% for message in messages %} @@ -56,27 +53,22 @@ {% endfor %} </div> {% endif %} - {% block content %} <div id="content-left-wrapper"> <div id="content-left"> {% block content_left %}{% endblock %} - </div><!-- #content_left --> + </div> </div> - <div id="content-right"> {% block content_right %}{% endblock %} - </div><!-- #content_right --> + </div> {% endblock %} - <div id="footer"> <p>Copyleft 2009-{% now "Y" %} Parabola Project. All content is released under a <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">cc-by-sa 3.0 unported</a> license.</p> - </div><!-- #footer --> - - </div><!-- #content --> - + </div> + </div> </body> </html> |