Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
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
edx
edx-platform
Commits
b1136b0e
Commit
b1136b0e
authored
Sep 03, 2012
by
Rocky Duan
Committed by
Matthew Mongeau
Sep 10, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed wmd editor / tag for new post
parent
2e2925e7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
177 additions
and
31 deletions
+177
-31
lms/static/coffee/src/discussion/views/new_post_view.coffee
+7
-4
lms/static/sass/_discussion.scss
+168
-25
lms/templates/discussion/_new_post.html
+2
-2
No files found.
lms/static/coffee/src/discussion/views/new_post_view.coffee
View file @
b1136b0e
...
@@ -11,6 +11,9 @@ class @NewPostView extends Backbone.View
...
@@ -11,6 +11,9 @@ class @NewPostView extends Backbone.View
@
setSelectedTopic
()
@
setSelectedTopic
()
DiscussionUtil
.
makeWmdEditor
@
$el
,
$
.
proxy
(
@
$
,
@
),
"new-post-body"
@
$
(
".new-post-tags"
).
tagsInput
DiscussionUtil
.
tagsInputOptions
()
events
:
events
:
"submit .new-post-form"
:
"createPost"
"submit .new-post-form"
:
"createPost"
"click .topic_dropdown_button"
:
"toggleTopicDropdown"
"click .topic_dropdown_button"
:
"toggleTopicDropdown"
...
@@ -74,7 +77,7 @@ class @NewPostView extends Backbone.View
...
@@ -74,7 +77,7 @@ class @NewPostView extends Backbone.View
getNameWidth
:
(
name
)
->
getNameWidth
:
(
name
)
->
test
=
$
(
"<div>"
)
test
=
$
(
"<div>"
)
test
.
css
test
.
css
"font-size"
:
@
dropdownButton
.
css
(
'font-size'
)
"font-size"
:
@
dropdownButton
.
css
(
'font-size'
)
opacity
:
0
opacity
:
0
position
:
'absolute'
position
:
'absolute'
...
@@ -112,14 +115,14 @@ class @NewPostView extends Backbone.View
...
@@ -112,14 +115,14 @@ class @NewPostView extends Backbone.View
createPost
:
(
event
)
->
createPost
:
(
event
)
->
event
.
preventDefault
()
event
.
preventDefault
()
title
=
@
$
(
".new-post-title"
).
val
()
title
=
@
$
(
".new-post-title"
).
val
()
body
=
@
$
(
".new-post-body"
).
val
()
body
=
@
$
(
".new-post-body"
).
find
(
".wmd-input"
).
val
()
tags
=
@
$
(
".new-post-tags"
).
val
()
tags
=
@
$
(
".new-post-tags"
).
val
()
anonymous
=
false
||
@
$
(
"input.discussion-anonymous"
).
is
(
":checked"
)
anonymous
=
false
||
@
$
(
"input.discussion-anonymous"
).
is
(
":checked"
)
follow
=
false
||
@
$
(
"input.discussion-follow"
).
is
(
":checked"
)
follow
=
false
||
@
$
(
"input.discussion-follow"
).
is
(
":checked"
)
$formTopicDropBtn
.
bind
(
'click'
,
showFormTopicDrop
)
;
$formTopicDropBtn
.
bind
(
'click'
,
showFormTopicDrop
)
$formTopicDropMenu
.
bind
(
'click'
,
setFormTopic
)
;
$formTopicDropMenu
.
bind
(
'click'
,
setFormTopic
)
url
=
DiscussionUtil
.
urlFor
(
'create_thread'
,
@
topicId
)
url
=
DiscussionUtil
.
urlFor
(
'create_thread'
,
@
topicId
)
...
...
lms/static/sass/_discussion.scss
View file @
b1136b0e
...
@@ -37,7 +37,33 @@
...
@@ -37,7 +37,33 @@
}
}
}
}
@mixin
discussion-wmd-input
{
width
:
100%
;
height
:
240px
;
margin-top
:
0
;
padding
:
10px
;
box-sizing
:
border-box
;
border
:
1px
solid
#aaa
;
border-radius
:
3px
3px
0
0
;
background
:
#fff
;
font-family
:
'Monaco'
,
monospace
;
font-size
:
13px
;
line-height
:
1
.6
;
box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0
.15
)
inset
;
}
@mixin
discussion-wmd-preview
{
width
:
100%
;
min-height
:
40px
;
padding
:
10px
;
box-sizing
:
border-box
;
border
:
1px
solid
#aaa
;
border-top
:
none
;
border-radius
:
0
0
3px
3px
;
background
:
#eee
;
color
:
#333
;
box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0
.15
)
inset
;
}
@-webkit-keyframes
fadeIn
{
@-webkit-keyframes
fadeIn
{
0
%
{
opacity
:
0
;
}
0
%
{
opacity
:
0
;
}
...
@@ -47,6 +73,141 @@
...
@@ -47,6 +73,141 @@
/*** base editor styles ***/
.wmd-panel
{
width
:
100%
;
min-width
:
500px
;
}
.wmd-button-bar
{
width
:
100%
;
background-color
:
Silver
;
}
.wmd-input
{
height
:
150px
;
width
:
100%
;
background-color
:
#e9e9e9
;
border
:
1px
solid
#c8c8c8
;
font-family
:
Monaco
,
'Lucida Console'
,
monospace
;
font-style
:
normal
;
font-size
:
0
.8em
;
line-height
:
1
.6em
;
@include
border-radius
(
3px
3px
0
0
);
&
:
:-
webkit-input-placeholder
{
color
:
#888
;
}
}
.wmd-preview
{
position
:
relative
;
font-family
:
$sans-serif
;
padding
:
25px
20px
10px
20px
;
margin-bottom
:
5px
;
box-sizing
:
border-box
;
border
:
1px
solid
#c8c8c8
;
border-top-width
:
0
;
@include
border-radius
(
0
0
3px
3px
);
overflow
:
hidden
;
@include
transition
(
all
,
.2s
,
easeOut
);
&
:before
{
content
:
'PREVIEW'
;
position
:
absolute
;
top
:
3px
;
left
:
5px
;
font-size
:
11px
;
color
:
#bbb
;
}
p
{
font-family
:
$sans-serif
;
}
background-color
:
#fafafa
;
}
.wmd-button-row
{
position
:
relative
;
margin-left
:
5px
;
margin-right
:
5px
;
margin-bottom
:
5px
;
margin-top
:
10px
;
padding
:
0px
;
height
:
20px
;
overflow
:
hidden
;
@include
transition
(
all
,
.2s
,
easeOut
);
}
.wmd-spacer
{
width
:
1px
;
height
:
20px
;
margin-left
:
14px
;
position
:
absolute
;
background-color
:
Silver
;
display
:
inline-block
;
list-style
:
none
;
}
.wmd-button
{
width
:
20px
;
height
:
20px
;
padding-left
:
2px
;
padding-right
:
3px
;
position
:
absolute
;
display
:
inline-block
;
list-style
:
none
;
cursor
:
pointer
;
}
.wmd-button
>
span
{
background-image
:
url('/static/images/wmd-buttons.png')
;
background-repeat
:
no-repeat
;
background-position
:
0px
0px
;
width
:
20px
;
height
:
20px
;
display
:
inline-block
;
}
.wmd-spacer1
{
left
:
50px
;
}
.wmd-spacer2
{
left
:
175px
;
}
.wmd-spacer3
{
left
:
300px
;
}
.wmd-prompt-background
{
background-color
:
Black
;
}
.wmd-prompt-dialog
{
border
:
1px
solid
#999999
;
background-color
:
#F5F5F5
;
}
.wmd-prompt-dialog
>
div
{
font-size
:
0
.8em
;
font-family
:
arial
,
helvetica
,
sans-serif
;
}
.wmd-prompt-dialog
>
form
>
input
[
type
=
"text"
]
{
border
:
1px
solid
#999999
;
color
:
black
;
}
.wmd-prompt-dialog
>
form
>
input
[
type
=
"button"
]
{
border
:
1px
solid
#888888
;
font-family
:
trebuchet
MS
,
helvetica
,
sans-serif
;
font-size
:
0
.8em
;
font-weight
:
bold
;
}
body
.discussion
{
body
.discussion
{
...
@@ -204,7 +365,8 @@ body.discussion {
...
@@ -204,7 +365,8 @@ body.discussion {
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
.new-post-body
{
.new-post-body
.wmd-input
{
@include
discussion-wmd-input
;
position
:
relative
;
position
:
relative
;
width
:
100%
;
width
:
100%
;
height
:
200px
;
height
:
200px
;
...
@@ -220,10 +382,11 @@ body.discussion {
...
@@ -220,10 +382,11 @@ body.discussion {
box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0
.3
)
inset
;
box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0
.3
)
inset
;
}
}
.new-post-preview
{
.new-post-body
.wmd-preview
{
@include
discussion-wmd-preview
;
position
:
relative
;
position
:
relative
;
width
:
100%
;
width
:
100%
;
height
:
50px
;
//
height: 50px;
margin-top
:
-1px
;
margin-top
:
-1px
;
padding
:
10px
;
padding
:
10px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
...
@@ -1207,31 +1370,11 @@ body.discussion {
...
@@ -1207,31 +1370,11 @@ body.discussion {
}
}
#wmd-input
{
#wmd-input
{
width
:
100%
;
@include
discussion-wmd-input
;
height
:
240px
;
margin-top
:
0
;
padding
:
10px
;
box-sizing
:
border-box
;
border
:
1px
solid
#aaa
;
border-radius
:
3px
3px
0
0
;
background
:
#fff
;
font-family
:
'Monaco'
,
monospace
;
font-size
:
13px
;
line-height
:
1
.6
;
box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0
.15
)
inset
;
}
}
#wmd-preview
{
#wmd-preview
{
width
:
100%
;
@include
discussion-wmd-preview
;
min-height
:
40px
;
padding
:
10px
;
box-sizing
:
border-box
;
border
:
1px
solid
#aaa
;
border-top
:
none
;
border-radius
:
0
0
3px
3px
;
background
:
#eee
;
color
:
#333
;
box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0
.15
)
inset
;
}
}
.reply-post-control
{
.reply-post-control
{
...
...
lms/templates/discussion/_new_post.html
View file @
b1136b0e
...
@@ -50,8 +50,8 @@
...
@@ -50,8 +50,8 @@
<input
type=
"text"
class=
"new-post-title"
name=
"title"
placeholder=
"Title"
>
<input
type=
"text"
class=
"new-post-title"
name=
"title"
placeholder=
"Title"
>
</div>
</div>
<div
class=
"form-row"
>
<div
class=
"form-row"
>
<
textarea
class=
"new-post-body"
name=
"body"
placeholder=
"Enter your question or comment…"
></textarea
>
<
div
class=
"new-post-body"
name=
"body"
placeholder=
"Enter your question or comment…"
></div
>
<
div
class=
"new-post-preview"
><span
class=
"new-post-preview-label"
>
Preview
</span></div
>
<
!---<div class="new-post-preview"><span class="new-post-preview-label">Preview</span></div>--
>
</div>
</div>
<div
class=
"form-row"
>
<div
class=
"form-row"
>
<input
type=
"text"
class=
"new-post-tags"
name=
"tags"
placeholder=
"Tags"
>
<input
type=
"text"
class=
"new-post-tags"
name=
"tags"
placeholder=
"Tags"
>
...
...
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