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
86588c49
Commit
86588c49
authored
Jan 29, 2014
by
Frances Botsford
Committed by
Julia Hansbrough
Jan 31, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added notification styles for re-verification and general on LMS
parent
3e1519c6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
139 additions
and
18 deletions
+139
-18
lms/static/sass/base/_variables.scss
+9
-0
lms/static/sass/elements/_system-feedback.scss
+66
-7
lms/static/sass/multicourse/_dashboard.scss
+45
-0
lms/static/sass/views/_verification.scss
+0
-0
lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html
+7
-3
lms/templates/dashboard/_dashboard_reverification_sidebar.html
+12
-8
No files found.
lms/static/sass/base/_variables.scss
View file @
86588c49
...
...
@@ -224,6 +224,15 @@ $error-color: $error-red;
$warning-color
:
$m-pink
;
$confirm-color
:
$m-green
;
// Notifications
$notify-banner-bg1
:
rgb
(
56
,
56
,
56
);
$notify-banner-bg2
:
rgb
(
136
,
136
,
136
);
$notify-banner-bg3
:
rgb
(
223
,
223
,
223
);
$alert-color
:
rgb
(
212
,
64
,
64
);
//rich red
$warning-color
:
rgb
(
237
,
189
,
60
);
//rich yellow
$success-color
:
rgb
(
37
,
184
,
90
);
//rich green
// ====================
// MISC: visual horizontal rules
...
...
lms/static/sass/elements/_system-feedback.scss
View file @
86588c49
...
...
@@ -5,11 +5,12 @@
// UI : message
.wrapper-msg
{
box-shadow
:
0
0
5px
$
action-primary-shadow
inset
;
margin-bottom
:
(
$baseline
*
1
.5
);
box-shadow
:
0
0
5px
$
shadow-d1
inset
;
margin-bottom
:
(
$baseline
/
4
);
padding
:
$baseline
(
$baseline
*
1
.5
);
background
:
$
action-primary-bg
;
background
:
$
notify-banner-bg1
;
// basic object
.msg
{
@include
clearfix
();
max-width
:
grid-width
(
12
);
...
...
@@ -25,24 +26,23 @@
}
.msg-content
{
width
:
flex-grid
(
10
,
12
);
.title
{
@extend
%t-title5
;
@extend
%t-weight4
;
margin-bottom
:
(
$baseline
/
4
);
color
:
$white
;
color
:
inherit
;
text-transform
:
none
;
letter-spacing
:
0
;
}
.copy
{
@extend
%t-copy-sub1
;
color
:
$white
;
color
:
inherit
;
p
{
// nasty reset
@extend
%t-copy-sub1
;
color
:
$white
;
color
:
inherit
;
}
}
}
...
...
@@ -57,6 +57,7 @@
width
:
flex-grid
(
2
,
12
);
display
:
inline-block
;
vertical-align
:
middle
;
text-align
:
right
;
.action-primary
{
@extend
%btn-primary-green
;
...
...
@@ -64,7 +65,65 @@
}
}
.is-dismissable
{
.msg-content
{
width
:
flex-grid
(
11
,
12
);
}
.action-dismiss
{
width
:
flex-grid
(
1
,
12
);
display
:
inline-block
;
vertical-align
:
top
;
text-align
:
right
;
.button-dismiss
{
//ugly reset on button element
@extend
%t-icon4
;
background
:
none
;
box-shadow
:
none
;
border
:
none
;
text-shadow
:
none
;
color
:
inherit
;
}
}
}
// object variations
&
.urgency-high
{
background
:
$notify-banner-bg1
;
.msg
{
color
:
$white
;
}
}
&
.urgency-mid
{
background
:
$notify-banner-bg2
;
.msg
{
color
:
$white
;
}
}
&
.urgency-low
{
background
:
$notify-banner-bg3
;
.msg
{
color
:
$black
;
}
}
&
.alert
{
border-top
:
3px
solid
$alert-color
;
}
&
.warning
{
border-top
:
3px
solid
$warning-color
;
}
&
.success
{
border-top
:
3px
solid
$success-color
;
}
}
// prompts
...
...
lms/static/sass/multicourse/_dashboard.scss
View file @
86588c49
...
...
@@ -133,6 +133,51 @@
}
}
}
.reverify-status-list
{
padding
:
0
0
0
9px
;
.status-item
{
@extend
%t-copy-sub2
;
margin-bottom
:
7px
;
border-bottom
:
0
;
padding
:
0
;
[
class
^=
"icon-"
]
{
display
:
inline-block
;
vertical-align
:
top
;
margin
:
(
$baseline
/
10
)
(
$baseline
/
4
)
0
0
;
}
&
.is-open
[
class
^=
"icon-"
]
{
color
:
$action-primary-bg
;
}
&
.is-pending
[
class
^=
"icon-"
]
{
color
:
$warning-color
;
}
&
.is-approved
[
class
^=
"icon-"
]
{
color
:
$success-color
;
}
&
.is-denied
[
class
^=
"icon-"
]
{
color
:
$alert-color
;
}
.label
{
@extend
%text-sr
;
}
.course-name
{
display
:
inline-block
;
vertical-align
:
top
;
width
:
80%
;
color
:
inherit
;
line-height
:
1
.4
;
}
}
}
}
.news-carousel
{
...
...
lms/static/sass/views/_verification.scss
View file @
86588c49
This diff is collapsed.
Click to expand it.
lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html
View file @
86588c49
...
...
@@ -2,8 +2,9 @@
<
%!
from
django
.
core
.
urlresolvers
import
reverse
%
>
<!--TODO replace this with something a clever deisgn person approves of-->
<!--TODO replace this with a shiny loopy thing to actually print out all courses-->
% if reverifications["must_reverify"]:
<div
class=
"wrapper-msg"
>
<div
class=
"wrapper-msg
urgency-high
"
>
<div
class=
"msg msg-reverify has-actions"
>
<div
class=
"msg-content"
>
<h2
class=
"title"
>
${_("You need to re-verify to continue")}
</h2>
...
...
@@ -27,8 +28,8 @@
%endif
%if reverifications["denied"]:
<div
class=
"wrapper-msg"
>
<div
class=
"msg msg-reverify
has-actions
"
>
<div
class=
"wrapper-msg
urgency-low
"
>
<div
class=
"msg msg-reverify
is-dismissable
"
>
<div
class=
"msg-content"
>
<h2
class=
"title"
>
${_("Your re-verification failed")}
</h2>
% for course_id, course_name, course_number, date, status in reverifications["denied"]:
...
...
@@ -38,6 +39,9 @@
</p>
</div>
</div>
<div
class=
"action-dismiss"
>
<button
class=
"button-dismiss"
><i
class=
"icon-remove-sign"
></i>
<span
class=
"sr"
>
Dismiss
</span></button>
</div>
</div>
</div>
</div>
...
...
lms/templates/dashboard/_dashboard_reverification_sidebar.html
View file @
86588c49
...
...
@@ -2,31 +2,36 @@
<
%!
from
django
.
core
.
urlresolvers
import
reverse
%
>
<!--TODO replace this with something a clever deisgn person approves of-->
<!--TODO replace this with a shiny loopy thing to actually print out all courses-->
% if reverifications["must_reverify"] or reverifications["pending"] or reverifications["denied"] or reverifications["approved"]:
<li
class=
"status status-verification is-accepted"
>
<span
class=
"title status-title"
>
${_("Re-verification now open for:")}
</span>
<ul
class=
"reverify-status-list"
>
<h2
class=
"title"
>
${_("Re-verification now open for")}
</h2>
% if reverifications["must_reverify"]:
% for course_id, course_name, course_number, date, status in reverifications["must_reverify"]:
${_('Must Reverify:
<strong>
{course_name}
</strong>
').format(course_name=course_name)}
<li
class=
"status-item is-open"
>
${_('
<i
class=
"icon-circle"
></i><span
class=
"label"
>
Re-verify now:
</span>
<span
class=
"course-name"
><a
href=
""
>
{course_name}
</span></a>
').format(course_name=course_name)}
</li>
% endfor
%endif
% if reverifications["pending"]:
% for course_id, course_name, course_number, date, status in reverifications["pending"]:
${_('Denied:
<strong>
{course_name}
</strong>
').format(course_name=course_name)}
<li
class=
"status-item is-pending"
>
${_('
<i
class=
"icon-circle"
></i><span
class=
"label"
>
Pending:
</span>
<span
class=
"course-name"
><a
href=
""
>
{course_name}
</span></a>
').format(course_name=course_name)}
</li>
% endfor
%endif
% if reverifications["denied"]:
% for course_id, course_name, course_number, date, status in reverifications["denied"]:
${_('Denied:
<strong>
{course_name}
</strong>
').format(course_name=course_name)}
<li
class=
"status-item is-denied"
>
${_('
<i
class=
"icon-remove-sign"
></i><span
class=
"label"
>
Denied:
</span>
<span
class=
"course-name"
><a
href=
""
>
{course_name}
</span></a>
').format(course_name=course_name)}
</li>
% endfor
%endif
% if reverifications["approved"]:
% for course_id, course_name, course_number, date, status in reverifications["approved"]:
${_('Denied:
<strong>
{course_name}
</strong>
').format(course_name=course_name)}
<li
class=
"status-item is-approved"
>
${_('
<i
class=
"icon-ok"
></i><span
class=
"label"
>
Approved:
</span>
<span
class=
"course-name"
><a
href=
""
>
{course_name}
</span></a>
').format(course_name=course_name)}
</li>
% endfor
%endif
%endif
\ No newline at end of file
</ul>
</li>
%endif
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