Changeset 1532

Timestamp:

04/23/08 09:31:05 (6 months ago)

Author:

JensDiemer

Message:

• page title
  
  • plugin_manager.handle_command() changes the page title, if it's not changes by the plugin themself.
    
  • remove some headlines in internal pages
    
  • set some title in plugins
    
• add BasePlugin?.build_menu() - Used in show_internals (comes later)
  

Location:

trunk/pylucid

Files:

• media/PyLucid/internal_page/admin_menu/sub_menu.html (modified) (2 diffs)
• media/PyLucid/internal_page/page_admin/delete_pages.html (modified) (1 diff)
• media/PyLucid/internal_page/page_admin/select_edit_page.html (modified) (1 diff)
• media/PyLucid/internal_page/page_admin/sequencing.html (modified) (1 diff)
• media/PyLucid/internal_page/plugin_admin/administation_menu.html (modified) (1 diff)
• PyLucid/plugins_internal/admin_menu/admin_menu.py (modified) (2 diffs)
• PyLucid/plugins_internal/plugin_admin/plugin_admin.py (modified) (1 diff)
• PyLucid/system/BasePlugin.py (modified) (2 diffs)
• PyLucid/system/plugin_manager.py (modified) (2 diffs)

trunk/pylucid/media/PyLucid/internal_page/admin_menu/sub_menu.html

@@ -1 @@
-<h2>{% trans 'Administration sub menu' %}</h2>
-
 <fieldset><legend>{% trans 'page admin' %}</legend>
 <ul>
@@ -64 +62 @@
         <a href="{{ commandURLprefix }}/filemanager/filelist/">{% trans 'Filemanager' %}</a>
     </li>
+    <li>
+        <a href="{{ commandURLprefix }}/show_internals/menu/">{% trans 'Show internals' %}</a>
+    </li>
 </ul>
 </fieldset>

trunk/pylucid/media/PyLucid/internal_page/page_admin/delete_pages.html

@@ -1 @@
-<h2>{% trans 'Delete pages' %}</h2>
-
 <fieldset class="internalpage">
   <legend>{% trans 'Select pages you will delete:' %}</legend>

trunk/pylucid/media/PyLucid/internal_page/page_admin/select_edit_page.html

@@ -1 @@
-<h2>Edit Page</h2>
-
 <form name="edit_page" method="post" action=".">
 

trunk/pylucid/media/PyLucid/internal_page/page_admin/sequencing.html

@@ -1 @@
-<h2>{% trans 'Sequencing pages' %}</h2>
-
 <p>
   {% trans 'Here you can change the page position by setting the weights.' %}<br />

trunk/pylucid/media/PyLucid/internal_page/plugin_admin/administation_menu.html

@@ -1 @@
-<h2>Plugin Administration {{ version }}</h2>
-
 <table class="plugin_admin">
     <tr><td class="caption" colspan="7"><h3>not installed</h3></td></tr>

trunk/pylucid/PyLucid/plugins_internal/admin_menu/admin_menu.py

@@ -18 +18 @@
 """
 
+from django.utils.translation import ugettext as _
 
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
@@ -43 +44 @@
         render the sub menu
         """
+        # Change the global page title:
+        self.context["PAGE"].title = _("Administration sub menu")
+
         is_admin = self.request.user.is_superuser or self.request.user.is_staff
 

trunk/pylucid/PyLucid/plugins_internal/plugin_admin/plugin_admin.py

@@ -66 +66 @@
         Run the method from a POST and display the menu.
         """
+        # Change the global page title:
+        self.context["PAGE"].title = _("plugin administration")
+
         if self.request.method == 'POST':
             POST = self.request.POST

trunk/pylucid/PyLucid/system/BasePlugin.py

@@ -40 +40 @@
 from PyLucid.tools.utils import escape
 from PyLucid.system.internal_page import InternalPage, InternalPageNotFound
+from PyLucid.system.plugin_manager import get_plugin_config, debug_plugin_config
+from PyLucid.models import Plugin
+
 
 
@@ -56 +59 @@
 
         self.current_page = self.context["PAGE"]
+
+    def build_menu(self):
+        """
+        Build a simple menu for all plugin methods witch have a "menu_section"
+
+        Use the internal page template "admin_menu.plugin_menu" !
+
+        In the plugin config (plugin_manager_data) must be exist some meta
+        information for the menu:
+          "menu_section"     : The upper block name
+          "menu_description" : Link text (optional, otherewise method name used)
+        """
+        plugin = Plugin.objects.get(plugin_name=self.plugin_name)
+        plugin_config = get_plugin_config(self.request,
+            package_name = plugin.package_name,
+            plugin_name = self.plugin_name,
+            dissolve_version_string = True,
+        )
+#        debug_plugin_config(self.page_msg, plugin_config)
+
+        plugin_manager_data = plugin_config.plugin_manager_data
+
+        menu_data = {}
+        for method_name, data in plugin_manager_data.iteritems():
+            if not "menu_section" in data:
+                continue
+
+            menu_section = data["menu_section"]
+
+            if not menu_section in menu_data:
+                menu_data[menu_section] = []
+
+            menu_data[menu_section].append(
+                {
+                    "link": self.URLs.methodLink(method_name),
+                    "description": data.get("menu_description", method_name),
+                }
+            )
+
+        context = {
+            "plugin_name": self.plugin_name,
+            "version": plugin_config.__version__,
+            "menu_data": menu_data,
+        }
+
+        # Change the internal_page and use them from "admin_menu" plugin.
+        plugin_internal_page = self.internal_page
+        self.internal_page = InternalPage(
+            self.context, plugin_name="admin_menu"
+        )
+
+        self._render_template("plugin_menu", context)#, debug=False)
+
+        # change back to the original internal pages from the current plugin.
+        self.internal_page = self.internal_page
+
 
     def _debug_context(self, context, template):

trunk/pylucid/PyLucid/system/plugin_manager.py

@@ -60 +60 @@
     plugin_class = getattr(plugin, plugin_name)
     return plugin_class
+
+def debug_plugin_config(page_msg, plugin_config):
+    for item in dir(plugin_config):
+        if item.startswith("_"):
+            continue
+        page_msg("'%s':" % item)
+        page_msg(getattr(plugin_config, item))
 
 def get_plugin_config(request, package_name, plugin_name,
@@ -198 +205 @@
 def handle_command(context, response, plugin_name, method_name, url_args):
     """
-    handle a _command url request
-    """
+    handle a _command url request.
+    If the plugin doesn't change the page title, we set it here.
+    """
+    original_page_title = context["PAGE"].title
+
     output = run(context, response, plugin_name, method_name, url_args)
+
+    if context["PAGE"].title == original_page_title:
+        # The plugin doesn't set a page title.
+        if plugin_name == method_name or method_name == "lucidTag":
+            title = plugin_name
+        else:
+            title = "%s - %s" % (plugin_name, method_name)
+        context["PAGE"].title = title.replace("_", " ")
 
     return output