Commit 363f50ac by benjaoming

Fix #206 by upgrading markitup to newer version

parent 34ac301b
...@@ -6,6 +6,7 @@ from django.utils.safestring import mark_safe ...@@ -6,6 +6,7 @@ from django.utils.safestring import mark_safe
from wiki.editors.base import BaseEditor from wiki.editors.base import BaseEditor
class MarkItUpAdminWidget(forms.Widget): class MarkItUpAdminWidget(forms.Widget):
"""A simplified more fail-safe widget for the backend""" """A simplified more fail-safe widget for the backend"""
def __init__(self, attrs=None): def __init__(self, attrs=None):
...@@ -22,6 +23,7 @@ class MarkItUpAdminWidget(forms.Widget): ...@@ -22,6 +23,7 @@ class MarkItUpAdminWidget(forms.Widget):
return mark_safe(u'<textarea%s>%s</textarea>' % (flatatt(final_attrs), return mark_safe(u'<textarea%s>%s</textarea>' % (flatatt(final_attrs),
conditional_escape(force_unicode(value)))) conditional_escape(force_unicode(value))))
class MarkItUpWidget(forms.Widget): class MarkItUpWidget(forms.Widget):
def __init__(self, attrs=None): def __init__(self, attrs=None):
# The 'rows' and 'cols' attributes are required for HTML correctness. # The 'rows' and 'cols' attributes are required for HTML correctness.
...@@ -37,6 +39,7 @@ class MarkItUpWidget(forms.Widget): ...@@ -37,6 +39,7 @@ class MarkItUpWidget(forms.Widget):
return mark_safe(u'<div><textarea%s>%s</textarea></div>' % (flatatt(final_attrs), return mark_safe(u'<div><textarea%s>%s</textarea></div>' % (flatatt(final_attrs),
conditional_escape(force_unicode(value)))) conditional_escape(force_unicode(value))))
class MarkItUp(BaseEditor): class MarkItUp(BaseEditor):
editor_id = 'markitup' editor_id = 'markitup'
......
...@@ -17,27 +17,21 @@ ...@@ -17,27 +17,21 @@
} }
.markItUpContainer { .markItUpContainer {
font:11px Verdana, Arial, Helvetica, sans-serif; font:11px Verdana, Arial, Helvetica, sans-serif;
}
.markItUpHeader
{
padding-top: 5px;
padding-bottom: 15px;
} }
.markItUpEditor { .markItUpEditor {
font:12px 'Courier New', Courier, monospace; font:12px 'Courier New', Courier, monospace;
padding:5px; padding:5px;
width:690px; width:690px;
height:320px; height:320px;
clear:both; display:block; clear:both;
line-height:18px; line-height:18px;
overflow:auto; overflow:auto;
} }
.markItUpPreviewFrame { .markItUpPreviewFrame {
overflow:auto; overflow:auto;
background-color:#FFFFFF; background-color:#FFF;
width:99.9%; width:99.9%;
height:350px; height:300px;
margin:5px 0; margin:5px 0;
} }
.markItUpFooter { .markItUpFooter {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment