Changeset 2070

Timestamp:

06/25/09 14:55:31 (8 months ago)

Author:

JensDiemer

Message:

starting to add a pylucid admin menu...

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/templates/admin/base_site.html (modified) (2 diffs)
• apps/pylucid_admin (added)
• apps/pylucid_admin/templates (added)
• apps/pylucid_admin/templates/pylucid_admin (added)
• apps/pylucid_admin/templates/pylucid_admin/menu.html (added)
• apps/pylucid_admin/urls.py (added)
• apps/pylucid_admin/views.py (added)
• apps/pylucid_admin/__init__.py (added)
• media/PyLucid/superfish/superfish-vertical.css (added)
• pylucid_plugins/extrahead/admin_url.py (added)
• pylucid_plugins/extrahead/admin_views.py (added)
• pylucid_plugins/__init__.py (modified) (2 diffs)
• settings.py (modified) (6 diffs)
• urls.py (modified) (1 diff)

branches/0.9/pylucid_project/apps/pylucid/templates/admin/base_site.html

@@ -67 +67 @@
 <ul class="sf-menu">
     <li class="current">
-        <a href="/">&lt;&lt; back to "/" root page</a>
+        <a href="/" title="<< goto {{ current_site.name }} root page">&lt;&lt; {{ current_site.domain }}</a>
     </li>
     {% if not sites|length_is:"1" %}
@@ -88 +88 @@
     {% endif %}
     <li>
-        <a href="#TODO">{% trans 'admin menu' %}</a>
+        <a href="{% url admin_index %}">{% trans 'Django admin site' %}</a>
     </li>
     {% if user.is_superuser %}
     <li>
-        <a href="{% url PyLucidUpdate-menu %}">{% trans 'update section' %}</a>
+        <a href="{% url PyLucidAdmin-menu %}">{% trans 'PyLucid admin menu' %}</a>
+        <ul>
+                    <li>
+                        <a href="{% url PyLucidUpdate-menu %}">{% trans 'update section' %}</a>
+                    </li>
+            </ul>
     </li>
     {% endif %}

branches/0.9/pylucid_project/pylucid_plugins/__init__.py

@@ -11 +11 @@
     """
     _CACHE = None
-    
+
     def __init__(self, fs_path, pkg_prefix):
         installed_apps = ()
@@ -21 +21 @@
             if not os.path.isdir(item_path):
                 continue
-            
+
             pkg_string = ".".join([pkg_prefix, dir_item])
             installed_apps += (pkg_string,)
-            
+
             template_path = os.path.join(item_path, "templates")
             if os.path.isdir(template_path):
                 template_dirs += (template_path,)
-            
+
+#            admin_url_file = os.path.join(item_path, "admin_url.py")
+#            if os.path.isfile(admin_url_file):
+#                admin_urls.append(pkg_string + ".admin_url")
+
         self._CACHE = {
             "installed_apps": installed_apps,
             "template_dirs": template_dirs,
         }
-                
+
     def get_installed_apps(self):
         return self._CACHE["installed_apps"]
     def get_template_dirs(self):
-        return self._CACHE["template_dirs"]    
+        return self._CACHE["template_dirs"]

branches/0.9/pylucid_project/settings.py

@@ -70 +70 @@
     SITE_ID = 1
 
-print "Used port is %s -> set SITE_ID: %s" % (_used_port, SITE_ID)    
+print "Used port is %s -> set SITE_ID: %s" % (_used_port, SITE_ID)
 
 
@@ -79 +79 @@
     # From http://code.google.com/p/django-tools/
     'django_tools.middlewares.ThreadLocal.ThreadLocalMiddleware',
-    
+
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    
+
     'pylucid_project.middlewares.PageMessages.PageMessagesMiddleware',
-    
+
     # slow down the django developer server
     # From http://code.google.com/p/django-tools/
@@ -96 +96 @@
 
 _plugins = pylucid_plugins.PluginList(
-    fs_path = os.path.join(_BASE_PATH, "pylucid_plugins"),
-    pkg_prefix = "pylucid_project.pylucid_plugins"
+    fs_path=os.path.join(_BASE_PATH, "pylucid_plugins"),
+    pkg_prefix="pylucid_project.pylucid_plugins"
 )
 
 TEMPLATE_DIRS = (
     os.path.join(_BASE_PATH, "apps/pylucid/templates/"),
+    os.path.join(_BASE_PATH, "apps/pylucid_admin/templates/"),
     os.path.join(_BASE_PATH, "apps/pylucid_update/templates/"),
-    
+
     os.path.join(_BASE_PATH, "apps/dbpreferences/templates/"),
 
@@ -140 +141 @@
 #    from django_tools.template import warn_invalid_template_vars
 #    warn_invalid_template_vars.add_warning()
-    
+
 
 
@@ -165 +166 @@
 #http://docs.djangoproject.com/en/dev/ref/settings/#setting-TEST_RUNNER
 #Default: 'django.test.simple.run_tests'
-TEST_RUNNER='pylucid_project.tests.test_tools.test_runner.run_tests'
+TEST_RUNNER = 'pylucid_project.tests.test_tools.test_runner.run_tests'
 
 #_____________________________________________________________________________
@@ -220 +221 @@
 # TODO: must be used ;)
 SLUG_BLACKLIST = (
-    MEDIA_URL.strip("/").split("/",1)[0],
+    MEDIA_URL.strip("/").split("/", 1)[0],
     ADMIN_URL_PREFIX, PYLUCID.HEAD_FILES_URL_PREFIX,
 )

branches/0.9/pylucid_project/urls.py

@@ -28 +28 @@
     #_____________________________________
     # PYLUCID UPDATE SECTION
-    ('^%s/update/'% settings.ADMIN_URL_PREFIX, include('pylucid_update.urls')),
-    
+    ('^%s/update/' % settings.ADMIN_URL_PREFIX, include('pylucid_update.urls')),
+
+    #_____________________________________
+    # PYLUCID ADMIN
+    (r'^%s/' % settings.ADMIN_URL_PREFIX, include('pylucid_admin.urls')),
+
     #_____________________________________
     # DJANGO ADMIN PANEL