Changeset 2551

Timestamp:

02/26/10 17:10:55 (5 months ago)

Author:

JensDiemer

Message:

plugin can change the permalink, e.g. to a detail view.
more info: http://www.pylucid.org/permalink/319/about-permalink-for-plugin-developers

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/context_processors.py (modified) (1 diff)
• apps/pylucid/system/permalink.py (added)
• apps/pylucid/views.py (modified) (2 diffs)
• middlewares/headline_anchor.py (modified) (1 diff)
• pylucid_plugins/blog/models.py (modified) (2 diffs)
• pylucid_plugins/blog/templates/blog/detail_view.html (modified) (1 diff)
• pylucid_plugins/blog/templates/blog/includes/blog_entry.html (added)
• pylucid_plugins/blog/templates/blog/summary.html (modified) (1 diff)
• pylucid_plugins/blog/views.py (modified) (3 diffs)
• pylucid_plugins/lexicon/models.py (modified) (2 diffs)
• pylucid_plugins/lexicon/views.py (modified) (1 diff)

branches/0.9/pylucid_project/apps/pylucid/context_processors.py

@@ +1 @@
+# coding: utf-8
 
 """

branches/0.9/pylucid_project/apps/pylucid/views.py

@@ -11 +11 @@
 from pylucid_project.system.pylucid_plugins import PYLUCID_PLUGINS
 
-from pylucid.markup.converter import apply_markup
-from pylucid.signals import pre_render_global_template
-from pylucid.system import pylucid_plugin, i18n, pylucid_objects
-from pylucid.models import PageTree, PageMeta, PageContent, PluginPage, ColorScheme, \
+from pylucid_project.apps.pylucid.markup.converter import apply_markup
+from pylucid_project.apps.pylucid.signals import pre_render_global_template
+from pylucid_project.apps.pylucid.system import pylucid_plugin, i18n, pylucid_objects
+from pylucid_project.apps.pylucid.models import PageTree, PageMeta, PageContent, PluginPage, ColorScheme, \
                                                                     EditableHtmlHeadFile, Language
 
@@ -339 +339 @@
     url = pagemeta.get_absolute_url()
 
+    if pagetree.page_type == pagetree.PLUGIN_TYPE and url_rest and "/" in url_rest:
+        # pass a permalink additional to the plugin, e.g.: blog entry detail view
+        additional_url = url_rest.split("/", 1)[1]
+        url += additional_url
+
     return http.HttpResponseRedirect(url)
 

branches/0.9/pylucid_project/middlewares/headline_anchor.py

@@ -117 +117 @@
 
         # Get the permalink to the current page
-        permalink = pagemeta.get_permalink()
+        permalink = request.PYLUCID.context["page_permalink"]
+#        permalink = pagemeta.get_permalink()
 
         # insert the Headline links

branches/0.9/pylucid_project/pylucid_plugins/blog/models.py

@@ -30 +30 @@
 
 from pylucid_project.apps.pylucid.shortcuts import failsafe_message
+from pylucid_project.apps.pylucid.markup.converter import apply_markup
+from pylucid_project.apps.pylucid.cache import clean_complete_pagecache
+from pylucid_project.apps.pylucid.system.permalink import plugin_permalink
 from pylucid_project.apps.pylucid.models import PageContent, Language, PluginPage
-from pylucid_project.apps.pylucid.markup.converter import apply_markup
 from pylucid_project.apps.pylucid.models.base_models import AutoSiteM2M, UpdateInfoBaseModel
-from pylucid_project.apps.pylucid.cache import clean_complete_pagecache
 
 from pylucid_project.pylucid_plugins import update_journal
@@ -164 +165 @@
                 return "#No-Blog-PagePlugin-exists"
 
+    def get_permalink(self, request):
+        """ permalink to this entry detail view """
+        absolute_url = self.get_absolute_url() # Absolute url to this entry
+        permalink = plugin_permalink(request, absolute_url)
+        return permalink
+
     def get_html(self):
         """

branches/0.9/pylucid_project/pylucid_plugins/blog/templates/blog/detail_view.html

@@ -7 +7 @@
 
 <fieldset class="entry">
-    <legend class="headline">
-         <a href="{{ entry.get_absolute_url }}">{{ entry.headline }}<br />
-         <small class="headline_info">{% blocktrans with entry.createtime|timesince as time %}Before {{ time }} published by{% endblocktrans %} {{ entry.createby }}.</small>
-         </a>
-    </legend>
-
-    {% if not entry.is_public %}
-        <p class="admin_info_line">not public</p>
-    {% endif %}
-    
-    {% include "blog/includes/admin_links.html" %}
-    
-    <div class="content">{{ entry.get_html }}</div>
-    
-    {% if entry.lastupdateby %}
-    <small><p class="date_info">
-        (Last update: {{ entry.lastupdatetime|date:_("DATETIME_FORMAT") }} by {{ entry.lastupdateby }}.)
-    </p></small>
-    {% endif %}
-    
-    {% include "blog/includes/taglist.html" %}
-    
+    {% include "blog/includes/blog_entry.html" %}
     {% include "pylucid_comments/includes/comments_list.html" %}
 </fieldset>

branches/0.9/pylucid_project/pylucid_plugins/blog/templates/blog/summary.html

@@ -9 +9 @@
 {% for entry in entries.object_list %}
 <fieldset class="entry">
-    <legend class="headline">
-         <a href="{{ entry.get_absolute_url }}">{{ entry.headline }}<br />
-         <small class="headline_info">{% blocktrans with entry.createtime|timesince as time %}Before {{ time }} published by{% endblocktrans %} {{ entry.createby }}.</small>
-         </a>
-    </legend>
-    {% if not entry.is_public %}
-        <p class="admin_info_line">not public</p>
-    {% endif %}
-
-    {% include "blog/includes/admin_links.html" %}
-
-    <div class="content">{{ entry.get_html }}</div>
-
-    {% if entry.lastupdateby %}
-    <small><p class="date_info">
-        (Last update: {{ entry.lastupdatetime|date:_("DATETIME_FORMAT") }} by {{ entry.lastupdateby }}.)
-    </p></small>
-    {% endif %}
-
-   {% include "blog/includes/taglist.html" %}
-
-   {% get_comment_count for entry as comment_count %}            
-   <a href="{{ entry.get_absolute_url }}" class="comment_link" title="Display all comments | Leave a comment">{{ comment_count }} comment{{ comment_count|pluralize:"s" }}...</a>
-
+        {% include "blog/includes/blog_entry.html" %}
+        {% get_comment_count for entry as comment_count %}            
+        <a href="{{ entry.get_absolute_url }}" class="comment_link" title="Display all comments | Leave a comment">{{ comment_count }} comment{{ comment_count|pluralize:"s" }}...</a>
 </fieldset>
 {% endfor %}

branches/0.9/pylucid_project/pylucid_plugins/blog/views.py

@@ -141 +141 @@
 
     tag_cloud = BlogEntry.objects.get_tag_cloud(request)
+
+#    request.context["page_permalink"] = "YYYY"
 
     context = {
@@ -224 +226 @@
     tag_cloud = BlogEntry.objects.get_tag_cloud(request)
 
+    # Change permalink from the blog root page to this entry detail view
+    permalink = entry.get_permalink(request)
+    request.PYLUCID.context["page_permalink"] = permalink # for e.g. the HeadlineAnchor
+
     context = {
         "page_title": entry.headline, # Change the global title with blog headline
@@ -229 +235 @@
         "tag_cloud": tag_cloud,
         "CSS_PLUGIN_CLASS_NAME": settings.PYLUCID.CSS_PLUGIN_CLASS_NAME,
+        "page_permalink": permalink, # Change the permalink in the global page template
     }
     return context

branches/0.9/pylucid_project/pylucid_plugins/lexicon/models.py

@@ -27 +27 @@
 from pylucid_project.pylucid_plugins import update_journal
 
-from pylucid.shortcuts import failsafe_message
-from pylucid.markup.converter import apply_markup
-from pylucid.models import PageContent, Language
-from pylucid.models.base_models import AutoSiteM2M, UpdateInfoBaseModel
+from pylucid_project.apps.pylucid.shortcuts import failsafe_message
+from pylucid_project.apps.pylucid.markup.converter import apply_markup
+from pylucid_project.apps.pylucid.models import PageContent, Language
+from pylucid_project.apps.pylucid.system.permalink import plugin_permalink
+from pylucid_project.apps.pylucid.models.base_models import AutoSiteM2M, UpdateInfoBaseModel
 #from PyLucid.tools.content_processors import apply_markup, fallback_markup
 #from PyLucid.models import Page
@@ -112 +113 @@
                 return "?lexicon=%s" % self.term
 
+    def get_permalink(self, request):
+        """ permalink to this entry detail view """
+        absolute_url = self.get_absolute_url() # Absolute url to this entry
+        permalink = plugin_permalink(request, absolute_url)
+        return permalink
+
     def get_html(self):
         """

branches/0.9/pylucid_project/pylucid_plugins/lexicon/views.py

@@ -88 +88 @@
     _add_breadcrumb(request, title="%s: %s" % (entry.term, entry.short_definition), url=request.path)
 
-    context = {"entry": entry}
+    # Change permalink from the blog root page to this entry detail view
+    permalink = entry.get_permalink(request)
+    request.PYLUCID.context["page_permalink"] = permalink # for e.g. the HeadlineAnchor
+
+    context = {
+        "entry": entry,
+        "page_permalink": permalink, # Change the permalink in the global page template
+    }
     return context