Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xblock-drag-and-drop-v2
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
xblock-drag-and-drop-v2
Commits
2c0b51ef
Commit
2c0b51ef
authored
Jan 25, 2016
by
Tim Krones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix inconsistent naming (problem title vs. problem header).
parent
5b2037b0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
drag_and_drop_v2/public/css/drag_and_drop.css
+1
-1
drag_and_drop_v2/public/js/view.js
+1
-1
tests/integration/test_title_and_question.py
+2
-2
No files found.
drag_and_drop_v2/public/css/drag_and_drop.css
View file @
2c0b51ef
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
/* Header, instruction text, etc. */
/* Header, instruction text, etc. */
.xblock--drag-and-drop
.problem-
header
{
.xblock--drag-and-drop
.problem-
title
{
display
:
inline-block
;
display
:
inline-block
;
margin
:
0
0
15px
0
;
margin
:
0
0
15px
0
;
}
}
...
...
drag_and_drop_v2/public/js/view.js
View file @
2c0b51ef
...
@@ -215,7 +215,7 @@
...
@@ -215,7 +215,7 @@
};
};
var
mainTemplate
=
function
(
ctx
)
{
var
mainTemplate
=
function
(
ctx
)
{
var
problemTitle
=
ctx
.
show_title
?
h
(
'h2.problem-
header
'
,
{
innerHTML
:
ctx
.
title_html
})
:
null
;
var
problemTitle
=
ctx
.
show_title
?
h
(
'h2.problem-
title
'
,
{
innerHTML
:
ctx
.
title_html
})
:
null
;
var
problemHeader
=
ctx
.
show_problem_header
?
h
(
'h3.title1'
,
gettext
(
'Problem'
))
:
null
;
var
problemHeader
=
ctx
.
show_problem_header
?
h
(
'h3.title1'
,
gettext
(
'Problem'
))
:
null
;
var
popupSelector
=
'div.popup'
;
var
popupSelector
=
'div.popup'
;
if
(
ctx
.
popup_html
&&
!
ctx
.
last_action_correct
)
{
if
(
ctx
.
popup_html
&&
!
ctx
.
last_action_correct
)
{
...
...
tests/integration/test_title_and_question.py
View file @
2c0b51ef
...
@@ -52,8 +52,8 @@ class TestDragAndDropTitleAndProblem(BaseIntegrationTest):
...
@@ -52,8 +52,8 @@ class TestDragAndDropTitleAndProblem(BaseIntegrationTest):
page
=
self
.
go_to_page
(
const_page_name
)
page
=
self
.
go_to_page
(
const_page_name
)
if
show_title
:
if
show_title
:
problem_header
=
page
.
find_element_by_css_selector
(
'h2.problem-
header
'
)
problem_header
=
page
.
find_element_by_css_selector
(
'h2.problem-
title
'
)
self
.
assertEqual
(
self
.
get_element_html
(
problem_header
),
display_name
)
self
.
assertEqual
(
self
.
get_element_html
(
problem_header
),
display_name
)
else
:
else
:
with
self
.
assertRaises
(
NoSuchElementException
):
with
self
.
assertRaises
(
NoSuchElementException
):
page
.
find_element_by_css_selector
(
'h2.problem-
header
'
)
page
.
find_element_by_css_selector
(
'h2.problem-
title
'
)
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