Permalink
Browse files

Fixed example base html to use jquery version of current mezzanine pr…

…oject, minor fixes
  • Loading branch information...
1 parent 277f0c3 commit bfd091d6954146f6e23e49df6ff5a33e5a8f6f36 @osiloke committed Apr 11, 2012
View
@@ -9,3 +9,4 @@ build
*.egg
*.ropeproject
*.sublime-*
+example/static
@@ -4,7 +4,7 @@
DATABASES = {
"default": {
# "postgresql_psycopg2", "postgresql", "mysql", "sqlite3" or "oracle".
- "ENGINE": "sqlite3",
+ "ENGINE": "django.db.backends.sqlite3",
# DB name or path to database file if using sqlite3.
"NAME": "mezzanine.db",
# Not used with sqlite3.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -20,7 +20,7 @@
{% if "cartridge.shop"|is_installed %}
<link rel="stylesheet" href="{{ STATIC_URL }}css/cartridge.css">
{% endif %}
-<script src="{{ STATIC_URL }}mezzanine/js/jquery-1.4.4.min.js"></script>
+<script src="{{ STATIC_URL }}mezzanine/js/jquery-1.7.1.min.js"></script>
<script>
$(function() {
$('.middleinput:text, textarea').addClass('xlarge');
View
@@ -1,2 +1,2 @@
-mezzanine==1.0
+mezzanine
django-classy-tags
View
@@ -37,6 +37,13 @@ def fullsplit(path, result=None):
'templates/*.html',
'templates/*/*.html',
'templates/*/*/*.html',
+ 'templates/*/*/*/*.html',
+ 'static/widget/css/*',
+ 'static/widget/js/*'
+]
+
+static_patterns = [
+ 'static/*'
]
package_data = dict(
View
@@ -76,7 +76,7 @@ class Widget(Orderable, Ownable):
widget_file_title = models.CharField(max_length=255, editable=False)
author = models.CharField(max_length=255, editable=False)
acts_on = models.CharField(max_length=255, editable=False)
- widgetslot = models.CharField(max_length=255, default="none", name="Slot")
+ widgetslot = models.CharField(max_length=255, default="none")
page_less = models.BooleanField(default=False)
page = models.ForeignKey(Page, null=True, blank=True)
status = models.IntegerField(_("Status"),

0 comments on commit bfd091d

Please sign in to comment.