Updated base template to match new mezzanine 1.3.0 release

overshard · overshard · commit 80a39557dee0 · 2013-01-09T20:25:52.000Z
diff --git a/mezzanine_slides/templates/base.html b/mezzanine_slides/templates/base.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-{% load pages_tags mezzanine_tags i18n %}
+{% load pages_tags mezzanine_tags i18n future %}
 <html>
 <head>
 
@@ -11,8 +11,8 @@
 <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico">
 
 {% ifinstalled mezzanine.blog %}
-<link rel="alternate" type="application/rss+xml" title="RSS" href="{% url blog_post_feed "rss" %}">
-<link rel="alternate" type="application/atom+xml" title="Atom" href="{% url blog_post_feed "atom" %}">
+<link rel="alternate" type="application/rss+xml" title="RSS" href="{% url "blog_post_feed" "rss" %}">
+<link rel="alternate" type="application/atom+xml" title="Atom" href="{% url "blog_post_feed" "atom" %}">
 {% endifinstalled %}
 
 {% compress css %}
@@ -40,15 +40,15 @@
 {% block extra_js %}{% endblock %}
 {% endcompress %}
 <!--[if lt IE 9]>
-<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<script src="{{ STATIC_URL }}js/html5shiv.js"></script>
 <![endif]-->
 
 {% block extra_head %}{% endblock %}
 
 </head>
 <body id="{% block body_id %}body{% endblock %}">
 
-<div class="navbar">
+<div class="navbar navbar-inverse">
 <div class="navbar-inner">
 <div class="container">
     <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -59,9 +59,7 @@
     {% if settings.SITE_TITLE %}<a class="brand" href="/">{{ settings.SITE_TITLE }}</a>{% endif %}
     {% if settings.SITE_TAGLINE %}<p class="tagline">{{ settings.SITE_TAGLINE }}</p>{% endif %}
     <div class="nav-collapse">
-        <form action="{% url search %}" class="navbar-search pull-right">
-        <input class="search-query" placeholder="{% trans "Search" %}" type="text" name="q" value="{{ request.REQUEST.q }}">
-        </form>
+        {% search_form "all" %}
         {% page_menu "pages/menus/dropdown.html" %}
     </div>
 </div>
@@ -135,7 +133,7 @@ <h1>{% block title %}{% endblock %}</h1>
     {% trans "Theme by" %} <a href="http://twitter.github.com/bootstrap/">Bootstrap</a>
     {% ifinstalled mezzanine.mobile %}
     <span class="separator">|</span>
-    <a href="{% url set_device "mobile" %}?next={{ request.path }}">{% trans "View Mobile Site" %}</a>
+    <a href="{% url "set_device" "mobile" %}?next={{ request.path }}">{% trans "View Mobile Site" %}</a>
     {% endifinstalled %}
 </p>
 </div>
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='mezzanine-slides',
-    version='1.0.1',
+    version='1.0.2',
     license='Simplified BSD',
 
     install_requires = [
