From fed5dfcf1e3aacf86fad9ee53a2bbdda36462aa0 Mon Sep 17 00:00:00 2001 From: davidh-ssec <david.hoese@ssec.wisc.edu> Date: Mon, 17 Aug 2015 15:27:59 -0500 Subject: [PATCH] Fixed default page menu templates and moved page title and banner to line up with other parts of the page. --- sparc_cms/sparc_cms/settings.py | 11 ++++++----- sparc_cms/theme/templates/base.html | 15 ++++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/sparc_cms/sparc_cms/settings.py b/sparc_cms/sparc_cms/settings.py index f700f91..31152b4 100644 --- a/sparc_cms/sparc_cms/settings.py +++ b/sparc_cms/sparc_cms/settings.py @@ -64,11 +64,12 @@ SEARCH_MODEL_CHOICES = ("pages.Page", "field_experiments.DailyStatus") # menus a page should appear in. Note that if a menu template is used # that doesn't appear in this setting, all pages will appear in it. -# PAGE_MENU_TEMPLATES = ( -# (1, _("Top navigation bar"), "pages/menus/dropdown.html"), -# (2, _("Left-hand tree"), "pages/menus/tree.html"), -# (3, _("Footer"), "pages/menus/footer.html"), -# ) +PAGE_MENU_TEMPLATES = ( + (1, _("Top navigation bar"), "pages/menus/ssec_dropdown.html"), + (2, _("Left-hand tree"), "pages/menus/tree.html"), + (3, _("Footer"), "pages/menus/footer.html"), +) +PAGE_MENU_TEMPLATES_DEFAULT = (1,) # A sequence of fields that will be injected into Mezzanine's (or any # library's) models. Each item in the sequence is a four item sequence. diff --git a/sparc_cms/theme/templates/base.html b/sparc_cms/theme/templates/base.html index 47199be..bc6c328 100644 --- a/sparc_cms/theme/templates/base.html +++ b/sparc_cms/theme/templates/base.html @@ -73,9 +73,14 @@ <body id="{% block body_id %}body{% endblock %}"> -<div id="banner" class="container text-center"> - <div class="row"> - <img src="{% static "img/sparc_banner.png" %}"> +<div id="banner"> + <div class="container"> + <div class="row"> +{# <div class="col-md-2"></div>#} + <div class="col-md-10"> + <img src="{% static "img/sparc_banner.png" %}"> + </div> + </div> </div> </div> @@ -99,7 +104,7 @@ </div> </div> </div> -<div class="container-fluid"> +<div class="container"> <ul class="breadcrumb"> <li id="breadcrumb-menu-sparc"> <a href="{% url "home" %}">SPARC</a> @@ -126,7 +131,7 @@ {% endnevercache %} <div class="row"> -{# <div class="col-md-2"></div>#} + <div class="col-md-2"></div> <div class="col-md-10"> <h1>{% block title %}{% endblock %}</h1> </div> -- GitLab