From d68945de334912ba24cfbd93948f0ecd572d2e60 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Tue, 30 Oct 2012 15:04:21 -0400 Subject: [PATCH 01/26] started adding settings page --- cms/djangoapps/contentstore/views.py | 4 +++ cms/static/sass/_settings.scss | 39 ++++++++++++++++++++++ cms/static/sass/base-style.scss | 1 + cms/templates/settings.html | 48 ++++++++++++++++++++++++++++ cms/urls.py | 1 + 5 files changed, 93 insertions(+) create mode 100644 cms/static/sass/_settings.scss create mode 100644 cms/templates/settings.html diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 05cde6043d..8794404118 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -869,6 +869,10 @@ def edit_static(request, org, course, coursename): return render_to_response('edit-static-page.html', {}) +def settings(request, org, course, coursename): + return render_to_response('settings.html', {}) + + def not_found(request): return render_to_response('error.html', {'error': '404'}) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss new file mode 100644 index 0000000000..7dd349adb9 --- /dev/null +++ b/cms/static/sass/_settings.scss @@ -0,0 +1,39 @@ +.settings { + .settings-overview { + @extend .window; + padding: 30px 40px; + + .details { + margin-bottom: 20px; + font-size: 14px; + } + + .row { + margin-bottom: 20px; + padding-bottom: 0; + border-bottom: none; + } + + label { + display: inline-block; + width: 200px; + font-size: 14px; + + &.check-label { + display: inline; + } + } + } + + h2 { + margin-bottom: 20px; + font-size: 24px; + font-weight: 300; + } + + section { + border-bottom: 1px solid $mediumGrey; + margin-bottom: 40px; + padding-bottom: 40px; + } +} \ No newline at end of file diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index 6a6105c109..73812125a8 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -18,6 +18,7 @@ @import "static-pages"; @import "users"; @import "import"; +@import "settings"; @import "course-info"; @import "landing"; @import "graphics"; diff --git a/cms/templates/settings.html b/cms/templates/settings.html new file mode 100644 index 0000000000..8df3cede31 --- /dev/null +++ b/cms/templates/settings.html @@ -0,0 +1,48 @@ +<%inherit file="base.html" /> +<%! from django.core.urlresolvers import reverse %> +<%block name="bodyclass">settings +<%block name="title">Settings + +<%namespace name='static' file='static_content.html'/> + +<%block name="jsextra"> + + + +<%block name="content"> +
+
+

Settings

+
+
+

Details

+
+ + +
+
+ + +
+
+ + +
+
+
+

Grading

+
+ + +
+
+
+

Problems

+
+ +
+
+
+
+
+ diff --git a/cms/urls.py b/cms/urls.py index 7b3dd90a0b..620460ad35 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -37,6 +37,7 @@ urlpatterns = ('', url(r'^pages/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.static_pages', name='static_pages'), url(r'^edit_static/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.edit_static', name='edit_static'), url(r'^(?P[^/]+)/(?P[^/]+)/assets/(?P[^/]+)$', 'contentstore.views.asset_index', name='asset_index'), + url(r'^settings/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.settings', name='settings'), # temporary landing page for a course url(r'^edge/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.landing', name='landing'), From ef4b2f044f7a0257d505d153d19437949123e7c2 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 31 Oct 2012 17:03:06 -0400 Subject: [PATCH 02/26] =?UTF-8?q?basic=20settings=20framework=20=E2=80=93?= =?UTF-8?q?=20wip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cms/static/sass/_settings.scss | 244 ++++++++++++++++++++++++++++++--- cms/templates/settings.html | 197 ++++++++++++++++++++++---- 2 files changed, 396 insertions(+), 45 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index 7dd349adb9..97d391525b 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -1,39 +1,251 @@ .settings { .settings-overview { @extend .window; - padding: 30px 40px; + @include clearfix; + display: table; + width: 100%; - .details { - margin-bottom: 20px; - font-size: 14px; + .sidebar { + display: table-cell; + float: none; + width: 20%; + padding: 30px 0 30px 20px; + border-radius: 3px 0 0 3px; + background: $lightGrey; } - .row { - margin-bottom: 20px; - padding-bottom: 0; - border-bottom: none; + .main-column { + display: table-cell; + float: none; + width: 80%; + padding: 30px 40px 30px 60px; } label { display: inline-block; width: 200px; - font-size: 14px; + font-size: 15px; + font-weight: 400; &.check-label { display: inline; + margin-left: 10px; + } + + &.cutoff { + float: left; + width: 90px; + line-height: 38px; + } + } + + input { + font-size: 15px; + + &.long { + width: 400px; + } + + &.short { + width: 100px; + } + + &.date { + width: 140px; + } + } + + .settings-page-section { + > section { + display: none; + margin-bottom: 40px; + + &.is-shown { + display: block; + } + + .row { + margin-bottom: 20px; + padding: 0; + border-bottom: none; + + &:last-child { + margin-bottom: 0; + } + } + + &:last-child { + border-bottom: none; + } + + > section { + padding-bottom: 40px; + margin-bottom: 40px; + border-radius: 3px; + border-bottom: 1px solid $mediumGrey; + @include clearfix; + + &:last-child { + padding-bottom: 0; + border-bottom: none; + } + } + } + } + + .settings-page-menu { + a { + display: block; + padding-left: 20px; + line-height: 52px; + + &.is-shown { + background: #fff; + border-radius: 5px 0 0 5px; + } } } } h2 { - margin-bottom: 20px; - font-size: 24px; - font-weight: 300; + margin-bottom: 30px; + font-size: 28px; + font-weight: 300; + color: $blue; } - section { - border-bottom: 1px solid $mediumGrey; - margin-bottom: 40px; - padding-bottom: 40px; + h3 { + margin-bottom: 20px; + font-size: 15px; + font-weight: 700; + line-height: 34px; + color: $blue; + } + + .grade-slider { + float: left; + width: 500px; + + .grade-bar { + position: relative; + width: 100%; + height: 40px; + background: $lightGrey; + + .increments { + position: relative; + + li { + position: absolute; + top: 42px; + width: 30px; + margin-left: -15px; + font-size: 9px; + text-align: center; + + &.increment-0 { + left: 0; + } + + &.increment-10 { + left: 10%; + } + + &.increment-20 { + left: 20%; + } + + &.increment-30 { + left: 30%; + } + + &.increment-40 { + left: 40%; + } + + &.increment-50 { + left: 50%; + } + + &.increment-60 { + left: 60%; + } + + &.increment-70 { + left: 70%; + } + + &.increment-80 { + left: 80%; + } + + &.increment-90 { + left: 90%; + } + + &.increment-100 { + left: 100%; + } + } + } + + .grades { + position: relative; + + li { + position: absolute; + top: 0; + height: 40px; + text-align: right; + color: rgba(0, 0, 0, .5); + + &.bar-a { + background: #4fe696; + width: 100%; + } + + &.bar-b { + background: #ffdf7e; + width: 80%; + } + + &.bar-c { + background: #ef68a6; + width: 70%; + } + + .letter-grade { + display: block; + margin: 6px 5px 0 0; + font-size: 14px; + font-weight: 700; + line-height: 14px; + } + + .range { + display: block; + margin-right: 5px; + font-size: 10px; + line-height: 12px; + } + + .drag-bar { + position: absolute; + top: 0; + right: -1px; + height: 40px; + width: 2px; + background-color: #fff; + cursor: ew-resize; + @include transition(none); + + &:hover { + width: 4px; + right: -2px; + } + } + } + } + } } } \ No newline at end of file diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 8df3cede31..0d8f7f05b0 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -6,42 +6,181 @@ <%namespace name='static' file='static_content.html'/> <%block name="jsextra"> + <%block name="content">
-
+

Settings

-
-

Details

-
- - -
-
- - -
-
- - -
-
-
-

Grading

-
- - -
-
-
-

Problems

-
- -
-
+
+ +
+
+
+

Course Details

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+

Grading

+
+ +
+
+
    +
  1. 0
    2. +
  2. 10
    3. +
  3. 20
    4. +
  4. 30
    5. +
  5. 40
    6. +
  6. 50
    7. +
  7. 60
    8. +
  8. 70
    9. +
  9. 80
    10. +
  10. 90
    11. +
  11. 100
    12. +
+
    +
  1. + A + 80–100 +
    2. +
  2. + B + 70–80 + +
    3. +
  3. + C + 0–70 + +
    4. +
+
+
+
+
+
+ + +
+
+
+

Homework

+
+ + +
+
+ + +
+
+ + +
+
+
+

Lab

+
+ + +
+
+ + +
+
+ + +
+
+
+
+

Problems

+
+ +
+
+
From a6d5edce5e871261d0ee4c5ed91089c8e1a0c10a Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Thu, 1 Nov 2012 11:34:02 -0400 Subject: [PATCH 03/26] polished grade range slider --- cms/static/sass/_settings.scss | 79 +++++++++++++++++++------ cms/templates/settings.html | 105 +++++++++++++++++++++------------ 2 files changed, 128 insertions(+), 56 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index 97d391525b..0834a90893 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -32,10 +32,8 @@ margin-left: 10px; } - &.cutoff { - float: left; - width: 90px; - line-height: 38px; + &.ranges { + margin-bottom: 20px; } } @@ -115,16 +113,43 @@ } h3 { - margin-bottom: 20px; + margin-bottom: 30px; font-size: 15px; font-weight: 700; - line-height: 34px; color: $blue; } + .grade-controls { + @include clearfix; + } + + .new-grade-button { + position: relative; + float: left; + display: block; + width: 29px; + height: 29px; + margin: 4px 10px 0 0; + border-radius: 20px; + border: 1px solid $darkGrey; + @include linear-gradient(top, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0)); + background-color: #d1dae3; + @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset); + color: #6d788b; + + .plus-icon { + position: absolute; + top: 50%; + left: 50%; + margin-left: -6px; + margin-top: -6px; + } + } + .grade-slider { float: left; - width: 500px; + width: 560px; + height: 60px; .grade-bar { position: relative; @@ -197,26 +222,46 @@ top: 0; height: 40px; text-align: right; - color: rgba(0, 0, 0, .5); - &.bar-a { + &:hover, + &.is-dragging { + .remove-button { + display: block; + } + } + + .remove-button { + display: none; + position: absolute; + top: -17px; + right: 1px; + height: 17px; + font-size: 10px; + } + + &:nth-child(1) { background: #4fe696; - width: 100%; } - &.bar-b { + &:nth-child(2) { background: #ffdf7e; - width: 80%; } - &.bar-c { - background: #ef68a6; - width: 70%; + &:nth-child(3) { + background: #ffb657; + } + + &:nth-child(4) { + background: #fb336c; + } + + &:nth-child(5) { + background: #ef54a1; } .letter-grade { display: block; - margin: 6px 5px 0 0; + margin: 7px 5px 0 0; font-size: 14px; font-weight: 700; line-height: 14px; @@ -225,7 +270,7 @@ .range { display: block; margin-right: 5px; - font-size: 10px; + font-size: 9px; line-height: 12px; } diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 0d8f7f05b0..1630ad4ffa 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -13,15 +13,31 @@ var barOrigin; var barWidth; var gradeThresholds; + var GRADES = ['A', 'B', 'C', 'D', 'E']; (function() { $body = $('body'); $gradeBar = $('.grade-bar'); gradeThresholds = [100, 80, 70]; $('.settings-page-menu a').bind('click', showSettingsTab); - $('.drag-bar').bind('mousedown', startDragBar); + $body.on('mousedown', '.drag-bar', startDragBar); + $('.new-grade-button').bind('click', addNewGrade); + $body.on('click', '.remove-button', removeGrade); })(); + function addNewGrade(e) { + e.preventDefault(); + var $newGradeBar = $('
  • ' + GRADES[$('.grades li').length] + 'remove
    • '); + $('.grades').append($newGradeBar); + } + + function removeGrade(e) { + e.preventDefault(); + var index = $(this).closest('li').index(); + gradeThresholds.splice(index, 1); + $(this).closest('li').remove(); + } + function showSettingsTab(e) { e.preventDefault(); $('.settings-page-section > section').hide(); @@ -34,28 +50,33 @@ e.preventDefault(); barOrigin = $gradeBar.offset().left; barWidth = $gradeBar.width(); - $draggingBar = $(e.target).closest('li'); + $draggingBar = $(e.target).closest('li').addClass('is-dragging'); $body.bind('mousemove', moveBar); $body.bind('mouseup', stopDragBar); } function moveBar(e) { - var percentage = (e.pageX - barOrigin) / barWidth * 100; + var barIndex = $draggingBar.index(); + console.log(barIndex); + var min = gradeThresholds[barIndex + 1] || 0; + var max = gradeThresholds[barIndex - 1] || 100; + var percentage = Math.min(Math.max((e.pageX - barOrigin) / barWidth * 100, min), max); $draggingBar.css('width', percentage + '%'); gradeThresholds[$draggingBar.index()] = Math.round(percentage); renderGradeRanges(); } function stopDragBar(e) { + $draggingBar.removeClass('is-dragging'); $body.unbind('mousemove', moveBar); $body.unbind('mouseup', stopDragBar); } function renderGradeRanges() { $('.range').each(function(i) { - var min = gradeThresholds[i + 1] || 0; + var min = gradeThresholds[i + 1] + 1 || 0; var max = gradeThresholds[i]; - $(this).text(min + '–' + max); + $(this).text(min + '-' + max); }); } @@ -76,7 +97,7 @@
    -
    +

    Course Details

    @@ -99,41 +120,47 @@
    -
    +

    Grading

    - -
    -
    -
      -
    1. 0
      2. -
    2. 10
      3. -
    3. 20
      4. -
    4. 30
      5. -
    5. 40
      6. -
    6. 50
      7. -
    7. 60
      8. -
    8. 70
      9. -
    9. 80
      10. -
    10. 90
      11. -
    11. 100
      12. -
    -
      -
    1. - A - 80–100 -
      2. -
    2. - B - 70–80 - -
      3. -
    3. - C - 0–70 - -
      4. -
    + +
    + +
    +
    +
      +
    1. 0
      2. +
    2. 10
      3. +
    3. 20
      4. +
    4. 30
      5. +
    5. 40
      6. +
    6. 50
      7. +
    7. 60
      8. +
    8. 70
      9. +
    9. 80
      10. +
    10. 90
      11. +
    11. 100
      12. +
    +
      +
    1. + A + 81-100 + remove +
      2. +
    2. + B + 71-80 + + remove +
      3. +
    3. + C + 0-70 + + remove +
      4. +
    +
    From 7887f92e3ba50517eb388e94e51257c395986b52 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Thu, 1 Nov 2012 11:34:31 -0400 Subject: [PATCH 04/26] removed log --- cms/templates/settings.html | 1 - 1 file changed, 1 deletion(-) diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 1630ad4ffa..4110f72ef4 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -57,7 +57,6 @@ function moveBar(e) { var barIndex = $draggingBar.index(); - console.log(barIndex); var min = gradeThresholds[barIndex + 1] || 0; var max = gradeThresholds[barIndex - 1] || 100; var percentage = Math.min(Math.max((e.pageX - barOrigin) / barWidth * 100, min), max); From 3b42ea7e9e037e2f21e2ab2443fb580d1a0bee57 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 7 Nov 2012 15:00:48 -0500 Subject: [PATCH 05/26] added basic settings markup and revised sections based on additional fields/info needed --- cms/static/sass/_base.scss | 3 +- cms/static/sass/_settings.scss | 14 +- cms/templates/settings.html | 227 ++++++++++++++++++++++++++++++--- 3 files changed, 222 insertions(+), 22 deletions(-) diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index c1875edb06..a91d703d0f 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -80,7 +80,8 @@ footer { input[type="text"], input[type="email"], -input[type="password"] { +input[type="password"], +textarea { padding: 6px 8px 8px; @include box-sizing(border-box); border: 1px solid #b0b6c2; diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index 0834a90893..e26bf8dd8d 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -37,13 +37,17 @@ } } - input { + input, textarea { font-size: 15px; &.long { width: 400px; } + &.tall { + height: 200px; + } + &.short { width: 100px; } @@ -54,6 +58,14 @@ } .settings-page-section { + > .alert { + display: none; + + &.is-shown { + display: block; + } + } + > section { display: none; margin-bottom: 40px; diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 4110f72ef4..fa5443a0c0 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -90,35 +90,211 @@
    +

    Course Details

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    + +
    +
    +

    Basic Information

    + The nuts and bolts of your class +
    + +
    + + +
    +
    + + +
    +
    + + + e.g. 101x +
    +
    + + +
    +
    + +
    +
    +

    Dates & Times

    + The nuts and bolts of your class +
    + +
    + + + First day the class begins +
    + +
    + + + Last day of class activty +
    + +
    + + +
    +
      +
    1. +
      + + Milestone Date +
      + +
      + + Milestone Name +
      + + +
      2. +
    + + + New Class Milestone + +
    +
    +
    + +
    +
    +

    Introducing Your Course

    + How your course will be shown to students considering taking it +
    + +
    + + +
    + +
    + + + Used to introduce your class to perspective students +
    + +
    + + +
    +
    + +
    +
    +

    Requirements

    + Expectations of the students taking this course +
    + +
    + + +
    + +
    + + +
    + + + + New Link + +
    +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    +
      +
    1. +
      + + Textbook Name +
      + +
      + + Textbook URL +
      + + +
      2. +
    + + + New Textbook + +
    +
    +
    + +
    +
    +

    More Information

    + Other helpful information about the course +
    + +
    + + +
    +
      +
    1. +
      + + Question +
      + +
      + + Answer +
      + + +
      2. +
    + + + New Question & Answer + +
    +
    +
    +
    + +
    +

    Course Staff

    + +
    +

    Grading

    @@ -200,6 +376,17 @@
    + +
    +

    Handouts & Guides

    + +
    + + + PDF formatted file +
    +
    +

    Problems

    From 8f2ab52215a5d9e113b66669c28907d1b28fa66a Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 8 Nov 2012 17:48:38 -0500 Subject: [PATCH 06/26] in progress form styling of course info --- cms/static/sass/_settings.scss | 95 +++++++++++++++++++++++++++++++++- cms/templates/settings.html | 20 ++++--- 2 files changed, 102 insertions(+), 13 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index e26bf8dd8d..a3d74a5bd0 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -23,6 +23,7 @@ label { display: inline-block; + vertical-align: top; width: 200px; font-size: 15px; font-weight: 400; @@ -37,6 +38,12 @@ } } + .label-micro { + display: block; + margin-top: 5px; + font-size: 13px; + } + input, textarea { font-size: 15px; @@ -55,6 +62,61 @@ &.date { width: 140px; } + + &:focus { + border-color: $blue; + outline: 0; + } + } + + .field { + background: #b6eab1; + display: inline-block; + vertical-align: top; + min-width: 400px; + + input { + display: block; + } + + .input-list { + + .element { + position: relative; + width: 100%; + @include clearfix(); + + div { + float: left; + margin-right: 20px; + + &:last-child { + margin-right: 0; + } + } + + .delete-icon { + position: absolute; + right: 10px; + top: 10px; + } + } + + &.element-stacked { + + } + + &.element-multi { + + } + } + + .new-item { + margin-top: 20px; + padding-bottom: 10px; + @include grey-button; + @include box-sizing(border-box); + } } .settings-page-section { @@ -82,6 +144,13 @@ &:last-child { margin-bottom: 0; } + + .tip { + color: $mediumGrey; + display: inline-block; + margin-left: 10px; + font-size: 13px; + } } &:last-child { @@ -89,12 +158,34 @@ } > section { - padding-bottom: 40px; + padding-bottom: 60px; margin-bottom: 40px; border-radius: 3px; - border-bottom: 1px solid $mediumGrey; + border-bottom: 1px solid $lightGrey; @include clearfix; + header { + @include clearfix; + border-bottom: 1px solid $mediumGrey; + margin-bottom: 20px; + padding-bottom: 10px; + + h3 { + color: $darkGrey; + float: left; + + margin: 0 40px 0 0; + text-transform: uppercase; + } + + .detail { + float: right; + marign-top: 3px; + color: $mediumGrey; + font-size: 13px; + } + } + &:last-child { padding-bottom: 0; border-bottom: none; diff --git a/cms/templates/settings.html b/cms/templates/settings.html index fa5443a0c0..e13741ec4c 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -150,23 +150,22 @@
      -
    1. +
    2. Milestone Date
      - + Milestone Name
      -
    - New Class Milestone + New Class Milestone
    @@ -213,7 +212,7 @@ - New Link + New Link @@ -233,7 +232,7 @@
      -
    1. +
    2. Textbook Name @@ -244,12 +243,12 @@ Textbook URL
      - +
    - New Textbook + New Textbook
    @@ -266,7 +265,7 @@
      -
    1. +
    2. Question @@ -277,12 +276,11 @@ Answer
      -
    - New Question & Answer + New Question & Answer
    From f1e1f9e7e5b6f943b86036da31773faa610e0d3d Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 8 Nov 2012 18:11:48 -0500 Subject: [PATCH 07/26] in progress field layout styling --- cms/static/sass/_settings.scss | 51 ++++++++++++++++++++++------------ cms/templates/settings.html | 18 ++++++------ 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index a3d74a5bd0..4d292c8f31 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -64,16 +64,16 @@ } &:focus { + @include linear-gradient(tint($blue, 80%), tint($blue, 90%)); border-color: $blue; outline: 0; } } .field { - background: #b6eab1; display: inline-block; vertical-align: top; - min-width: 400px; + max-width: 400px; input { display: block; @@ -87,12 +87,7 @@ @include clearfix(); div { - float: left; - margin-right: 20px; - &:last-child { - margin-right: 0; - } } .delete-icon { @@ -102,12 +97,27 @@ } } - &.element-stacked { + .element-stacked { + div { + margin-bottom: 20px; + + &:last-child { + margin-bottom: 0; + } + } } - &.element-multi { + .element-multi { + div { + float: left; + margin-right: 20px; + + &:last-child { + margin-right: 0; + } + } } } @@ -137,19 +147,29 @@ } .row { - margin-bottom: 20px; - padding: 0; - border-bottom: none; + margin-bottom: 15px; + padding-bottom: 15px; + border-bottom: 1px solid $lightGrey; &:last-child { margin-bottom: 0; + padding-bottom: 0; + border-bottom: none; } .tip { color: $mediumGrey; + font-size: 13px; + } + + .tip-inline { display: inline-block; margin-left: 10px; - font-size: 13px; + } + + .tip-stacked { + display: block; + margin: 10px 0 0 200px; } } @@ -158,10 +178,7 @@ } > section { - padding-bottom: 60px; - margin-bottom: 40px; - border-radius: 3px; - border-bottom: 1px solid $lightGrey; + margin-bottom: 100px; @include clearfix; header { diff --git a/cms/templates/settings.html b/cms/templates/settings.html index e13741ec4c..4586fc423c 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -92,7 +92,7 @@
  • Course Details
  • Staff
  • Grading
    • -
  • Handouts & Guides
    • +
  • Handouts
  • Problems
    • @@ -119,7 +119,7 @@
    - e.g. 101x + e.g. 101x
    @@ -136,13 +136,13 @@
    - First day the class begins + First day the class begins
    - Last day of class activty + Last day of class activty
    @@ -174,7 +174,7 @@

    Introducing Your Course

    - How your course will be shown to students considering taking it + Information for perspective students
    @@ -185,7 +185,7 @@
    - Used to introduce your class to perspective students + Used to introduce your class to perspective students
    @@ -243,7 +243,7 @@ Textbook URL
    - + @@ -261,11 +261,11 @@
    - +
      -
    1. +
    2. Question From b1451127408c6bab206ef23e14bb3573524cf122 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 9 Nov 2012 08:39:54 -0500 Subject: [PATCH 08/26] multi-input field markup and styling --- cms/static/sass/_settings.scss | 27 +++++++++++++++++++++++---- cms/templates/settings.html | 10 ++++++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index 4d292c8f31..b0f45b2197 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -90,10 +90,24 @@ } - .delete-icon { - position: absolute; - right: 10px; - top: 10px; + .remove-item { + display: block; + border-top: 1px solid $lightGrey; + margin-top: 5px; + padding-top: 10px; + font-size: 13px; + } + } + + .element-group { + width: 400px; + padding: 15px 20px; + background: tint($lightGrey, 50%); + @include border-radius(3px); + @include box-sizing(border-box); + + input.long, textarea { + width: 100%; } } @@ -118,6 +132,11 @@ margin-right: 0; } } + + .remove-item { + float: left; + width: 100%; + } } } diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 4586fc423c..fe3c59f10f 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -150,7 +150,7 @@
        -
      1. +
      2. Milestone Date @@ -161,6 +161,7 @@ Milestone Name
        + Delete Milestone
      @@ -232,7 +233,7 @@
        -
      1. +
      2. Textbook Name @@ -243,7 +244,7 @@ Textbook URL
        - + Delete Textbook
      @@ -265,7 +266,7 @@
        -
      1. +
      2. Question @@ -276,6 +277,7 @@ Answer
        + Delete Question & Answer
      From 39fda1ea9bb04b60daa6fc1e31508a1268d925ea Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 9 Nov 2012 10:31:08 -0500 Subject: [PATCH 09/26] in progress staff section styling --- cms/static/sass/_settings.scss | 37 ++++++++++++++++++++++-- cms/templates/settings.html | 51 ++++++++++++++++++++++++++++++++-- 2 files changed, 84 insertions(+), 4 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index b0f45b2197..c2e285ce4a 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -70,6 +70,15 @@ } } + ::-webkit-input-placeholder { + color: $mediumGrey; + font-size: 13px; + } + :-moz-placeholder { + color: $mediumGrey; + font-size: 13px; + } + .field { display: inline-block; vertical-align: top; @@ -93,7 +102,7 @@ .remove-item { display: block; border-top: 1px solid $lightGrey; - margin-top: 5px; + margin-top: 10px; padding-top: 10px; font-size: 13px; } @@ -101,7 +110,7 @@ .element-group { width: 400px; - padding: 15px 20px; + padding: 15px; background: tint($lightGrey, 50%); @include border-radius(3px); @include box-sizing(border-box); @@ -242,6 +251,30 @@ } } } + + .settings-details { + + } + + .settings-staff { + + } + + .settings-grading { + + } + + .settings-handouts { + + } + + .settings-problems { + + } + + .settings-discussions { + + } } h2 { diff --git a/cms/templates/settings.html b/cms/templates/settings.html index fe3c59f10f..77800f99c5 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -94,6 +94,7 @@
    3. Grading
    4. Handouts
    5. Problems
      6. +
    6. Discussions
    @@ -152,7 +153,7 @@
    1. - + Milestone Date
      @@ -210,7 +211,16 @@
      - + +
        +
      1. +
        + +
        + + Delete Link +
        2. +
      New Link @@ -293,6 +303,38 @@

      Course Staff

      +
      +
      +

      Faculty

      +
      + +
        +
      1. +
        + + +
        +
        + + +
        +
        + + + This photo will appear on your course's info page +
        +
        + + + A brief description of your education, experience, and expertise +
        +
        2. +
      + +       + New Faculty Member + +
      @@ -393,6 +435,11 @@
    + +
    +

    Discussions

    + +
    From 65869461f819e3bcd3dad5908e40cd3d6b522056 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 14 Nov 2012 14:50:48 -0500 Subject: [PATCH 10/26] finalized layout and styling for course details and faculty settings --- cms/static/sass/_settings.scss | 765 +++++++++++++++++++-------------- cms/templates/settings.html | 619 +++++++++++++++----------- 2 files changed, 809 insertions(+), 575 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index c2e285ce4a..40d991937d 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -5,12 +5,13 @@ display: table; width: 100%; + // layout .sidebar { display: table-cell; float: none; width: 20%; padding: 30px 0 30px 20px; - border-radius: 3px 0 0 3px; + @include border-radius(3px 0 0 3px); background: $lightGrey; } @@ -21,139 +22,16 @@ padding: 30px 40px 30px 60px; } - label { - display: inline-block; - vertical-align: top; - width: 200px; - font-size: 15px; - font-weight: 400; - - &.check-label { - display: inline; - margin-left: 10px; - } - - &.ranges { - margin-bottom: 20px; - } - } - - .label-micro { - display: block; - margin-top: 5px; - font-size: 13px; - } - - input, textarea { - font-size: 15px; - - &.long { - width: 400px; - } - - &.tall { - height: 200px; - } - - &.short { - width: 100px; - } - - &.date { - width: 140px; - } - - &:focus { - @include linear-gradient(tint($blue, 80%), tint($blue, 90%)); - border-color: $blue; - outline: 0; - } - } - - ::-webkit-input-placeholder { - color: $mediumGrey; - font-size: 13px; - } - :-moz-placeholder { - color: $mediumGrey; - font-size: 13px; - } - - .field { - display: inline-block; - vertical-align: top; - max-width: 400px; - - input { + .settings-page-menu { + a { display: block; - } + padding-left: 20px; + line-height: 52px; - .input-list { - - .element { - position: relative; - width: 100%; - @include clearfix(); - - div { - - } - - .remove-item { - display: block; - border-top: 1px solid $lightGrey; - margin-top: 10px; - padding-top: 10px; - font-size: 13px; - } + &.is-shown { + background: #fff; + @include border-radius(5px 0 0 5px); } - - .element-group { - width: 400px; - padding: 15px; - background: tint($lightGrey, 50%); - @include border-radius(3px); - @include box-sizing(border-box); - - input.long, textarea { - width: 100%; - } - } - - .element-stacked { - - div { - margin-bottom: 20px; - - &:last-child { - margin-bottom: 0; - } - } - } - - .element-multi { - - div { - float: left; - margin-right: 20px; - - &:last-child { - margin-right: 0; - } - } - - .remove-item { - float: left; - width: 100%; - } - } - } - - .new-item { - margin-top: 20px; - padding-bottom: 10px; - @include grey-button; - @include box-sizing(border-box); } } @@ -174,37 +52,17 @@ display: block; } - .row { - margin-bottom: 15px; - padding-bottom: 15px; - border-bottom: 1px solid $lightGrey; - - &:last-child { - margin-bottom: 0; - padding-bottom: 0; - border-bottom: none; - } - - .tip { - color: $mediumGrey; - font-size: 13px; - } - - .tip-inline { - display: inline-block; - margin-left: 10px; - } - - .tip-stacked { - display: block; - margin: 10px 0 0 200px; - } - } - &:last-child { border-bottom: none; } + > .title { + margin-bottom: 30px; + font-size: 28px; + font-weight: 300; + color: $blue; + } + > section { margin-bottom: 100px; @include clearfix; @@ -239,25 +97,276 @@ } } - .settings-page-menu { - a { - display: block; - padding-left: 20px; - line-height: 52px; + // form basics + label, .label { + padding: 0; + border: none; + background: none; + font-size: 15px; + font-weight: 400; - &.is-shown { - background: #fff; - border-radius: 5px 0 0 5px; + &.check-label { + display: inline; + margin-left: 10px; + } + + &.ranges { + margin-bottom: 20px; + } + } + + input, textarea { + @include transition(all 1s ease-in-out); + @include box-sizing(border-box); + font-size: 15px; + + &.long { + width: 100%; + } + + &.tall { + height: 200px; + } + + &.short { + width: 25%; + } + + &.date { + + } + + &:focus { + @include linear-gradient(tint($blue, 80%), tint($blue, 90%)); + border-color: $blue; + outline: 0; + } + } + + ::-webkit-input-placeholder { + color: $mediumGrey; + font-size: 13px; + } + :-moz-placeholder { + color: $mediumGrey; + font-size: 13px; + } + + .tip { + color: $mediumGrey; + font-size: 13px; + } + + + // form layouts + .row { + margin-bottom: 30px; + padding-bottom: 30px; + border-bottom: 1px solid $lightGrey; + + &:last-child { + margin-bottom: 0; + padding-bottom: 0; + border-bottom: none; + } + + // structural labels, not semantic labels per se + > label, .label { + display: inline-block; + vertical-align: top; + width: 200px; + } + + // tips + .tip-inline { + display: inline-block; + margin-left: 10px; + } + + .tip-stacked { + display: block; + margin-top: 10px; + } + + // structural field, not semantic fields per se + .field { + display: inline-block; + width: 400px; + + > input, > textarea, .input { + display: inline-block; + + &:last-child { + margin-bottom: 0; + } + + .group { + input, textarea { + margin-bottom: 5px; + } + + .label, label { + font-size: 13px; + } + } + + // multi-field + &.multi { + display: block; + background: tint($lightGrey, 50%); + padding: 15px; + @include border-radius(4px); + @include box-sizing(border-box); + + .group { + margin-bottom: 10px; + + &:last-child { + margin-bottom: 0; + } + + input, .input, textarea { + + } + } + } + + // multi stacked + &.multi-stacked { + + .group { + input, .input, textarea { + width: 100%; + } + } + } + + // multi-field inline + &.multi-inline { + @include clearfix; + + .group { + float: left; + margin-right: 20px; + width: 170px; + + &:nth-child(2) { + margin-right: 0; + } + + .input, input, textarea { + width: 100%; + } + } + + .remove-item { + float: right; + } + } + } + + // input-list + .input-list { + + .input { + margin-bottom: 15px; + padding-bottom: 15px; + border-bottom: 1px dotted $lightGrey; + + &:last-child { + border: 0; + } + } + } + + // enumerated inputs + &.enum { } } } + // editing controls - adding + .new-item, .replace-item { + clear: both; + display: block; + margin-top: 10px; + padding-bottom: 10px; + @include grey-button; + @include box-sizing(border-box); + } + + + // editing controls - removing + .remove-item { + clear: both; + display: block; + opacity: 0.75; + font-size: 13px; + text-align: right; + @include transition(opacity 0.25s ease-in-out); + + + &:hover { + color: $blue; + opacity: 0.99; + } + } + + // editing controls - preview + .input-existing { + display: block !important; + + .current { + width: 100%; + margin: 10px 0; + padding: 15px; + @include box-sizing(border-box); + @include border-radius(5px); + background: tint($blue, 80%); + } + } + + + // specific sections .settings-details { } - .settings-staff { + .settings-faculty { + .settings-faculty-members { + + > header { + display: none; + } + + .field .multi { + display: block; + margin-bottom: 40px; + padding: 20px; + background: tint($lightGrey, 50%); + @include border-radius(4px); + @include box-sizing(border-box); + } + + .course-faculty-list-item { + + .row { + + &:nth-child(4) { + padding-bottom: 0; + border-bottom: none; + } + } + } + + #course-faculty-bio-input { + margin-bottom: 0; + } + + .new-course-faculty-item { + } + } } .settings-grading { @@ -275,194 +384,200 @@ .settings-discussions { } - } - h2 { - margin-bottom: 30px; - font-size: 28px; - font-weight: 300; - color: $blue; - } + // states + label.is-focused { + color: $blue; + @include transition(color 1s ease-in-out); + } - h3 { - margin-bottom: 30px; - font-size: 15px; - font-weight: 700; - color: $blue; - } - - .grade-controls { - @include clearfix; - } - - .new-grade-button { - position: relative; - float: left; - display: block; - width: 29px; - height: 29px; - margin: 4px 10px 0 0; - border-radius: 20px; - border: 1px solid $darkGrey; - @include linear-gradient(top, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0)); - background-color: #d1dae3; - @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset); - color: #6d788b; - - .plus-icon { - position: absolute; - top: 50%; - left: 50%; - margin-left: -6px; - margin-top: -6px; + // misc + .divide { + display: none; } } - .grade-slider { - float: left; - width: 560px; - height: 60px; - .grade-bar { - position: relative; - width: 100%; - height: 40px; - background: $lightGrey; - .increments { - position: relative; + // h3 { + // margin-bottom: 30px; + // font-size: 15px; + // font-weight: 700; + // color: $blue; + // } - li { - position: absolute; - top: 42px; - width: 30px; - margin-left: -15px; - font-size: 9px; - text-align: center; + // .grade-controls { + // @include clearfix; + // } - &.increment-0 { - left: 0; - } + // .new-grade-button { + // position: relative; + // float: left; + // display: block; + // width: 29px; + // height: 29px; + // margin: 4px 10px 0 0; + // border-radius: 20px; + // border: 1px solid $darkGrey; + // @include linear-gradient(top, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0)); + // background-color: #d1dae3; + // @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset); + // color: #6d788b; - &.increment-10 { - left: 10%; - } + // .plus-icon { + // position: absolute; + // top: 50%; + // left: 50%; + // margin-left: -6px; + // margin-top: -6px; + // } + // } - &.increment-20 { - left: 20%; - } + // .grade-slider { + // float: left; + // width: 560px; + // height: 60px; - &.increment-30 { - left: 30%; - } + // .grade-bar { + // position: relative; + // width: 100%; + // height: 40px; + // background: $lightGrey; - &.increment-40 { - left: 40%; - } + // .increments { + // position: relative; - &.increment-50 { - left: 50%; - } + // li { + // position: absolute; + // top: 42px; + // width: 30px; + // margin-left: -15px; + // font-size: 9px; + // text-align: center; - &.increment-60 { - left: 60%; - } + // &.increment-0 { + // left: 0; + // } - &.increment-70 { - left: 70%; - } + // &.increment-10 { + // left: 10%; + // } - &.increment-80 { - left: 80%; - } + // &.increment-20 { + // left: 20%; + // } - &.increment-90 { - left: 90%; - } + // &.increment-30 { + // left: 30%; + // } - &.increment-100 { - left: 100%; - } - } - } + // &.increment-40 { + // left: 40%; + // } - .grades { - position: relative; + // &.increment-50 { + // left: 50%; + // } - li { - position: absolute; - top: 0; - height: 40px; - text-align: right; + // &.increment-60 { + // left: 60%; + // } - &:hover, - &.is-dragging { - .remove-button { - display: block; - } - } + // &.increment-70 { + // left: 70%; + // } - .remove-button { - display: none; - position: absolute; - top: -17px; - right: 1px; - height: 17px; - font-size: 10px; - } + // &.increment-80 { + // left: 80%; + // } - &:nth-child(1) { - background: #4fe696; - } + // &.increment-90 { + // left: 90%; + // } - &:nth-child(2) { - background: #ffdf7e; - } + // &.increment-100 { + // left: 100%; + // } + // } + // } - &:nth-child(3) { - background: #ffb657; - } + // .grades { + // position: relative; - &:nth-child(4) { - background: #fb336c; - } + // li { + // position: absolute; + // top: 0; + // height: 40px; + // text-align: right; - &:nth-child(5) { - background: #ef54a1; - } + // &:hover, + // &.is-dragging { + // .remove-button { + // display: block; + // } + // } - .letter-grade { - display: block; - margin: 7px 5px 0 0; - font-size: 14px; - font-weight: 700; - line-height: 14px; - } + // .remove-button { + // display: none; + // position: absolute; + // top: -17px; + // right: 1px; + // height: 17px; + // font-size: 10px; + // } - .range { - display: block; - margin-right: 5px; - font-size: 9px; - line-height: 12px; - } + // &:nth-child(1) { + // background: #4fe696; + // } - .drag-bar { - position: absolute; - top: 0; - right: -1px; - height: 40px; - width: 2px; - background-color: #fff; - cursor: ew-resize; - @include transition(none); + // &:nth-child(2) { + // background: #ffdf7e; + // } - &:hover { - width: 4px; - right: -2px; - } - } - } - } - } - } + // &:nth-child(3) { + // background: #ffb657; + // } + + // &:nth-child(4) { + // background: #fb336c; + // } + + // &:nth-child(5) { + // background: #ef54a1; + // } + + // .letter-grade { + // display: block; + // margin: 7px 5px 0 0; + // font-size: 14px; + // font-weight: 700; + // line-height: 14px; + // } + + // .range { + // display: block; + // margin-right: 5px; + // font-size: 9px; + // line-height: 12px; + // } + + // .drag-bar { + // position: absolute; + // top: 0; + // right: -1px; + // height: 40px; + // width: 2px; + // background-color: #fff; + // cursor: ew-resize; + // @include transition(none); + + // &:hover { + // width: 4px; + // right: -2px; + // } + // } + // } + // } + // } + // } } \ No newline at end of file diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 77800f99c5..b7753674bf 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -15,6 +15,12 @@ var gradeThresholds; var GRADES = ['A', 'B', 'C', 'D', 'E']; + $(" :input, textarea").focus(function() { + $("label[for='" + this.id + "']").addClass("is-focused"); + }).blur(function() { + $("label").removeClass("is-focused"); + }); + (function() { $body = $('body'); $gradeBar = $('.grade-bar'); @@ -82,6 +88,7 @@ <%block name="content"> +

    Settings

    @@ -90,9 +97,8 @@
    -
    -

    Course Details

    +
    +

    Course Details

    Basic Information

    - The nuts and bolts of your class + The nuts and bolts of your course
    - - -
    -
    - - -
    -
    - - - e.g. 101x -
    -
    - - -
    -
    - -
    -
    -

    Dates & Times

    - The nuts and bolts of your class -
    - -
    - - - First day the class begins -
    - -
    - - - Last day of class activty -
    - -
    - - +
    -
      -
    1. -
      - - Milestone Date + +
      +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + + e.g. 101x +
    +
    +
    +
    + +
    + +
    +
    +

    Course Schedule

    + Important steps and segments of your your course +
    + +
    + +
    +
    + + First day the class begins +
    +
    +
    + +
    + +
    +
    + + Last day the class begins +
    +
    +
    + +
    +

    Milestones:

    + +
    +
      +
    • +
      + +
      -
      - - Milestone Name +
      + +
      Delete Milestone
      • - + +
    • +
      + + +
      + +
      + + +
      +
      • +
    - New Class Milestone + New Course Milestone
    -
    -
    +
    -
    +
    + +
    +
    +
    +
    + + + Replace Syllabus + + PDF formatting preferred +
    + +
    + + Upload Syllabus + + PDF formatting preferred +
    +
    +
    +
    + +
    + +

    Introducing Your Course

    Information for perspective students
    - - -
    + +
    + + Detailed summary of concepts and lessons covered +
    +
    - - - Used to introduce your class to perspective students -
    + +
    + + 1-2 sentences used to introduce your class to perspective students +
    +
    - - -
    -
    + +
    +
    +
    + +
    + + + Replace Video + + Video restrictions go here +
    + +
    + + Upload Video + + Video restrictions go here +
    +
    + + + +
    @@ -203,68 +286,101 @@
    - - -
    - -
    - - +
    - -
      -
    1. -
      - -
      - - Delete Link -
      2. -
    - - - New Link - + + Supplies, software, and set-up that students will need
    -
    - -
    - -
    - - -
    + +
    + + Time students should spend on all course work +
    +
    - +

    Textbooks:

    -
    -
      -
    1. -
      - - Textbook Name +
      +
    + +
  • +
    + + +
    - +
    + + +
    + +
    • + + + New Textbook
    -
    + + +
    +

    Prerequisites:

    + +
    +
      +
    • +
      + + +
      + +
      + + +
      + + Delete Prerequisite +
      • + +
    • +
      + + +
      + +
      + + +
      +
      • +
    + + + New Prerequisite + +
    +
    +
    +

    More Information

    @@ -272,24 +388,38 @@
    - +

    FAQs:

    -
    -
      -
    1. -
      - - Question +
      +
    + +
  • +
    + + +
    + +
    + + +
    + + Delete Question & Answer +
    • + New Question & Answer @@ -297,149 +427,138 @@
    - - + -
    -

    Course Staff

    +
    +

    Faculty

    -
    +
    -

    Faculty

    +

    Faculty Members

    + Individuals instructing and help with this course
    -
      -
    1. -
      - - -
      -
      - - -
      -
      - - - This photo will appear on your course's info page -
      -
      - - - A brief description of your education, experience, and expertise -
      -
      2. -
    +
    + + + + New Faculty Member + +
    -
    + +
    -

    Grading

    -
    - -
    - -
    -
    -
      -
    1. 0
      2. -
    2. 10
      3. -
    3. 20
      4. -
    4. 30
      5. -
    5. 40
      6. -
    6. 50
      7. -
    7. 60
      8. -
    8. 70
      9. -
    9. 80
      10. -
    10. 90
      11. -
    11. 100
      12. -
    -
      -
    1. - A - 81-100 - remove -
      2. -
    2. - B - 71-80 - - remove -
      3. -
    3. - C - 0-70 - - remove -
      4. -
    -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -

    Homework

    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -

    Lab

    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    +

    Grading

    -
    -

    Handouts & Guides

    - -
    - - - PDF formatted file -
    -
    +
    -

    Problems

    -
    - -
    -
    +

    Problems

    + +
    -

    Discussions

    +

    Discussions

    -
    + From 1a297674cedba64ff9b37f8bfd92ec1bdabfd19f Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 15 Nov 2012 14:31:16 -0500 Subject: [PATCH 11/26] added in fields for problems and discussions portions of CMS settings --- cms/static/sass/_settings.scss | 129 +++++++++++- cms/static/sass/_variables.scss | 1 + cms/templates/settings.html | 356 +++++++++++++++++++++++++++++--- 3 files changed, 457 insertions(+), 29 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index 40d991937d..a809c76973 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -152,6 +152,74 @@ font-size: 13px; } + .field.ui-status { + + > .input { + display: block !important; + margin-bottom: 15px; + } + + .ui-status-input-checkbox, .ui-status-input-radio { + position: absolute; + top: -9999px; + left: -9999px; + } + + label { + cursor: pointer; + } + + .ui-status-input-checkbox ~ label, .ui-status-input-radio ~ label { + display: inline-block; + margin: 0 0 0 5px; + color: $offBlack; + opacity: 0.50; + cursor: pointer; + @include transition(opacity 0.25s ease-in-out); + + &:after { + content: "(Off)"; + display: inline-block; + margin-left: 10px; + } + + ~ .tip { + margin-top: 0; + @include transition(color 0.25s ease-in-out); + } + } + + .ui-status-indic { + position: relative; + top: 2px; + display: inline-block; + height: 15px; + width: 15px; + border: 2px; + background: $offBlack; + opacity: 0.50; + @include border-radius(50px); + @include box-sizing(border-box); + @include transition(opacity 0.25s ease-in-out); + } + + .ui-status-input-checkbox:checked ~ label, .ui-status-input-radio:checked ~ label { + opacity: 0.99; + + &:after { + content: "(On)"; + } + + ~ .tip { + color: $darkGrey; + } + } + + .ui-status-input-checkbox:checked ~ .ui-status-indic, .ui-status-input-radio:checked ~ .ui-status-indic { + opacity: 0.99; + } + } + .tip { color: $mediumGrey; font-size: 13px; @@ -174,7 +242,6 @@ > label, .label { display: inline-block; vertical-align: top; - width: 200px; } // tips @@ -191,7 +258,7 @@ // structural field, not semantic fields per se .field { display: inline-block; - width: 400px; + width: 100%; > input, > textarea, .input { display: inline-block; @@ -248,7 +315,6 @@ .group { float: left; margin-right: 20px; - width: 170px; &:nth-child(2) { margin-right: 0; @@ -283,6 +349,26 @@ &.enum { } } + + // layout - aligned label/field pairs + &.row-col2 { + + > label, .label { + width: 200px; + } + + .field { + width: 400px; + } + + &.multi-inline { + @include clearfix; + + .group { + width: 170px; + } + } + } } // editing controls - adding @@ -326,7 +412,6 @@ } } - // specific sections .settings-details { @@ -379,10 +464,23 @@ .settings-problems { + > section { + + &.is-shown { + display: block; + } + } } .settings-discussions { - + + } + + .settings-discussions-exceptions, .settings-problems-exceptions { + + p, ul { + font-size: 15px; + } } // states @@ -391,6 +489,27 @@ @include transition(color 1s ease-in-out); } + // extras/abbreviations + // .settings-extras { + + // > header { + // cursor: pointer; + + // &.active { + + // } + // } + + // > div { + // display: none; + // @include transition(display 0.25s ease-in-out); + + // &.is-shown { + // display: block; + // } + // } + // } + // misc .divide { display: none; diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss index fec65e4e11..a234a0d47e 100644 --- a/cms/static/sass/_variables.scss +++ b/cms/static/sass/_variables.scss @@ -13,6 +13,7 @@ $body-line-height: golden-ratio(.875em, 1); $pink: rgb(182,37,104); $error-red: rgb(253, 87, 87); +$offBlack: #3c3c3c; $blue: #5597dd; $orange: #edbd3c; $lightGrey: #edf1f5; diff --git a/cms/templates/settings.html b/cms/templates/settings.html index b7753674bf..bbfcbc6dbd 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -26,6 +26,7 @@ $gradeBar = $('.grade-bar'); gradeThresholds = [100, 80, 70]; $('.settings-page-menu a').bind('click', showSettingsTab); + $('.settings-extra header').bind('click', showSettingsExtras); $body.on('mousedown', '.drag-bar', startDragBar); $('.new-grade-button').bind('click', addNewGrade); $body.on('click', '.remove-button', removeGrade); @@ -52,6 +53,12 @@ $(e.target).addClass('is-shown'); } + function showSettingsExtras(e) { + e.preventDefault(); + $(this).toggleClass('active'); + $(this).siblings.toggleClass('is-shown'); + } + function startDragBar(e) { e.preventDefault(); barOrigin = $gradeBar.offset().left; @@ -115,21 +122,21 @@ The nuts and bolts of your course -
    +
    -
    +
    -
    +
    @@ -138,7 +145,7 @@
    - +
    @@ -148,7 +155,7 @@ Important steps and segments of your your course -
    +
    @@ -158,7 +165,7 @@
    -
    +
    @@ -168,7 +175,7 @@
    -
    +

    Milestones:

    @@ -206,7 +213,7 @@
    -
    +
    @@ -237,7 +244,7 @@ Information for perspective students -
    +
    @@ -245,7 +252,7 @@
    -
    +
    @@ -253,7 +260,7 @@
    -
    +
    @@ -285,7 +292,7 @@ Expectations of the students taking this course -
    +
    @@ -293,7 +300,7 @@
    -
    +
    @@ -301,7 +308,7 @@
    -
    +

    Textbooks:

    @@ -340,7 +347,7 @@
    -
    +

    Prerequisites:

    @@ -387,7 +394,7 @@ Other helpful information about the course -
    +

    FAQs:

    @@ -441,21 +448,21 @@
    • -
      +
      -
      +
      -
      +
      @@ -478,7 +485,7 @@
      -
      +
      @@ -490,21 +497,21 @@
    • -
      +
      -
      +
      -
      +
      @@ -527,7 +534,7 @@
      -
      +
      @@ -553,11 +560,312 @@

      Problems

      +
      +
      +

      General Settings

      + Course-wide settings for all problems +
      + +
      +

      Problem Randomization:

      + +
      +
      + +
      + + randomize all problems +
      + +
      + +
      + + do not randomize problems +
      + +
      + +
      + + randomize problems per student +
      +
      +
      + +
      +

      Show Answers:

      + +
      +
      + +
      + + Answers will be shown after the number of attempts has been met +
      + +
      + +
      + + Answers will never be shown, regardless of attempts +
      +
      +
      + +
      + + +
      +
      + + To set infinite atttempts, use "0" +
      +
      +
      +
      + +
      +
      +

      Lesson Exercises

      + In-lesson question & problem specific rules +
      + +
      +

      Problem Randomization:

      + +
      +
      + +
      + + randomize all problems +
      + +
      + +
      + + do not randomize problems +
      + +
      + +
      + + randomize problems per student +
      +
      +
      + +
      +

      Show Answers:

      + +
      +
      + +
      + + Answers will be shown after the number of attempts has been met +
      + +
      + +
      + + Answers will never be shown, regardless of attempts +
      +
      +
      + +
      + + +
      +
      + + To set infinite atttempts, use "0" +
      +
      +
      +
      + +
      +
      +

      Labs

      + Exploratory assignment-specific rules +
      + +
      +

      Problem Randomization:

      + +
      +
      + +
      + + randomize all problems +
      + +
      + +
      + + do not randomize problems +
      + +
      + +
      + + randomize problems per student +
      +
      +
      + +
      +

      Show Answers:

      + +
      +
      + +
      + + Answers will be shown after the number of attempts has been met +
      + +
      + +
      + + Answers will never be shown, regardless of attempts +
      +
      +
      + +
      + + +
      +
      + + To set infinite atttempts, use "0" +
      +
      +
      +
      + +
      +
      +

      Exams

      + Mid-term and final exam-specific rules +
      + +
      +

      Problem Randomization:

      + +
      +
      + +
      + + randomize all problems +
      + +
      + +
      + + do not randomize problems +
      + +
      + +
      + + randomize problems per student +
      +
      +
      + +
      +

      Show Answers:

      + +
      +
      + +
      + + Answers will be shown after the number of attempts has been met +
      + +
      + +
      + + Answers will never be shown, regardless of attempts +
      +
      +
      + +
      + + +
      +
      + + To set infinite atttempts, use "0" +
      +
      +
      +
      + +
      + +

      Discussions

      +
      +
      +

      General Settings

      + Course-wide settings for online discussion +
      + +
      +

      Anonymous Discussions:

      + +
      +
      + +
      + + Students and faculty will be able to post anonymously +
      + +
      + +
      + + Posting anonymously is not allowed. Any previous anonymous posts will be reverted to non-anonymous +
      +
      +
      + +
      +
      +

      Discussion Settings Elsewhere

      + More specific settings for particular discussions +
      + +

      The following discussions have had their settings specified elsewhere and will follow those rules.

      + +
        + Discussion +
      +
      From 4c220ea420fba53bd0df4c512bcf36466a0cdd1b Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 15 Nov 2012 16:45:16 -0500 Subject: [PATCH 12/26] in progress discussion work --- cms/static/sass/_settings.scss | 22 +++++++++++++--------- cms/templates/settings.html | 17 ----------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index a809c76973..9897043bd4 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -170,15 +170,23 @@ } .ui-status-input-checkbox ~ label, .ui-status-input-radio ~ label { + position: relative; + left: -30px; display: inline-block; + z-index: 100; margin: 0 0 0 5px; + padding-left: 30px; color: $offBlack; opacity: 0.50; cursor: pointer; @include transition(opacity 0.25s ease-in-out); + &:before { + display: inline-block; + margin-right: 10px; + } + &:after { - content: "(Off)"; display: inline-block; margin-left: 10px; } @@ -192,6 +200,7 @@ .ui-status-indic { position: relative; top: 2px; + z-index: 10; display: inline-block; height: 15px; width: 15px; @@ -207,7 +216,9 @@ opacity: 0.99; &:after { - content: "(On)"; + } + + &:before { } ~ .tip { @@ -476,13 +487,6 @@ } - .settings-discussions-exceptions, .settings-problems-exceptions { - - p, ul { - font-size: 15px; - } - } - // states label.is-focused { color: $blue; diff --git a/cms/templates/settings.html b/cms/templates/settings.html index bbfcbc6dbd..102e57ebec 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -819,10 +819,6 @@
      - -
      - -
      @@ -853,19 +849,6 @@
      - -
      -
      -

      Discussion Settings Elsewhere

      - More specific settings for particular discussions -
      - -

      The following discussions have had their settings specified elsewhere and will follow those rules.

      - -
        - Discussion -
      -
      From 74dec7f172019888f13818b5396d393d2a492cf4 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 16 Nov 2012 09:14:18 -0500 Subject: [PATCH 13/26] settings - wip --- cms/static/sass/_settings.scss | 300 ++++++++++++++++----------------- cms/templates/settings.html | 273 +++++++++++++++++++++--------- 2 files changed, 341 insertions(+), 232 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index 9897043bd4..4042edb5e9 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -522,185 +522,185 @@ - // h3 { - // margin-bottom: 30px; - // font-size: 15px; - // font-weight: 700; - // color: $blue; - // } + h3 { + margin-bottom: 30px; + font-size: 15px; + font-weight: 700; + color: $blue; + } - // .grade-controls { - // @include clearfix; - // } + .grade-controls { + @include clearfix; + } - // .new-grade-button { - // position: relative; - // float: left; - // display: block; - // width: 29px; - // height: 29px; - // margin: 4px 10px 0 0; - // border-radius: 20px; - // border: 1px solid $darkGrey; - // @include linear-gradient(top, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0)); - // background-color: #d1dae3; - // @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset); - // color: #6d788b; + .new-grade-button { + position: relative; + float: left; + display: block; + width: 29px; + height: 29px; + margin: 4px 10px 0 0; + border-radius: 20px; + border: 1px solid $darkGrey; + @include linear-gradient(top, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0)); + background-color: #d1dae3; + @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset); + color: #6d788b; - // .plus-icon { - // position: absolute; - // top: 50%; - // left: 50%; - // margin-left: -6px; - // margin-top: -6px; - // } - // } + .plus-icon { + position: absolute; + top: 50%; + left: 50%; + margin-left: -6px; + margin-top: -6px; + } + } - // .grade-slider { - // float: left; - // width: 560px; - // height: 60px; + .grade-slider { + float: left; + width: 560px; + height: 60px; - // .grade-bar { - // position: relative; - // width: 100%; - // height: 40px; - // background: $lightGrey; + .grade-bar { + position: relative; + width: 100%; + height: 40px; + background: $lightGrey; - // .increments { - // position: relative; + .increments { + position: relative; - // li { - // position: absolute; - // top: 42px; - // width: 30px; - // margin-left: -15px; - // font-size: 9px; - // text-align: center; + li { + position: absolute; + top: 42px; + width: 30px; + margin-left: -15px; + font-size: 9px; + text-align: center; - // &.increment-0 { - // left: 0; - // } + &.increment-0 { + left: 0; + } - // &.increment-10 { - // left: 10%; - // } + &.increment-10 { + left: 10%; + } - // &.increment-20 { - // left: 20%; - // } + &.increment-20 { + left: 20%; + } - // &.increment-30 { - // left: 30%; - // } + &.increment-30 { + left: 30%; + } - // &.increment-40 { - // left: 40%; - // } + &.increment-40 { + left: 40%; + } - // &.increment-50 { - // left: 50%; - // } + &.increment-50 { + left: 50%; + } - // &.increment-60 { - // left: 60%; - // } + &.increment-60 { + left: 60%; + } - // &.increment-70 { - // left: 70%; - // } + &.increment-70 { + left: 70%; + } - // &.increment-80 { - // left: 80%; - // } + &.increment-80 { + left: 80%; + } - // &.increment-90 { - // left: 90%; - // } + &.increment-90 { + left: 90%; + } - // &.increment-100 { - // left: 100%; - // } - // } - // } + &.increment-100 { + left: 100%; + } + } + } - // .grades { - // position: relative; + .grades { + position: relative; - // li { - // position: absolute; - // top: 0; - // height: 40px; - // text-align: right; + li { + position: absolute; + top: 0; + height: 40px; + text-align: right; - // &:hover, - // &.is-dragging { - // .remove-button { - // display: block; - // } - // } + &:hover, + &.is-dragging { + .remove-button { + display: block; + } + } - // .remove-button { - // display: none; - // position: absolute; - // top: -17px; - // right: 1px; - // height: 17px; - // font-size: 10px; - // } + .remove-button { + display: none; + position: absolute; + top: -17px; + right: 1px; + height: 17px; + font-size: 10px; + } - // &:nth-child(1) { - // background: #4fe696; - // } + &:nth-child(1) { + background: #4fe696; + } - // &:nth-child(2) { - // background: #ffdf7e; - // } + &:nth-child(2) { + background: #ffdf7e; + } - // &:nth-child(3) { - // background: #ffb657; - // } + &:nth-child(3) { + background: #ffb657; + } - // &:nth-child(4) { - // background: #fb336c; - // } + &:nth-child(4) { + background: #fb336c; + } - // &:nth-child(5) { - // background: #ef54a1; - // } + &:nth-child(5) { + background: #ef54a1; + } - // .letter-grade { - // display: block; - // margin: 7px 5px 0 0; - // font-size: 14px; - // font-weight: 700; - // line-height: 14px; - // } + .letter-grade { + display: block; + margin: 7px 5px 0 0; + font-size: 14px; + font-weight: 700; + line-height: 14px; + } - // .range { - // display: block; - // margin-right: 5px; - // font-size: 9px; - // line-height: 12px; - // } + .range { + display: block; + margin-right: 5px; + font-size: 9px; + line-height: 12px; + } - // .drag-bar { - // position: absolute; - // top: 0; - // right: -1px; - // height: 40px; - // width: 2px; - // background-color: #fff; - // cursor: ew-resize; - // @include transition(none); + .drag-bar { + position: absolute; + top: 0; + right: -1px; + height: 40px; + width: 2px; + background-color: #fff; + cursor: ew-resize; + @include transition(none); - // &:hover { - // width: 4px; - // right: -2px; - // } - // } - // } - // } - // } - // } + &:hover { + width: 4px; + right: -2px; + } + } + } + } + } + } } \ No newline at end of file diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 102e57ebec..0177e9862a 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -445,108 +445,110 @@ Individuals instructing and help with this course -
      - - - New Faculty Member - + + New Faculty Member + +
      @@ -555,6 +557,113 @@

      Grading

      +
      +
      +

      Overall Grade Range

      + Course grade ranges and their values +
      + +
      + +
      + +
      +
      +
        +
      1. 0
        2. +
      2. 10
        3. +
      3. 20
        4. +
      4. 30
        5. +
      5. 40
        6. +
      6. 50
        7. +
      7. 60
        8. +
      8. 70
        9. +
      9. 80
        10. +
      10. 90
        11. +
      11. 100
        12. +
      +
        +
      1. + A + 81-100 + remove +
        2. +
      2. + B + 71-80 + + remove +
        3. +
      3. + C + 0-70 + + remove +
        4. +
      +
      +
      +
      + +
      +
      + +
      +
      +

      Assignments

      + Course grade ranges and their values +
      + + +
      + +
      +
      +

      Assignments

      + Course grade ranges and their values +
      + + +
      + +
      +
      + + +
      +
      +
      +

      Homework

      +
      + + +
      +
      + + +
      +
      + + +
      +
      +
      +

      Lab

      +
      + + +
      +
      + + +
      +
      + + +
      +
      + +
      From 6f52fea09cb098016831d671112d7b5107d9f676 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 16 Nov 2012 09:23:33 -0500 Subject: [PATCH 14/26] added and wired in SymbolSet font icon library assets --- cms/templates/base.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cms/templates/base.html b/cms/templates/base.html index ba91b2f400..33fe02aadd 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -9,6 +9,9 @@ <%static:css group='base-style'/> + + + <%block name="title"></%block> @@ -33,6 +36,9 @@ + + + + + + @@ -133,7 +134,8 @@
      - + + This is used in your course URL, and cannot be changed
    @@ -142,7 +144,8 @@
    - + + This is used in your course URL, and cannot be changed
    @@ -151,8 +154,9 @@
    - + e.g. 101x + This is used in your course URL, and cannot be changed
    @@ -167,43 +171,41 @@
    - +

    Course Dates:

    +
    -
    - - First day the course begins +
    +
    + + + First day the course begins +
    + +
    + + + Last day the course is active +
    - +

    Enrollment Dates:

    +
    -
    - - First day the course begins - The start date of the course cannot be after the end date of the course -
    -
    -
    +
    +
    + + + First day students can enroll +
    -
    - -
    -
    - - Last day the course begins -
    -
    -
    - -
    - -
    -
    - - Last day the course begins - The end date of the course cannot be before the start date of the course +
    + + + Last day students can enroll +
    @@ -227,36 +229,6 @@ Delete Milestone -
  • -
    - - - A milestone date cannot be after the end of a course -
    - -
    - - -
    - - Delete Milestone -
    • - -
  • -
    - - - A milestone date cannot be before the start of a course -
    - -
    - - -
    - - Delete Milestone -
    • -
  • @@ -281,10 +253,10 @@
    - CS184x_syllabus.pdf -
    + 📄CS184x_syllabus.pdf - Delete Syllabus + Delete Syllabus +
    @@ -330,10 +302,10 @@
    - -
    + - Delete Video + Delete Video +
    @@ -515,37 +487,36 @@
    • -
      +
      -
      +
      -
      +
      -
      - Faculty Photo +
      + Faculty Photo + Delete Faculty Photo
      - - Delete Faculty Photo
      -
      +
      - + A brief description of your education, experience, and expertise
      @@ -554,21 +525,21 @@
    • -
      +
      -
      +
      -
      +
      @@ -580,11 +551,11 @@
      -
      +
      - + A brief description of your education, experience, and expertise
      @@ -825,22 +796,22 @@

      Problem Randomization:

      -
      - +
      +
      randomize all problems
      -
      - +
      +
      do not randomize problems
      -
      - +
      +
      randomize problems per student @@ -852,15 +823,15 @@

      Show Answers:

      -
      - +
      +
      Answers will be shown after the number of attempts has been met
      -
      - +
      +
      Answers will never be shown, regardless of attempts @@ -890,22 +861,22 @@

      Problem Randomization:

      -
      - +
      +
      randomize all problems
      -
      - +
      +
      do not randomize problems
      -
      - +
      +
      randomize problems per student @@ -917,15 +888,15 @@

      Show Answers:

      -
      - +
      +
      Answers will be shown after the number of attempts has been met
      -
      - +
      +
      Answers will never be shown, regardless of attempts @@ -955,22 +926,22 @@

      Problem Randomization:

      -
      - +
      +
      randomize all problems
      -
      - +
      +
      do not randomize problems
      -
      - +
      +
      randomize problems per student @@ -982,15 +953,15 @@

      Show Answers:

      -
      - +
      +
      Answers will be shown after the number of attempts has been met
      -
      - +
      +
      Answers will never be shown, regardless of attempts @@ -1020,22 +991,22 @@

      Problem Randomization:

      -
      - +
      +
      randomize all problems
      -
      - +
      +
      do not randomize problems
      -
      - +
      +
      randomize problems per student @@ -1047,15 +1018,15 @@

      Show Answers:

      -
      - +
      +
      Answers will be shown after the number of attempts has been met
      -
      - +
      +
      Answers will never be shown, regardless of attempts @@ -1089,21 +1060,20 @@

      Anonymous Discussions:

      -
      - -
      +
      + +
      Students and faculty will be able to post anonymously
      -
      - -
      +
      + +
      Posting anonymously is not allowed. Any previous anonymous posts will be reverted to non-anonymous
      -
      @@ -1166,18 +1136,6 @@
      - -
      -

      Create Discussion
      Categories for Each
      Course Unit

      - -
      -
      - -
      - - This option is automatically set currently -
      -
      From c7784e30fd7977820a95a4fb1776b60ea518b422 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Mon, 19 Nov 2012 14:59:25 -0500 Subject: [PATCH 25/26] settings - radio/checkbox UI - wip --- cms/static/sass/_settings.scss | 8 +++----- cms/templates/settings.html | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index 48b8b6b050..2d381b5454 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -213,11 +213,9 @@ .ui-status-indic { z-index: 10; display: inline-block; - height: 15px; - width: 15px; - border: 2px; + height: 30px; + width: 20px; opacity: 0.50; - @include box-sizing(border-box); @include transition(opacity 0.25s ease-in-out); } @@ -244,7 +242,7 @@ } .ui-status-input-checkbox input:checked ~ .ui-status-indic, .ui-status-input-radio input:checked ~ .ui-status-indic { - background: transparent url('/static/img/.png') 0 0 no-repeat; + background: transparent url('../images/correct-icon.png') 0 0 no-repeat; opacity: 0.99; } diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 8d618fcfc1..ab603923ee 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -1062,14 +1062,14 @@
      -
      +
      Students and faculty will be able to post anonymously
      -
      +
      Posting anonymously is not allowed. Any previous anonymous posts will be reverted to non-anonymous
      From d37030791785594c353eac7c50fbd98d9346d582 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Mon, 19 Nov 2012 15:48:57 -0500 Subject: [PATCH 26/26] settings - simplified course details fields per Mark's feedback and radio/checkbox UI --- cms/static/sass/_settings.scss | 6 +- cms/templates/settings.html | 306 ++++++--------------------------- 2 files changed, 54 insertions(+), 258 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index 2d381b5454..d2c8ac514b 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -211,10 +211,11 @@ } .ui-status-indic { + background: transparent url('../images/correct-icon.png') 0 0 no-repeat; z-index: 10; display: inline-block; - height: 30px; - width: 20px; + height: 20px; + width: 30px; opacity: 0.50; @include transition(opacity 0.25s ease-in-out); } @@ -464,6 +465,7 @@ .remove-doc-data { display: inline-block; + margin-top: 0; width: 150px; } } diff --git a/cms/templates/settings.html b/cms/templates/settings.html index ab603923ee..5dae8a5d09 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -135,7 +135,7 @@
      - This is used in your course URL, and cannot be changed + This is used in your course URL, and cannot be changed
      @@ -145,7 +145,7 @@
      - This is used in your course URL, and cannot be changed + This is used in your course URL, and cannot be changed
      @@ -156,7 +156,7 @@
      e.g. 101x - This is used in your course URL, and cannot be changed + This is used in your course URL, and cannot be changed
      @@ -210,44 +210,6 @@
      -
      -

      Milestones:

      - -
      -
        -
      • -
        - - -
        - -
        - - -
        - - Delete Milestone -
        • - -
      • -
        - - -
        - -
        - - -
        -
        • -
      - - - New Course Milestone - -
      -
      -
      @@ -281,22 +243,12 @@
      - - Detailed summary of concepts and lessons covered + + Introductions, prerequisites, FAQs that are used on your course summary page
      -
      - -
      -
      - - 1-2 sentences used to introduce your class to perspective students -
      -
      -
      -
      @@ -326,16 +278,6 @@ Expectations of the students taking this course -
      - -
      -
      - - Supplies, software, and set-up that students will need -
      -
      -
      -
      @@ -345,132 +287,6 @@
      - -
      -

      Textbooks:

      - -
      -
        -
      • -
        - - -
        - -
        - - -
        - - Delete Textbook -
        • - -
      • -
        - - -
        - -
        - - -
        - -
        • -
      - - - New Textbook - -
      -
      - -
      -

      Prerequisites:

      - -
      -
        -
      • -
        - - -
        - -
        - - -
        - - Delete Prerequisite -
        • - -
      • -
        - - -
        - -
        - - -
        -
        • -
      - - - New Prerequisite - -
      -
      - - -
      - -
      -
      -

      More Information

      - Other helpful information about the course -
      - -
      -

      FAQs:

      - -
      - - - - New Question & Answer - -
      -
      @@ -795,24 +611,21 @@

      Problem Randomization:

      -
      -
      - -
      +
      +
      + randomize all problems
      -
      - -
      +
      + do not randomize problems
      -
      - -
      +
      + randomize problems per student
      @@ -823,16 +636,14 @@

      Show Answers:

      -
      - -
      +
      + Answers will be shown after the number of attempts has been met
      -
      - -
      +
      + Answers will never be shown, regardless of attempts
      @@ -861,23 +672,20 @@

      Problem Randomization:

      -
      - -
      +
      + randomize all problems
      -
      - -
      +
      + do not randomize problems
      -
      - -
      +
      + randomize problems per student
      @@ -888,16 +696,14 @@

      Show Answers:

      -
      - -
      +
      + Answers will be shown after the number of attempts has been met
      -
      - -
      +
      + Answers will never be shown, regardless of attempts
      @@ -926,23 +732,20 @@

      Problem Randomization:

      -
      - -
      +
      + randomize all problems
      -
      - -
      +
      + do not randomize problems
      -
      - -
      +
      + randomize problems per student
      @@ -953,16 +756,14 @@

      Show Answers:

      -
      - -
      +
      + Answers will be shown after the number of attempts has been met
      -
      - -
      +
      + Answers will never be shown, regardless of attempts
      @@ -991,23 +792,20 @@

      Problem Randomization:

      -
      - -
      +
      + randomize all problems
      -
      - -
      +
      + do not randomize problems
      -
      - -
      +
      + randomize problems per student
      @@ -1018,16 +816,14 @@

      Show Answers:

      -
      - -
      +
      + Answers will be shown after the number of attempts has been met
      -
      - -
      +
      + Answers will never be shown, regardless of attempts
      @@ -1060,16 +856,14 @@

      Anonymous Discussions:

      -
      - -
      +
      + Students and faculty will be able to post anonymously
      -
      - -
      +
      + Posting anonymously is not allowed. Any previous anonymous posts will be reverted to non-anonymous