From 0e17d16dbe003ab28be3f5616b43e0a5ac887cb0 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 30 Jan 2013 20:02:45 -0500 Subject: [PATCH] studio - advanced settings - added in several more static states and firmed up key/value pair styling specifically --- cms/static/sass/_settings.scss | 43 +++++++++++++- cms/templates/settings.html | 101 +++++++++++++++++++++++++-------- 2 files changed, 119 insertions(+), 25 deletions(-) diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index e045c1ab05..5f14b83a9b 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -562,6 +562,14 @@ margin: 0; border: none; padding: 0; + + // existing fields + &.existing { + + input, textarea { + color: $mediumGrey; + } + } } .key { @@ -589,6 +597,35 @@ } } } + + .message-error { + margin: 0 0 10px 0; + } + } + + .actions { + @include clearfix(); + margin-top: 15px; + border-top: 1px solid $lightGrey; + padding-top: 15px; + + .save-button { + float: left; + @include blue-button; + margin-right: 10px; + padding-top: 8px; + padding-bottom: 8px; + } + + .cancel-button { + float: left; + @include white-button; + margin-top: 4px; + } + + .new-button { + float: right; + } } } @@ -619,10 +656,14 @@ // } // } - input.error, textarea.error { + input.error, textarea.error, .error input, .error textarea { border-color: $red; } + .error label { + color: $red; + } + .message-error { display: block; margin-top: 5px; diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 877c87cfc3..7153b6daa3 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -729,69 +729,108 @@ from contentstore import utils
-

Additional Policy Definition

- Manually Edit Course Policy Values +

Manual Policy Definition

+ Manually Edit Course Policy Values (JSON Key and Pair values)

Warning: Add only manual policy data that you are familiar with.

+ +
  • -
    - +
    -
    - +
    - +
    Delete
    • +
  • - + This policy key, $KEYNAME, already exists.
    - +
    - +
    -
    - +
    - +
    Delete
    • +
  • - + You cannot leave the key value for this pair blank.
    -
    - +
    +
    - +
    - -
    - +
    +
    - + +
    +
    +
    + Delete +
    • + + +
  • + The JSON value for $KEYNAME is invalid. +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + Delete +
    • + + +
  • +
    +
    + +
    + +
    +
    +
    + +
    +
    @@ -799,9 +838,23 @@ from contentstore import utils
- - New Manual Policy - + +
+ Save + Cancel + + New Manual Policy + +
+ + +
+ Save + Cancel + + New Manual Policy + +