Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-ora2
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-ora2
Commits
f1699ccf
Commit
f1699ccf
authored
Jul 31, 2014
by
gradyward
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added in animations
parent
d1154015
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
24 deletions
+45
-24
openassessment/templates/openassessmentblock/edit/oa_edit.html
+1
-1
openassessment/xblock/static/css/openassessment.css
+0
-0
openassessment/xblock/static/js/openassessment-studio.min.js
+0
-0
openassessment/xblock/static/js/src/studio/oa_edit_validation_alert.js
+29
-17
openassessment/xblock/static/sass/oa/utilities/_developer.scss
+15
-6
No files found.
openassessment/templates/openassessmentblock/edit/oa_edit.html
View file @
f1699ccf
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
</ul>
</ul>
</div>
</div>
<div
id=
"openassessment_validation_alert"
class=
"
is--hidden
"
>
<div
id=
"openassessment_validation_alert"
class=
"
covered
"
>
<i
class=
"openassessment_alert_icon"
></i>
<i
class=
"openassessment_alert_icon"
></i>
<div
class=
"openassessment_alert_header"
>
<div
class=
"openassessment_alert_header"
>
<h2
class=
"openassessment_alert_title"
>
{% trans "Rubric Change Impacts Settings Section" %}
</h2>
<h2
class=
"openassessment_alert_title"
>
{% trans "Rubric Change Impacts Settings Section" %}
</h2>
...
...
openassessment/xblock/static/css/openassessment.css
View file @
f1699ccf
This source diff could not be displayed because it is too large. You can
view the blob
instead.
openassessment/xblock/static/js/openassessment-studio.min.js
View file @
f1699ccf
This diff is collapsed.
Click to expand it.
openassessment/xblock/static/js/src/studio/oa_edit_validation_alert.js
View file @
f1699ccf
...
@@ -10,6 +10,8 @@ OpenAssessment.ValidationAlert = function() {
...
@@ -10,6 +10,8 @@ OpenAssessment.ValidationAlert = function() {
this
.
editorElement
=
$
(
this
.
element
).
parent
();
this
.
editorElement
=
$
(
this
.
element
).
parent
();
this
.
title
=
$
(
".openassessment_alert_title"
,
this
.
element
);
this
.
title
=
$
(
".openassessment_alert_title"
,
this
.
element
);
this
.
message
=
$
(
".openassessment_alert_message"
,
this
.
element
);
this
.
message
=
$
(
".openassessment_alert_message"
,
this
.
element
);
this
.
ALERT_YELLOW
=
'rgb(192, 172, 0)'
;
this
.
DARK_GREY
=
'#323232'
;
};
};
OpenAssessment
.
ValidationAlert
.
prototype
=
{
OpenAssessment
.
ValidationAlert
.
prototype
=
{
...
@@ -37,7 +39,7 @@ OpenAssessment.ValidationAlert.prototype = {
...
@@ -37,7 +39,7 @@ OpenAssessment.ValidationAlert.prototype = {
// Finds the height of all other elements in the editor_and_tabs (the Header) and sets the height
// Finds the height of all other elements in the editor_and_tabs (the Header) and sets the height
// of the editing area to be 100% of that element minus those constraints.
// of the editing area to be 100% of that element minus those constraints.
var
headerHeight
=
$
(
'#openassessment_editor_header'
,
this
.
editorElement
).
outerHeight
();
var
headerHeight
=
$
(
'#openassessment_editor_header'
,
this
.
editorElement
).
outerHeight
();
this
.
element
.
addClass
(
'
is--hidden
'
);
this
.
element
.
addClass
(
'
covered
'
);
var
styles
=
{
var
styles
=
{
'height'
:
'Calc(100% - '
+
headerHeight
+
'px)'
,
'height'
:
'Calc(100% - '
+
headerHeight
+
'px)'
,
'border-top-right-radius'
:
'3px'
,
'border-top-right-radius'
:
'3px'
,
...
@@ -57,21 +59,31 @@ OpenAssessment.ValidationAlert.prototype = {
...
@@ -57,21 +59,31 @@ OpenAssessment.ValidationAlert.prototype = {
OpenAssessment.ValidationAlert
OpenAssessment.ValidationAlert
*/
*/
show
:
function
()
{
show
:
function
()
{
this
.
element
.
removeClass
(
'is--hidden'
);
var
view
=
this
;
// Finds the height of all other elements in the editor_and_tabs (the Header and Alert) and sets
if
(
this
.
isVisible
()){
// the height of the editing area to be 100% of that element minus those constraints.
$
(
this
.
element
).
animate
(
var
headerHeight
=
$
(
'#openassessment_editor_header'
,
this
.
editorElement
).
outerHeight
();
{
'background-color'
:
view
.
ALERT_YELLOW
},
300
,
'swing'
,
function
()
{
var
heightString
=
'Calc(100% - '
+
(
this
.
element
.
outerHeight
()
+
headerHeight
)
+
'px)'
;
$
(
this
).
animate
({
'background-color'
:
view
.
DARK_GREY
},
700
,
'swing'
);
var
styles
=
{
}
'height'
:
heightString
,
);
'border-top-right-radius'
:
'0px'
,
}
else
{
'border-top-left-radius'
:
'0px'
// Finds the height of all other elements in the editor_and_tabs (the Header and Alert) and sets
};
// the height of the editing area to be 100% of that element minus those constraints.
this
.
element
.
removeClass
(
'covered'
);
$
(
'.oa_editor_content_wrapper'
,
this
.
editorElement
).
each
(
function
()
{
var
alertHeight
=
this
.
element
.
outerHeight
();
$
(
this
).
css
(
styles
);
var
headerHeight
=
$
(
'#openassessment_editor_header'
,
this
.
editorElement
).
outerHeight
();
});
var
heightString
=
'Calc(100% - '
+
(
alertHeight
+
headerHeight
)
+
'px)'
;
return
this
;
var
styles
=
{
'height'
:
heightString
,
'border-top-right-radius'
:
'0px'
,
'border-top-left-radius'
:
'0px'
};
$
(
'.oa_editor_content_wrapper'
,
this
.
editorElement
).
each
(
function
()
{
$
(
this
).
css
(
styles
);
});
return
this
;
}
},
},
/**
/**
...
@@ -99,7 +111,7 @@ OpenAssessment.ValidationAlert.prototype = {
...
@@ -99,7 +111,7 @@ OpenAssessment.ValidationAlert.prototype = {
**/
**/
isVisible
:
function
()
{
isVisible
:
function
()
{
return
!
this
.
element
.
hasClass
(
'
is--hidden
'
);
return
!
this
.
element
.
hasClass
(
'
covered
'
);
},
},
/**
/**
...
...
openassessment/xblock/static/sass/oa/utilities/_developer.scss
View file @
f1699ccf
...
@@ -230,7 +230,6 @@
...
@@ -230,7 +230,6 @@
}
}
#openassessment_validation_alert
{
#openassessment_validation_alert
{
height
:
auto
;
width
:
100%
;
width
:
100%
;
border-top-left-radius
:
2px
;
border-top-left-radius
:
2px
;
border-top-right-radius
:
2px
;
border-top-right-radius
:
2px
;
...
@@ -239,8 +238,14 @@
...
@@ -239,8 +238,14 @@
padding
:
10px
;
padding
:
10px
;
position
:
absolute
;
position
:
absolute
;
z-index
:
10
;
z-index
:
10
;
min-height
:
70px
;
max-height
:
200px
;
@include
transition
(
color
0
.50s
ease-in-out
0s
);
.openassessment_alert_icon
{
position
:
absolute
;
top
:
35%
;
font-size
:
200%
;
left
:
3%
;
}
.openassessment_alert_icon
:before
{
.openassessment_alert_icon
:before
{
font-family
:
FontAwesome
;
font-family
:
FontAwesome
;
...
@@ -248,8 +253,8 @@
...
@@ -248,8 +253,8 @@
display
:
inline-block
;
display
:
inline-block
;
color
:
rgb
(
192
,
172
,
0
);
color
:
rgb
(
192
,
172
,
0
);
float
:
left
;
float
:
left
;
font-size
:
200%
;
height
:
0
;
margin
:
1
.5%
0px
0px
2%
;
width
:
0
;
}
}
.openassessment_alert_header
{
.openassessment_alert_header
{
width
:
85%
;
width
:
85%
;
...
@@ -273,7 +278,6 @@
...
@@ -273,7 +278,6 @@
top
:
0px
;
top
:
0px
;
right
:
0px
;
right
:
0px
;
color
:
#e9e9e9
;
color
:
#e9e9e9
;
background
:
#323232
;
text-align
:
center
;
text-align
:
center
;
margin
:
5px
10px
;
margin
:
5px
10px
;
...
@@ -298,6 +302,11 @@
...
@@ -298,6 +302,11 @@
overflow-y
:
scroll
;
overflow-y
:
scroll
;
position
:
absolute
;
position
:
absolute
;
bottom
:
0
;
bottom
:
0
;
z-index
:
11
;
transition
:
height
1s
ease-in-out
0
;
-webkit-transition
:
height
1s
ease-in-out
0
;
-moz-transition
:
height
1s
ease-in-out
0
;
}
}
#openassessment_prompt_editor
{
#openassessment_prompt_editor
{
...
...
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