Changeset 270:ac188cd2a054

Timestamp:

29/11/10 01:11:24 (2 years ago)

Author:

SAn

Branch:

default

Message:

Add django-markitup

Files:

• cyclope/apps/staticpages/admin.py (modified) (3 diffs)
• cyclope/default_settings.py (modified) (2 diffs)
• cyclope/default_urls.py (modified) (1 diff)
• setup.py (modified) (1 diff)

cyclope/apps/staticpages/admin.py

@@ -25 +25 @@
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.contenttypes.models import ContentType
+from markitup.widgets import AdminMarkItUpWidget
 
 from cyclope.core.collections.admin import CollectibleAdmin
@@ -33 +34 @@
 from models import StaticPage
 
+
 class StaticPageAdminForm(forms.ModelForm):
     menu_items = forms.ModelMultipleChoiceField(label=_('Menu items'),
@@ -39 +41 @@
     if cyc_settings.CYCLOPE_STATICPAGE_TEXT_STYLE ==  'wysiwyg':
         text = forms.CharField(label=_('Text'), widget=WYMEditor())
+    else:
+        text = forms.CharField(label=_('Text'), widget=AdminMarkItUpWidget())
+        
 
     def __init__(self, *args, **kwargs):

cyclope/default_settings.py

@@ -103 +103 @@
     'dbgettext',
     'rosetta',
+    'markitup',
 
 #    'debug_toolbar',
@@ -229 +230 @@
     'rosetta',
     )
+
+# martkitup settings
+JQUERY_URL = "" # We dont want jquery to be included twice in the admin.
+MARKITUP_SET = 'markitup/sets/textile'
+MARKITUP_FILTER = ('django.contrib.markup.templatetags.markup.textile', {})
+

cyclope/default_urls.py

@@ -74 +74 @@
     url(r'^rss/(?P<object_name>[\w-]+)/$', ContentTypeFeed(),
         name='content_type_feed'),
+    url(r'^markitup/', include('markitup.urls')),
 )
 

setup.py

@@ -77 +77 @@
         'django-dbgettext>=0.1', # fixed revision in dep links
         'django-rosetta-temp>=0.5.6', # installed from our clone
+        'django-markitup',
     ],