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
c4e8673d
Commit
c4e8673d
authored
Nov 12, 2014
by
Marco Morales
Committed by
Andy Armstrong
Jan 15, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
creation of a courseware preview menu to contain staff view toggle.
parent
55d2f1d5
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
94 additions
and
71 deletions
+94
-71
lms/static/sass/base/_base.scss
+3
-0
lms/static/sass/base/_variables.scss
+4
-2
lms/static/sass/course-rtl.scss.mako
+1
-0
lms/static/sass/course.scss.mako
+1
-0
lms/static/sass/course/base/_base.scss
+8
-2
lms/static/sass/course/base/_extends.scss
+11
-0
lms/static/sass/course/layout/_courseware_header.scss
+10
-12
lms/static/sass/course/layout/_courseware_preview.scss
+27
-0
lms/static/sass/course/layout/_courseware_subnav.scss
+0
-52
lms/static/sass/ie.scss
+1
-1
lms/templates/courseware/course_navigation.html
+28
-2
No files found.
lms/static/sass/base/_base.scss
View file @
c4e8673d
// lms - base
// ====================
// html {
// html {
// overflow-y: scroll;
// overflow-y: scroll;
// }
// }
...
...
lms/static/sass/base/_variables.scss
View file @
c4e8673d
...
@@ -360,12 +360,14 @@ $dashboard-course-cover-border: $light-gray;
...
@@ -360,12 +360,14 @@ $dashboard-course-cover-border: $light-gray;
// MISC: course assets
// MISC: course assets
$content-wrapper-bg
:
$white
;
$content-wrapper-bg
:
$white
;
$course-bg-color
:
#d6d6d6
;
$course-bg-color
:
#f2f2f2
;
$course-bg-image
:
url(../images/bg-texture.png)
;
$account-content-wrapper-bg
:
shade
(
$body-bg
,
2%
);
$account-content-wrapper-bg
:
shade
(
$body-bg
,
2%
);
$course-profile-bg
:
rgb
(
245
,
245
,
245
);
$course-profile-bg
:
rgb
(
245
,
245
,
245
);
$course-header-bg
:
rgba
(
255
,
255
,
255
,
0
.93
);
$course-header-bg
:
rgba
(
255
,
255
,
255
,
0
.93
);
// MISC: course background texture
//$course-bg-image: url(../images/bg-texture.png);
// MISC: borders
// MISC: borders
$border-color-1
:
rgb
(
190
,
190
,
190
);
$border-color-1
:
rgb
(
190
,
190
,
190
);
$border-color-2
:
rgb
(
200
,
200
,
200
);
$border-color-2
:
rgb
(
200
,
200
,
200
);
...
...
lms/static/sass/course-rtl.scss.mako
View file @
c4e8673d
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
// course - base
// course - base
@import 'course/layout/courseware_header';
@import 'course/layout/courseware_header';
@import 'course/layout/courseware_preview';
@import 'course/layout/footer';
@import 'course/layout/footer';
@import 'course/base/mixins';
@import 'course/base/mixins';
@import 'course/base/base';
@import 'course/base/base';
...
...
lms/static/sass/course.scss.mako
View file @
c4e8673d
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
// course - base
// course - base
@import 'course/layout/courseware_header';
@import 'course/layout/courseware_header';
@import 'course/layout/courseware_preview';
@import 'course/layout/footer';
@import 'course/layout/footer';
@import 'course/base/mixins';
@import 'course/base/mixins';
@import 'course/base/base';
@import 'course/base/base';
...
...
lms/static/sass/course/base/_base.scss
View file @
c4e8673d
// lms - course - base
// ====================
body
{
body
{
min-width
:
980px
;
min-width
:
980px
;
min-height
:
100%
;
min-height
:
100%
;
background-image
:
$course-bg-image
;
background-color
:
$course-bg-color
;
background-color
:
$course-bg-color
;
//for background texture:
//background-image: $course-bg-image;
}
}
body
,
h1
,
h2
,
h3
,
h4
,
h5
,
h6
,
p
,
p
a
:link
,
p
a
:visited
,
a
,
label
{
body
,
h1
,
h2
,
h3
,
h4
,
h5
,
h6
,
p
,
p
a
:link
,
p
a
:visited
,
a
,
label
{
...
@@ -27,7 +32,7 @@ a {
...
@@ -27,7 +32,7 @@ a {
}
}
.container
{
.container
{
padding
:
20px
0
0
0
;
padding
:
0
;
>
div
{
>
div
{
display
:
table
;
display
:
table
;
...
@@ -53,6 +58,7 @@ form.choicegroup {
...
@@ -53,6 +58,7 @@ form.choicegroup {
}
}
}
}
textarea
,
textarea
,
input
[
type
=
"text"
],
input
[
type
=
"text"
],
input
[
type
=
"email"
],
input
[
type
=
"email"
],
...
...
lms/static/sass/course/base/_extends.scss
View file @
c4e8673d
// lms - course - extends
// ====================
// lms inner wrapper
%inner-wrapper
{
margin
:
0
auto
;
max-width
:
1180px
;
width
:
flex-grid
(
12
);
}
// Older Course Extends - to review/remove with LMS cleanup
h1
.top-header
{
h1
.top-header
{
border-bottom
:
1px
solid
$border-color-2
;
border-bottom
:
1px
solid
$border-color-2
;
@include
text-align
(
left
);
@include
text-align
(
left
);
...
...
lms/static/sass/course/layout/_courseware_header.scss
View file @
c4e8673d
nav
.
course-material
{
.wrapper-
course-material
{
@include
clearfix
();
@include
clearfix
();
@include
box-sizing
(
border-box
);
@include
box-sizing
(
border-box
);
border-bottom
:
none
;
border-bottom
:
none
;
margin
:
0
px
auto
0px
;
margin
:
0
auto
0
;
padding
:
0
px
;
padding
:
0
;
width
:
100%
;
width
:
100%
;
.inner-wrapper
{
.course-material
{
margin
:
0
auto
;
@extend
%inner-wrapper
;
max-width
:
1200px
;
width
:
flex-grid
(
12
);
}
}
ol
.course-tabs
{
ol
.course-tabs
{
@include
border-top-radius
(
4px
);
@include
border-top-radius
(
4px
);
@include
clearfix
();
@include
clearfix
();
padding
:
28px
0
10px
0
;
@include
margin-left
(
10px
);
@include
margin-left
(
10px
);
padding
:
(
$baseline
*
0
.75
)
0
(
$baseline
*
0
.75
)
0
;
li
{
li
{
@include
float
(
left
);
@include
float
(
left
);
...
@@ -30,7 +28,7 @@ nav.course-material {
...
@@ -30,7 +28,7 @@ nav.course-material {
}
}
&
.prominent
+
li
{
&
.prominent
+
li
{
padding-left
:
15px
;
padding-left
:
(
$baseline
*
0
.75
)
;
border-left
:
1px
solid
#333
;
border-left
:
1px
solid
#333
;
}
}
...
@@ -39,7 +37,7 @@ nav.course-material {
...
@@ -39,7 +37,7 @@ nav.course-material {
color
:
#555
;
color
:
#555
;
display
:
block
;
display
:
block
;
text-align
:
center
;
text-align
:
center
;
padding
:
10px
13px
12px
;
padding
:
(
$baseline
/
2
)
13px
12px
;
font-size
:
14px
;
font-size
:
14px
;
font-weight
:
bold
;
font-weight
:
bold
;
text-decoration
:
none
;
text-decoration
:
none
;
...
@@ -74,7 +72,7 @@ nav.course-material {
...
@@ -74,7 +72,7 @@ nav.course-material {
header
.global.slim
{
header
.global.slim
{
box-shadow
:
0
1px
2px
$shadow-l1
;
box-shadow
:
0
1px
2px
$shadow-l1
;
height
:
auto
;
height
:
auto
;
padding
:
5px
0
10px
0
;
padding
:
(
$baseline
/
4
)
0
(
$baseline
/
2
)
0
;
border-bottom
:
1px
solid
$outer-border-color
;
border-bottom
:
1px
solid
$outer-border-color
;
background
:
$header-bg
;
background
:
$header-bg
;
...
@@ -119,7 +117,7 @@ header.global.slim {
...
@@ -119,7 +117,7 @@ header.global.slim {
}
}
h1
.logo
{
h1
.logo
{
margin
:
0
10px
0
13px
;
margin
:
0
(
$baseline
/
2
)
0
0
;
@include
padding-right
(
20px
);
@include
padding-right
(
20px
);
&
:before
{
&
:before
{
...
...
lms/static/sass/course/layout/_courseware_preview.scss
0 → 100644
View file @
c4e8673d
.wrapper-preview-menu
{
@include
clearfix
();
@include
box-sizing
(
border-box
);
margin
:
0
auto
0
;
padding
:
(
$baseline
*
0
.75
);
width
:
100%
;
background-color
:
$gray-l3
;
.preview-menu
{
@extend
%inner-wrapper
;
}
.preview-actions
{
display
:
inline-block
;
.action-preview
{
display
:
inline-block
;
.action-preview-label
{
display
:
inline-block
;
margin-right
:
(
$baseline
/
2
);
margin-bottom
:
0
;
vertical-align
:
middle
;
}
}
}
}
lms/static/sass/course/layout/_courseware_subnav.scss
deleted
100644 → 0
View file @
55d2f1d5
nav
.course-material
{
@include
clearfix
();
@include
box-sizing
(
border-box
);
background
:
none
;
margin
:
0px
auto
0px
;
padding
:
0px
;
width
:
100%
;
.inner-wrapper
{
margin
:
0
auto
;
max-width
:
1200px
;
width
:
flex-grid
(
12
);
}
ol
.course-tabs
{
@include
border-top-radius
(
4px
);
@include
clearfix
();
padding
:
10px
0
0
0
;
li
{
@include
float
(
left
);
list-style
:
none
;
a
{
color
:
darken
(
$lighter-base-font-color
,
20%
);
display
:
block
;
text-align
:
center
;
padding
:
8px
13px
12px
;
font-size
:
14px
;
font-weight
:
400
;
text-decoration
:
none
;
text-shadow
:
0
1px
rgb
(
255
,
255
,
255
);
&
:hover
,
&
:focus
{
color
:
$base-font-color
;
}
&
.active
{
color
:
$blue
;
}
}
}
}
}
.course-content
{
margin-top
:
(
$baseline
*
1
.5
);
.courseware
{
min-height
:
300px
;
}
}
lms/static/sass/ie.scss
View file @
c4e8673d
...
@@ -139,7 +139,7 @@
...
@@ -139,7 +139,7 @@
}
}
// active navigation
// active navigation
nav
.
course-material
ol
.course-tabs
li
a
.active
,
nav
.course-material
.xmodule_SequenceModule
nav
.sequence-nav
ol
.course-tabs
li
a
.seq_video.active
,
.xmodule_SequenceModule
nav
.sequence-nav
nav
.
course-material
ol
.course-tabs
li
a
.seq_video.active
{
nav
.
wrapper-course-material
ol
.course-tabs
li
a
.active
,
nav
.wrapper-course-material
.xmodule_SequenceModule
nav
.sequence-nav
ol
.course-tabs
li
a
.seq_video.active
,
.xmodule_SequenceModule
nav
.sequence-nav
nav
.wrapper-
course-material
ol
.course-tabs
li
a
.seq_video.active
{
background-color
:
#333
;
background-color
:
#333
;
background-color
:
rgba
(
0
,
0
,
0
,
.4
);
background-color
:
rgba
(
0
,
0
,
0
,
.4
);
}
}
...
...
lms/templates/courseware/course_navigation.html
View file @
c4e8673d
...
@@ -23,9 +23,35 @@ def url_class(is_active):
...
@@ -23,9 +23,35 @@ def url_class(is_active):
user_is_enrolled =
user.is_authenticated()
and
CourseEnrollment
.
is_enrolled
(
user
,
course
.
id
)
user_is_enrolled =
user.is_authenticated()
and
CourseEnrollment
.
is_enrolled
(
user
,
course
.
id
)
%
>
%
>
% if show_preview_menu:
<nav
class=
"wrapper-preview-menu"
>
<div
class=
"preview-menu"
>
<ol
class=
"preview-actions"
>
<li
class=
"action-preview"
>
<form
action=
"#"
class=
"action-preview-form"
method=
"post"
>
<label
for=
"action-preview-select"
class=
"action-preview-label"
>
${_("previewing as:")}
</label>
<select
class=
"action-preview-select"
id=
"action-preview-select"
name=
"select"
>
<option
value=
"staff"
${"
selected
"
if
not
is_student_masquerade
else
""}
>
${_("Staff")}
</option>
<option
value=
"student"
${"
selected
"
if
is_student_masquerade
and
not
masquerade_group_id
else
""}
>
${_("Student")}
</option>
% if cohorted_user_partition:
% for group in sorted(cohorted_user_partition.groups, key=lambda group: group.name):
<option
value=
"group.id"
data-group-id=
"${group.id}"
${"
selected
"
if
masquerade_group_id =
=
group
.
id
else
""}
>
${_("Student in {content_group}").format(content_group=group.name)}
</option>
% endfor
% endif
</select>
<button
type=
"submit"
class=
"sr"
name=
"submit"
value=
"submit"
>
${_("set preview mode")}
</button>
</form>
</li>
</ol>
</div>
</nav>
% endif
% if disable_tabs is UNDEFINED or not disable_tabs:
% if disable_tabs is UNDEFINED or not disable_tabs:
<nav
class=
"${active_page} course-material"
>
<nav
class=
"${active_page}
wrapper-
course-material"
>
<div
class=
"
inner-wrapper
"
>
<div
class=
"
course-material
"
>
<ol
class=
"course-tabs"
>
<ol
class=
"course-tabs"
>
% for tab in CourseTabList.iterate_displayable(course, settings, user.is_authenticated(), has_access(user, 'staff', course, course.id), user_is_enrolled):
% for tab in CourseTabList.iterate_displayable(course, settings, user.is_authenticated(), has_access(user, 'staff', course, course.id), user_is_enrolled):
<
%
<
%
...
...
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