From 278c731aefbdfd363ac5758360d6b345f473df25 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 20 Nov 2012 09:26:40 -0500 Subject: [PATCH] settings - made assignment types user-determined fields vs. pre-set types in UI --- cms/static/sass/_settings.scss | 17 +- cms/templates/settings.html | 369 ++++++++++----------------------- 2 files changed, 118 insertions(+), 268 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index 855f9f6009..dafd51e9f9 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -83,7 +83,7 @@ .detail { float: right; - marign-top: 3px; + margin-top: 3px; color: $mediumGrey; font-size: 13px; } @@ -231,7 +231,7 @@ &.multi { display: block; background: tint($lightGrey, 50%); - padding: 15px; + padding: 20px 15px; @include border-radius(4px); @include box-sizing(border-box); @@ -298,6 +298,9 @@ &:last-child { border: 0; } + + .row { + } } } @@ -481,9 +484,15 @@ .settings-grading { - .course-grading-gradeweight, .course-grading-totalassignments, .course-grading-totalassignmentsdroppable { + .input-list { + .row { - input { + .input { + &:last-child { + margin-bottom: 0; + padding-bottom: 0; + } + } } } } diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 8ac9460f62..57fdeb34d5 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -167,7 +167,7 @@

Course Schedule

- Important steps and segments of your your course + Important steps and segments of your course
@@ -460,8 +460,8 @@
- Boston, MA Local Time (UTC/GMT -5 hours) - Convert to your time zone + Boston, MA Local Time (UTC/GMT -5 hours).
+ Convert to your time zone
@@ -478,122 +478,114 @@
-
+
-

Lesson Exercises

- Grading in-lesson question & problems +

Assignment Types

-
- +
+
+
    +
  • +
    + -
    -
    - - e.g. 25% -
    -
    -
    +
    +
    + + e.g. Homework, Labs, Midterm Exams, Final Exam +
    +
    +
-
- +
+ -
-
- - total exercises assigned -
-
-
+
+
+ + e.g. 25% +
+
+
-
- +
+ -
-
- - total exercises that won't be graded -
-
-
-
+
+
+ + total exercises assigned +
+
+ -
-
-

Labs

- Grading in-lesson question & problems -
+
+ -
- +
+
+ + total exercises that won't be graded +
+
+
-
-
- - e.g. 25% -
-
-
+ Delete Assignment Type + -
- +
  • +
    + -
    -
    - - total labs assigned -
    -
    -
    +
    +
    + + e.g. Homework, Labs, Midterm Exams, Final Exam +
    +
    +
    • -
    - +
    + -
    -
    - - total labs that won't be graded -
    -
    -
    -
    +
    +
    + + e.g. 25% +
    +
    + -
    -
    -

    Exams

    - Grading in-lesson question & problems -
    +
    + -
    - +
    +
    + + total exercises assigned +
    +
    +
    -
    -
    - - e.g. 50% -
    -
    -
    +
    + -
    - +
    +
    + + total exercises that won't be graded +
    +
    +
    -
    -
    - - total exams held -
    -
    -
    + Delete Assignment Type + + -
    - - -
    -
    - - 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" -
    -
    -
    -
    +