Add basic submenu support

diff --git a/sommitrealweird/bpcms/context_processors.py b/sommitrealweird/bpcms/context_processors.py
index 90b98cc902abe87be74ce7c1e05e4da2353666fc..b464307381ffc634e3bc542d6d362dec1df48cfd 100644 (file)
--- a/sommitrealweird/bpcms/context_processors.py
+++ b/sommitrealweird/bpcms/context_processors.py
@@ -1,5 +1,6 @@
 from bpcms.models import Document, Folder
-import operator
+from django.conf import settings
+import re
 
 def content_menu(request):
     items = Document.objects.filter(folder__isnull=True, islive__exact=True)
@@ -26,8 +27,65 @@ def content_menu(request):
         except:
             pass
 
-    menu_items.sort(cmp=lambda x,y: cmp(x['title'].lower(), y['title'].lower()))
+    menu_items.sort( \
+        cmp=lambda x,y: cmp(x['title'].lower(), y['title'].lower()))
 
     return {
         'content_menu': menu_items,
     }
+
+def content_submenu(request):
+    # find where we are in the tree first
+    folderpath = request.path
+    folderpath = re.sub(u'^%s' %(settings.BPCMS_ROOT), '', folderpath)
+    # right - that should be any prefix got rid of, now traverse the tree till
+    # we've got something
+    folder = None
+    folderpath = folderpath.split('/')
+    for part in folderpath:
+        try:
+            if folder:
+                f = Folder.objects.get(parent__exact=folder, slug__exact=part)
+            else:
+                f = Folder.objects.get(parent__isnull=True, slug__exact=part)
+            folder = f
+        except:
+            break
+
+    # We have the folder (in theory)
+    menu_items = []
+    if folder:
+        items = Document.objects.filter(folder__exact=folder, \
+            islive__exact=True)
+        for item in items:
+            if item.slug != 'index':
+                menu_items.append(
+                    {
+                        'title': item.title,
+                        'url': item.get_basic_url(),
+                    }
+                )
+        try:
+            folders = Folder.objects.filter(parent__exact=folder)
+        except:
+            pass
+        for folder in folders:
+            try:
+                items = Document.objects.filter(folder__exact=folder, \
+                    islive__exact=True, slug__exact='index')
+                for item in items:
+                    menu_items.append(
+                        {
+                            'title': item.title,
+                            'url': folder.get_basic_url(),
+                        }
+                    )
+            except:
+                pass
+
+    menu_items.sort( \
+        cmp=lambda x,y: cmp(x['title'].lower(), y['title'].lower()))
+
+    return {
+        'content_submenu': menu_items,
+    }

diff --git a/sommitrealweird/bpcms/models.py b/sommitrealweird/bpcms/models.py
index f538421613dd453f43f6dd038a6663f9edca7978..70d398a60b188da440ec8f7fb3b6bedf34d61340 100644 (file)
--- a/sommitrealweird/bpcms/models.py
+++ b/sommitrealweird/bpcms/models.py
@@ -1,5 +1,6 @@
 from django.db import models
 from bpcms.content_val import is_unique_name
+from django.conf import settings
 
 FORMAT_CHOICES = (
         ('rst', 'reStructuredText'),
@@ -11,7 +12,7 @@ class Document(models.Model):
     islive = models.BooleanField()
     folder = models.ForeignKey('Folder', null=True, blank=True)
     format = models.CharField(maxlength=10, choices=FORMAT_CHOICES)
-    slug = models.SlugField(prepopulate_from=("title",), validator_list=[is_unique_name,])
+    slug = models.SlugField(prepopulate_from=("title",))
     content = models.TextField()
 
     def __str__(self):
@@ -44,7 +45,7 @@ class Document(models.Model):
         if folderstring != u'':
             folderstring = "%s/" %(folderstring,)
 
-        return "%s%s/" %(folderstring, self.slug)
+        return "%s%s%s/" %(settings.BPCMS_ROOT, folderstring, self.slug)
 
     class Admin:
         pass
@@ -72,7 +73,7 @@ class Folder(models.Model):
         if folderstring != u'':
             folderstring = "%s/" %(folderstring,)
 
-        return "%s" %(folderstring)
+        return "%s%s" %(settings.BPCMS_ROOT, folderstring)
 
     class Admin:
         pass

diff --git a/sommitrealweird/settings.py b/sommitrealweird/settings.py
index aadcaa2f76f746161bd893336422691458bb52ed..d363f2fea051654b6f28bdfc19cc8739921af851 100644 (file)
--- a/sommitrealweird/settings.py
+++ b/sommitrealweird/settings.py
@@ -91,4 +91,12 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.i18n',
     'generic.context_processors.media',
     'bpcms.context_processors.content_menu',
+    'bpcms.context_processors.content_submenu',
+)
+
+BPCMS_ROOT = '/'
+BPCMS_DISALLOWED_ROOT_DOC_NAMES = (
+    'admin',
+    'blog',
+    'photos',
 )

diff --git a/templates/base.html b/templates/base.html
index 384e601df7ffcb4c09243b2ac64e86d736f79001..06cc632f01d257ad54a047be52c48c752e1d7a50 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,7 +16,7 @@
                     <ul>
                         <li><a href="/">Home</a></li>
                         {% for item in content_menu %}
-                        <li><a href="/{{ item.url }}">{{ item.title }}</a></li>
+                        <li><a href="{{ item.url }}">{{ item.title }}</a></li>
                         {% endfor %}
                         <li>Photos</li>
                         <li>Blog</li>
@@ -25,6 +25,17 @@
                 </div>
             </div>
             <div id="content">
+                {% block submenu %}
+                <div id="submenu">
+                    {% if content_submenu %}
+                    <ul>
+                        {% for item in content_submenu %}
+                        <li><a href="{{ item.url }}">{{ item.title }}</a></li>
+                        {% endfor %}
+                    </ul>
+                    {% endif %}
+                </div>
+                {% endblock %}
                 {% block content %}
                 {{ content }}
                 {% endblock %}