Changeset 2052

Timestamp:

06/19/09 15:57:40 (9 months ago)

Author:

JensDiemer

Message:

• Add CSS color scheme stuff, see:  http://pylucid.org/phpBB2/viewtopic.php?t=285 (de)
• Create and use AutoSiteM2M base model: Automatic add current Site on save() (Needs more tests!)

TODO: Use CSS color scheme ;)

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/admin.py (modified) (2 diffs)
• apps/pylucid/fields.py (added)
• apps/pylucid/models.py (modified) (14 diffs)
• apps/pylucid/system/auto_model_info.py (modified) (2 diffs)
• apps/pylucid/system/css_color_utils.py (added)
• apps/pylucid_update/forms.py (modified) (2 diffs)
• apps/pylucid_update/templates/pylucid_update/menu.html (modified) (1 diff)
• apps/pylucid_update/templates/pylucid_update/update08.html (modified) (1 diff)
• apps/pylucid_update/urls.py (modified) (1 diff)
• apps/pylucid_update/views.py (modified) (12 diffs)
• pylucid_plugins/page_admin/templates/page_admin/edit_page_form.html (modified) (1 diff)

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

@@ -103 +103 @@
 admin.site.register(models.PluginPage, PluginPageAdmin)
 
+#-----------------------------------------------------------------------------
+
+class ColorInline(admin.TabularInline):
+    model = models.Color
+
+class ColorSchemeAdmin(VersionAdmin):    
+    list_display = ("name",)
+    list_display_links = ("name",)
+    search_fields = ("name",)
+    inlines = [
+        ColorInline,
+    ]
+    
+admin.site.register(models.ColorScheme, ColorSchemeAdmin)
+
+
 
 class DesignAdmin(VersionAdmin):    
-    list_display = ("name", "template", "lastupdatetime", "lastupdateby")
+    list_display = ("name", "template", "colorscheme", "lastupdatetime", "lastupdateby")
     list_display_links = ("name",)
-    list_filter = ("site", "template", "createby", "lastupdateby")
-    search_fields = ("name", "template")
+    list_filter = ("site", "template", "colorscheme", "createby", "lastupdateby")
+    search_fields = ("name", "template", "colorscheme")
 
 admin.site.register(models.Design, DesignAdmin)
@@ -120 +136 @@
 admin.site.register(models.EditableHtmlHeadFile, EditableHtmlHeadFileAdmin)
 
+#-----------------------------------------------------------------------------
 
 class UserProfileAdmin(VersionAdmin):

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

@@ -29 +29 @@
 from django.db import models
 from django.conf import settings
+from django.core import exceptions
 from django.db.models import signals
 from django.core.urlresolvers import reverse
@@ -41 +42 @@
 from pylucid_project.utils import crypt
 
-from pylucid.system.auto_model_info import UpdateInfoBaseModel
+from pylucid.system.auto_model_info import UpdateInfoBaseModel,AutoSiteM2M
+from pylucid.shortcuts import user_message_or_warn
+from pylucid.fields import ColorField
 from pylucid.system import headfile
-from pylucid.shortcuts import user_message_or_warn
 
 
@@ -433 +435 @@
         ordering = ("page", "lang")
 
+#------------------------------------------------------------------------------
+
+class ColorScheme(AutoSiteM2M, UpdateInfoBaseModel):
+    """
+    inherited attributes from AutoSiteM2M:
+        site    -> ManyToManyField to Site
+        on_site -> sites.managers.CurrentSiteManager instance
+    """
+    name = models.CharField(max_length=255, help_text="The name of this color scheme.")
+    
+    def update(self, colors):
+        assert isinstance(colors, dict)
+        new = []
+        updated = []
+        exists = []
+        for name, value in colors.iteritems():
+            color, created = Color.objects.get_or_create(
+                colorscheme=self, name=name,
+                defaults={"colorscheme":self, "name":name, "value":value}
+            )
+            if created:
+                new.append(color)
+            elif color.value != value:
+                color.value = value
+                updated.append(color)
+                color.save()
+            else:
+                exists.append(color)
+        return new, updated, exists
+
+    def __unicode__(self):
+        sites = [site.name for site in self.site.all()]
+        return u"ColorScheme '%s' (on sites: %r)" % (self.name, sites)
+
+
+class Color(AutoSiteM2M, UpdateInfoBaseModel):
+    """
+    inherited attributes from AutoSiteM2M:
+        site    -> ManyToManyField to Site
+        on_site -> sites.managers.CurrentSiteManager instance
+    """
+    colorscheme = models.ForeignKey(ColorScheme)
+    name = models.CharField(max_length=128,
+        help_text="Name if this color (e.g. main_color, head_background)"
+    )
+    value = ColorField(help_text="CSS hex color value.")
+    
+    def __unicode__(self):
+        sites = [site.name for site in self.site.all()]
+        return u"Color '%s' (%s, on sites: %r)" % (self.name, self.colorscheme, sites)
 
 #------------------------------------------------------------------------------
@@ -439 +491 @@
     pass
 
-class Design(UpdateInfoBaseModel):
+class Design(AutoSiteM2M, UpdateInfoBaseModel):
     """
     Page design: template + CSS/JS files
+    
+    inherited attributes from AutoSiteM2M:
+        site    -> ManyToManyField to Site
+        on_site -> sites.managers.CurrentSiteManager instance
     
     inherited attributes from UpdateInfoBaseModel:
@@ -451 +507 @@
     objects = DesignManager()
     
-    site = models.ManyToManyField(Site, default=[settings.SITE_ID])
-    on_site = CurrentSiteManager()
-    
     name = models.CharField(unique=True, max_length=150, help_text="Name of this design combination",)
     template = models.CharField(max_length=128, help_text="filename of the used template for this page")
@@ -459 +512 @@
         help_text="Static files (stylesheet/javascript) for this page, included in html head via link tag"
     )
+    colorscheme = models.ForeignKey(ColorScheme, null=True, blank=True)
 
     def save(self, *args, **kwargs):
@@ -467 +521 @@
 
     def __unicode__(self):
-        return u"Page design '%s'" % self.name
+        sites = [site.name for site in self.site.all()]
+        return u"Page design '%s' (on sites: %r)" % (self.name, sites)
     
     class Meta:
@@ -484 +539 @@
         
 
-class EditableHtmlHeadFile(UpdateInfoBaseModel):
+class EditableHtmlHeadFile(AutoSiteM2M, UpdateInfoBaseModel):
     """
     Storage for editable static text files, e.g.: stylesheet / javascript.
+    
+    inherited attributes from AutoSiteM2M:
+        site    -> ManyToManyField to Site
+        on_site -> sites.managers.CurrentSiteManager instance
     
     inherited attributes from UpdateInfoBaseModel:
@@ -496 +555 @@
     objects = EditableHtmlHeadFileManager()
     
-    site = models.ManyToManyField(Site, default=[settings.SITE_ID])
-    on_site = CurrentSiteManager()
-    
     filepath = models.CharField(max_length=256)
     mimetype = models.CharField(max_length=64)
     html_attributes = models.CharField(max_length=256, null=False, blank=True,
+        # TODO: Use this!
         help_text='Additional html tag attributes (CSS example: media="screen")'
+    )
+    render = models.BooleanField(default = False,
+        help_text="Are there CSS ColorScheme entries in the content?"
     )
     description = models.TextField(null=True, blank=True)
@@ -588 +648 @@
 
     def __unicode__(self):
-        return u"EditableHtmlHeadFile '%s'" % self.filepath
+        sites = [site.name for site in self.site.all()]
+        return u"EditableHtmlHeadFile '%s' (on sites: %r)" % (self.filepath, sites)
 
     class Meta:
@@ -597 +658 @@
 
     
-class UserProfile(UpdateInfoBaseModel):
+class UserProfile(AutoSiteM2M, UpdateInfoBaseModel):
     """
     Stores additional information about PyLucid users
@@ -603 +664 @@
     
     Created via post_save signal, if a new user created.
+    
+    inherited attributes from AutoSiteM2M:
+        site    -> ManyToManyField to Site
+        on_site -> sites.managers.CurrentSiteManager instance
     """
     user = models.ForeignKey(User, unique=True, related_name="%(class)s_user")
@@ -613 +678 @@
     )
     
-    site = models.ManyToManyField(Site,
-        help_text="User can access only these sites."
-    )
+    # TODO: Overwrite help_text:
+#    site = models.ManyToManyField(Site,
+#        help_text="User can access only these sites."
+#    )
     
     def set_sha_login_password(self, raw_password):
@@ -650 +716 @@
     if created:
         user_message_or_warn("UserProfile entry for user '%s' created." % user)
-            
-        if not user.is_superuser: # Info: superuser can automaticly access all sites
-            site = Site.objects.get_current()
-            userprofile.site.add(site)
-            user_message_or_warn("Add site '%s' to '%s' UserProfile." % (site.name, user))            
+#            
+#        if not user.is_superuser: # Info: superuser can automaticly access all sites
+#            site = Site.objects.get_current()
+#            userprofile.site.add(site)
+#            user_message_or_warn("Add site '%s' to '%s' UserProfile." % (site.name, user))            
 
 signals.post_save.connect(create_user_profile, sender=User)

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

@@ -22 +22 @@
 
 from django.db import models
+from django.conf import settings
 from django.contrib import admin
 from django.http import HttpRequest
 from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from django.db import transaction, IntegrityError
+from pylucid.shortcuts import user_message_or_warn
+from django.contrib.sites.managers import CurrentSiteManager
 
 from django_tools.middlewares import ThreadLocal
+
+
+class AutoSiteM2M(models.Model):
+    """
+    Add site and on_site to model, and add at least the current site in save method.
+    """
+    site = models.ManyToManyField(Site)
+    on_site = CurrentSiteManager()
+
+    def save(self, *args, **kwargs):
+        """ Automatic current site, if not exist. """
+        if self.pk==None:
+            # instance needs to have a primary key value before a many-to-many relationship can be used.
+            super(AutoSiteM2M, self).save(*args, **kwargs)
+        
+        if self.site.count()==0:
+            site = Site.objects.get_current()
+            if settings.DEBUG:
+                user_message_or_warn("Automatic add site '%s' to %r" % (site.name, self))             
+            self.site.add(site)
+            
+        super(AutoSiteM2M, self).save(*args, **kwargs)
+
+    class Meta:
+        abstract = True
 
 
@@ -35 +64 @@
     The createby and lastupdateby ForeignKey would be automaticly updated. This needs the 
     request object as the first argument in the save method.
-    
-    Important: Every own objects manager should be inherit from UpdateInfoBaseModelManager!
-    """    
+    """
+    objects = models.Manager()
+            
     createtime = models.DateTimeField(auto_now_add=True, help_text="Create time",)
     lastupdatetime = models.DateTimeField(auto_now=True, help_text="Time of the last change.",)

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

@@ -2 +2 @@
 
 from django import forms
-from django.contrib.sites.models import Site
 from django.utils.translation import ugettext as _
 
@@ -8 +7 @@
 
 class UpdateForm(forms.Form):
-    site = forms.ModelChoiceField(
-        queryset=Site.objects.all(),
-        help_text=_("Select the site for the existing pages."),
-    )
     language = forms.ModelChoiceField(
         queryset=Language.objects.all(),

branches/0.9/pylucid_project/apps/pylucid_update/templates/pylucid_update/menu.html

@@ -4 +4 @@
 {% block content %}
 <!-- view_content block -->
+<p>Update on site: <strong>{{ site }}</strong></p>
 Please select:
 <ol>

branches/0.9/pylucid_project/apps/pylucid_update/templates/pylucid_update/update08.html

@@ -6 +6 @@
 <fieldset><legend>update</legend>
 <p>TODO: Insert info text here ;)</p>
+<p>Update on site: <strong>{{ site }}</strong></p>
 Please select:
 <form method="post" action="{{ url }}">

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

@@ -2 +2 @@
 
 """
-    Generate dynamicly urls based on the database tree
+    urls for update section
 """
 

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

@@ -15 +15 @@
 """
 
+import re
 import posixpath
 
@@ -20 +21 @@
 from django.template import RequestContext
 from django.core.urlresolvers import reverse
+from django.contrib.sites.models import Site
 from django.shortcuts import render_to_response
 from django.template.loader import find_template_source
@@ -26 +28 @@
 
 from pylucid_project.utils.SimpleStringIO import SimpleStringIO
-from pylucid_project.apps.pylucid.models import PageTree, PageMeta, PageContent, Design, \
-                                                            EditableHtmlHeadFile, UserProfile
+from pylucid.models import PageTree, PageMeta, PageContent, ColorScheme, Design, EditableHtmlHeadFile, \
+                                                                                            UserProfile
 from pylucid_project.apps.pylucid_update.models import Page08, Template08, Style08, JS_LoginData08
+from pylucid.system.css_color_utils import filter_content, extract_colors
 from pylucid_project.apps.pylucid_update.forms import UpdateForm
-
+from pylucid.fields import CSS_VALUE_RE
 
 
@@ -37 +40 @@
     context = {
         "title": "menu",
+        "site": Site.objects.get_current()
     }
     return render_to_response('pylucid_update/menu.html', context, context_instance=RequestContext(request))
 
 
-def _do_update(request, site, language):
+def _do_update(request, language):
     out = SimpleStringIO()
+    site = Site.objects.get_current()
     out.write("Starting update and move v0.8 data into v0.9 (on site: %s)" % site)
 
@@ -53 +58 @@
         
         userprofile, created = UserProfile.objects.get_or_create(user = user)
-        userprofile.site.add(site)           
+        #userprofile.site.add(site)           
         if created:
             out.write("UserProfile for user '%s' created." % user.username)
@@ -100 +105 @@
             }
         )
-        new_staticfile.site.add(site)
         cssfiles[style.name] = new_staticfile
         if created:
@@ -123 +127 @@
         design_key = "%s %s" % (old_page.template.name, old_page.style.name)
         if design_key not in designs:
+            style_name = old_page.style.name
             # The template/style combination was not created, yet.
-            if old_page.template.name == old_page.style.name:
+            if old_page.template.name == style_name:
                 new_design_name = old_page.template.name
             else:
-                new_design_name = "%s + %s" % (old_page.template.name, old_page.style.name)
+                new_design_name = "%s + %s" % (old_page.template.name, style_name)
                 
             design, created = Design.objects.get_or_create(
@@ -135 +140 @@
                 }
             )
-            design.site.add(site)
             if created:
-                # Add old page css file
-                design.headfiles.add(cssfiles[old_page.style.name])
                 out.write("New design created: %s" % new_design_name)
-            
+            else:
+                out.write("Use existing Design: %r" % design)
+
+            # Add old page css file
+            css_file = cssfiles[style_name] # EditableHtmlHeadFile instance
+            assert isinstance(css_file, EditableHtmlHeadFile)
+            design.headfiles.add(css_file)
+                
+            colorscheme, created = ColorScheme.objects.get_or_create(name=style_name)
+            if created:
+                out.write("Use new color scheme: %s" % colorscheme.name)
+                out.write("Colors can be extracted later.")
+            else:
+                out.write("Use color scheme: %s" % colorscheme.name)
+                
+            design.colorscheme = colorscheme
+            design.save()
             designs[design_key] = design
         else:
             design = designs[design_key]
+            out.write("Use existing Design: %r" % design)
             
         #---------------------------------------------------------------------
@@ -240 +259 @@
         form = UpdateForm(request.POST)
         if form.is_valid():
-            site = form.cleaned_data["site"]
             language = form.cleaned_data["language"]
-
-            return _do_update(request, site, language)
+            return _do_update(request, language)
     else:
         form = UpdateForm()
@@ -250 +267 @@
         "title": "update data from PyLucid v0.8 to v0.9",
         "url": reverse("PyLucidUpdate-update08"),
+        "site": Site.objects.get_current(),
         "form": form,
     }
@@ -355 +373 @@
 
 
+
 def update08styles(request):
     """
@@ -363 +382 @@
     out = SimpleStringIO()
     
-    def replace(content, out, old, new):
-        out.write("replace %r with %r" % (old, new))
-        if not old in content:
-            out.write("String not found. Updated already?")
-        else:
-            content = content.replace(old, new)
-        return content
-    
-    # Get the file content via django template loader:
-    additional_styles, origin = find_template_source("pylucid_update/additional_styles.css")
-        
-    styles = EditableHtmlHeadFile.objects.filter(filepath__istartswith=settings.SITE_TEMPLATE_PREFIX)
-    styles = styles.filter(filepath__iendswith=".css")
-    for style in styles:
+    def update_headfile_colorscheme(design, headfile):
+        out.write("\nExtract colors from: '%s'" % headfile.filepath)
+
+        colorscheme = design.colorscheme
+        if colorscheme == None:
+            # This design has no color scheme, yet -> create one
+            colorscheme=ColorScheme(name=headfile.filepath)
+#            colorscheme.site.add(site = Site.objects.get_current()) # FIXME ?!?
+            colorscheme.save()
+            out.write("Add color scheme %r to %r" % (colorscheme.name, design.name))
+            design.colorscheme = colorscheme
+            design.save()
+        
+        out.write("Use color scheme %r" % colorscheme.name)
+        
+        content = headfile.content
+        new_content, color_dict = extract_colors(content)
+        out.write(repr(new_content))
+        out.write(repr(color_dict))
+
+        created, updated, exists = colorscheme.update(color_dict)
+        out.write("created colors: %r" % created)
+        out.write("updated colors: %r" % updated)
+        out.write("exists colors: %r" % exists)
+        
+        colorscheme.save()
+        
+        headfile.content = new_content
+        headfile.save()
+        
+        
+    def update_all_design_colorscheme(design):
+        headfiles = design.headfiles.all()
+        out.write("\nExisting headfiles: %r" % headfiles)
+        
+        for headfile in headfiles:
+            if not headfile.filepath.lower().endswith(".css"):
+                out.write("Skip headfile: %r" % headfile)
+            else:
+                update_headfile_colorscheme(design, headfile)
+    
+    for design in Design.objects.all():
         out.write("\n______________________________________________________________")
-        out.write("\nUpdate Style: '%s'" % style.filepath)
-        
-        content = style.content
-        if additional_styles in content:
-            out.write("additional styles allready inserted.")
-        else:
-            content = additional_styles + content
-            style.content = content
-            style.save()
-            out.write("additional styles inserted.")        
+        out.write("\nUpdate color scheme for design: '%s'" % design.name)
+                
+        update_all_design_colorscheme(design)
+    
+    
+#    styles = EditableHtmlHeadFile.objects.filter(filepath__istartswith=settings.SITE_TEMPLATE_PREFIX)
+#    styles = styles.filter(filepath__iendswith=".css")
+#    for style in styles:
+#        out.write("\n______________________________________________________________")
+#        out.write("\nUpdate Style: '%s'" % style.filepath)
+#        
+#        content = style.content
+#        filtered_content = filter_content(content) # Skip all pygments styles
+#        out.write(filtered_content)
+#        
+#        new_content, color_dict = extract_colors(content)
+#        out.write(new_content)
+#        out.write(repr(color_dict))
+    
+#    def replace(content, out, old, new):
+#        out.write("replace %r with %r" % (old, new))
+#        if not old in content:
+#            out.write("String not found. Updated already?")
+#        else:
+#            content = content.replace(old, new)
+#        return content
+#    
+#    # Get the file content via django template loader:
+#    additional_styles, origin = find_template_source("pylucid_update/additional_styles.css")
+#        
+#    styles = EditableHtmlHeadFile.objects.filter(filepath__istartswith=settings.SITE_TEMPLATE_PREFIX)
+#    styles = styles.filter(filepath__iendswith=".css")
+#    for style in styles:
+#        out.write("\n______________________________________________________________")
+#        out.write("\nUpdate Style: '%s'" % style.filepath)
+#        
+#        content = style.content
+#        if additional_styles in content:
+#            out.write("additional styles allready inserted.")
+#        else:
+#            content = additional_styles + content
+#            style.content = content
+#            style.save()
+#            out.write("additional styles inserted.")        
     
     context = {

branches/0.9/pylucid_project/pylucid_plugins/page_admin/templates/page_admin/edit_page_form.html

@@ -9 +9 @@
     $("#preview_fieldset").hide();
     
+    // from media/PyLucid/pylucid_js_tools.js
     pylucid_ajax_form_view('#edit_page_form');