From f29f605f62833a2c955d4a45a081df5104e36066 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 20 Nov 2012 08:40:45 -0500 Subject: [PATCH 1/4] settings - refactored radio/checkbox input formatting --- cms/static/sass/_settings.scss | 136 ++++++-------------- cms/templates/settings.html | 228 +++++++++++++++++++++------------ 2 files changed, 189 insertions(+), 175 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index d2c8ac514b..855f9f6009 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -151,6 +151,11 @@ } } + input[type="checkbox"], input[type="radio"] { + + } + + .input-default input, .input-default textarea { color: $mediumGrey; background: $lightGrey; @@ -165,98 +170,6 @@ font-size: 13px; } - .field.ui-status { - - > .input { - display: block !important; - margin-bottom: 15px; - } - - .ui-status-input-checkbox input, .ui-status-input-radio input { - position: absolute; - top: -9999px; - left: -9999px; - } - - label { - cursor: pointer; - } - - .ui-status-input-checkbox input ~ label, .ui-status-input-radio input ~ 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 { - display: inline-block; - margin-left: 10px; - } - - ~ .tip { - margin-top: 0; - @include transition(color 0.25s ease-in-out); - } - } - - .ui-status-indic { - background: transparent url('../images/correct-icon.png') 0 0 no-repeat; - z-index: 10; - display: inline-block; - height: 20px; - width: 30px; - opacity: 0.50; - @include transition(opacity 0.25s ease-in-out); - } - - .ss-check { - color: $green; - } - - .ss-delete { - color: $red; - } - - .ui-status-input-checkbox input:checked ~ label, .ui-status-input-radio input:checked ~ label { - opacity: 0.99; - - &:after { - } - - &:before { - } - - ~ .tip { - color: $darkGrey; - } - } - - .ui-status-input-checkbox input:checked ~ .ui-status-indic, .ui-status-input-radio input:checked ~ .ui-status-indic { - background: transparent url('../images/correct-icon.png') 0 0 no-repeat; - opacity: 0.99; - } - - // disabled - .ui-status-input-checkbox input:disabled, .ui-status-input-radio input:disabled { - color: $mediumGrey; - } - - .ui-status-input-checkbox input:disabled ~ .ui-status-indic, .ui-status-input-radio input:disabled ~ .ui-status-indic { - color: $mediumGrey; - } - } - .tip { color: $mediumGrey; font-size: 13px; @@ -388,6 +301,42 @@ } } + //radio buttons and checkboxes + .input-radio { + @include clearfix(); + + input { + display: block; + float: left; + margin-right: 10px; + } + + .copy { + position: relative; + top: -5px; + float: left; + width: 350px; + } + + label { + display: block; + margin-bottom: 0; + } + + .tip { + display: block; + margin-top: 0; + } + + .message-error { + + } + } + + .input-checkbox { + + } + // enumerated inputs &.enum { } @@ -405,7 +354,7 @@ } &.multi-inline { - @include clearfix; + @include clearfix(); .group { width: 170px; @@ -516,7 +465,6 @@ } .current-faculty-photo { - overflow: hidden; padding: 0; img { diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 5dae8a5d09..8ac9460f62 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -303,21 +303,21 @@
-
- - -
-
- - total exams that won't be graded -
+ + New Assignment Type +
@@ -677,10 +669,9 @@
-
+
-

Lesson Exercises

- In-lesson question & problem specific rules +

[Assignment Type Name]

@@ -688,28 +679,28 @@
- +
- + randomize all problems
- +
- + do not randomize problems
- +
- + randomize problems per student
@@ -721,19 +712,19 @@
- +
- + Answers will be shown after the number of attempts has been met
- +
- + Answers will never be shown, regardless of attempts
@@ -741,166 +732,16 @@
- +
- + 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" -
-
-
-
+
From a69d3cb0644d9e105ea5f807d37a155029bbcc4f Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 20 Nov 2012 09:32:13 -0500 Subject: [PATCH 3/4] settings - discussion UI revision --- cms/static/sass/_settings.scss | 2 +- cms/templates/settings.html | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index dafd51e9f9..300a81f9dd 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -513,7 +513,7 @@ .settings-discussions { - .settings-discussions-categories .course-discussions-categories-list-item { + .course-discussions-categories-list-item { label { display: none; diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 57fdeb34d5..db1c1393ef 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -775,9 +775,8 @@ -
+ -

Discussion Categories

@@ -837,8 +836,7 @@
- -
+ From 6c3c3776195596fa07ba024506cba7315ab1e5cd Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 20 Nov 2012 11:34:16 -0500 Subject: [PATCH 4/4] settings - general class/ID naming convention cleaning --- cms/static/sass/_settings.scss | 8 ++ cms/templates/settings.html | 184 ++++++++++++++++----------------- 2 files changed, 100 insertions(+), 92 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index 300a81f9dd..4e2490beaf 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -483,6 +483,14 @@ .settings-grading { + .course-grading-assignment-list-item { + + .row:nth-child(4) { + border: none; + margin-bottom: 0; + padding-bottom: 0; + } + } .input-list { .row { diff --git a/cms/templates/settings.html b/cms/templates/settings.html index db1c1393ef..4ee64120f6 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -131,30 +131,30 @@
- +
- + This is used in your course URL, and cannot be changed
- +
- + This is used in your course URL, and cannot be changed
- +
- + e.g. 101x This is used in your course URL, and cannot be changed
@@ -176,14 +176,14 @@
- - + + First day the course begins
- - + + Last day the course is active
@@ -196,14 +196,14 @@
- - + + First day students can enroll
- - + + Last day students can enroll
@@ -211,18 +211,18 @@
- +
📄CS184x_syllabus.pdf - Delete Syllabus + Delete Syllabus
- + Upload Syllabus PDF formatting preferred @@ -304,24 +304,24 @@
  • - +
    - +
    - +
    - +
    - +
    -
    +
    Faculty Photo Delete Faculty Photo
    @@ -329,10 +329,10 @@
    -
    - +
    +
    - + A brief description of your education, experience, and expertise
    @@ -342,24 +342,24 @@
  • - +
    - +
    - +
    - +
    - +
    - + Upload Faculty Photo Max size: 30KB @@ -367,11 +367,11 @@
    -
    - +
    +
    - + A brief description of your education, experience, and expertise
    @@ -399,7 +399,7 @@
    -
    +
    @@ -455,11 +455,11 @@
    - +
    - + Boston, MA Local Time (UTC/GMT -5 hours).
    Convert to your time zone
    @@ -471,7 +471,7 @@
    - + leeway on due dates
    @@ -488,11 +488,11 @@
    • - +
      - + e.g. Homework, Labs, Midterm Exams, Final Exam
      @@ -521,11 +521,11 @@
      - +
      -
      - +
      + total exercises that won't be graded
      @@ -536,11 +536,11 @@
    • - +
      - + e.g. Homework, Labs, Midterm Exams, Final Exam
      @@ -569,11 +569,11 @@
      - +
      -
      - +
      + total exercises that won't be graded
      @@ -605,28 +605,28 @@
      - +
      - + randomize all problems
      - +
      - + do not randomize problems
      - +
      - + randomize problems per student
      @@ -638,19 +638,19 @@
      - +
      - + Answers will be shown after the number of attempts has been met
      - +
      - + Answers will never be shown, regardless of attempts
      @@ -658,18 +658,18 @@
      - +
      - - To set infinite atttempts, use "0" + + Students will this have this number of chances to answer a problem. To set infinite atttempts, use "0"
      -
      +

      [Assignment Type Name]

      @@ -679,28 +679,28 @@
      - +
      - + randomize all problems
      - +
      - + do not randomize problems
      - +
      - + randomize problems per student
      @@ -712,19 +712,19 @@
      - +
      - + Answers will be shown after the number of attempts has been met
      - +
      - + Answers will never be shown, regardless of attempts
      @@ -732,12 +732,12 @@
      - +
      - - To set infinite atttempts, use "0" + + Students will this have this number of chances to answer a problem. To set infinite atttempts, use "0"
      @@ -758,19 +758,19 @@
      - +
      - + Students and faculty will be able to post anonymously
      - +
      - + Posting anonymously is not allowed. Any previous anonymous posts will be reverted to non-anonymous
      @@ -784,29 +784,29 @@
      • - - + +
      • - - + +
      • - - + +
      • - - + + Delete Category
        @@ -814,8 +814,8 @@
      • - - + +
        Delete Category @@ -823,8 +823,8 @@
      • - - + +
        Delete Category