Changeset 1440 for trunk/pylucid/PyLucid/system/context_processors.py

Timestamp:

02/22/08 15:02:26 (9 months ago)

Author:

JensDiemer

Message:

A new way to setup contextrobots?
I am not really convinced of it yet.

Files:

• trunk/pylucid/PyLucid/system/context_processors.py (modified) (3 diffs)

trunk/pylucid/PyLucid/system/context_processors.py

@@ -17 +17 @@
     http://www.djangoproject.com/documentation/templates_python/#writing-your-own-context-processors
     """
-    context_extras = {}
-
-    #___________________________________________________________________________
-
-    context_extras['powered_by'] = mark_safe(
-        '<a href="http://www.pylucid.org">PyLucid v%s</a>' \
+    return {
+        "powered_by": mark_safe(
+            '<a href="http://www.pylucid.org">PyLucid v%s</a>' \
                                                         % PYLUCID_VERSION_STRING
-    )
-
-    #___________________________________________________________________________
-
-    # The module_manager set "must_login":
-    if getattr(request, "must_login", False):
-        context_extras["robots"] = "NONE,NOARCHIVE"
-    else:
-        context_extras["robots"] = "index,follow"
-
-    #___________________________________________________________________________
-
-    return context_extras
-
+        ),
+        # This value would be changed in index._render_cms_page(), if the
+        # plugin manager or any plugin set request.anonymous_view = False
+        "robots": "index,follow",
+    }
 
 
@@ -53 +41 @@
         txt = "%s [%s]" % (_("Log out"), request.user.username)
     else:
-        url = URLs.commandLink("auth", "login/?next=%s" % request.path)
+#        url = URLs.commandLink("auth", "login/?next=%s" % request.path)
+        url = URLs.commandLink("auth", "login")
         txt = _("Log in")
 
-    context["login_link"] = mark_safe(
-        '<a href="%s">%s</a>' % (url, txt)
-    )
-    
+    context["login_link"] = mark_safe('<a href="%s">%s</a>' % (url, txt))
+
     # Put the language information into the context, if it exists.
     # see: http://www.djangoproject.com/documentation/i18n/
@@ -66 +53 @@
     else:
         context['django_language']=''
-