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
cd434ea6
Commit
cd434ea6
authored
Aug 11, 2016
by
Matjaz Gregoric
Committed by
Tim Krones
Aug 16, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address review comments.
parent
9bc8c070
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
36 deletions
+23
-36
drag_and_drop_v2/public/css/drag_and_drop_edit.css
+15
-32
drag_and_drop_v2/public/js/drag_and_drop_edit.js
+4
-0
drag_and_drop_v2/templates/html/drag_and_drop_edit.html
+2
-2
drag_and_drop_v2/templates/html/js_templates.html
+2
-2
No files found.
drag_and_drop_v2/public/css/drag_and_drop_edit.css
View file @
cd434ea6
...
@@ -61,8 +61,7 @@
...
@@ -61,8 +61,7 @@
position
:
relative
;
position
:
relative
;
}
}
.xblock--drag-and-drop--editor
.tab
::after
,
.xblock--drag-and-drop--editor
.tab
::after
{
.xblock--drag-and-drop--editor
.tab-footer
::after
{
content
:
""
;
content
:
""
;
display
:
table
;
display
:
table
;
clear
:
both
;
clear
:
both
;
...
@@ -84,19 +83,11 @@
...
@@ -84,19 +83,11 @@
}
}
.xblock--drag-and-drop--editor
.tab-header
,
.xblock--drag-and-drop--editor
.tab-header
,
.xblock--drag-and-drop--editor
.tab-content
,
.xblock--drag-and-drop--editor
.tab-content
{
.xblock--drag-and-drop--editor
.tab-footer
{
width
:
96%
;
width
:
96%
;
margin
:
2%
;
margin
:
2%
;
}
}
.xblock--drag-and-drop--editor
.tab-footer
{
height
:
25px
;
position
:
relative
;
display
:
block
;
float
:
left
;
}
.xblock--drag-and-drop--editor
.items
{
.xblock--drag-and-drop--editor
.items
{
width
:
calc
(
100%
-
515px
);
width
:
calc
(
100%
-
515px
);
margin
:
10px
0
0
0
;
margin
:
10px
0
0
0
;
...
@@ -157,7 +148,6 @@
...
@@ -157,7 +148,6 @@
width
:
40%
;
width
:
40%
;
max-width
:
50%
;
max-width
:
50%
;
min-width
:
330px
;
min-width
:
330px
;
margin-right
:
15px
;
}
}
.xblock--drag-and-drop--editor
.zones-tab
.tab-content
.target
{
.xblock--drag-and-drop--editor
.zones-tab
.tab-content
.target
{
...
@@ -207,7 +197,6 @@
...
@@ -207,7 +197,6 @@
.xblock--drag-and-drop--editor
.zones-form
.zone-row
.layout
.zone-size
,
.xblock--drag-and-drop--editor
.zones-form
.zone-row
.layout
.zone-size
,
.xblock--drag-and-drop--editor
.zones-form
.zone-row
.layout
.zone-coord
{
.xblock--drag-and-drop--editor
.zones-form
.zone-row
.layout
.zone-coord
{
width
:
35%
;
width
:
35%
;
margin
:
0
19px
5px
0
;
line-height
:
inherit
;
line-height
:
inherit
;
}
}
...
@@ -258,10 +247,6 @@
...
@@ -258,10 +247,6 @@
width
:
97%
;
width
:
97%
;
}
}
.xblock--drag-and-drop--editor
.items-form
.zone-checkbox-label
{
text-align
:
left
;
}
.xblock--drag-and-drop--editor
.items-form
.row.advanced
{
.xblock--drag-and-drop--editor
.items-form
.row.advanced
{
display
:
none
;
display
:
none
;
}
}
...
@@ -278,6 +263,12 @@
...
@@ -278,6 +263,12 @@
content
:
'\25B6'
;
content
:
'\25B6'
;
margin-right
:
0.5em
;
margin-right
:
0.5em
;
}
}
.rtl
.xblock--drag-and-drop--editor
.items-form
.row.advanced-link
button
:before
{
content
:
'\25C0'
;
margin-left
:
0.5em
;
margin-right
:
0
;
}
.xblock--drag-and-drop-editor
.items-form
.zone-checkbox-row
{
.xblock--drag-and-drop-editor
.items-form
.zone-checkbox-row
{
margin-bottom
:
0px
;
margin-bottom
:
0px
;
}
}
...
@@ -291,14 +282,10 @@
...
@@ -291,14 +282,10 @@
padding
:
5px
10px
;
padding
:
5px
10px
;
}
}
.xblock--drag-and-drop--editor
.btn
:hover
{
.xblock--drag-and-drop--editor
.btn
:hover
,
opacity
:
0.8
;
cursor
:
pointer
;
}
.xblock--drag-and-drop--editor
.btn
:focus
{
.xblock--drag-and-drop--editor
.btn
:focus
{
outline
:
none
;
background-color
:
#296ba5
;
opacity
:
0.5
;
box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,
0.5
)
;
}
}
.xblock--drag-and-drop--editor
.remove-zone
,
.xblock--drag-and-drop--editor
.remove-zone
,
...
@@ -307,12 +294,15 @@
...
@@ -307,12 +294,15 @@
padding
:
3px
;
padding
:
3px
;
border-radius
:
12px
;
border-radius
:
12px
;
}
}
.rtl
.xblock--drag-and-drop--editor
.remove-zone
,
.rtl
.xblock--drag-and-drop--editor
.remove-item
{
float
:
left
;
}
.xblock--drag-and-drop--editor
.icon
{
.xblock--drag-and-drop--editor
.icon
{
width
:
14px
;
width
:
14px
;
height
:
14px
;
height
:
14px
;
border-radius
:
7px
;
border-radius
:
7px
;
background-color
:
#1d5280
;
display
:
inline-block
;
display
:
inline-block
;
}
}
...
@@ -321,13 +311,6 @@
...
@@ -321,13 +311,6 @@
display
:
block
;
display
:
block
;
}
}
.xblock--drag-and-drop--editor
.add-zone
:hover
,
.xblock--drag-and-drop--editor
.add-zone
:hover
.icon
,
.xblock--drag-and-drop--editor
.remove-zone
:hover
,
.xblock--drag-and-drop--editor
.remove-zone
:hover
.icon
{
opacity
:
0.7
;
}
.xblock--drag-and-drop--editor
.tab
.field-error
{
.xblock--drag-and-drop--editor
.tab
.field-error
{
outline
:
none
;
outline
:
none
;
box-shadow
:
0
0
10px
0
darkred
;
box-shadow
:
0
0
10px
0
darkred
;
...
...
drag_and_drop_v2/public/js/drag_and_drop_edit.js
View file @
cd434ea6
...
@@ -181,6 +181,8 @@ function DragAndDropEditBlock(runtime, element, params) {
...
@@ -181,6 +181,8 @@ function DragAndDropEditBlock(runtime, element, params) {
.
on
(
'click'
,
'.add-zone'
,
function
(
e
)
{
.
on
(
'click'
,
'.add-zone'
,
function
(
e
)
{
e
.
preventDefault
();
e
.
preventDefault
();
_fn
.
build
.
form
.
zone
.
add
();
_fn
.
build
.
form
.
zone
.
add
();
// Set focus to first field of the new zone.
$
(
'.zones-form .zone-row:last input[type=text]:first'
,
element
).
select
().
focus
();
})
})
.
on
(
'click'
,
'.remove-zone'
,
_fn
.
build
.
form
.
zone
.
remove
)
.
on
(
'click'
,
'.remove-zone'
,
_fn
.
build
.
form
.
zone
.
remove
)
.
on
(
'input'
,
'.zone-row input'
,
_fn
.
build
.
form
.
zone
.
changedInputHandler
)
.
on
(
'input'
,
'.zone-row input'
,
_fn
.
build
.
form
.
zone
.
changedInputHandler
)
...
@@ -220,6 +222,8 @@ function DragAndDropEditBlock(runtime, element, params) {
...
@@ -220,6 +222,8 @@ function DragAndDropEditBlock(runtime, element, params) {
.
on
(
'click'
,
'.add-item'
,
function
(
e
)
{
.
on
(
'click'
,
'.add-item'
,
function
(
e
)
{
e
.
preventDefault
();
e
.
preventDefault
();
_fn
.
build
.
form
.
item
.
add
();
_fn
.
build
.
form
.
item
.
add
();
// Set focus to first field of the new item.
$
(
'.items-form .item:last input[type=text]:first'
,
element
).
select
().
focus
();
})
})
.
on
(
'click'
,
'.remove-item'
,
_fn
.
build
.
form
.
item
.
remove
)
.
on
(
'click'
,
'.remove-item'
,
_fn
.
build
.
form
.
item
.
remove
)
.
on
(
'click'
,
'.advanced-link button'
,
_fn
.
build
.
form
.
item
.
showAdvancedSettings
)
.
on
(
'click'
,
'.advanced-link button'
,
_fn
.
build
.
form
.
item
.
showAdvancedSettings
)
...
...
drag_and_drop_v2/templates/html/drag_and_drop_edit.html
View file @
cd434ea6
...
@@ -137,7 +137,7 @@
...
@@ -137,7 +137,7 @@
<div
class=
"controls"
>
<div
class=
"controls"
>
<form
class=
"zones-form"
></form>
<form
class=
"zones-form"
></form>
<button
class=
"btn add-zone add-element"
>
<button
class=
"btn add-zone add-element"
>
<span
class=
"icon add"
></span>
<span
class=
"icon add"
aria-hidden=
"true"
></span>
{% trans "Add a zone" %}
{% trans "Add a zone" %}
</button>
</button>
</div>
</div>
...
@@ -180,7 +180,7 @@
...
@@ -180,7 +180,7 @@
<h4>
{% trans "Item definitions" %}
</h4>
<h4>
{% trans "Item definitions" %}
</h4>
<form
class=
"items-form"
></form>
<form
class=
"items-form"
></form>
<button
class=
"btn add-item add-element"
>
<button
class=
"btn add-item add-element"
>
<span
class=
"icon add"
></span>
<span
class=
"icon add"
aria-hidden=
"true"
></span>
{% trans "Add an item" %}
{% trans "Add an item" %}
</button>
</button>
</section>
</section>
...
...
drag_and_drop_v2/templates/html/js_templates.html
View file @
cd434ea6
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
<script
class=
"zone-input-tpl"
type=
"text/html"
>
<script
class=
"zone-input-tpl"
type=
"text/html"
>
<
fieldset
class
=
"zone-row"
data
-
uid
=
"{{zone.uid}}"
>
<
fieldset
class
=
"zone-row"
data
-
uid
=
"{{zone.uid}}"
>
<
button
type
=
"button"
class
=
"btn remove-zone hidden"
title
=
"{{i18n 'Remove zone'}}"
>
<
button
type
=
"button"
class
=
"btn remove-zone hidden"
title
=
"{{i18n 'Remove zone'}}"
>
<
span
class
=
"icon remove"
><
/span
>
<
span
class
=
"icon remove"
aria
-
hidden
=
"true"
><
/span
>
<
/button
>
<
/button
>
<
label
>
<
label
>
<
span
>
{{
i18n
"Title"
}}
<
/span
>
<
span
>
{{
i18n
"Title"
}}
<
/span
>
...
@@ -104,7 +104,7 @@
...
@@ -104,7 +104,7 @@
<script
class=
"item-input-tpl"
type=
"text/html"
>
<script
class=
"item-input-tpl"
type=
"text/html"
>
<
fieldset
class
=
"item"
>
<
fieldset
class
=
"item"
>
<
button
type
=
"button"
class
=
"btn remove-item hidden"
title
=
"{{i18n 'Remove item'}}"
>
<
button
type
=
"button"
class
=
"btn remove-item hidden"
title
=
"{{i18n 'Remove item'}}"
>
<
span
class
=
"icon remove"
><
/span
>
<
span
class
=
"icon remove"
aria
-
hidden
=
"true"
><
/span
>
<
/button
>
<
/button
>
<
div
class
=
"row"
>
<
div
class
=
"row"
>
<
label
class
=
"h4"
>
<
label
class
=
"h4"
>
...
...
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