aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'feature/digital.glarus.navigation' into develop

Browse source
This commit is contained in:
rascencio 2015-10-04 15:21:08 -06:00
commit eb9c1cebdb
3 changed files with 39 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dynamicweb/urls.py
View file

@ -8,7 +8,7 @@ from dynamicweb import settings
from hosting.views import railshosting from hosting.views import railshosting
urlpatterns = [ urlpatterns = [
url(r'^digitalglarus/', include('digitalglarus.urls', url(r'^digitalglarus_old/', include('digitalglarus.urls',
namespace="digitalglarus")), namespace="digitalglarus")),
url(r'^hosting/', include('hosting.urls', namespace="hosting")), url(r'^hosting/', include('hosting.urls', namespace="hosting")),
url(r'^railshosting/', railshosting, name="rails.hosting"), url(r'^railshosting/', railshosting, name="rails.hosting"),

38
templates/cms/digitalglarus/base.html
View file

@ -56,43 +56,7 @@
</div> </div>
<!-- Navigation --> <!-- Navigation -->
<nav class="navbar navbar-default" role="navigation"> {% include "templates/cms/digitalglarus/partials/menu.html" %}
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- navbar-brand is hidden on larger screens, but visible when the menu is collapsed -->
<a class="navbar-brand" href="index.html">Digital Glarus</a>
</div>
<!-- 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">
<li>
<a href="{% url 'digitalglarus:letscowork' %}">Crowdfunding</a>
</li>
<li>
<a href="{% url 'digitalglarus:home' %}">Home</a>
</li>
<li>
<a href="{% url 'digitalglarus:contact' %}">Contact</a>
</li>
<li>
<a href="{% url 'digitalglarus:about' %}">About</a>
</li>
<li>
<a href="{% url 'digitalglarus:blog' %}">Blog</a>
</li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
</nav>
<div class="container"> <div class="container">
{% block content %} {% endblock %} {% block content %} {% endblock %}

37
templates/cms/digitalglarus/partials/menu.html Normal file
View file

@ -0,0 +1,37 @@
{% load menu_tags staticfiles cms_tags %}
<!-- Navigation -->
<nav class="navbar navbar-default" role="navigation">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- navbar-brand is hidden on larger screens, but visible when the menu is collapsed -->
<a class="navbar-brand" href="index.html">Digital Glarus</a>
</div>
<!-- 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">
{% for child in children %}
<li class="child{% if child.selected %} selected{% endif %}{% if child.ancestor %} ancestor{% endif %}{% if child.sibling %} sibling{% endif %}{% if child.descendant %} descendant{% endif %}">
<a href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">{{ child.get_menu_title }}</a>
{% if child.children %}
<ul>
{% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
</ul>
{% endif %}
</li>
{% endfor %}
<li>
<a href="{% url 'digitalglarus:blog' %}">Blog</a>
</li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
</nav>