Changeset 223:8630bac391e6

Timestamp:

Jan 4, 2010 2:17:36 PM (3 years ago)

Author:

slav0nic <slav0nic0@…>

Branch:

default

Message:

closed #24: Replace postmarkup by django-bbmarkup

Location:

djangobb

Files:

• djangobb_forum/markups/mypostmarkup.py (deleted)
• djangobb_forum/markups/postmarkup.py (deleted)
• djangobb_forum/models.py (modified) (4 diffs)
• djangobb_forum/tests/__init__.py (modified) (1 diff)
• djangobb_forum/tests/postmarkup.py (deleted)
• djangobb_forum/util.py (modified) (4 diffs)
• djangobb_forum/views.py (modified) (4 diffs)
• static/forum/js/markitup/sets/bbcode/set.js (modified) (1 diff)

djangobb/djangobb_forum/models.py

@@ -11 +11 @@
 from django.utils.hashcompat import sha_constructor
 
-from djangobb_forum.markups import mypostmarkup 
+from djangobb_forum.markups import bbmarkup
 from djangobb_forum.fields import AutoOneToOneField, ExtendedImageField, JSONField
 from djangobb_forum.util import urlize, smiles
@@ -188 +188 @@
     def save(self, *args, **kwargs):
         if self.markup == 'bbcode':
-            self.body_html = mypostmarkup.markup(self.body, auto_urls=False)
-        elif self.markup == 'markdown':
+            self.body_html = bbmarkup.bbcode(self.body)
+        elif self.markup == 'markdown' and MARKDOWN_AVAILABLE:
             self.body_html = unicode(Markdown(self.body, safe_mode='escape'))
             #self.body_html = markdown(self.body, 'safe')
@@ -348 +348 @@
     def save(self, *args, **kwargs):
         if self.markup == 'bbcode':
-            self.body_html = mypostmarkup.markup(self.body, auto_urls=False)
+            self.body_html = bbmarkup.bbcode(self.body)
         elif self.markup == 'markdown':
             self.body_html = unicode(Markdown(self.body, safe_mode='escape'))
@@ -354 +354 @@
         else:
             raise Exception('Invalid markup property: %s' % self.markup)
-        self.body_text = strip_tags(self.body_html)
+        #self.body_text = strip_tags(self.body_html)
         self.body_html = urlize(self.body_html)
         if forum_settings.SMILES_SUPPORT:
             self.body_html = smiles(self.body_html)
-        new = self.id is None
         super(PrivateMessage, self).save(*args, **kwargs)
 

djangobb/djangobb_forum/tests/__init__.py

@@ -3 +3 @@
 """
 import unittest
-
-from djangobb_forum.tests.postmarkup import PostmarkupTestCase
-
-def suite():
-    cases = (PostmarkupTestCase,
-            )
-    tests = unittest.TestSuite(
-        unittest.TestLoader().loadTestsFromTestCase(x)\
-        for x in cases)
-    return tests

djangobb/djangobb_forum/util.py

@@ -21 +21 @@
 #compile smiles regexp
 _SMILES = [(re.compile(smile_re), path) for smile_re, path in forum_settings.SMILES]
+
 
 def render_to(template):
@@ -73 +74 @@
     return renderer
 
+
 def absolute_url(path):
     return 'http://%s%s' % (forum_settings.HOST, path)
+
 
 def paged(paged_list_name, per_page):
@@ -210 +213 @@
 
         def handle_charref(self, name):
-            self.html.append('&%s;' % name)
+            self.html.append('&#%s;' % name)
 
         def __html_attrs(self, attrs):
@@ -262 +265 @@
         paged_list_name = paginator.page(page_number).object_list
     except (InvalidPage, EmptyPage):
-       raise Http404
+        raise Http404
     return pages, paginator, paged_list_name 
 

djangobb/djangobb_forum/views.py

@@ -1 +1 @@
 import math
 from datetime import datetime, timedelta
+from markdown import Markdown
 
 from django.shortcuts import get_object_or_404
@@ -13 +14 @@
 from django.db.models import Q, F, Sum
 from django.utils.encoding import smart_str
+from django.views.decorators.http import require_POST
 
 from djangobb_forum.util import render_to, paged, build_form, paginate, set_language
@@ -21 +23 @@
     PersonalProfileForm, MessagingProfileForm, PersonalityProfileForm,\
     DisplayProfileForm, PrivacyProfileForm, ReportForm, UploadAvatarForm, CreatePMForm
-from djangobb_forum.markups import mypostmarkup
+from djangobb_forum.markups import bbmarkup
 from djangobb_forum.templatetags import forum_extras
 from djangobb_forum import settings as forum_settings
@@ -787 +789 @@
     return response
 
-#TODO: check markup
+
+@login_required
+#@require_POST
 @render_to('forum/post_preview.html')
 def post_preview(request):
     '''Preview for markitup'''
-    data = mypostmarkup.markup(request.POST.get('data', ''), auto_urls=False)
+
+    markup = request.user.forum_profile.markup
+    data = request.POST.get('data', '')
+    if markup == 'bbcode':
+        data = bbmarkup.bbcode(data)
+    elif markup == 'markdown' and MARKDOWN_AVAILABLE:
+        data = unicode(Markdown(data, safe_mode='escape'))
+    else:
+        raise Exception('Invalid markup property: %s' % markup)
+
     data = urlize(data)
-    data = smiles(data)
+    if forum_settings.SMILES_SUPPORT:
+        data = smiles(data)
     return {'data': data}

djangobb/static/forum/js/markitup/sets/bbcode/set.js

@@ -20 +20 @@
                 {name:'Link', key:'L', openWith:'[url=[![Url]!]]', closeWith:'[/url]', placeHolder:'Your text to link here...'},
                 {separator:'---------------' },
-                {name:'Size', key:'S', openWith:'[size=[![Text size]!]]', closeWith:'[/size]',
+                {name:'Size', key:'S', openWith:'', closeWith:'',
                 dropMenu :[
-                        {name:'Big', openWith:'[size=200]', closeWith:'[/size]' },
-                        {name:'Normal', openWith:'[size=100]', closeWith:'[/size]' },
-                        {name:'Small', openWith:'[size=50]', closeWith:'[/size]' }
+                        {name:'Big', openWith:'[big]', closeWith:'[/big]' },
+                        {name:'Small', openWith:'[small]', closeWith:'[/small]' }
                 ]},
                 {separator:'---------------' },