Changeset 2022

Timestamp:

06/09/09 16:15:25 (9 months ago)

Author:

JensDiemer

Message:

* rewrite headfile stuff.
* add own jQuery.js
* Use the jQuery part of the superfish menu, too.
*

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/admin.py (modified) (1 diff)
• apps/pylucid/app_settings.py (modified) (2 diffs)
• apps/pylucid/defaulttags/extraheadBlock.py (added)
• apps/pylucid/defaulttags/lucidTag.py (modified) (1 diff)
• apps/pylucid/defaulttags/__init__.py (modified) (2 diffs)
• apps/pylucid/models.py (modified) (5 diffs)
• apps/pylucid/system/headfile.py (added)
• apps/pylucid/system/pylucid_plugin.py (modified) (2 diffs)
• apps/pylucid/templates/admin/base_site.html (modified) (3 diffs)
• apps/pylucid/templates/pylucid/headfile_css_link.html (moved) (moved from branches/0.9/pylucid_project/apps/pylucid/templates/pylucid/headlink_css_file.html)
• apps/pylucid/templates/pylucid/headfile_js_link.html (moved) (moved from branches/0.9/pylucid_project/apps/pylucid/templates/pylucid/headlink_js_file.html)
• apps/pylucid/urls.py (modified) (1 diff)
• apps/pylucid/views.py (modified) (2 diffs)
• apps/pylucid_update/views.py (modified) (4 diffs)
• manage.py (modified) (1 diff)
• media/PyLucid/jquery.js (added)
• media/PyLucid/superfish/pylucid_superfish_init.js (added)
• pylucid_plugins/admin_menu/templates/admin_menu/admin_top_menu.html (modified) (2 diffs)
• pylucid_plugins/admin_menu/views.py (modified) (2 diffs)
• pylucid_plugins/auth/templates/auth/input_password.html (modified) (2 diffs)
• pylucid_plugins/auth/views.py (modified) (4 diffs)
• pylucid_plugins/extrahead (moved) (moved from branches/0.9/pylucid_project/pylucid_plugins/head_files)
• pylucid_plugins/extrahead/context_middleware.py (added)
• pylucid_plugins/head_files/views.py (deleted)
• settings.py (modified) (1 diff)
• tests/test_admin_site.py (modified) (2 diffs)
• tests/test_PluginAPI.py (modified) (2 diffs)
• tests/test_tools/pylucid_test_data.py (modified) (3 diffs)
• tests/unittest_plugin/urls.py (modified) (1 diff)
• tests/unittest_plugin/views.py (modified) (3 diffs)

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

@@ -115 +115 @@
 
 class EditableHtmlHeadFileAdmin(UpdateInfoBaseAdmin, VersionAdmin):
-    list_display = ("filename", "description", "lastupdatetime", "lastupdateby")
-    list_display_links = ("filename", "description")
+    list_display = ("filepath", "description", "lastupdatetime", "lastupdateby")
+    list_display_links = ("filepath", "description")
     list_filter = ("site",)
 

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

@@ -11 +11 @@
 CSS_PLUGIN_CLASS_NAME = "PyLucidPlugins"
 
-EDITABLE_HEAD_LINK_TEMPLATE = "pylucid/headlink_%s_file.html"
+HEADFILE_INLINE_TEMPLATES = "pylucid/headfile_%s_inline.html"
+HEADFILE_LINK_TEMPLATES = "pylucid/headfile_%s_link.html"
 HEAD_FILES_URL_PREFIX = "headfile"
+
+# File cache directory used for EditableHtmlHeadFile
+# filesystem path is: MEDIA_ROOT + PYLUCID_MEDIA_DIR + CACHE_DIR
+# URL if not cacheable in filesystem: /HEAD_FILES_URL_PREFIX/filepath
+# URL if written into filesystem path: MEDIA_URL + PYLUCID_MEDIA_DIR + CACHE_DIR + filepath
+CACHE_DIR = "headfile_cache" # store path: 
 
 # i18n stuff:
@@ -21 +28 @@
 # All PyLucid media files stored in a sub directory under the django media
 # path. Used for building filesystem path and URLs.
-# filesystem path: MEDIA_ROOT + PYLUCID_MEDIA_SUBDIR
-# URLs: MEDIA_URL + PYLUCID_MEDIA_SUBDIR
+# filesystem path: MEDIA_ROOT + PYLUCID_MEDIA_DIR
+# URLs: MEDIA_URL + PYLUCID_MEDIA_DIR
 PYLUCID_MEDIA_DIR = "PyLucid" # Without slashes at begin/end!

branches/0.9/pylucid_project/apps/pylucid/defaulttags/lucidTag.py

@@ -138 +138 @@
         if response==None:
             return u""
-        assert(isinstance(response, HttpResponse), "pylucid plugins must return a HttpResponse instance!")
-        assert(response.status_code == 200, "Response status code != 200 ???")
-        
-        return response.content
+        elif isinstance(response, basestring):
+            return response
+        elif isinstance(response, HttpResponse):
+            assert(response.status_code == 200, "Response status code != 200 ???")
+            return response.content
+        
+        raise RuntimeError("pylucid plugins must return None, a basestring or a HttpResponse instance!")
 #        
 #        # callback is either a string like 'foo.views.news.stories.story_detail'

branches/0.9/pylucid_project/apps/pylucid/defaulttags/__init__.py

@@ -26 +26 @@
 from django.templatetags.i18n import do_translate, do_block_translate
 
-from pylucid_project.apps.pylucid.defaulttags.lucidTag import lucidTag
+from pylucid_project.apps.pylucid.defaulttags import lucidTag
+from pylucid_project.apps.pylucid.defaulttags import extraheadBlock
 #from PyLucid.template_addons.lucidTag import lucidTag
 #from PyLucid.template_addons.blocktag_pygments import sourcecode
@@ -34 +35 @@
 register = Library()
 
-register.tag(lucidTag)
+register.tag(lucidTag.lucidTag)
+register.tag("extrahead", extraheadBlock.do_extrahead)
+#register.tag(extraheadBlock.ExtraheadNode)
 #register.tag(sourcecode)
 #register.filter(chmod_symbol)

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

@@ -21 +21 @@
 
 import os
+import warnings
+import posixpath
+import mimetypes
 from xml.sax.saxutils import escape
 
@@ -33 +36 @@
 
 from pylucid.system.auto_model_info import UpdateInfoBaseModel, UpdateInfoBaseModelManager
-
+from pylucid.system import headfile
 
 
@@ -426 +429 @@
 #------------------------------------------------------------------------------
 
-
 class Design(UpdateInfoBaseModel):
     """
@@ -461 +463 @@
 #------------------------------------------------------------------------------
 
+class EditableHtmlHeadFileManager(UpdateInfoBaseModelManager):
+    def get_HeadfileLink(self, filename):
+        """
+        returns a pylucid.system.headfile.Headfile instance
+        """
+        db_instance = self.get(filename=filename)
+        return headfile.HeadfileLink(filename=db_instance.filename)#, content=db_instance.content)
+        
 
 class EditableHtmlHeadFile(UpdateInfoBaseModel):
@@ -471 +481 @@
         createby       -> ForeignKey to user who creaded this entry
         lastupdateby   -> ForeignKey to user who has edited this entry
-    
-    TODO: the save() method should be try to store the file into media path!
-    """   
+    """
+    objects = EditableHtmlHeadFileManager()
+    
     site = models.ManyToManyField(Site, default=[settings.SITE_ID])
     on_site = CurrentSiteManager()
     
-    filename = models.CharField(max_length=150)
+    filepath = models.CharField(max_length=256)
+    mimetype = models.CharField(max_length=64)
+    html_attributes = models.CharField(max_length=256, null=False, blank=True,
+        help_text='Additional html tag attributes (CSS example: media="screen")'
+    )
     description = models.TextField(null=True, blank=True)
     content = models.TextField()
-
-    def get_mimetype(self):
-        if self.filename.endswith(".css"):
+    
+    def get_cachepath(self):
+        """
+        filesystem path with filename.
+        TODO: Install section sould create the directories!
+        """
+        return os.path.join(
+            settings.MEDIA_ROOT, settings.PYLUCID.PYLUCID_MEDIA_DIR, settings.PYLUCID.CACHE_DIR,
+            self.filepath
+        )
+        
+    def save_cache_file(self):
+        """ Try to cache the head file into filesystem (Only worked, if python process has write rights) """
+        cachepath = self.get_cachepath()
+        try:
+            f = file(cachepath, "w")
+            f.write(self.content)
+            f.close()
+        except Exception, err:
+            warnings.warn("Can't cache EditableHtmlHeadFile into %r: %s" % (cachepath, err))
+        else:
+            if settings.DEBUG:
+                warnings.warn("EditableHtmlHeadFile cached successful into: %r" % cachepath)
+                
+    def get_headfilelink(self):
+        """ Get the link url to this head file. """
+        cachepath = self.get_cachepath()
+        if os.path.isfile(cachepath):
+            # The file exist in media path -> Let the webserver send this file ;)
+            url = posixpath.join(
+                settings.MEDIA_URL, settings.PYLUCID.PYLUCID_MEDIA_DIR, settings.PYLUCID.CACHE_DIR,
+                self.filepath
+            )
+        else:
+            # not cached into filesystem -> use pylucid.views.send_head_file for it
+            url = reverse('PyLucid-send_head_file', kwargs={"filepath":self.filepath})
+        return headfile.HeadfileLink(url)
+
+    def auto_mimetype(self):
+        """ returns the mimetype for the current filename """
+        fileext = os.path.splitext(self.filepath)[1].lower()
+        if fileext == ".css":
             return u"text/css"
-        elif self.filename.endswith(".js"):
+        elif fileext == ".js":
             return u"text/javascript"
         else:
-            from mimetypes import guess_type
-            returnguess_type(self.filename)[0] or u"application/octet-stream"            
-
-    def get_head_template(self):
-        """ returns the template name for building the html head link. """
-        ext = os.path.splitext(self.filename)[1].strip(".")
-        return settings.PYLUCID.EDITABLE_HEAD_LINK_TEMPLATE % ext
-
-    def get_head_link(self):
-        """
-        TODO: Should check if the file was saved into media path
-        """
-        template_name = self.get_head_template()
-        filename = self.filename
-        url = reverse("PyLucid-send_head_file", kwargs={"filename": filename})
-        head_link = render_to_string(template_name, {'url': url})
-        return head_link
-
-    def __unicode__(self):
-        return u"EditableHtmlHeadFile '%s'" % self.filename
-
-    class Meta:
-        ordering = ("filename",)
+            mimetypes.guess_type(self.filepath)[0] or u"application/octet-stream"
+
+    def save(self, *args, **kwargs):
+        if not self.mimetype:
+            # autodetect mimetype
+            self.mimetype = self.auto_mimetype()
+
+        # Try to cache the head file into filesystem (Only worked, if python process has write rights)
+        self.save_cache_file()
+
+        return super(EditableHtmlHeadFile, self).save(*args, **kwargs)
+
+    def __unicode__(self):
+        return u"EditableHtmlHeadFile '%s'" % self.filepath
+
+    class Meta:
+        ordering = ("filepath",)
 
 

branches/0.9/pylucid_project/apps/pylucid/system/pylucid_plugin.py

@@ -181 +181 @@
     for plugin_name in plugin_names:
         # Get the middleware class from the plugin
-        middleware_class = _get_middleware_class(plugin_name)
+        try:
+            middleware_class = _get_middleware_class(plugin_name)
+        except ImportError, err:
+            request.page_msg.error("Can't import context middleware '%s': %s" % (plugin_name, err))
+            continue
+        
         # make a instance 
         instance = middleware_class(request, context)
@@ -192 +197 @@
     """
     context = request.PYLUCID.context
+    context_middlewares = context["context_middlewares"]
     def replace(match):
         plugin_name = match.group(1)
-        middleware_class_instance = context["context_middlewares"][plugin_name]
+        try:
+            middleware_class_instance = context_middlewares[plugin_name]
+        except KeyError, err:
+            return "[Error: context middleware %r doesn't exist!]" % plugin_name
+        
         response = middleware_class_instance.render()
         if response == None:

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

@@ -7 +7 @@
 <!-- app_extrahead block start -->
 {# stylesheets for all PyLucid views #}
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js"></script>
-
+<script type="text/javascript" src="{{ PyLucid_media_url }}jquery.js"></script>
 <link rel="stylesheet" type="text/css" media="screen" href="{{ PyLucid_media_url }}superfish/superfish.css" />
 <link rel="stylesheet" type="text/css" media="screen" href="{{ PyLucid_media_url }}superfish/admin_design.css" />
@@ -56 +55 @@
 {% block pretitle %}
 <!-- app pretitle block start -->
+{% if request.user.is_authenticated %}
 <ul class="sf-menu">
     <li class="current">
-        <a href="/">&lt;&lt; back to root dev page</a>
+        <a href="/">&lt;&lt; back to "/" root page</a>
     </li>
     <li>
@@ -84 +84 @@
     </li>
 </ul>
+{% endif %}
 <!-- app pretitle block end -->
 {% endblock %}

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

@@ -28 +28 @@
     url(r'^$', views.root_page, name='PyLucid-root_page'),
     
-    url(r'^%s/(?P<filename>[\w/\.]{4,})?$' % settings.PYLUCID.HEAD_FILES_URL_PREFIX, views.send_head_file,
+    url(r'^%s/(?P<filepath>[\w/\.]{4,})?$' % settings.PYLUCID.HEAD_FILES_URL_PREFIX, views.send_head_file,
         name='PyLucid-send_head_file'
     ),

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

@@ -174 +174 @@
 
 
-def send_head_file(request, filename):
+def send_head_file(request, filepath):
     """
     Sending a headfile
@@ -180 +180 @@
     """
     try:
-        headfile = EditableHtmlHeadFile.objects.get(filename=filename)
+        headfile = EditableHtmlHeadFile.objects.get(filepath=filepath)
     except EditableHtmlHeadFile.DoesNotExist:
         if settings.DEBUG:
-            request.page_msg.error("Headfile %r not found!" % filename)
+            request.page_msg.error("Headfile %r not found!" % filepath)
         raise http.Http404
     
-    mimetype = headfile.get_mimetype()
     content = headfile.content
-    
+    mimetype = headfile.mimetype    
     return http.HttpResponse(content, mimetype=mimetype)
 

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

@@ -1 +1 @@
 # coding: utf-8
+
+import posixpath
 
 from django.conf import settings
@@ -80 +82 @@
     for style in Style08.objects.all():
         new_staticfile, created = EditableHtmlHeadFile.objects.get_or_create(request,
-            filename = settings.SITE_TEMPLATE_PREFIX + style.name + ".css",
+            filepath = settings.SITE_TEMPLATE_PREFIX + style.name + ".css",
             defaults = {
                 "description": style.description,
@@ -265 +267 @@
         content = template.content
 
-        content = replace(content, out,"{% lucidTag page_style %}", "{% lucidTag head_files %}")
+        new_head_file_tag = (
+            '<script src="%(url)s"'
+            ' onerror="JavaScript:alert(\'Error loading file [%(url)s] !\');"'
+            ' type="text/javascript" /></script>\n'
+            '<!-- ContextMiddleware extrahead -->\n'
+        ) % {
+            "url": posixpath.join(settings.MEDIA_URL, settings.PYLUCID.PYLUCID_MEDIA_DIR, "jquery.js")
+        }
+        
+        content = replace(content, out,"{% lucidTag page_style %}", new_head_file_tag)
+        # temp in developer version:
+        content = replace(content, out,"{% lucidTag head_files %}", new_head_file_tag)
+        content = replace(content, out,"<!-- ContextMiddleware head_files -->", new_head_file_tag)
+        
         content = replace(content, out,"{% lucidTag back_links %}", "<!-- ContextMiddleware breadcrumb -->")
         content = replace(content, out,
@@ -335 +350 @@
     additional_styles, origin = find_template_source("pylucid_update/additional_styles.css")
         
-    styles = EditableHtmlHeadFile.objects.filter(filename__istartswith=settings.SITE_TEMPLATE_PREFIX)
-    styles = styles.filter(filename__iendswith=".css")
+    styles = EditableHtmlHeadFile.objects.filter(filepath__istartswith=settings.SITE_TEMPLATE_PREFIX)
+    styles = styles.filter(filepath__iendswith=".css")
     for style in styles:       
-        out.write("\nUpdate Styles: '%s'" % style.filename)
+        out.write("\nUpdate Styles: '%s'" % style.filepath)
         
         content = style.content

branches/0.9/pylucid_project/manage.py

@@ -1 +1 @@
 #!/usr/bin/env python
+# coding: utf-8
 
 """

branches/0.9/pylucid_project/pylucid_plugins/admin_menu/templates/admin_menu/admin_top_menu.html

@@ -1 +1 @@
 {% extends "pylucid/css_anchor_div.html" %}
 
+
 {% block plugin_content %}
-<link rel="stylesheet" type="text/css" media="screen" href="{{ PyLucid_media_url }}superfish.css" />
+
+{% extrahead %}
+<link rel="stylesheet" type="text/css" media="screen" href="{{ PyLucid_media_url }}superfish/superfish.css" onerror="JavaScript:alert('{{ PyLucid_media_url }}superfish/superfish.css');" />
+<link rel="stylesheet" type="text/css" media="screen" href="{{ PyLucid_media_url }}superfish/admin_design.css" onerror="JavaScript:alert('{{ PyLucid_media_url }}superfish/admin_design.css');" />
+<script type="text/javascript" src="{{ PyLucid_media_url }}superfish/superfish.js" onerror="JavaScript:alert('{{ PyLucid_media_url }}superfish/superfish.js');" ></script>
+<script type="text/javascript" src="{{ PyLucid_media_url }}superfish/pylucid_superfish_init.js" onerror="JavaScript:alert('{{ PyLucid_media_url }}superfish/pylucid_superfish_init.js');" ></script>
+<style type="text/css">
+<!--
+/* setup superfish background urls */
+.sf-sub-indicator {
+    background: url('{{ PyLucid_media_url }}superfish/arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+}
+.sf-shadow ul {
+    background: url('{{ PyLucid_media_url }}superfish/shadow.png') no-repeat bottom right;
+}
+-->
+</style>
+{% endextrahead %}
+
 <ul class="sf-menu">
     <li class="current">
@@ -19 +38 @@
     </li>
     <li>
-        <a>{% trans 'admin menu' %}</a>
+        <a href="{{ admin_menu_link }}">{% trans 'admin menu' %}</a>
         <ul>
-            <li><a href="{{ admin_menu_link }}">non popup</a></li>
-            <li><a href="{{ admin_menu_link }}">popup</a></li>
+            <li><a href="{{ admin_menu_link }}">in popup win</a></li>
         </ul>
     </li>
 </ul>
-
-
 {% endblock %}

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

@@ -12 +12 @@
     if not request.user.is_authenticated():
         # Don't insert the admin top menu
-        return
+        return  
     
     pagetree = request.PYLUCID.pagetree
@@ -25 +25 @@
         
     edit_meta_admin_panel_link = reverse("admin_pylucid_pagemeta_change", args=(pagemeta.id,))
-        
     
     context = {

branches/0.9/pylucid_project/pylucid_plugins/auth/templates/auth/input_password.html

@@ +1 @@
+{% extends "pylucid/css_anchor_div.html" %}
+
+
+{% block plugin_content %}
+
+{% extrahead %}
+<script type="text/javascript" src="{{ PyLucid_media_url }}sha.js"></script>
+<script type="text/javascript" src="{{ PyLucid_media_url }}shared_sha_tools.js"></script>
+<script type="text/javascript" src="{{ PyLucid_media_url }}sha_login_input_password.js"></script>
+<script type="text/javascript">
+debug_msg = {{ debug }};
+salt = '{{ salt }}';
+challenge = '{{ challenge }}';
+submit_url = '{{ form_url }}';
+focus_id = 'plaintext_pass';
+
+function start_init() {
+    try {
+        $(document);
+    } catch (e) {
+        alert("Error, jQuery JS not loaded!\n Original error was:" + e);
+        return;
+    }
+    
+    try {
+        $(document).ready(function(){
+            init();
+        });
+    } catch (e) {
+        alert("Error, can't initialize SHA login:\n\n" + e + "\n\n(Possible error: JS files not loaded.)");
+    }
+}
+start_init();
+</script>
+{% endextrahead %}
+
 <fieldset><legend>PyLucid <a href="http://www.pylucid.org/_goto/8/JS-SHA-Login/" title="What is the PyLucid JS-SHA-LogIn?">JS-SHA-LogIn</a> - step 2</legend>
 
@@ -25 +61 @@
 {% endif %}
 </fieldset>
-
-<script type="text/javascript">
-function load_error(filename) {
-    alert("Error loading JavaScript library file {{ PyLucid_media_url }}"+filename+"!");
-}
-</script>
-<script language="javascript" type="text/javascript" src="{{ PyLucid_media_url }}/shared_sha_tools.js" onerror="load_error('shared_sha_tools.js');"></script>
-<script language="javascript" type="text/javascript" src="{{ PyLucid_media_url }}/sha.js" onerror="load_error('sha.js');"></script>
-<script language="javascript" type="text/javascript" src="{{ PyLucid_media_url }}/sha_login_input_password.js" onerror="load_error('sha_login_input_password.js');"></script>
-<script type="text/javascript">
-    debug_msg = {{ debug }};
-    salt = '{{ salt }}';
-    challenge = '{{ challenge }}';
-    submit_url = '{{ form_url }}';
-    focus_id = 'plaintext_pass';
-    
-    init();
-</script>
+{% endblock %}

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

@@ -3 +3 @@
 from django.contrib import auth
 from django.conf import settings
+from django.template import RequestContext
+from django.http import HttpResponseRedirect
+from django.shortcuts import render_to_response
 from django.utils.translation import ugettext as _
 from django.template.loader import render_to_string
-from django.http import HttpResponseRedirect
-from django.shortcuts import render_to_response
 
 from pylucid_project.utils import crypt
@@ -24 +25 @@
 
 
-def _logout_view(request):
+def _logout_view(request, next_url):
     """ Logout the current user. """
     auth.logout(request)
     request.page_msg.successful(_("You are logged out!"))
+    return HttpResponseRedirect(next_url)
 
 
@@ -118 +120 @@
     
     context["form"] = SHA_login_form
-    
+
     # return a string for replacing the normal cms page content
-    return render_to_string('auth/input_password.html', context)
+    return render_to_string('auth/input_password.html', context, 
+        context_instance=RequestContext(request)
+    )
 
 
@@ -159 +163 @@
     Login+Logout view via GET parameters
     """
+    next_url = request.path
+    
     action = request.GET["auth"]
     if action=="login":
         form_url = request.path + "?auth=login" # FIXME: How can we add the GET Parameter?
-        next_url = request.path
         return _login_view(request, form_url, next_url)
     elif action=="logout":
-        return _logout_view(request)
+        return _logout_view(request, next_url)
     
     if settings.DEBUG:

branches/0.9/pylucid_project/settings.py

@@ -131 +131 @@
     # http://www.djangoproject.com/documentation/settings/#template-string-if-invalid
     TEMPLATE_STRING_IF_INVALID = "XXX INVALID TEMPLATE STRING '%s' XXX"
+    from django_tools.template import warn_invalid_template_vars
+    warn_invalid_template_vars.add_warning()
+    
 
 

branches/0.9/pylucid_project/tests/test_admin_site.py

@@ -16 +16 @@
         self.assertResponse(response,
             must_contain=("PyLucid", "PyLucid - Log in"),
-            must_not_contain=("error", "Traceback")
+            must_not_contain=("Traceback",)#"error")
         )
         
@@ -24 +24 @@
         self.assertResponse(response,
             must_contain=("PyLucid", "Page trees", "Page contents"),
-            must_not_contain=("Log in", "error", "Traceback")
+            must_not_contain=("Log in", "Traceback",)#"error")
         )
 

branches/0.9/pylucid_project/tests/test_PluginAPI.py

@@ -185 +185 @@
                             "site_name": site.name,
                         },
-                        "context_middlewares: {u'breadcrumb': <pylucid_plugins.breadcrumb",
+                        "context_middlewares: [u'extrahead', u'breadcrumb']",
                         "default_lang_code: %s" % self.default_lang_code,
                         "default_lang_entry: <Language: Language %s" % self.default_lang_code,
@@ -205 +205 @@
                 )
 
+    def test_add_headfiles(self):
+        """
+        Add content into html head with {% extrahead %} block tag in plugin template.
+        """
+        for site in TestSites():
+            for language in TestLanguages():
+                url = "/%s/%s/test_add_headfiles/" % (language.code, unittest_plugin.PLUGIN_PAGE_URL)
+                response = self.client.get(url)
+                self.assertResponse(response,
+                    must_contain=(
+                        "Here ist the unittest plugin extra head content ;)",
+                        '3-pluginpage title (lang:%(lang)s, site:%(site_name)s) %(site_name)s' % {
+                            "lang": language.code,
+                            "site_name": site.name,
+                        },
+                    ),
+                    must_not_contain=(
+                        "Traceback",
+                    )
+                )
+
 
 if __name__ == "__main__":

branches/0.9/pylucid_project/tests/test_tools/pylucid_test_data.py

@@ -131 +131 @@
 <meta name="DC.Language" content="{{ page_language }}">
 <link rel="canonical" href="{{ page_get_permalink }}" />
-{% lucidTag head_files %}
+<!-- ContextMiddleware extrahead -->
 </head>
 <body>
@@ -241 +241 @@
 def create_headfiles(verbosity, headfile_dict, site, request):
     headfile_map = {}
-    for filename, data in headfile_dict.iteritems():
+    for filepath, data in headfile_dict.iteritems():
         headfile = EditableHtmlHeadFile(
-            filename = filename,
+            filepath = filepath,
             description = data["description"],
             content = data["content"],
@@ -250 +250 @@
         headfile.site.add(site)
         if verbosity:
-            print("EditableStaticFile '%s' created on site: %s" % (filename, site.name))
-        
-        headfile_map[filename+site.name] = headfile
+            print("EditableStaticFile '%s' created on site: %s" % (filepath, site.name))
+        
+        headfile_map[filepath+site.name] = headfile
     return headfile_map
 

branches/0.9/pylucid_project/tests/unittest_plugin/urls.py

@@ -38 +38 @@
         views.test_BreadcrumbPlugin, name='UnittestPlugin-test_BreadcrumbPlugin'
     ),
+    
+    url(
+        r'^test_add_headfiles/$',
+        views.test_add_headfiles, name='UnittestPlugin-test_add_headfiles'
+    ),
+
 )

branches/0.9/pylucid_project/tests/unittest_plugin/views.py

@@ -21 +21 @@
 
 from django import http
+from django.template import RequestContext
 from django.core.urlresolvers import reverse
 from django.shortcuts import render_to_response
@@ -108 +109 @@
     context = request.PYLUCID.context
     output = []
-    output.append("context_middlewares: %s" % context["context_middlewares"])
+    output.append("context_middlewares: %s" % context["context_middlewares"].keys())
     output.append("default_lang_code: %s" % request.PYLUCID.default_lang_code)
     output.append("default_lang_entry: %r" % request.PYLUCID.default_lang_entry)
@@ -136 +137 @@
     
     return ADDED_LINK_RESPONSE_STRING
+
+
+#_____________________________________________________________________________
+# Add headfiles tests
+
+def test_add_headfiles(request):
+    """
+    Add content into html head with {% extrahead %} block tag in plugin template.
+    """
+    context = request.PYLUCID.context
+    output = render_to_response('unittest_plugin/test_extrahead_blocktag.html', context)
+    return output
+
+