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
b5bb705a
Commit
b5bb705a
authored
Mar 13, 2014
by
Brian Talbot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
applying save-based error styling to response step
parent
6464d70c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
86 additions
and
48 deletions
+86
-48
apps/openassessment/templates/openassessmentblock/response/oa_response.html
+15
-6
apps/openassessment/xblock/static/css/openassessment.css
+0
-0
apps/openassessment/xblock/static/sass/oa/views/_oa-base.scss
+65
-42
apps/openassessment/xblock/static/sass/xb/elements/_forms.scss
+6
-0
No files found.
apps/openassessment/templates/openassessmentblock/response/oa_response.html
View file @
b5bb705a
...
...
@@ -44,15 +44,24 @@
<li
class=
"field field--textarea submission__answer"
id=
"submission__answer"
>
<label
class=
"sr"
for=
"submission__answer__value"
>
Please provide your response to the question.
</label>
<textarea
id=
"submission__answer__value"
placeholder=
""
>
{{ saved_response }}
</textarea>
<span
class=
"tip"
>
You may continue to work on your response until you submit it.
</span>
</li>
</ol>
<ul
class=
"list list--actions response__submission__actions"
>
<li
class=
"list--actions__item"
>
<button
type=
"submit"
id=
"submission__save"
class=
"action action--save submission__save is--disabled"
>
Save Your Progress
</button>
<span
class=
"tip"
>
You may continue to work on your response until you submit it.
</span>
</li>
</ul>
<div
class=
"response__submission__actions has--error"
>
<ul
class=
"list list--actions"
>
<li
class=
"list--actions__item"
>
<button
type=
"submit"
id=
"submission__save"
class=
"action action--save submission__save is--disabled"
>
Save Your Progress
</button>
</li>
</ul>
<div
class=
"message message--error message--error-server"
>
<h3
class=
"message__title"
>
We could not save your progress
</h3>
<div
class=
"message__content"
>
<p>
There was a problem communicating with the server. Please try again.
</p>
</div>
</div>
</div>
</form>
</div>
...
...
apps/openassessment/xblock/static/css/openassessment.css
View file @
b5bb705a
This source diff could not be displayed because it is too large. You can
view the blob
instead.
apps/openassessment/xblock/static/sass/oa/views/_oa-base.scss
View file @
b5bb705a
...
...
@@ -470,7 +470,6 @@
// --------------------
// errors
// --------------------
// CASE: default error display (hidden)
.message--error
{
@extend
%trans-opacity
;
...
...
@@ -478,16 +477,14 @@
opacity
:
0
.0
;
}
// CASE: error is shown
.has--error
{
// CASE: error is shown
.has--error
{
.message--error
{
display
:
block
;
opacity
:
1
.0
;
}
.message--error
{
display
:
block
;
opacity
:
1
.0
;
}
}
// --------------------
...
...
@@ -548,6 +545,7 @@
textarea
{
@extend
%ui-content-longanswer
;
min-height
:
(
$baseline-v
*
10
);
margin-bottom
:
(
$baseline-v
/
2
);
}
}
...
...
@@ -567,36 +565,10 @@
}
.response__submission__actions
{
.action--submit
,
.tip
{
display
:
block
;
width
:
100%
;
margin-bottom
:
(
$baseline-v
/
2
);
@include
media
(
$bp-ds
)
{
display
:
inline-block
;
vertical-align
:
middle
;
width
:
auto
;
}
@include
media
(
$bp-dm
)
{
display
:
inline-block
;
vertical-align
:
middle
;
width
:
auto
;
}
@include
media
(
$bp-dl
)
{
display
:
inline-block
;
vertical-align
:
middle
;
width
:
auto
;
}
@include
media
(
$bp-dx
)
{
display
:
inline-block
;
vertical-align
:
middle
;
width
:
auto
;
}
}
@include
transition
(
background-color
$tmg-f1
ease-in-out
0s
);
border-radius
:
(
$baseline-v
/
5
);
padding
:
(
$baseline-v
/
2
)
(
$baseline-h
/
2
);
background
:
transparent
;
.action--save
{
@extend
%btn--secondary
;
...
...
@@ -625,9 +597,60 @@
}
}
.tip
{
@extend
%copy-5
;
color
:
$copy-supplemental-color
;
// STATE: has error
&
.has--error
{
@include
row
();
background
:
tint
(
$color-error
,
90%
);
.message
{
display
:
block
;
@include
media
(
$bp-ds
)
{
@include
span-columns
(
3
of
6
);
text-align
:
left
;
}
@include
media
(
$bp-dm
)
{
@include
span-columns
(
6
of
12
);
margin-bottom
:
0
;
text-align
:
left
;
}
@include
media
(
$bp-dl
)
{
@include
span-columns
(
6
of
12
);
text-align
:
left
;
}
@include
media
(
$bp-dx
)
{
@include
span-columns
(
6
of
12
);
text-align
:
left
;
}
}
.list--actions
{
display
:
block
;
margin-bottom
:
(
$baseline-v
/
2
);
@include
media
(
$bp-ds
)
{
@include
span-columns
(
3
of
6
);
margin-bottom
:
0
;
}
@include
media
(
$bp-dm
)
{
@include
span-columns
(
6
of
12
);
margin-bottom
:
0
;
}
@include
media
(
$bp-dl
)
{
@include
span-columns
(
6
of
12
);
margin-bottom
:
0
;
}
@include
media
(
$bp-dx
)
{
@include
span-columns
(
6
of
12
);
margin-bottom
:
0
;
}
}
}
}
}
...
...
apps/openassessment/xblock/static/sass/xb/elements/_forms.scss
View file @
b5bb705a
...
...
@@ -41,6 +41,12 @@
textarea
{
width
:
100%
;
}
.tip
{
display
:
block
;
@extend
%copy-5
;
color
:
$copy-supplemental-color
;
}
}
}
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