Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-wiki
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
django-wiki
Commits
363f50ac
Commit
363f50ac
authored
Nov 18, 2013
by
benjaoming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #206 by upgrading markitup to newer version
parent
34ac301b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
9 deletions
+6
-9
wiki/editors/markitup.py
+3
-0
wiki/static/wiki/markitup/jquery.markitup.js
+0
-0
wiki/static/wiki/markitup/skins/simple/images/menu.png
+0
-0
wiki/static/wiki/markitup/skins/simple/style.css
+3
-9
No files found.
wiki/editors/markitup.py
View file @
363f50ac
...
...
@@ -6,6 +6,7 @@ from django.utils.safestring import mark_safe
from
wiki.editors.base
import
BaseEditor
class
MarkItUpAdminWidget
(
forms
.
Widget
):
"""A simplified more fail-safe widget for the backend"""
def
__init__
(
self
,
attrs
=
None
):
...
...
@@ -22,6 +23,7 @@ class MarkItUpAdminWidget(forms.Widget):
return
mark_safe
(
u'<textarea
%
s>
%
s</textarea>'
%
(
flatatt
(
final_attrs
),
conditional_escape
(
force_unicode
(
value
))))
class
MarkItUpWidget
(
forms
.
Widget
):
def
__init__
(
self
,
attrs
=
None
):
# The 'rows' and 'cols' attributes are required for HTML correctness.
...
...
@@ -37,6 +39,7 @@ class MarkItUpWidget(forms.Widget):
return
mark_safe
(
u'<div><textarea
%
s>
%
s</textarea></div>'
%
(
flatatt
(
final_attrs
),
conditional_escape
(
force_unicode
(
value
))))
class
MarkItUp
(
BaseEditor
):
editor_id
=
'markitup'
...
...
wiki/static/wiki/markitup/jquery.markitup.js
View file @
363f50ac
This diff is collapsed.
Click to expand it.
wiki/static/wiki/markitup/skins/simple/images/menu.png
View replaced file @
34ac301b
View file @
363f50ac
241 Bytes
|
W:
|
H:
26.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
wiki/static/wiki/markitup/skins/simple/style.css
View file @
363f50ac
...
...
@@ -17,27 +17,21 @@
}
.markItUpContainer
{
font
:
11px
Verdana
,
Arial
,
Helvetica
,
sans-serif
;
}
.markItUpHeader
{
padding-top
:
5px
;
padding-bottom
:
15px
;
}
.markItUpEditor
{
font
:
12px
'Courier New'
,
Courier
,
monospace
;
padding
:
5px
;
width
:
690px
;
height
:
320px
;
clear
:
both
;
display
:
block
;
clear
:
both
;
line-height
:
18px
;
overflow
:
auto
;
}
.markItUpPreviewFrame
{
overflow
:
auto
;
background-color
:
#FFF
FFF
;
background-color
:
#FFF
;
width
:
99.9%
;
height
:
3
5
0px
;
height
:
3
0
0px
;
margin
:
5px
0
;
}
.markItUpFooter
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment