From b338ba60921c1f5f0fc8fcb6227b1d425d560783 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Sun, 4 Oct 2015 15:13:13 -0600
Subject: [PATCH 1/2] digitalglarus: cms navigation.

Signed-off-by: rscnt <rascnt@gmail.com>
---
 templates/cms/digitalglarus/base.html         | 38 +------------------
 .../cms/digitalglarus/partials/menu.html      | 37 ++++++++++++++++++
 2 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 templates/cms/digitalglarus/partials/menu.html

diff --git a/templates/cms/digitalglarus/base.html b/templates/cms/digitalglarus/base.html
index d5d50456..64af3186 100644
--- a/templates/cms/digitalglarus/base.html
+++ b/templates/cms/digitalglarus/base.html
@@ -56,43 +56,7 @@
     </div>
 
     <!-- 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">
-		    <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>
+    {% include "templates/cms/digitalglarus/partials/menu.html" %}
 
     <div class="container">
     {% block content %} {% endblock %}
diff --git a/templates/cms/digitalglarus/partials/menu.html b/templates/cms/digitalglarus/partials/menu.html
new file mode 100644
index 00000000..8fbbb6ab
--- /dev/null
+++ b/templates/cms/digitalglarus/partials/menu.html
@@ -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>

From 0827c6f2ffd9e9a47155b3c2d91504f45284e15b Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Sun, 4 Oct 2015 15:20:39 -0600
Subject: [PATCH 2/2] digitalglarus: moving digital glarus static url.

Signed-off-by: rscnt <rascnt@gmail.com>
---
 dynamicweb/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index b624498d..71ddc68f 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -8,7 +8,7 @@ from dynamicweb import settings
 from hosting.views import railshosting
 
 urlpatterns = [
-    url(r'^digitalglarus/', include('digitalglarus.urls',
+    url(r'^digitalglarus_old/', include('digitalglarus.urls',
                                     namespace="digitalglarus")),
     url(r'^hosting/', include('hosting.urls', namespace="hosting")),
     url(r'^railshosting/', railshosting, name="rails.hosting"),