Changeset 50

Timestamp:

08/05/09 23:04:04 (3 years ago)

Author:

msaelices

Message:

Three things:

• I forgot upload some files:
  • templates/themes/ directory, with two example dummy themes
  • apps/themes/checker.py
  • apps/base/templates/base.html
• Refactor, putting updating theme info logic into model.
• Improve checker function to make transaction aware.

Fixes #23.

Location:

trunk/merengueproj

Files:

• apps/base/templates/base.html (added)
• apps/themes/__init__.py (modified) (1 diff)
• apps/themes/admin.py (modified) (2 diffs)
• apps/themes/checker.py (added)
• apps/themes/models.py (modified) (3 diffs)
• templates/themes (added)
• templates/themes/bluesky (added)
• templates/themes/bluesky/base.html (added)
• templates/themes/bluesky/inc.footer.html (added)
• templates/themes/bluesky/theme.info (added)
• templates/themes/default (added)
• templates/themes/default/base.html (added)

trunk/merengueproj/apps/themes/__init__.py

@@ -18 +18 @@
         for theme_dir in os.listdir(themes_root):
             yield theme_dir, safe_join(themes_root, theme_dir)
+
+
+def get_theme_path(directory_name=None):
+    for theme_dir, theme_path in get_theme_dirs():
+        if directory_name == theme_dir:
+            return theme_path

trunk/merengueproj/apps/themes/admin.py

@@ -1 @@
-from base.admin import BaseAdmin
+from base.admin import BaseAdmin, set_field_read_only
 from themes.checker import check_themes
 from themes.models import Theme
@@ -5 +5 @@
 
 class ThemeAdmin(BaseAdmin):
-    readonly_fields = ('name', 'description', 'directory_name')
-    list_display = ('name', 'directory_name', 'enabled', 'active')
+    readonly_fields = ('name', 'description', 'directory_name', 'installed')
+    list_display = ('name', 'directory_name', 'installed', 'active')
+
+    def get_form(self, request, obj=None):
+        form = super(ThemeAdmin, self).get_form(request, obj)
+        if not obj.installed:
+            set_field_read_only(form.base_fields['active'], 'active', obj)
+        return form
 
     def changelist_view(self, request, extra_context=None):

trunk/merengueproj/apps/themes/models.py

@@ +1 @@
+import os
+import ConfigParser
+
 from django.db import models
 from django.db.models import signals
 from django.utils.translation import ugettext_lazy as _
 
+from themes import get_theme_path
 from themes.managers import ThemeManager
 
@@ -9 +13 @@
     name = models.CharField(_('name'), max_length=100)
     description = models.TextField(_('description'))
-    enabled = models.BooleanField(default=False)
+    installed = models.BooleanField(default=False)
     active = models.BooleanField(default=False)
     directory_name = models.CharField(_('directory name'), max_length=100)
@@ -17 +21 @@
     def __unicode__(self):
         return self.name
+
+    def get_path(self):
+        """ get theme template path """
+        return get_theme_path(self.directory_name)
+
+    def update_from_fs(self, commit=True):
+        """ update theme info from filesystem """
+        theme_info_file = os.path.join(self.get_path(), 'theme.info')
+        if os.path.isfile(theme_info_file):
+            config = ConfigParser.ConfigParser()
+            config.read(theme_info_file)
+            theme_name = config.get(ConfigParser.DEFAULTSECT, 'name', self.directory_name)
+            theme_description = config.get(ConfigParser.DEFAULTSECT, 'description', '')
+        else:
+            theme_name = self.directory_name
+            theme_description = ''
+        self.name = theme_name
+        self.description = theme_description
+        if commit:
+            self.save()