diff --git a/cms/static/img/plus-icon-small.png b/cms/static/img/plus-icon-small.png new file mode 100644 index 0000000000..1abb12b6da Binary files /dev/null and b/cms/static/img/plus-icon-small.png differ diff --git a/cms/static/sass/_graphics.scss b/cms/static/sass/_graphics.scss index 1f07f4433c..994372504e 100644 --- a/cms/static/sass/_graphics.scss +++ b/cms/static/sass/_graphics.scss @@ -139,6 +139,14 @@ background: url(../img/plus-icon.png) no-repeat; } +.plus-icon-small { + display: inline-block; + width: 6px; + height: 6px; + margin-right: 8px; + background: url(../img/plus-icon-small.png) no-repeat center; +} + .folder-icon { display: inline-block; width: 15px; diff --git a/cms/static/sass/_jquery-ui-calendar.scss b/cms/static/sass/_jquery-ui-calendar.scss new file mode 100644 index 0000000000..e153750a49 --- /dev/null +++ b/cms/static/sass/_jquery-ui-calendar.scss @@ -0,0 +1,53 @@ +.ui-datepicker { + border-color: $darkGrey; + border-radius: 2px; + background: #fff; + font-family: $sans-serif; + font-size: 12px; + @include box-shadow(0 5px 10px rgba(0, 0, 0, 0.1)); + + .ui-widget-header { + background: $darkGrey; + border: none; + border-radius: 2px; + } + + .ui-datepicker-next, + .ui-datepicker-prev { + @include transition(none); + + &.ui-state-hover { + border-color: transparent; + background: $mediumGrey; + + .ui-icon-circle-triangle-e, + .ui-icon-circle-triangle-w { + background-image: url(/static/css/vendor/ui-lightness/images/ui-icons_ffffff_256x240.png); + } + } + } + + .ui-state-default { + border-color: $mediumGrey; + color: $blue; + @include transition(none); + + &.ui-state-hover { + background: $orange; + border-color: $orange; + color: #fff; + } + } + + .ui-state-highlight { + background: $blue; + border-color: $blue; + color: #fff; + } + + .ui-state-active { + background: $orange; + border-color: $orange; + color: #fff; + } +} \ No newline at end of file diff --git a/cms/static/sass/_subsection.scss b/cms/static/sass/_subsection.scss index b45d7d4af6..9b2ee5169f 100644 --- a/cms/static/sass/_subsection.scss +++ b/cms/static/sass/_subsection.scss @@ -20,6 +20,30 @@ @include tree-view; } } + + .policy-list { + .policy-list-name { + margin-right: 5px; + } + + .policy-list-value { + margin-right: 10px; + } + + li { + margin-bottom: 10px; + } + } + + .new-policy-item { + margin: 10px 0; + + .plus-icon-small { + position: relative; + top: -1px; + vertical-align: middle; + } + } } .subsection-name-input { diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index 91e5d52026..5eeefaecaa 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -285,6 +285,7 @@ } .published-alert { + display: none; padding: 10px; border: 1px solid #edbd3c; border-radius: 3px; @@ -430,7 +431,11 @@ display: none; } - #create-draft { + .published-alert { + display: block; + } + + .edit-draft-message { display: none; } } @@ -438,13 +443,17 @@ .edit-state-public { #save-draft, #delete-draft, - #publish-draft, .component-actions, .new-component-item, - #published-alert { + #published-alert, + .publish-draft-message { display: none; } + .published-alert { + display: block; + } + .drag-handle { display: none !important; } diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss index 5d1a9ebd46..fec65e4e11 100644 --- a/cms/static/sass/_variables.scss +++ b/cms/static/sass/_variables.scss @@ -14,6 +14,7 @@ $pink: rgb(182,37,104); $error-red: rgb(253, 87, 87); $blue: #5597dd; +$orange: #edbd3c; $lightGrey: #edf1f5; $mediumGrey: #ced2db; $darkGrey: #8891a1; diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index fd3881a371..ec5ece2338 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -23,6 +23,7 @@ @import "modal"; @import "alerts"; @import "login"; +@import 'jquery-ui-calendar'; @import 'content-types'; diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html index e6eeed0963..ec5adc770a 100644 --- a/cms/templates/edit_subsection.html +++ b/cms/templates/edit_subsection.html @@ -38,11 +38,10 @@
  • : 
    • - % endfor - - - New Policy Data - + % endfor + + New Policy Data + diff --git a/cms/templates/emails/activation_email.txt b/cms/templates/emails/activation_email.txt index 209ff98335..5a1d63b670 100644 --- a/cms/templates/emails/activation_email.txt +++ b/cms/templates/emails/activation_email.txt @@ -1,4 +1,4 @@ -Thank you for signing up for edX! To activate your account, +Thank you for signing up for edX edge! To activate your account, please copy and paste this address into your web browser's address bar: diff --git a/cms/templates/emails/activation_email_subject.txt b/cms/templates/emails/activation_email_subject.txt index 495e0b5fad..0b0fb2ffe9 100644 --- a/cms/templates/emails/activation_email_subject.txt +++ b/cms/templates/emails/activation_email_subject.txt @@ -1 +1 @@ -Your account for edX +Your account for edX edge diff --git a/cms/templates/overview.html b/cms/templates/overview.html index 93a4ff2678..d31e1e4823 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -45,9 +45,7 @@

    Courseware

    -
    - -
    +
    New Section % for section in sections: diff --git a/cms/templates/unit.html b/cms/templates/unit.html index bef3695a8d..1348072d4c 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -80,8 +80,10 @@
    - This unit has been published. Click here to edit it. - This unit has already been published. Click here to release your changes to it +
    +

    This unit has been published. To make changes, you must edit a draft.

    +

    This is a draft of the published unit. To update the live version, you must replace it with this draft.

    +

    This unit is scheduled to be released to students on ${subsection.start} with the subsection "${subsection.display_name}"

    diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 0805354b85..fb436ddde2 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -3,10 +3,10 @@