From 45a665c7c757f59fe5cbc2d0b7f58d54cbfdc53b Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 29 Apr 2013 10:18:56 -0400 Subject: [PATCH 001/117] added mode bar up top --- cms/static/sass/views/_unit.scss | 13 +++++++++++++ cms/templates/component.html | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 06849f851c..317247e886 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -423,6 +423,19 @@ body.course.unit { padding: 20px; border-radius: 2px 2px 0 0; + .component-edit-modes { + @include box-sizing(border-box); + list-style: none; + position: absolute; + width: 100%; + padding: 15px; + top: 0; + right: 0; + border-bottom: 1px solid $lightBluishGrey2; + background: $lightGrey; + + } + .metadata_edit { margin-bottom: 20px; font-size: 13px; diff --git a/cms/templates/component.html b/cms/templates/component.html index dad407ff7b..46a0880f35 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,11 +1,15 @@
+ + Editor + Settings +
${editor}
- Save - Cancel + Save + Cancel
From 94390e4314f88bf217032550b0039161288b2c48 Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 29 Apr 2013 14:20:37 -0400 Subject: [PATCH 002/117] aria tabs v1 --- cms/templates/component.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cms/templates/component.html b/cms/templates/component.html index 46a0880f35..c2b1f856f1 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,9 +1,15 @@
- - Editor - Settings - +
+ +
${editor}
From 30240ff01aa6bd8c363b1f2318f652e047ae6c81 Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 29 Apr 2013 19:53:16 -0400 Subject: [PATCH 003/117] non revision --- cms/templates/component.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cms/templates/component.html b/cms/templates/component.html index c2b1f856f1..318e75c197 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -5,11 +5,12 @@ -
+
${editor}
From d55527b693564a0f126463615b3b0cdce13364ac Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 1 May 2013 17:22:09 -0400 Subject: [PATCH 004/117] changes with aria --- cms/static/sass/views/_unit.scss | 60 +++++++++++++++++++++++++++++--- cms/templates/component.html | 56 +++++++++++++++++++---------- 2 files changed, 92 insertions(+), 24 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 317247e886..7a9cc42af3 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -13,6 +13,10 @@ body.course.unit { } //end problem selector reqs + + // Unit Page Main Column + // ==================== + .main-column { clear: both; float: left; @@ -31,6 +35,9 @@ body.course.unit { .unit-body { + // Unit Page Name + // ==================== + .unit-name-input { padding: 20px 40px; @@ -73,6 +80,10 @@ body.course.unit { letter-spacing: 1px; text-transform: uppercase; } + + // Component List Meta + // ==================== + // TODO: clean up organization of this page, to many levels/duplication .components { @@ -81,8 +92,6 @@ body.course.unit { z-index: 10; margin: 20px 40px; - - .title { margin: 0 0 15px 0; color: $mediumGrey; @@ -91,6 +100,9 @@ body.course.unit { } } + // New Components + // ==================== + &.new-component-item { margin: 20px 0px; border-top: 1px solid $mediumGrey; @@ -355,6 +367,9 @@ body.course.unit { } } + // Component Drag and Drop, Non-Edit Module Rendering, Styling + // ==================== + .component { border: 1px solid $lightBluishGrey2; border-radius: 3px; @@ -410,6 +425,9 @@ body.course.unit { } } + // Component Editing + // ==================== + .wrapper-component-editor { z-index: 9999; position: relative; @@ -423,9 +441,11 @@ body.course.unit { padding: 20px; border-radius: 2px 2px 0 0; - .component-edit-modes { + + // Edit Menu (Component Name, Mode-Editor, Mode-Settings) + + .component-edit-menu { @include box-sizing(border-box); - list-style: none; position: absolute; width: 100%; padding: 15px; @@ -434,8 +454,33 @@ body.course.unit { border-bottom: 1px solid $lightBluishGrey2; background: $lightGrey; + //Component Name + h3 { + //TO-DO ? + } + + //Nav-Edit Modes + .nav-edit-modes { + //TODO + + .tab { + display: inline; + } + } } + // Module Editors + .editor-wrapper{ + //TO-DO ? + } + + // Module Settings + .settings-wrapper{ + //TO-DO ? + } + + //OLD Meta-data Styling + //TO-DO port over old styling .metadata_edit { margin-bottom: 20px; font-size: 13px; @@ -469,6 +514,9 @@ body.course.unit { } } + // Unit Page Sidebar + // ==================== + .unit-settings { .window-contents { padding: 10px 20px; @@ -669,7 +717,9 @@ body.course.unit { } } -// editing units from courseware +// Editing Units from Courseware +// ==================== + body.unit { .component { diff --git a/cms/templates/component.html b/cms/templates/component.html index 318e75c197..1782c41b7c 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,24 +1,42 @@
-
- -
-
- ${editor} -
-
- Save - Cancel -
-
+
+

Name of Component

+ +
    + + +
+
+ +
+
+ ${editor} +
+ + + + + + + + + + + + + + + +
+ Save + Cancel +
+
From fbaed2e28b772cf82d45c2b5b032d8d346f5e5be Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 3 May 2013 00:00:10 -0700 Subject: [PATCH 005/117] added shell of css and html organization --- cms/static/sass/views/_unit.scss | 58 +++++++++++++++++++++++++++----- cms/templates/component.html | 39 ++++++++++----------- 2 files changed, 70 insertions(+), 27 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 7a9cc42af3..ae45c29fb5 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -456,27 +456,69 @@ body.course.unit { //Component Name h3 { - //TO-DO ? + //TO-DO + //determine proper h-level } //Nav-Edit Modes .nav-edit-modes { - //TODO + list-style: none; + //move to the right, - .tab { - display: inline; + li { + //TO-DO + //inherit button styling + //no idea what it currently inherits... + + &:hover { + //TO-DO + //opacity change + } + + &.is-active { + //TO-DO + //inherit button styling + } } + } } - // Module Editors + // Editor Wrapper .editor-wrapper{ - //TO-DO ? + //TO-DO } - // Module Settings + // Settings Wrapper .settings-wrapper{ - //TO-DO ? + //TO-DO + + .settings-row { + // general row sizing stuff + width: 100%; + padding: 10px; + border-bottom: 1px solid $gray; + + //SettingsLabel + li > label { + //Text all aligned left + //this sets height of .settings-row to allow for long help strings. + } + + //SettingsInput + li > input { + width: 100px; + //TO-DO + + + } + + //SettingsHelp + li > span { + //Text all aligned left + } + + } } //OLD Meta-data Styling diff --git a/cms/templates/component.html b/cms/templates/component.html index 1782c41b7c..95e5d6915b 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,36 +1,37 @@
-

Name of Component

- -
    -
+
${editor} +
- -
Setting LabelSetting InputSetting Help
Example DropdownInput/Form stuff to be children here. Example Numerical Input
- - - - - - - - - - - - +
    + +
  • + + + ${helpstring} +
    • + +
  • + + + ${helpstring} +
    • ≈ +
Save From c842a5fc7c7b3e6fc6068e1462d83f2ecbcdfa5c Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 3 May 2013 00:33:58 -0700 Subject: [PATCH 006/117] plugged in more pseudo code for various css class states necessary as well as examples for dropdown case and extra logic required there --- cms/static/sass/views/_unit.scss | 17 +++++++++++++++-- cms/templates/component.html | 25 ++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index ae45c29fb5..b4352f413d 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -502,15 +502,28 @@ body.course.unit { //SettingsLabel li > label { //Text all aligned left + display: inline-block; //this sets height of .settings-row to allow for long help strings. } //SettingsInput - li > input { + li > input, li > select { + @include placeholder($gray-l4); + @include font-size(16); + @include size(100%,100%); width: 100px; + height: auto; //TO-DO - + &:focus { + //TO-DO + } + } + + //SettingsClear + li > button { + border-radius: 20px; //maybe a % calc from input box height + margin-left: 15px; } //SettingsHelp diff --git a/cms/templates/component.html b/cms/templates/component.html index 95e5d6915b..b6c537e036 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -20,17 +20,36 @@
    -
  • + +
  • + + ${helpstring}
    • -
  • +
  • ${helpstring} -
    • ≈ + + +
  • + + + ${helpstring} +
    • +
From 036991dce8ca0018fa2ecdea15bf27f1181ce7e9 Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 3 May 2013 08:10:37 -0700 Subject: [PATCH 007/117] moved bad variable name --- cms/templates/component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/templates/component.html b/cms/templates/component.html index b6c537e036..5a4fe11257 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -22,7 +22,7 @@
  • - +
    • -
    +
    ${editor}
    @@ -23,7 +23,7 @@
  • - + - ${helpstring} + helpstring
  • - ${helpstring} + helpstring
  • From d1595892fd82392e557c98a2ec1472b3bf2eba79 Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 4 May 2013 12:23:40 -0700 Subject: [PATCH 011/117] starting settings --- cms/static/sass/views/_unit.scss | 51 +++++++++++++++++++------------- cms/templates/component.html | 20 ++++++------- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index fea72f4573..204e9064eb 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -434,6 +434,10 @@ body.course.unit { background: $lightBluishGrey2; } + .component-edit-menu { + background-color: pink; + } + .component-editor { @include edit-box; @include box-shadow(none); @@ -445,8 +449,6 @@ body.course.unit { .component-edit-menu { @include box-sizing(border-box); - position: absolute; - width: 100%; //padding: 15px; top: 0; right: 0; @@ -494,40 +496,39 @@ body.course.unit { .settings-row { // general row sizing stuff - width: 100%; + background-color: $white; padding: 10px; - border-bottom: 1px solid $gray; + border-bottom: 1px solid $gray-l4; - //SettingsLabel - li > label { - //Text all aligned left - display: inline-block; - //this sets height of .settings-row to allow for long help strings. + .setting-label { + font-weight: normal; + display: inline; + position: relative; + left: 0; + width: 200px; } - //SettingsInput - li > input, li > select { + .setting-input { @include placeholder($gray-l4); @include font-size(16); @include size(100%,100%); - width: 100px; + width: 200px; height: auto; //TO-DO - &:focus { + //&:focus { //TO-DO - } } - //SettingsClear - li > button { - border-radius: 20px; //maybe a % calc from input box height + .setting-clear { + border-radius: 50%; margin-left: 15px; } //SettingsHelp - li > span { - //Text all aligned left + .setting-help { + @include font-size(14); + font-color: $gray-l6; } } @@ -561,9 +562,17 @@ body.course.unit { font-weight: 700; } - .save-button { - margin-top: 10px; + // Module Actions + // ==================== + + .module-actions { + padding: 0 0 10px 10px; + box-shadow: 0 2px 1px rgba(182, 182, 182, 0.75) inset; + background-color: $gray-l4; + + .save-button { margin: 15px 8px 0 0; + } } } } diff --git a/cms/templates/component.html b/cms/templates/component.html index 72c7df2845..356766c412 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -22,24 +22,24 @@
  • - - + + - - helpstring + helpstring
  • - - - helpstring + + + helpstring
  • - - @@ -47,7 +47,7 @@ - helpstring + helpstring
    • From ad0909dfbd41f4c5b98e2f7dd4547d258fd54540 Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 4 May 2013 23:19:49 -0700 Subject: [PATCH 012/117] style input boxes --- cms/static/sass/views/_unit.scss | 64 ++++++++++++++++++++++++++------ cms/templates/component.html | 18 ++++++--- 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 204e9064eb..9e4a102d69 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -453,7 +453,8 @@ body.course.unit { top: 0; right: 0; border-bottom: 1px solid $lightBluishGrey2; - background: $gray-l4; + box-shadow: 0 2px 1px rgba(182, 182, 182, 0.75) inset; + background-color: $white; //Component Name h4 { @@ -492,43 +493,84 @@ body.course.unit { // Settings Wrapper .settings-wrapper{ - //TO-DO + //doverflow-y: scroll; .settings-row { // general row sizing stuff - background-color: $white; + background-color: $lightBluishGrey2; padding: 10px; - border-bottom: 1px solid $gray-l4; + border-bottom: 1px solid $gray-l2; + opacity: .8; + + &:hover { + opacity: 1; + } .setting-label { font-weight: normal; - display: inline; + display: inline-block; + padding-left: 15px; position: relative; left: 0; - width: 200px; + width: 100px; } .setting-input { @include placeholder($gray-l4); - @include font-size(16); - @include size(100%,100%); + border-radius: 2px; width: 200px; height: auto; - //TO-DO + border: 1px solid $gray-l2; //&:focus { //TO-DO } + select { + border: 1px solid $gray-l4; + background: none repeat scroll #F2F2F2; + padding: 5px; + + &:active { + background-color: #FFFCF1; + } + + option { + line-height: 16px; + + } + } + .setting-clear { + @include font-size(11); + color: $gray; + width: 25px; + height: 25px; + vertical-align: middle; + padding: 5px; border-radius: 50%; - margin-left: 15px; + margin-left: 10px; + box-shadow: none; + text-shadow: none; + border: 1px solid $gray-l4; + + &:hover { + background-color: $blue-s3; + color: $white; + } + + &.inactive { + visibility: hidden; + } } //SettingsHelp .setting-help { - @include font-size(14); + display: inline-block; + @include font-size(12); font-color: $gray-l6; + padding-left: 20px; + max-width: 50%; } } diff --git a/cms/templates/component.html b/cms/templates/component.html index 356766c412..6bb3b3eff9 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -4,10 +4,10 @@

    Viewing: Name of Component

    @@ -23,7 +23,7 @@
  • - + + helpstring helpstringhelpstringhelpstringhelpstringhel pstringhelpstringh elpstringhelpstrin sghelp stringhelp stringhelpstringhe lpstring helpstringhelpstringhelpstring
  • - + + helpstring
    • From 6b4ab20d02681d5c2c106e83477588c7abc871df Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 5 May 2013 14:09:59 -0700 Subject: [PATCH 013/117] styled modes header, added inactive and active mode visibility as well as is-set mode styling. no js behavior in yet. adds overscoll fix for webkit --- cms/static/sass/views/_unit.scss | 86 ++++++++++++++++++++------------ cms/templates/component.html | 17 ++++--- 2 files changed, 64 insertions(+), 39 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 9e4a102d69..8ee048df24 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -434,10 +434,6 @@ body.course.unit { background: $lightBluishGrey2; } - .component-edit-menu { - background-color: pink; - } - .component-editor { @include edit-box; @include box-shadow(none); @@ -449,40 +445,50 @@ body.course.unit { .component-edit-menu { @include box-sizing(border-box); - //padding: 15px; + padding: 15px; top: 0; right: 0; - border-bottom: 1px solid $lightBluishGrey2; - box-shadow: 0 2px 1px rgba(182, 182, 182, 0.75) inset; - background-color: $white; + border-bottom: 1px solid $gray-l2; + background-color: $lightBluishGrey2; + box-shadow: 0 1px 2px rgba(182, 182, 182, 0.75) inset; //Component Name - h4 { - //TO-DO - //determine proper h-level + .component-name { + width: 50%; + @include font-size(14); + + em { + font-weight: 700; + } } //Nav-Edit Modes .nav-edit-modes { list-style: none; + right: 0; + top: 0; + position: absolute; + padding: 10px; - li { - //TO-DO - //inherit button styling - float: right; - //no idea what it currently inherits... + .mode { + display: inline-block; - &:hover { - //TO-DO - //opacity change + .inactive-mode { + display: none; } - &.is-active { - //TO-DO - //inherit button styling + .active-mode { + @include white-button; + + &.is-set { + background-color: $lightBluishGrey2; + cursor: default; + linear-gradient: none; + @include box-shadow(0 0 1px 1px rgba(0, 0, 0, .6) inset); + + } } } - } } @@ -493,25 +499,46 @@ body.course.unit { // Settings Wrapper .settings-wrapper{ - //doverflow-y: scroll; + overflow: auto; + max-height: 400px; + //TO-DO browser testing for scrollbar, especially styles below. + + &::-webkit-scrollbar { + -webkit-appearance: none; + width: 11px; + height: 11px; + } + + &::-webkit-scrollbar-thumb { + border-radius: 8px; + border: 2px solid $lightBluishGrey2; + background-color: rgba(0, 0, 0, .5); + } .settings-row { // general row sizing stuff - background-color: $lightBluishGrey2; + background-color: $white; padding: 10px; border-bottom: 1px solid $gray-l2; - opacity: .8; + opacity: .6; &:hover { opacity: 1; } + &.is-set { + opacity: .9; + background-color: $white; + font-weight: 200; + } + .setting-label { font-weight: normal; display: inline-block; padding-left: 15px; position: relative; left: 0; + height: 50%; width: 100px; } @@ -534,11 +561,6 @@ body.course.unit { &:active { background-color: #FFFCF1; } - - option { - line-height: 16px; - - } } .setting-clear { @@ -570,7 +592,7 @@ body.course.unit { @include font-size(12); font-color: $gray-l6; padding-left: 20px; - max-width: 50%; + max-width: 40%; } } diff --git a/cms/templates/component.html b/cms/templates/component.html index 6bb3b3eff9..e4e733aacf 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,21 +1,24 @@
    -
    -

    Viewing: Name of Component

    +
    + Editing: Name of Component
    - ${editor} +
      @@ -37,7 +40,7 @@ - helpstring helpstringhelpstringhelpstringhelpstringhel pstringhelpstringh elpstringhelpstrin sghelp stringhelp stringhelpstringhe lpstring helpstringhelpstringhelpstring + This is a more reasonable helpstring sentence that would alos wrap around. A second sentence in some cases may be necessary.
    • From 38abc0167db13d17d9bfb8b5edbf53d145003384 Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 6 May 2013 07:37:14 -0700 Subject: [PATCH 014/117] label on top of input field move --- cms/static/sass/views/_settings.scss | 2 +- cms/static/sass/views/_unit.scss | 22 ++++++++++++---------- cms/templates/component.html | 14 +++++++------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/cms/static/sass/views/_settings.scss b/cms/static/sass/views/_settings.scss index d1ba706d56..def730071e 100644 --- a/cms/static/sass/views/_settings.scss +++ b/cms/static/sass/views/_settings.scss @@ -21,7 +21,7 @@ body.course.settings { font-size: 14px; } - .message-status { + .message-status { display: none; @include border-top-radius(2px); @include box-sizing(border-box); diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 8ee048df24..32b221d9c7 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -481,10 +481,10 @@ body.course.unit { @include white-button; &.is-set { - background-color: $lightBluishGrey2; + background-color: $white; cursor: default; linear-gradient: none; - @include box-shadow(0 0 1px 1px rgba(0, 0, 0, .6) inset); + @include box-shadow(0 0 1px 1px rgba(240, 240, 240, .1) inset); } } @@ -518,24 +518,22 @@ body.course.unit { .settings-row { // general row sizing stuff background-color: $white; - padding: 10px; + padding: 10px 20px; border-bottom: 1px solid $gray-l2; - opacity: .6; + opacity: .8; &:hover { opacity: 1; } &.is-set { - opacity: .9; + opacity: 1; background-color: $white; font-weight: 200; } .setting-label { - font-weight: normal; - display: inline-block; - padding-left: 15px; + font-weight: 500; position: relative; left: 0; height: 50%; @@ -545,6 +543,7 @@ body.course.unit { .setting-input { @include placeholder($gray-l4); border-radius: 2px; + padding: 6px 8px 8px; width: 200px; height: auto; border: 1px solid $gray-l2; @@ -578,7 +577,9 @@ body.course.unit { &:hover { background-color: $blue-s3; + border: 1px solid $blue-s3; color: $white; + @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 1px 1px rgba(0, 0, 0, .15)); } &.inactive { @@ -588,11 +589,12 @@ body.course.unit { //SettingsHelp .setting-help { + @include clearfix; display: inline-block; @include font-size(12); font-color: $gray-l6; padding-left: 20px; - max-width: 40%; + width: 65%; } } @@ -632,7 +634,7 @@ body.course.unit { .module-actions { padding: 0 0 10px 10px; box-shadow: 0 2px 1px rgba(182, 182, 182, 0.75) inset; - background-color: $gray-l4; + background-color: $gray-l6; .save-button { margin: 15px 8px 0 0; diff --git a/cms/templates/component.html b/cms/templates/component.html index e4e733aacf..7cb93bdecc 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -25,8 +25,8 @@
    • - - + +
    • - - + + - This is a more reasonable helpstring sentence that would alos wrap around. A second sentence in some cases may be necessary. +
      This is a more reasonable helpstring sentence that would alos wrap around. A second sentence in some cases may be necessary.
    • - - From d28c0b5f91733eb3252e89826339a25005dcb20d Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 7 May 2013 08:59:28 -0400 Subject: [PATCH 015/117] cleaned up styling, synced up partially to existing standards for forms, fonts, colors, etc; currently open select box issue on chrome --- cms/static/sass/views/_unit.scss | 104 ++++++++++++++++++++++--------- cms/templates/component.html | 90 ++++++++++++++------------ 2 files changed, 123 insertions(+), 71 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 32b221d9c7..cc7042ebca 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -445,20 +445,23 @@ body.course.unit { .component-edit-menu { @include box-sizing(border-box); - padding: 15px; + padding: 15px 0 15px 20px; top: 0; right: 0; border-bottom: 1px solid $gray-l2; - background-color: $lightBluishGrey2; + background-color: $blue; + color: $white; box-shadow: 0 1px 2px rgba(182, 182, 182, 0.75) inset; //Component Name .component-name { + @extend .t-copy-sub1; + color: $white; width: 50%; - @include font-size(14); em { - font-weight: 700; + @extend .t-title-3; + color: $white; } } @@ -478,14 +481,18 @@ body.course.unit { } .active-mode { - @include white-button; + @include blue-button; + } - &.is-set { - background-color: $white; - cursor: default; - linear-gradient: none; - @include box-shadow(0 0 1px 1px rgba(240, 240, 240, .1) inset); + .is-set { + @include linear-gradient($blue, $blue); + box-shadow: inset 0 0 2px $shadow; + background-color: $blue; + cursor: default; + &:hover { + box-shadow: inset 0 0 2px $shadow; + background-color: $blue; } } } @@ -493,16 +500,18 @@ body.course.unit { } // Editor Wrapper - .editor-wrapper{ + .wrapper-component-editor { //TO-DO } + + // Settings Wrapper - .settings-wrapper{ + .wrapper-component-settings ul{ overflow: auto; max-height: 400px; - //TO-DO browser testing for scrollbar, especially styles below. + //chrome scrollbar visibility correction &::-webkit-scrollbar { -webkit-appearance: none; width: 11px; @@ -511,57 +520,92 @@ body.course.unit { &::-webkit-scrollbar-thumb { border-radius: 8px; - border: 2px solid $lightBluishGrey2; + border: 2px solid $gray-l2; background-color: rgba(0, 0, 0, .5); } .settings-row { - // general row sizing stuff + @extend .field-group; // TO-DO ??? background-color: $white; padding: 10px 20px; border-bottom: 1px solid $gray-l2; opacity: .8; &:hover { + @include transition(opacity 0.25s ease-in-out); opacity: 1; } + //Styles for component settings which are set &.is-set { opacity: 1; background-color: $white; - font-weight: 200; + + .setting-label { + color: $blue-l1; + } + + .setting-input { + color: $blue-l1; + } + + .setting-clear { + //... + } } + .wrapper-setting-actions { + @extend .field; + display: inline-block; + width: 360px; + top: 0; + vertical-align: top; + } + + //Setting Label - also basic 'label' .setting-label { - font-weight: 500; + @extend .t-copy-sub2; + display: inline-block; position: relative; left: 0; height: 50%; - width: 100px; + width: 120px; + text-overflow: ellipsis; } + //Setting Input - also basic 'field' .setting-input { + @extend .t-copy-sub3; @include placeholder($gray-l4); border-radius: 2px; padding: 6px 8px 8px; - width: 200px; + width: 180px; height: auto; border: 1px solid $gray-l2; + text-overflow: ellipsis; //&:focus { //TO-DO } + //custom styling of selectbox to look more like input boxes. select { border: 1px solid $gray-l4; background: none repeat scroll #F2F2F2; padding: 5px; + &:focus { + @include box-shadow(0 1px 1px $shadow); + @include transition(opacity 0.25s ease-in-out); + background-color: #FFFCF1; + } + &:active { background-color: #FFFCF1; } } + //Setting Clear Button .setting-clear { @include font-size(11); color: $gray; @@ -570,16 +614,17 @@ body.course.unit { vertical-align: middle; padding: 5px; border-radius: 50%; - margin-left: 10px; + margin: 0 10px; box-shadow: none; text-shadow: none; border: 1px solid $gray-l4; &:hover { + @include box-shadow(0 1px 1px $shadow); + @include transition(opacity 0.25s ease-in-out); background-color: $blue-s3; border: 1px solid $blue-s3; color: $white; - @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 1px 1px rgba(0, 0, 0, .15)); } &.inactive { @@ -587,14 +632,13 @@ body.course.unit { } } - //SettingsHelp + //Setting Tip .setting-help { - @include clearfix; - display: inline-block; @include font-size(12); + display: inline-block; font-color: $gray-l6; - padding-left: 20px; - width: 65%; + max-width: 50%; + vertical-align: top; } } @@ -632,9 +676,9 @@ body.course.unit { // ==================== .module-actions { + @include box-shadow(inset 0 1px 1px $shadow); padding: 0 0 10px 10px; - box-shadow: 0 2px 1px rgba(182, 182, 182, 0.75) inset; - background-color: $gray-l6; + background-color: $gray-l4; .save-button { margin: 15px 8px 0 0; @@ -755,9 +799,9 @@ body.course.unit { .unit-location { .url { + @include box-shadow(none); width: 100%; margin-bottom: 10px; - @include box-shadow(none); } .draft-tag, @@ -771,6 +815,7 @@ body.course.unit { @include tree-view; .section-item { + @include box-sizing(border-box); display: inline-block; width: 100%; font-size: 11px; @@ -778,7 +823,6 @@ body.course.unit { text-overflow: ellipsis; white-space: nowrap; overflow: hidden; - @include box-sizing(border-box); } ol { diff --git a/cms/templates/component.html b/cms/templates/component.html index 7cb93bdecc..ffbd7b7cc8 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -17,49 +17,57 @@
    -
    - +
    +
    -
      - - -
    • - - - - - helpstring -
      • - -
    • - - - -
      This is a more reasonable helpstring sentence that would alos wrap around. A second sentence in some cases may be necessary.
      - - -
    • - - - - helpstring -
      • - -
    +
    +
      + + +
    • +
      + + + + +
      + helpstring +
      • + +
    • +
      + + + +
      + This is a longer sentence, repeated multiple times here just to test out the functionaltiy. +
      • + +
    • +
      + + + +
      + helpstring +
      • + +
    +
    Save From 977d0d76c24075a65d606f44b78ea490a3dc9758 Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 7 May 2013 16:40:21 -0400 Subject: [PATCH 016/117] cleaning up styles to use list-input, field, group, label, input, tip, etc standards. also opted to try out initial pass at hierarchy splitting of css classes on items that repeat (li, for example) --- cms/static/sass/elements/_forms.scss | 1 - cms/static/sass/views/_unit.scss | 836 ++++++++++++++------------- cms/templates/component.html | 49 +- 3 files changed, 473 insertions(+), 413 deletions(-) diff --git a/cms/static/sass/elements/_forms.scss b/cms/static/sass/elements/_forms.scss index 1faf4a883e..70d959fdea 100644 --- a/cms/static/sass/elements/_forms.scss +++ b/cms/static/sass/elements/_forms.scss @@ -124,7 +124,6 @@ code { .CodeMirror { font-size: 13px; - border: 1px solid $darkGrey; background: #fff; } diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index cc7042ebca..75b3224f45 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -431,7 +431,7 @@ body.course.unit { .wrapper-component-editor { z-index: 9999; position: relative; - background: $lightBluishGrey2; + background: $white; } .component-editor { @@ -441,225 +441,6 @@ body.course.unit { padding: 0; border-radius: 2px 2px 0 0; - // Edit Menu (Component Name, Mode-Editor, Mode-Settings) - - .component-edit-menu { - @include box-sizing(border-box); - padding: 15px 0 15px 20px; - top: 0; - right: 0; - border-bottom: 1px solid $gray-l2; - background-color: $blue; - color: $white; - box-shadow: 0 1px 2px rgba(182, 182, 182, 0.75) inset; - - //Component Name - .component-name { - @extend .t-copy-sub1; - color: $white; - width: 50%; - - em { - @extend .t-title-3; - color: $white; - } - } - - //Nav-Edit Modes - .nav-edit-modes { - list-style: none; - right: 0; - top: 0; - position: absolute; - padding: 10px; - - .mode { - display: inline-block; - - .inactive-mode { - display: none; - } - - .active-mode { - @include blue-button; - } - - .is-set { - @include linear-gradient($blue, $blue); - box-shadow: inset 0 0 2px $shadow; - background-color: $blue; - cursor: default; - - &:hover { - box-shadow: inset 0 0 2px $shadow; - background-color: $blue; - } - } - } - } - } - - // Editor Wrapper - .wrapper-component-editor { - //TO-DO - } - - - - // Settings Wrapper - .wrapper-component-settings ul{ - overflow: auto; - max-height: 400px; - - //chrome scrollbar visibility correction - &::-webkit-scrollbar { - -webkit-appearance: none; - width: 11px; - height: 11px; - } - - &::-webkit-scrollbar-thumb { - border-radius: 8px; - border: 2px solid $gray-l2; - background-color: rgba(0, 0, 0, .5); - } - - .settings-row { - @extend .field-group; // TO-DO ??? - background-color: $white; - padding: 10px 20px; - border-bottom: 1px solid $gray-l2; - opacity: .8; - - &:hover { - @include transition(opacity 0.25s ease-in-out); - opacity: 1; - } - - //Styles for component settings which are set - &.is-set { - opacity: 1; - background-color: $white; - - .setting-label { - color: $blue-l1; - } - - .setting-input { - color: $blue-l1; - } - - .setting-clear { - //... - } - } - - .wrapper-setting-actions { - @extend .field; - display: inline-block; - width: 360px; - top: 0; - vertical-align: top; - } - - //Setting Label - also basic 'label' - .setting-label { - @extend .t-copy-sub2; - display: inline-block; - position: relative; - left: 0; - height: 50%; - width: 120px; - text-overflow: ellipsis; - } - - //Setting Input - also basic 'field' - .setting-input { - @extend .t-copy-sub3; - @include placeholder($gray-l4); - border-radius: 2px; - padding: 6px 8px 8px; - width: 180px; - height: auto; - border: 1px solid $gray-l2; - text-overflow: ellipsis; - - //&:focus { - //TO-DO - } - - //custom styling of selectbox to look more like input boxes. - select { - border: 1px solid $gray-l4; - background: none repeat scroll #F2F2F2; - padding: 5px; - - &:focus { - @include box-shadow(0 1px 1px $shadow); - @include transition(opacity 0.25s ease-in-out); - background-color: #FFFCF1; - } - - &:active { - background-color: #FFFCF1; - } - } - - //Setting Clear Button - .setting-clear { - @include font-size(11); - color: $gray; - width: 25px; - height: 25px; - vertical-align: middle; - padding: 5px; - border-radius: 50%; - margin: 0 10px; - box-shadow: none; - text-shadow: none; - border: 1px solid $gray-l4; - - &:hover { - @include box-shadow(0 1px 1px $shadow); - @include transition(opacity 0.25s ease-in-out); - background-color: $blue-s3; - border: 1px solid $blue-s3; - color: $white; - } - - &.inactive { - visibility: hidden; - } - } - - //Setting Tip - .setting-help { - @include font-size(12); - display: inline-block; - font-color: $gray-l6; - max-width: 50%; - vertical-align: top; - } - - } - } - - //OLD Meta-data Styling - //TO-DO port over old styling - .metadata_edit { - margin-bottom: 20px; - font-size: 13px; - - li { - margin-bottom: 10px; - } - - label { - display: inline-block; - margin-right: 10px; - } - } - h3 { margin-bottom: 10px; font-size: 18px; @@ -671,222 +452,272 @@ body.course.unit { color: #fff; font-weight: 700; } + } + } +} - // Module Actions - // ==================== +// Edit Header (Component Name, Mode-Editor, Mode-Settings) - .module-actions { - @include box-shadow(inset 0 1px 1px $shadow); - padding: 0 0 10px 10px; - background-color: $gray-l4; +.component-edit-header { + @include box-sizing(border-box); + padding: 15px 0 15px 20px; + top: 0; + right: 0; + border-bottom: 1px solid $gray-l2; + background-color: $blue; + color: $white; + box-shadow: 0 1px 2px rgba(182, 182, 182, 0.75) inset; - .save-button { - margin: 15px 8px 0 0; - } - } + //Component Name + .component-name { + @extend .t-copy-sub1; + color: $white; + width: 50%; + + em { + font-weight: 600; + color: $white; } } - // Unit Page Sidebar - // ==================== + //Nav-Edit Modes + .nav-edit-modes { + list-style: none; + right: 0; + top: 0; + position: absolute; + padding: 10px; - .unit-settings { - .window-contents { - padding: 10px 20px; - } - - .unit-actions { - border-bottom: none; - padding-bottom: 0; - } - - .published-alert { - display: none; - padding: 10px; - border: 1px solid #edbd3c; - border-radius: 3px; - background: #fbf6e1; - font-size: 14px; - line-height: 1.4; - - div { - margin-top: 15px; - } - } - - input[type="radio"] { - margin-right: 7px; - } - - .status { - font-size: 12px; - - strong { - font-weight: 700; - } - } - - .preview-button, .view-button { - @include white-button; - margin-bottom: 10px; - } - - .publish-button { - @include orange-button; - } - - .delete-button { - @include blue-button; - } - - .delete-draft { + .mode { display: inline-block; - } - .delete-button, - .preview-button, - .publish-button, - .view-button { - font-size: 11px; - margin-top: 10px; - padding: 6px 15px 8px; - } - } - - .unit-history { - &.collapsed { - h4 { - border-bottom: none; - border-radius: 3px; - } - - .window-contents { + .inactive-mode { display: none; } - } - ol { - border: 1px solid #ced2db; + .active-mode { + @include blue-button; + } - li { - display: block; - padding: 6px 8px 8px 10px; - background: #edf1f5; - font-size: 12px; + .is-set { + @include linear-gradient($blue, $blue); + box-shadow: inset 0 0 2px $shadow; + background-color: $blue; + cursor: default; &:hover { - background: #fffcf1; - - .item-actions { - display: block; - } - } - - &.checked { - background: #d1dae3; - } - - .item-actions { - display: none; - } - - input[type="radio"] { - margin-right: 7px; + box-shadow: inset 0 0 2px $shadow; + background-color: $blue; } } } } +} - .unit-location { - .url { - @include box-shadow(none); - width: 100%; - margin-bottom: 10px; +// Editor Wrapper +.wrapper-comp-editor { + //TO-DO +} + +// Settings Wrapper +.wrapper-comp-settings { + + //settings-list + .list-input.settings-list { + margin: 0; + padding: 0; + list-style: none; + + overflow: auto; + max-height: 400px; + + + //chrome scrollbar visibility correction + &::-webkit-scrollbar { + -webkit-appearance: none; + width: 11px; + height: 11px; } - .draft-tag, - .hidden-tag, - .private-tag, - .has-new-draft-tag { - font-size: 8px; + &::-webkit-scrollbar-thumb { + border-radius: 8px; + border: 2px solid $gray-l2; + background-color: rgba(0, 0, 0, .5); } - .window-contents > ol { - @include tree-view; + //component-setting-entry + .field.comp-setting-entry { + //margin: 0 0 $baseline 0; - .section-item { - @include box-sizing(border-box); + background-color: $white; + padding: 20px 20px; + border-bottom: 1px solid $gray-l2; + opacity: .6; + + &:last-child { + //margin-bottom: 0; + } + + //no required component settings currently + &.required { + label { + //font-weight: 600; + } + label:after { + //margin-left: ($baseline/4); + //content: "*"; + } + } + + &:hover { + //TO-DO review existing patterns for hover on field + @include transition(opacity 0.25s ease-in-out); + opacity: 1; + } + + &.is-set { + opacity: 1; + background-color: $white; + + //setting-label + .setting-label { + //color: $blue-l1; + } + + //setting-input + .setting-input { + color: $blue-l1; + } + + //setting-clear + .setting-clear { + //... + } + } + + .wrapper-comp-setting{ display: inline-block; - width: 100%; - font-size: 11px; - padding: 2px 8px 4px; + width: 360px; + top: 0; + vertical-align: top; + } + + label.setting-label { + //@extend .t-copy-sub1; + //@include transition(color, 0.15s, ease-in-out); + //margin: 0 0 ($baseline/4) 0; + //font-weight: 400; + + @extend .t-copy-sub2; + display: inline-block; + position: relative; + left: 0; + height: 50%; + width: 120px; text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; + + //&.is-focused { + // color: $blue; + //} } - ol { - .section-item { - padding-left: 20px; + input, select { + //@include placeholder($gray-l4); + //@include font-size(16); + //@include size(100%,100%); + //padding: ($baseline/2); + + //&.long { + //} + + //&.short { + //} + + //&.error { + // border-color: $red; + //} + + //&:focus { + + // + .tip { + // color: $gray; + // } + + @extend .t-copy-sub3; + @include placeholder($gray-l4); + border-radius: 2px; + padding: 6px 8px 8px; + width: 180px; + height: auto; + border: 1px solid $gray-l2; + text-overflow: ellipsis; + } + + select { + border: 1px solid $gray-l4; + background: none repeat scroll #F2F2F2; + padding: 5px; + + &:focus { + @include box-shadow(0 1px 1px $shadow); + @include transition(opacity 0.25s ease-in-out); + background-color: #FFFCF1; } - .new-unit-item { - margin-left: 20px; + &:active { + background-color: #FFFCF1; } } - ol ol { - .section-item { - padding-left: 34px; + //input[type=others] + + .action.setting-clear { + @include font-size(11); + color: $gray; + width: 25px; + height: 25px; + vertical-align: middle; + padding: 5px; + border-radius: 50%; + margin: 0 10px; + box-shadow: none; + text-shadow: none; + border: 1px solid $gray-l4; + + &:hover { + @include box-shadow(0 1px 1px $shadow); + @include transition(opacity 0.25s ease-in-out); + background-color: $blue-s3; + border: 1px solid $blue-s3; + color: $white; } - .new-unit-item { - margin: 0 0 10px 41px; + &.inactive { + visibility: hidden; } } + + tip.setting-help { + @include font-size(12); + display: inline-block; + font-color: $gray-l6; + max-width: 50%; + vertical-align: top; + } } } +} - .edit-state-draft { - .visibility, +// Module Actions +// ==================== - .edit-draft-message, - .view-button { - display: none; - } +.module-actions { + @include box-shadow(inset 0 1px 1px $shadow); + padding: 0 0 10px 10px; + background-color: $gray-l4; - .published-alert { - display: block; - } - } - - .edit-state-public { - .delete-draft, - .component-actions, - .new-component-item, - .editing-draft-alert, - .publish-draft-message, - .preview-button { - display: none; - } - - .published-alert { - display: block; - } - - .drag-handle { - display: none !important; - } - } - - .edit-state-private { - .delete-draft, - .publish-draft, - .editing-draft-alert, - .create-draft, - .view-button { - display: none; - } + .save-button { + margin: 15px 8px 0 0; } } @@ -914,3 +745,222 @@ body.unit { } } } + +// Unit Page Sidebar +// ==================== + +.unit-settings { + .window-contents { + padding: 10px 20px; + } + + .unit-actions { + border-bottom: none; + padding-bottom: 0; + } + + .published-alert { + display: none; + padding: 10px; + border: 1px solid #edbd3c; + border-radius: 3px; + background: #fbf6e1; + font-size: 14px; + line-height: 1.4; + + div { + margin-top: 15px; + } + } + + input[type="radio"] { + margin-right: 7px; + } + + .status { + font-size: 12px; + + strong { + font-weight: 700; + } + } + + .preview-button, .view-button { + @include white-button; + margin-bottom: 10px; + } + + .publish-button { + @include orange-button; + } + + .delete-button { + @include blue-button; + } + + .delete-draft { + display: inline-block; + } + + .delete-button, + .preview-button, + .publish-button, + .view-button { + font-size: 11px; + margin-top: 10px; + padding: 6px 15px 8px; + } +} + +.unit-history { + &.collapsed { + h4 { + border-bottom: none; + border-radius: 3px; + } + + .window-contents { + display: none; + } + } + + ol { + border: 1px solid #ced2db; + + li { + display: block; + padding: 6px 8px 8px 10px; + background: #edf1f5; + font-size: 12px; + + &:hover { + background: #fffcf1; + + .item-actions { + display: block; + } + } + + &.checked { + background: #d1dae3; + } + + .item-actions { + display: none; + } + + input[type="radio"] { + margin-right: 7px; + } + } + } +} + +.unit-location { + .url { + @include box-shadow(none); + width: 100%; + margin-bottom: 10px; + } + + .draft-tag, + .hidden-tag, + .private-tag, + .has-new-draft-tag { + font-size: 8px; + } + + .window-contents > ol { + @include tree-view; + + .section-item { + @include box-sizing(border-box); + display: inline-block; + width: 100%; + font-size: 11px; + padding: 2px 8px 4px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + } + + ol { + .section-item { + padding-left: 20px; + } + + .new-unit-item { + margin-left: 20px; + } + } + + ol ol { + .section-item { + padding-left: 34px; + } + + .new-unit-item { + margin: 0 0 10px 41px; + } + } + } +} + +.edit-state-draft { + .visibility, + + .edit-draft-message, + .view-button { + display: none; + } + + .published-alert { + display: block; + } +} + +.edit-state-public { + .delete-draft, + .component-actions, + .new-component-item, + .editing-draft-alert, + .publish-draft-message, + .preview-button { + display: none; + } + + .published-alert { + display: block; + } + + .drag-handle { + display: none !important; + } +} + +.edit-state-private { + .delete-draft, + .publish-draft, + .editing-draft-alert, + .create-draft, + .view-button { + display: none; + } +} + + +//OLD Meta-data Styling +//TO-DO port over old styling +.metadata_edit { + margin-bottom: 20px; + font-size: 13px; + + li { + margin-bottom: 10px; + } + + label { + display: inline-block; + margin-right: 10px; + } +} \ No newline at end of file diff --git a/cms/templates/component.html b/cms/templates/component.html index ffbd7b7cc8..496da8cd61 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,6 +1,6 @@
    -
    +
    Editing: Name of Component
      @@ -17,41 +17,41 @@
    -
    +
    -
    +
      -
    • -
      - - +
    • +
      + + -
      - helpstring + helpstring
      • -
    • +
    • - - -
      - This is a longer sentence, repeated multiple times here just to test out the functionaltiy. + This is a longer sentence, repeated multiple times here just to test out the functionaltiy.
      • -
    • +
    • - - @@ -59,11 +59,22 @@ -
      - helpstring + helpstring +
      • +
    • +
      + + + + +
      + helpstring
    From 328424790501df948635c259a273e05c98880844 Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 9 May 2013 09:35:31 -0400 Subject: [PATCH 017/117] restyling of the input fields, partway through adding in examples of all settings --- cms/static/sass/views/_unit.scss | 81 +++++++++++++--------------- cms/templates/component.html | 91 +++++++++++++++++++++++++++----- 2 files changed, 115 insertions(+), 57 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 75b3224f45..c7cdce3cb1 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -452,6 +452,19 @@ body.course.unit { color: #fff; font-weight: 700; } + + // Module Actions + .module-actions { + @include box-shadow(inset 0 1px 1px $shadow); + padding: 0px 0 10px 10px; + background-color: $gray-l4; + + .save-button { + margin: 15px 8px 0 0; + } + } + + } } } @@ -501,12 +514,13 @@ body.course.unit { .is-set { @include linear-gradient($blue, $blue); - box-shadow: inset 0 0 2px $shadow; + box-shadow: inset 0 0 3px $shadow; background-color: $blue; + cursor: default; &:hover { - box-shadow: inset 0 0 2px $shadow; + box-shadow: inset 0 0 3px $shadow; background-color: $blue; } } @@ -531,7 +545,6 @@ body.course.unit { overflow: auto; max-height: 400px; - //chrome scrollbar visibility correction &::-webkit-scrollbar { -webkit-appearance: none; @@ -547,10 +560,9 @@ body.course.unit { //component-setting-entry .field.comp-setting-entry { - //margin: 0 0 $baseline 0; - + //margin: 0 0 $baseline 0; WILL BE REMOVED PRIOR TO PUSH background-color: $white; - padding: 20px 20px; + padding: 20px; border-bottom: 1px solid $gray-l2; opacity: .6; @@ -603,31 +615,32 @@ body.course.unit { } label.setting-label { - //@extend .t-copy-sub1; - //@include transition(color, 0.15s, ease-in-out); - //margin: 0 0 ($baseline/4) 0; - //font-weight: 400; + @extend .t-copy-sub1; + @include transition(color, 0.15s, ease-in-out); + //margin: 0 0 ($baseline/4) 0; WILL BE REMOVED PRIOR TO PUSH + font-weight: 400; - @extend .t-copy-sub2; display: inline-block; position: relative; left: 0; - height: 50%; - width: 120px; - text-overflow: ellipsis; + min-width: 100px; + width: 35%; - //&.is-focused { - // color: $blue; - //} + &.is-focused { + color: $blue; + } } input, select { - //@include placeholder($gray-l4); - //@include font-size(16); - //@include size(100%,100%); - //padding: ($baseline/2); + @include placeholder($gray-l4); + @include font-size(16); + @include size(100%,100%); + padding: ($baseline/2); + min-width: 100px; + width: 45%; //&.long { + // //} //&.short { @@ -638,23 +651,16 @@ body.course.unit { //} //&:focus { - // + .tip { // color: $gray; // } - - @extend .t-copy-sub3; - @include placeholder($gray-l4); - border-radius: 2px; - padding: 6px 8px 8px; - width: 180px; - height: auto; + border-radius: 3px; border: 1px solid $gray-l2; text-overflow: ellipsis; } select { - border: 1px solid $gray-l4; + //border: 1px solid $gray-l2; background: none repeat scroll #F2F2F2; padding: 5px; @@ -701,26 +707,13 @@ body.course.unit { @include font-size(12); display: inline-block; font-color: $gray-l6; - max-width: 50%; + //max-width: 50%; vertical-align: top; } } } } -// Module Actions -// ==================== - -.module-actions { - @include box-shadow(inset 0 1px 1px $shadow); - padding: 0 0 10px 10px; - background-color: $gray-l4; - - .save-button { - margin: 15px 8px 0 0; - } -} - // Editing Units from Courseware // ==================== diff --git a/cms/templates/component.html b/cms/templates/component.html index 496da8cd61..250609d43e 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -24,33 +24,97 @@
      + + +
    • +
      + + + +
      + If disabled, students cannot upload images to be graded with this problem. +
      • + +
    • +
      + + + +
      + If enabled, submissions with poor spelling, short length, or poor grammar won't be peer reviewed. +
      • + +
    • +
      + + + + +
      + This value specifies the discussion are where this . This name appears in the left pane of the discussion forum for your course (question) +
      • + + + + + +
    • +
      + + + + +
      + This value defines the name of this component, and is shown to students as a tooltip. +
      • + + + + +
    • - - + +
      - helpstring + This value defines the name of this component, and is shown to students as a tooltip.
      • - +
    • -
      - - +
      + +
      - This is a longer sentence, repeated multiple times here just to test out the functionaltiy. + When set, this limits the number of times a student can attempt this problem.
      • - +
    • -
      - +
      +
      - This value specifies the discussion are where this . This name appears in the left pane of the discussion forum for your course (question) -
      • - - - - - -
    • -
      - - - - -
      - This value defines the name of this component, and is shown to students as a tooltip. -
      • - - - - - -
    • -
      - - - - -
      - This value defines the name of this component, and is shown to students as a tooltip. + This value specifies the discussion are where this component lives, organized in the left pane of the discussion forum for your course.
    • - - + + + -
      - When set, this limits the number of times a student can attempt this problem. +
    + This value defines the name of this component, and is shown to students as a tooltip.
  • - - - - - - - + +
    - helpstring + If disabled, this problem will not be graded.
    • -
  • +
  • - - + + -
    - helpstring + This value ....needs helpstring....
    • + +
  • +
    + + + +
    + Choose from a few different ways to incorporate randomization into this problem. +
    • + +
  • +
    + + + +
    + Choose from a few different options to define whether students interact with the problem's answer. (info icon here) You can define this for every problem in a course. +
    • + +
  • +
    + + + + +
    + You can specify the order of discussion areas in the discussion dropdown menu. Their order is alphabetical, but uses the sort key value instead of their name. +
    • + +
  • +
    + + + + +
    + Specify a subcategory name for this discussion. This name appears in the left pane of the discussion forum for your course. +
    • + +
    From bfdbcc2f3244c3db41fe45c0225e2e416b3a323e Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 9 May 2013 11:16:12 -0400 Subject: [PATCH 019/117] Beginnings of Backbone views/models. --- .../generic_metadata_entry.html | 2 + .../client_templates/metadata_editor.html | 7 +++ .../coffee/src/views/module_edit.coffee | 28 +++-------- cms/static/js/models/metadata_editor.js | 8 +++ cms/static/js/models/metadata_model.js | 13 +++++ .../js/views/generic_metadata_editor.js | 28 +++++++++++ cms/static/js/views/metadata_editor_view.js | 44 ++++++++++++++++ cms/templates/base.html | 7 +++ cms/templates/widgets/metadata-edit.html | 50 +++---------------- common/lib/xmodule/xmodule/mako_module.py | 6 ++- common/lib/xmodule/xmodule/x_module.py | 11 +++- 11 files changed, 138 insertions(+), 66 deletions(-) create mode 100644 cms/static/client_templates/generic_metadata_entry.html create mode 100644 cms/static/client_templates/metadata_editor.html create mode 100644 cms/static/js/models/metadata_editor.js create mode 100644 cms/static/js/models/metadata_model.js create mode 100644 cms/static/js/views/generic_metadata_editor.js create mode 100644 cms/static/js/views/metadata_editor_view.js diff --git a/cms/static/client_templates/generic_metadata_entry.html b/cms/static/client_templates/generic_metadata_entry.html new file mode 100644 index 0000000000..ef65c1bf3f --- /dev/null +++ b/cms/static/client_templates/generic_metadata_entry.html @@ -0,0 +1,2 @@ + + diff --git a/cms/static/client_templates/metadata_editor.html b/cms/static/client_templates/metadata_editor.html new file mode 100644 index 0000000000..9fb8cee67b --- /dev/null +++ b/cms/static/client_templates/metadata_editor.html @@ -0,0 +1,7 @@ +
      + <% _.each(metadata_entries, function(entry) { %> +
    • +
      +
      • + <% }) %> +
    \ No newline at end of file diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index bf56807f66..eeda00638a 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -20,29 +20,15 @@ class CMS.Views.ModuleEdit extends Backbone.View loadEdit: -> if not @module @module = XModule.loadModule(@$el.find('.xmodule_edit')) - @originalMetadata = @metadata() - - metadata: -> - # cdodge: package up metadata which is separated into a number of input fields - # there's probably a better way to do this, but at least this lets me continue to move onwards - _metadata = {} - - $metadata = @$component_editor().find('.metadata_edit') - - if $metadata - # walk through the set of elments which have the 'xmetadata_name' attribute and - # build up a object to pass back to the server on the subsequent POST - _metadata[$(el).data("metadata-name")] = el.value for el in $('[data-metadata-name]', $metadata) - - return _metadata + # At this point, metadata-edit.html will be loaded, and the metadata (as JSON) is available. + metadataEditor = @$el.find('.metadata_edit') + @metadataEditor = new CMS.Views.Metadata.Editor({ + el: metadataEditor, + model: new CMS.Models.MetadataEditor(metadataEditor.data('metadata')) + }); changedMetadata: -> - currentMetadata = @metadata() - changedMetadata = {} - for key of currentMetadata - if currentMetadata[key] != @originalMetadata[key] - changedMetadata[key] = currentMetadata[key] - return changedMetadata + return @metadataEditor.getModifiedMetadataValues() cloneTemplate: (parent, template) -> $.post("/clone_item", { diff --git a/cms/static/js/models/metadata_editor.js b/cms/static/js/models/metadata_editor.js new file mode 100644 index 0000000000..334d8aa718 --- /dev/null +++ b/cms/static/js/models/metadata_editor.js @@ -0,0 +1,8 @@ +CMS.Models.MetadataEditor = Backbone.Model.extend({ + // This model class is not suited for restful operations and is considered just a server side initialized container + url: '', + + defaults: { + } + +}); diff --git a/cms/static/js/models/metadata_model.js b/cms/static/js/models/metadata_model.js new file mode 100644 index 0000000000..4349fa7187 --- /dev/null +++ b/cms/static/js/models/metadata_model.js @@ -0,0 +1,13 @@ +CMS.Models.Metadata = Backbone.Model.extend({ + // This model class is not suited for restful operations and is considered just a server side initialized container + url: '', + + defaults: { + "display_name": null, + "value" : null + }, + + getOriginalValue: function() { + return this.get('value'); + } +}); diff --git a/cms/static/js/views/generic_metadata_editor.js b/cms/static/js/views/generic_metadata_editor.js new file mode 100644 index 0000000000..3dc7f1f7e1 --- /dev/null +++ b/cms/static/js/views/generic_metadata_editor.js @@ -0,0 +1,28 @@ +if (!CMS.Views['Metadata']) CMS.Views.Metadata = {}; + +CMS.Views.Metadata.Generic = Backbone.View.extend({ + + // Model class ... + events : { + }, + + initialize : function() { + var self = this; + // instantiates an editor template for each update in the collection + window.templateLoader.loadRemoteTemplate("metadata_entry", + "/static/client_templates/generic_metadata_entry.html", + function (raw_template) { + self.template = _.template(raw_template); + self.$el.append(self.template({model: self.model})); + } + ); + }, + + modified: function () { + return this.getValue() !== this.model.getOriginalValue(); + }, + + getValue: function() { + return this.$el.find('.editor').val(); + } +}); diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js new file mode 100644 index 0000000000..6c1665d294 --- /dev/null +++ b/cms/static/js/views/metadata_editor_view.js @@ -0,0 +1,44 @@ +if (!CMS.Views['Metadata']) CMS.Views.Metadata = {}; + +CMS.Views.Metadata.Editor = Backbone.View.extend({ + + // Model class is ... + events : { + }, + + views : {}, // child views + + initialize : function() { + var self = this; + // instantiates an editor template for each update in the collection + window.templateLoader.loadRemoteTemplate("metadata_editor", + "/static/client_templates/metadata_editor.html", + function (raw_template) { + self.template = _.template(raw_template); + self.$el.append(self.template({metadata_entries: self.model.attributes})); + var counter = 0; + _.each(self.model.attributes, + function(item, key) { + self.views[key] = new CMS.Views.Metadata.Generic({ + el: self.$el.find('.metadata_entry')[counter], + model: new CMS.Models.Metadata(item) + } + ); + counter+=1; + }); + } + ); + }, + + getModifiedMetadataValues: function () { + var modified_values = {}; + _.each(this.views, + function (item, key) { + if (item.modified()) { + modified_values[key] = item.getValue(); + } + } + ); + return modified_values; + } +}); diff --git a/cms/templates/base.html b/cms/templates/base.html index f1a87d6424..db62c76015 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -49,6 +49,13 @@ + + + + + + + +
    \ No newline at end of file diff --git a/cms/templates/widgets/raw-edit.html b/cms/templates/widgets/raw-edit.html index 9488552be5..be41fad887 100644 --- a/cms/templates/widgets/raw-edit.html +++ b/cms/templates/widgets/raw-edit.html @@ -1,4 +1,6 @@ <%include file="metadata-edit.html" /> -
    - -
    +
    +
    + +
    +
    From b314b5ce590db3fc295f7840b0da17449a41432b Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 9 May 2013 14:51:16 -0400 Subject: [PATCH 024/117] Renaming of some files. --- cms/static/client_templates/metadata_option_entry.html | 0 ...{generic_metadata_entry.html => metadata_string_entry.html} | 2 +- cms/static/js/views/metadata_option_view.js | 0 .../{generic_metadata_editor.js => metadata_string_view.js} | 2 +- cms/templates/base.html | 3 ++- 5 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 cms/static/client_templates/metadata_option_entry.html rename cms/static/client_templates/{generic_metadata_entry.html => metadata_string_entry.html} (88%) create mode 100644 cms/static/js/views/metadata_option_view.js rename cms/static/js/views/{generic_metadata_editor.js => metadata_string_view.js} (91%) diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/static/client_templates/metadata_option_entry.html new file mode 100644 index 0000000000..e69de29bb2 diff --git a/cms/static/client_templates/generic_metadata_entry.html b/cms/static/client_templates/metadata_string_entry.html similarity index 88% rename from cms/static/client_templates/generic_metadata_entry.html rename to cms/static/client_templates/metadata_string_entry.html index 42069def5e..494a4ff97a 100644 --- a/cms/static/client_templates/generic_metadata_entry.html +++ b/cms/static/client_templates/metadata_string_entry.html @@ -6,4 +6,4 @@ ↩
    -'<%= model.get("help") %>' \ No newline at end of file +<%= model.get('help') %> \ No newline at end of file diff --git a/cms/static/js/views/metadata_option_view.js b/cms/static/js/views/metadata_option_view.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/cms/static/js/views/generic_metadata_editor.js b/cms/static/js/views/metadata_string_view.js similarity index 91% rename from cms/static/js/views/generic_metadata_editor.js rename to cms/static/js/views/metadata_string_view.js index 3dc7f1f7e1..53937f3a47 100644 --- a/cms/static/js/views/generic_metadata_editor.js +++ b/cms/static/js/views/metadata_string_view.js @@ -10,7 +10,7 @@ CMS.Views.Metadata.Generic = Backbone.View.extend({ var self = this; // instantiates an editor template for each update in the collection window.templateLoader.loadRemoteTemplate("metadata_entry", - "/static/client_templates/generic_metadata_entry.html", + "/static/client_templates/metadata_string_entry.html", function (raw_template) { self.template = _.template(raw_template); self.$el.append(self.template({model: self.model})); diff --git a/cms/templates/base.html b/cms/templates/base.html index db62c76015..5825cdb1b9 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -52,7 +52,8 @@ - + + From 6dbfa7499b25c823ad99f936ef5a399cfe91f06f Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 9 May 2013 14:58:54 -0400 Subject: [PATCH 025/117] removed metadata-edit styling --- cms/static/sass/views/_unit.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 57ce1e67d0..fd876c083c 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -560,7 +560,6 @@ body.course.unit { //component-setting-entry .field.comp-setting-entry { - //margin: 0 0 $baseline 0; WILL BE REMOVED PRIOR TO PUSH background-color: $white; padding: 20px; border-bottom: 1px solid $gray-l2; @@ -945,12 +944,6 @@ body.unit { //OLD Meta-data Styling //TO-DO port over old styling .metadata_edit { - margin-bottom: 20px; - font-size: 13px; - - li { - margin-bottom: 10px; - } label { display: inline-block; From 04bb7335e752f5d699fdcc73342f233748b2f9f3 Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 10 May 2013 13:18:43 -0400 Subject: [PATCH 026/117] removed extra section heading in settings DOM, placed settings after editor --- cms/static/client_templates/metadata_editor.html | 16 +++++++--------- cms/static/coffee/src/views/module_edit.coffee | 1 + cms/templates/widgets/html-edit.html | 2 +- cms/templates/widgets/metadata-edit.html | 2 +- cms/templates/widgets/problem-edit.html | 4 ++-- cms/templates/widgets/raw-edit.html | 2 +- cms/templates/widgets/sequence-edit.html | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/cms/static/client_templates/metadata_editor.html b/cms/static/client_templates/metadata_editor.html index 92f053ca9f..bf618bd6f1 100644 --- a/cms/static/client_templates/metadata_editor.html +++ b/cms/static/client_templates/metadata_editor.html @@ -1,9 +1,7 @@ -
    -
      - <% _.each(metadata_entries, function(entry) { %> -
    • -
      -
      • - <% }) %> -
    -
    \ No newline at end of file +
      + <% _.each(metadata_entries, function(entry) { %> +
    • +
      +
      • + <% }) %> +
    \ No newline at end of file diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index eeda00638a..8a6db67e3a 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -8,6 +8,7 @@ class CMS.Views.ModuleEdit extends Backbone.View "click .component-actions .edit-button": 'clickEditButton' "click .component-actions .delete-button": 'onDelete' + initialize: -> @onDelete = @options.onDelete @render() diff --git a/cms/templates/widgets/html-edit.html b/cms/templates/widgets/html-edit.html index 7c4a1bde7b..17f86a89dc 100644 --- a/cms/templates/widgets/html-edit.html +++ b/cms/templates/widgets/html-edit.html @@ -1,4 +1,3 @@ -<%include file="metadata-edit.html" />
      @@ -12,3 +11,4 @@
    +<%include file="metadata-edit.html" /> diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html index c1e2654724..8367011c42 100644 --- a/cms/templates/widgets/metadata-edit.html +++ b/cms/templates/widgets/metadata-edit.html @@ -8,7 +8,7 @@ % if 'source_code' in json_metadata_data: <% del json_metadata_data['source_code'] %> % endif -
    +
    % if showHighLevelSource: Edit High Level Source diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html index 908112cd01..e2856d731a 100644 --- a/cms/templates/widgets/problem-edit.html +++ b/cms/templates/widgets/problem-edit.html @@ -1,4 +1,3 @@ -<%include file="metadata-edit.html" />
    @@ -106,4 +105,5 @@
    -
    \ No newline at end of file +
    +<%include file="metadata-edit.html" /> \ No newline at end of file diff --git a/cms/templates/widgets/raw-edit.html b/cms/templates/widgets/raw-edit.html index be41fad887..2b1b0f9ef3 100644 --- a/cms/templates/widgets/raw-edit.html +++ b/cms/templates/widgets/raw-edit.html @@ -1,6 +1,6 @@ -<%include file="metadata-edit.html" />
    +<%include file="metadata-edit.html" /> diff --git a/cms/templates/widgets/sequence-edit.html b/cms/templates/widgets/sequence-edit.html index c70f2568fa..7956fbfbaf 100644 --- a/cms/templates/widgets/sequence-edit.html +++ b/cms/templates/widgets/sequence-edit.html @@ -29,7 +29,6 @@
    - <%include file="metadata-edit.html" />
      @@ -50,5 +49,6 @@
    + <%include file="metadata-edit.html" /> From fd52980a2d19902a532057a251791adddd542705 Mon Sep 17 00:00:00 2001 From: cahrens Date: Fri, 10 May 2013 16:02:22 -0400 Subject: [PATCH 027/117] Option view, changes getting persisted. --- .../metadata_option_entry.html | 12 +++++++ .../metadata_string_entry.html | 5 ++- cms/static/js/views/metadata_editor_view.js | 17 ++++++---- cms/static/js/views/metadata_option_view.js | 32 +++++++++++++++++++ cms/static/js/views/metadata_string_view.js | 9 +++--- common/lib/xmodule/xmodule/capa_module.py | 3 +- common/lib/xmodule/xmodule/x_module.py | 5 +++ 7 files changed, 69 insertions(+), 14 deletions(-) diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/static/client_templates/metadata_option_entry.html index e69de29bb2..3a1cd30337 100644 --- a/cms/static/client_templates/metadata_option_entry.html +++ b/cms/static/client_templates/metadata_option_entry.html @@ -0,0 +1,12 @@ +
    + + + +
    +<%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_string_entry.html b/cms/static/client_templates/metadata_string_entry.html index 494a4ff97a..af49dc0291 100644 --- a/cms/static/client_templates/metadata_string_entry.html +++ b/cms/static/client_templates/metadata_string_entry.html @@ -1,7 +1,6 @@
    - - - + + diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index 6c1665d294..9665b456dd 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -19,12 +19,17 @@ CMS.Views.Metadata.Editor = Backbone.View.extend({ var counter = 0; _.each(self.model.attributes, function(item, key) { - self.views[key] = new CMS.Views.Metadata.Generic({ - el: self.$el.find('.metadata_entry')[counter], - model: new CMS.Models.Metadata(item) - } - ); - counter+=1; + var data = { + el: self.$el.find('.metadata_entry')[counter++], + model: new CMS.Models.Metadata(item) + }; + if (item.options.length > 0) { + self.views[key] = new CMS.Views.Metadata.Option(data); + } + else { + self.views[key] = new CMS.Views.Metadata.String(data); + } + }); } ); diff --git a/cms/static/js/views/metadata_option_view.js b/cms/static/js/views/metadata_option_view.js index e69de29bb2..b619747282 100644 --- a/cms/static/js/views/metadata_option_view.js +++ b/cms/static/js/views/metadata_option_view.js @@ -0,0 +1,32 @@ +if (!CMS.Views['Metadata']) CMS.Views.Metadata = {}; + +CMS.Views.Metadata.Option = Backbone.View.extend({ + + // Model class ... + events : { + }, + + initialize : function() { + var self = this; + this.uniqueId = _.uniqueId('metadata_option_entry_'); + // instantiates an editor template for each update in the collection + window.templateLoader.loadRemoteTemplate("metadata_option_entry", + "/static/client_templates/metadata_option_entry.html", + function (raw_template) { + self.template = _.template(raw_template); + self.$el.append(self.template({model: self.model, uniqueId: self.uniqueId})); + $('#' + self.uniqueId + " option").filter(function() { + return $(this).text() === self.model.get('value'); + }).prop('selected', true); + } + ); + }, + + modified: function () { + return this.getValue() !== this.model.getOriginalValue(); + }, + + getValue: function() { + return this.$el.find('#' + this.uniqueId).find(":selected").text(); + } +}); diff --git a/cms/static/js/views/metadata_string_view.js b/cms/static/js/views/metadata_string_view.js index 53937f3a47..2cb5c04e1b 100644 --- a/cms/static/js/views/metadata_string_view.js +++ b/cms/static/js/views/metadata_string_view.js @@ -1,6 +1,6 @@ if (!CMS.Views['Metadata']) CMS.Views.Metadata = {}; -CMS.Views.Metadata.Generic = Backbone.View.extend({ +CMS.Views.Metadata.String = Backbone.View.extend({ // Model class ... events : { @@ -8,12 +8,13 @@ CMS.Views.Metadata.Generic = Backbone.View.extend({ initialize : function() { var self = this; + this.uniqueId = _.uniqueId('metadata_string_entry_'); // instantiates an editor template for each update in the collection - window.templateLoader.loadRemoteTemplate("metadata_entry", + window.templateLoader.loadRemoteTemplate("metadata_string_entry", "/static/client_templates/metadata_string_entry.html", function (raw_template) { self.template = _.template(raw_template); - self.$el.append(self.template({model: self.model})); + self.$el.append(self.template({model: self.model, uniqueId: self.uniqueId})); } ); }, @@ -23,6 +24,6 @@ CMS.Views.Metadata.Generic = Backbone.View.extend({ }, getValue: function() { - return this.$el.find('.editor').val(); + return this.$el.find('#' + this.uniqueId).val(); } }); diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py index 479cd5a759..004411e509 100644 --- a/common/lib/xmodule/xmodule/capa_module.py +++ b/common/lib/xmodule/xmodule/capa_module.py @@ -68,7 +68,8 @@ class CapaFields(object): showanswer = String(help="When to show the problem answer to the student", scope=Scope.settings, default="closed", values=["answered", "always", "attempted", "closed", "never"]) force_save_button = Boolean(help="Whether to force the save button to appear on the page", scope=Scope.settings, default=False) - rerandomize = Randomization(help="When to rerandomize the problem", default="always", scope=Scope.settings) + rerandomize = Randomization(help="When to rerandomize the problem", default="always", scope=Scope.settings, + values=["always", "onreset", "never", "per_student"]) data = String(help="XML data for the problem", scope=Scope.content) correct_map = Object(help="Dictionary with the correctness of current student answers", scope=Scope.user_state, default={}) input_state = Object(help="Dictionary for maintaining the state of inputtypes", scope=Scope.user_state) diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index 8b5ae3e63f..f3b249adff 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -648,8 +648,13 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock): 'inheritable': inheritable, 'explicitly_set': explicitly_set} + values = [] if field.values is None else field.values + for index, choice in enumerate(values): + values[index] = field.to_json(choice) + simple_metadata[field.name] = {'value': field.to_json(value), 'display_name' : field.display_name, + 'options' : values, 'default_value': field.to_json(default_value), 'inheritable': inheritable, 'explicitly_set': explicitly_set, From f4b06b2e966ac2a34a2c28d94ef4959a673caa22 Mon Sep 17 00:00:00 2001 From: cahrens Date: Fri, 10 May 2013 16:41:07 -0400 Subject: [PATCH 028/117] Beginnings of is-set work. --- cms/static/client_templates/metadata_editor.html | 3 +-- .../client_templates/metadata_string_entry.html | 2 +- cms/static/js/views/metadata_editor_view.js | 2 ++ cms/static/js/views/metadata_number_view.js | 14 ++++++++++++++ cms/static/js/views/metadata_option_view.js | 5 +++++ cms/static/js/views/metadata_string_view.js | 4 ++++ cms/templates/base.html | 1 + 7 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 cms/static/js/views/metadata_number_view.js diff --git a/cms/static/client_templates/metadata_editor.html b/cms/static/client_templates/metadata_editor.html index bf618bd6f1..6780c4f1da 100644 --- a/cms/static/client_templates/metadata_editor.html +++ b/cms/static/client_templates/metadata_editor.html @@ -1,7 +1,6 @@
      <% _.each(metadata_entries, function(entry) { %> -
    • -
      +
      • <% }) %>
    \ No newline at end of file diff --git a/cms/static/client_templates/metadata_string_entry.html b/cms/static/client_templates/metadata_string_entry.html index af49dc0291..647e48400a 100644 --- a/cms/static/client_templates/metadata_string_entry.html +++ b/cms/static/client_templates/metadata_string_entry.html @@ -5,4 +5,4 @@ ↩
    -<%= model.get('help') %> \ No newline at end of file +<%= model.get('help') %> diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index 9665b456dd..4e35deba9f 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -24,6 +24,8 @@ CMS.Views.Metadata.Editor = Backbone.View.extend({ model: new CMS.Models.Metadata(item) }; if (item.options.length > 0) { + // Right now, all our option types only hold strings. Should really support + // any type though. self.views[key] = new CMS.Views.Metadata.Option(data); } else { diff --git a/cms/static/js/views/metadata_number_view.js b/cms/static/js/views/metadata_number_view.js new file mode 100644 index 0000000000..a1be53eafa --- /dev/null +++ b/cms/static/js/views/metadata_number_view.js @@ -0,0 +1,14 @@ +if (!CMS.Views['Metadata']) CMS.Views.Metadata = {}; + +CMS.Views.Metadata.Number = CMS.Views.Metadata.String.extend({ + + getValue: function() { + var stringVal = this.$el.find('#' + this.uniqueId).val(); + if (this.isInteger) { + return parseInt(stringVal) + } + else { + return parseFloat(stringVal) + } + } +}); \ No newline at end of file diff --git a/cms/static/js/views/metadata_option_view.js b/cms/static/js/views/metadata_option_view.js index b619747282..28c49fb3d4 100644 --- a/cms/static/js/views/metadata_option_view.js +++ b/cms/static/js/views/metadata_option_view.js @@ -18,6 +18,11 @@ CMS.Views.Metadata.Option = Backbone.View.extend({ $('#' + self.uniqueId + " option").filter(function() { return $(this).text() === self.model.get('value'); }).prop('selected', true); + if (self.model.get('explicitly_set')) { + self.$el.addClass('is-set'); + self.$el.find('#'+self.uniqueId + " .setting-clear").addClass('active'); + } + } ); }, diff --git a/cms/static/js/views/metadata_string_view.js b/cms/static/js/views/metadata_string_view.js index 2cb5c04e1b..465b75ba8b 100644 --- a/cms/static/js/views/metadata_string_view.js +++ b/cms/static/js/views/metadata_string_view.js @@ -15,6 +15,10 @@ CMS.Views.Metadata.String = Backbone.View.extend({ function (raw_template) { self.template = _.template(raw_template); self.$el.append(self.template({model: self.model, uniqueId: self.uniqueId})); + if (self.model.get('explicitly_set')) { + self.$el.addClass('is-set'); + self.$el.find('#'+self.uniqueId + " .setting-clear").addClass('active'); + } } ); }, diff --git a/cms/templates/base.html b/cms/templates/base.html index 5825cdb1b9..6649affefb 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -53,6 +53,7 @@ + From 2360a111c83d416319c09f22f9ac057dc50417d7 Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 12 May 2013 12:08:04 -0400 Subject: [PATCH 029/117] attempt to trigger js event for mode button press, not breaking yet but nonfunctional --- cms/static/coffee/src/views/module_edit.coffee | 7 ++++++- cms/templates/component.html | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index 8a6db67e3a..83298a215b 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -7,7 +7,7 @@ class CMS.Views.ModuleEdit extends Backbone.View "click .component-editor .save-button": 'clickSaveButton' "click .component-actions .edit-button": 'clickEditButton' "click .component-actions .delete-button": 'onDelete' - + "click .mode .not-set": 'clickModeButton' initialize: -> @onDelete = @options.onDelete @@ -83,3 +83,8 @@ class CMS.Views.ModuleEdit extends Backbone.View $modalCover.show().addClass('is-fixed') @$component_editor().slideDown(150) @loadEdit() + + clickModeButton: (event) -> + event.preventDefault() + @$el.removeClass('not-set') + @$el.addClass('is-set') diff --git a/cms/templates/component.html b/cms/templates/component.html index a461f4ce06..5883bd55d5 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -11,7 +11,7 @@ Compiler
    From 125c9c13c1343334e769836a0cc4cd05aaab2c26 Mon Sep 17 00:00:00 2001 From: cahrens Date: Sun, 12 May 2013 15:45:31 -0400 Subject: [PATCH 030/117] Got clearing of fields working. --- cms/static/js/models/metadata_model.js | 41 ++++++- cms/static/js/views/metadata_editor_view.js | 115 ++++++++++++++++++++ cms/static/js/views/metadata_number_view.js | 14 --- cms/static/js/views/metadata_option_view.js | 37 ------- cms/static/js/views/metadata_string_view.js | 33 ------ cms/templates/base.html | 3 - 6 files changed, 155 insertions(+), 88 deletions(-) delete mode 100644 cms/static/js/views/metadata_number_view.js delete mode 100644 cms/static/js/views/metadata_option_view.js delete mode 100644 cms/static/js/views/metadata_string_view.js diff --git a/cms/static/js/models/metadata_model.js b/cms/static/js/models/metadata_model.js index 4349fa7187..4aa10f57d1 100644 --- a/cms/static/js/models/metadata_model.js +++ b/cms/static/js/models/metadata_model.js @@ -4,10 +4,49 @@ CMS.Models.Metadata = Backbone.Model.extend({ defaults: { "display_name": null, - "value" : null + "value" : null, + "explicitly_set": null, + "default_value" : null + }, + + initialize: function() { + this.original_value = this.get('value'); + this.original_explicitly_set = this.get('explicitly_set'); }, getOriginalValue: function() { + return this.originalValue; + }, + + isModified : function() { + if (!this.get('explicitly_set') && !this.original_explicitly_set) { + return false; + } + if (this.get('explicitly_set') && this.original_explicitly_set) { + return this.get('value') !== this.original_value; + } + return true; + }, + + isExplicitlySet: function() { + return this.get('explicitly_set'); + }, + + getDisplayValue : function () { return this.get('value'); + }, + + getValue: function() { + return this.get('explicitly_set') ? this.get('value') : null; + }, + + setValue: function (value) { + this.set('explicitly_set', true); + this.set('value', value); + }, + + clear: function() { + this.set('explicitly_set', false); + this.set('value', this.get('default_value')); } }); diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index 4e35deba9f..6c2081977c 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -49,3 +49,118 @@ CMS.Views.Metadata.Editor = Backbone.View.extend({ return modified_values; } }); + +CMS.Views.Metadata.AbstractEditor = Backbone.View.extend({ + + initialize : function() { + var self = this; + var templateName = this.getTemplateName(); + this.uniqueId = _.uniqueId(templateName + "_"); + window.templateLoader.loadRemoteTemplate(templateName, + "/static/client_templates/" + templateName + ".html", + function (raw_template) { + self.template = _.template(raw_template); + self.$el.append(self.template({model: self.model, uniqueId: self.uniqueId})); + self.render(); + } + ); + }, + + getTemplateName : function () {}, + + getValueFromEditor : function () {}, + + setValueInEditor : function (value) {}, + + updateModel: function () { + this.model.setValue(this.getValueFromEditor()); + this.render(); + }, + + clear: function () { + this.model.clear(); + this.render(); + }, + + showClearButton: function() { + if (!this.$el.hasClass('is-set')) { + this.$el.addClass('is-set'); + // TODO: can we use toggleclass? + this.$el.find('.setting-clear').removeClass('inactive'); + this.$el.find('.setting-clear').addClass('active'); + } + }, + + render: function () { + if (!this.template) return; + + this.setValueInEditor(this.model.getDisplayValue()); + + if (this.model.isExplicitlySet()) { + this.showClearButton(); + } + else { + this.$el.removeClass('is-set'); + // TODO: can we use toggleclass? + this.$el.find('.setting-clear').addClass('inactive'); + this.$el.find('.setting-clear').removeClass('active'); + } + }, + + + modified: function () { + return this.model.isModified(); + }, + + getValue: function() { + return this.model.getValue(); + } +}); + +CMS.Views.Metadata.String = CMS.Views.Metadata.AbstractEditor.extend({ + + events : { + "change input" : "updateModel", + "keypress .setting-input" : "showClearButton" , + "click .setting-clear" : "clear" + }, + + getTemplateName : function () { + return "metadata_string_entry"; + }, + + getValueFromEditor : function () { + var val = this.$el.find('#' + this.uniqueId).val(); +// TODO: not sure this is necessary. Trying to support empty value (""). + return val ? val : ""; + }, + + setValueInEditor : function (value) { + this.$el.find('input').val(value); + } +}); + +CMS.Views.Metadata.Option = CMS.Views.Metadata.AbstractEditor.extend({ + + events : { + "change select" : "updateModel", + "click .setting-clear" : "clear" + }, + + getTemplateName : function () { + return "metadata_option_entry"; + }, + + getValueFromEditor : function () { + return this.$el.find('#' + this.uniqueId).find(":selected").text(); + }, + + setValueInEditor : function (value) { + $('#' + this.uniqueId + " option").filter(function() { + return $(this).text() === value; + }).prop('selected', true); + } +}); + + + diff --git a/cms/static/js/views/metadata_number_view.js b/cms/static/js/views/metadata_number_view.js deleted file mode 100644 index a1be53eafa..0000000000 --- a/cms/static/js/views/metadata_number_view.js +++ /dev/null @@ -1,14 +0,0 @@ -if (!CMS.Views['Metadata']) CMS.Views.Metadata = {}; - -CMS.Views.Metadata.Number = CMS.Views.Metadata.String.extend({ - - getValue: function() { - var stringVal = this.$el.find('#' + this.uniqueId).val(); - if (this.isInteger) { - return parseInt(stringVal) - } - else { - return parseFloat(stringVal) - } - } -}); \ No newline at end of file diff --git a/cms/static/js/views/metadata_option_view.js b/cms/static/js/views/metadata_option_view.js deleted file mode 100644 index 28c49fb3d4..0000000000 --- a/cms/static/js/views/metadata_option_view.js +++ /dev/null @@ -1,37 +0,0 @@ -if (!CMS.Views['Metadata']) CMS.Views.Metadata = {}; - -CMS.Views.Metadata.Option = Backbone.View.extend({ - - // Model class ... - events : { - }, - - initialize : function() { - var self = this; - this.uniqueId = _.uniqueId('metadata_option_entry_'); - // instantiates an editor template for each update in the collection - window.templateLoader.loadRemoteTemplate("metadata_option_entry", - "/static/client_templates/metadata_option_entry.html", - function (raw_template) { - self.template = _.template(raw_template); - self.$el.append(self.template({model: self.model, uniqueId: self.uniqueId})); - $('#' + self.uniqueId + " option").filter(function() { - return $(this).text() === self.model.get('value'); - }).prop('selected', true); - if (self.model.get('explicitly_set')) { - self.$el.addClass('is-set'); - self.$el.find('#'+self.uniqueId + " .setting-clear").addClass('active'); - } - - } - ); - }, - - modified: function () { - return this.getValue() !== this.model.getOriginalValue(); - }, - - getValue: function() { - return this.$el.find('#' + this.uniqueId).find(":selected").text(); - } -}); diff --git a/cms/static/js/views/metadata_string_view.js b/cms/static/js/views/metadata_string_view.js deleted file mode 100644 index 465b75ba8b..0000000000 --- a/cms/static/js/views/metadata_string_view.js +++ /dev/null @@ -1,33 +0,0 @@ -if (!CMS.Views['Metadata']) CMS.Views.Metadata = {}; - -CMS.Views.Metadata.String = Backbone.View.extend({ - - // Model class ... - events : { - }, - - initialize : function() { - var self = this; - this.uniqueId = _.uniqueId('metadata_string_entry_'); - // instantiates an editor template for each update in the collection - window.templateLoader.loadRemoteTemplate("metadata_string_entry", - "/static/client_templates/metadata_string_entry.html", - function (raw_template) { - self.template = _.template(raw_template); - self.$el.append(self.template({model: self.model, uniqueId: self.uniqueId})); - if (self.model.get('explicitly_set')) { - self.$el.addClass('is-set'); - self.$el.find('#'+self.uniqueId + " .setting-clear").addClass('active'); - } - } - ); - }, - - modified: function () { - return this.getValue() !== this.model.getOriginalValue(); - }, - - getValue: function() { - return this.$el.find('#' + this.uniqueId).val(); - } -}); diff --git a/cms/templates/base.html b/cms/templates/base.html index 6649affefb..88bbc56677 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -52,9 +52,6 @@ - - - From 97de97cc18a703503a29bddb85a25d238a08e80b Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 13 May 2013 09:27:13 -0400 Subject: [PATCH 031/117] minimal mce editor style changes to borders --- cms/static/sass/views/_unit.scss | 4 ++++ .../js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index fd876c083c..b2d89c095b 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -453,6 +453,10 @@ body.course.unit { font-weight: 700; } + .row { + margin-bottom: 0px; + } + // Module Actions .module-actions { @include box-shadow(inset 0 1px 1px $shadow); diff --git a/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css b/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css index b2d3e494aa..c973248384 100644 --- a/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css +++ b/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css @@ -25,8 +25,8 @@ /* Layout */ .studioSkin table.mceLayout {border:0;} -.studioSkin table.mceLayout tr.mceFirst td {border-top:1px solid #3c3c3c;} -.studioSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #3c3c3c;} +.studioSkin table.mceLayout tr.mceFirst td {border-top: 1px solid #D1DCE6;} +.studioSkin table.mceLayout tr.mceLast td {border-bottom:none;} .studioSkin table.mceToolbar, .studioSkin tr.mceFirst .mceToolbar tr td, .studioSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;} .studioSkin td.mceToolbar { background: -webkit-linear-gradient(top, #d4dee8, #c9d5e2); @@ -36,7 +36,7 @@ background: linear-gradient(top, #d4dee8, #c9d5e2); border: 1px solid #3c3c3c; border-bottom-color: #a5aaaf; - border-radius: 3px 3px 0 0; + border-radius: 0; padding: 10px 10px 9px; vertical-align: top; } From e29c940e7c7c28a90999389c966e53ccea1838db Mon Sep 17 00:00:00 2001 From: cahrens Date: Mon, 13 May 2013 13:15:07 -0400 Subject: [PATCH 032/117] Add display_names, update help, remove unnecessary things from templates. --- common/lib/xmodule/xmodule/capa_module.py | 19 ++++++++++++------- .../lib/xmodule/xmodule/discussion_module.py | 8 ++++++-- .../xmodule/xmodule/templates/html/empty.yaml | 1 - .../templates/problem/circuitschematic.yaml | 2 -- .../templates/problem/customgrader.yaml | 2 -- .../xmodule/templates/problem/empty.yaml | 3 --- .../templates/problem/emptyadvanced.yaml | 3 --- .../templates/problem/forumularesponse.yaml | 2 -- .../templates/problem/imageresponse.yaml | 2 -- .../templates/problem/numericalresponse.yaml | 2 -- .../templates/problem/optionresponse.yaml | 2 -- .../templates/problem/string_response.yaml | 2 -- common/lib/xmodule/xmodule/x_module.py | 3 ++- 13 files changed, 20 insertions(+), 31 deletions(-) diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py index 004411e509..f7ffaec320 100644 --- a/common/lib/xmodule/xmodule/capa_module.py +++ b/common/lib/xmodule/xmodule/capa_module.py @@ -62,23 +62,28 @@ class ComplexEncoder(json.JSONEncoder): class CapaFields(object): attempts = StringyInteger(help="Number of attempts taken by the student on this problem", default=0, scope=Scope.user_state) - max_attempts = StringyInteger(help="Maximum number of attempts that a student is allowed", scope=Scope.settings) + max_attempts = StringyInteger(display_name="Maximum Attempts", + help="When set, this specifies the number of times the student can try to answer this problem.", scope=Scope.settings) due = Date(help="Date that this problem is due by", scope=Scope.settings) graceperiod = Timedelta(help="Amount of time after the due date that submissions will be accepted", scope=Scope.settings) - showanswer = String(help="When to show the problem answer to the student", scope=Scope.settings, default="closed", - values=["answered", "always", "attempted", "closed", "never"]) + showanswer = String(display_name="Show Answer", + help="Specifies when to show the answer to this problem. A default value can be set course-wide in Advanced Settings.", + scope=Scope.settings, default="closed", values=["answered", "always", "attempted", "closed", "never"]) force_save_button = Boolean(help="Whether to force the save button to appear on the page", scope=Scope.settings, default=False) - rerandomize = Randomization(help="When to rerandomize the problem", default="always", scope=Scope.settings, - values=["always", "onreset", "never", "per_student"]) + rerandomize = Randomization(display_name="Randomization", help="Specifies whether variable inputs for this problem are randomized each time a student loads the problem. This only applies to problems that have randomly generated numeric variables. A default value can be set course-wide in Advanced Settings.", + default="always", scope=Scope.settings, values=["always", "onreset", "never", "per_student"]) data = String(help="XML data for the problem", scope=Scope.content) correct_map = Object(help="Dictionary with the correctness of current student answers", scope=Scope.user_state, default={}) input_state = Object(help="Dictionary for maintaining the state of inputtypes", scope=Scope.user_state) student_answers = Object(help="Dictionary with the current student responses", scope=Scope.user_state) done = Boolean(help="Whether the student has answered the problem", scope=Scope.user_state) seed = StringyInteger(help="Random seed for this student", scope=Scope.user_state) - weight = StringyFloat(help="How much to weight this problem by", scope=Scope.settings) + weight = StringyFloat(display_name="Problem Weight", + help="Specifies the number of points the problem is worth. By default, each response field in the problem is worth one point.", + scope=Scope.settings) markdown = String(help="Markdown source of this module", scope=Scope.settings) - source_code = String(help="Source code for LaTeX and Word problems. This feature is not well-supported.", scope=Scope.settings) + source_code = String(help="Source code for LaTeX and Word problems. This feature is not well-supported.", + scope=Scope.settings) class CapaModule(CapaFields, XModule): diff --git a/common/lib/xmodule/xmodule/discussion_module.py b/common/lib/xmodule/xmodule/discussion_module.py index 98082ddea2..62d14e0600 100644 --- a/common/lib/xmodule/xmodule/discussion_module.py +++ b/common/lib/xmodule/xmodule/discussion_module.py @@ -8,8 +8,12 @@ from xblock.core import String, Scope class DiscussionFields(object): discussion_id = String(scope=Scope.settings) - discussion_category = String(scope=Scope.settings) - discussion_target = String(scope=Scope.settings) + discussion_category = String(display_name="Category", + help="Specifies a category name for this discussion. This name appears in the left pane of the discussion forum for your course.", + scope=Scope.settings) + discussion_target = String(display_name="Subcategory", + help="Specifies a subcategory name for this discussion. This name appears in the left pane of the discussion forum for your course.", + scope=Scope.settings) sort_key = String(scope=Scope.settings) diff --git a/common/lib/xmodule/xmodule/templates/html/empty.yaml b/common/lib/xmodule/xmodule/templates/html/empty.yaml index b6d867d7d6..40b005af28 100644 --- a/common/lib/xmodule/xmodule/templates/html/empty.yaml +++ b/common/lib/xmodule/xmodule/templates/html/empty.yaml @@ -1,7 +1,6 @@ --- metadata: display_name: Blank HTML Page - empty: True data: | diff --git a/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml b/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml index a94b824cfb..841bd5afcd 100644 --- a/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml @@ -4,8 +4,6 @@ metadata: display_name: Circuit Schematic Builder rerandomize: never showanswer: always - weight: "" - attempts: "" data: | Please make a voltage divider that splits the provided voltage evenly. diff --git a/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml b/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml index aadbe4075a..6fa1779918 100644 --- a/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml @@ -3,8 +3,6 @@ metadata: display_name: Custom Python-Evaluated Input rerandomize: never showanswer: always - weight: "" - attempts: "" data: |

    diff --git a/common/lib/xmodule/xmodule/templates/problem/empty.yaml b/common/lib/xmodule/xmodule/templates/problem/empty.yaml index 39c9e7671c..d372048ee5 100644 --- a/common/lib/xmodule/xmodule/templates/problem/empty.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/empty.yaml @@ -4,9 +4,6 @@ metadata: rerandomize: never showanswer: always markdown: "" - weight: "" - empty: True - attempts: "" data: | diff --git a/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml b/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml index bba7b3a8ac..902b08e252 100644 --- a/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml @@ -3,9 +3,6 @@ metadata: display_name: Blank Advanced Problem rerandomize: never showanswer: always - weight: "" - attempts: "" - empty: True data: | diff --git a/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml b/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml index b4c53a107b..890260d381 100644 --- a/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml @@ -3,8 +3,6 @@ metadata: display_name: Math Expression Input rerandomize: never showanswer: always - weight: "" - attempts: "" data: |

    diff --git a/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml index 3ef619d54b..9086dd7426 100644 --- a/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml @@ -3,8 +3,6 @@ metadata: display_name: Image Mapped Input rerandomize: never showanswer: always - weight: "" - attempts: "" data: |

    diff --git a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml index 1dc46f5f51..4623e53e00 100644 --- a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml @@ -3,8 +3,6 @@ metadata: display_name: Numerical Input rerandomize: never showanswer: always - weight: "" - attempts: "" markdown: "A numerical input problem accepts a line of text input from the student, and evaluates the input for correctness based on its diff --git a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml index f523c7fdc5..a87885594a 100644 --- a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml @@ -3,8 +3,6 @@ metadata: display_name: Dropdown rerandomize: never showanswer: always - weight: "" - attempts: "" markdown: "Dropdown problems give a limited set of options for students to respond with, and present those options in a format that encourages them to search for a specific answer rather than being immediately presented diff --git a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml index c018d3f6cf..9519c192ac 100644 --- a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml @@ -3,8 +3,6 @@ metadata: display_name: Text Input rerandomize: never showanswer: always - weight: "" - attempts: "" # Note, the extra newlines are needed to make the yaml parser add blank lines instead of folding markdown: "A text input problem accepts a line of text from the diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index f3b249adff..7e2944e1fd 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -80,7 +80,8 @@ class HTMLSnippet(object): class XModuleFields(object): display_name = String( - help="Display name for this module", + display_name="Display Name", + help="Specifies the name for this component. The name appears as a tooltip in the course ribbon at the top of the page.", scope=Scope.settings, default=None ) From 8c36918abfe6f9a4d077af8c4f0c806034555efe Mon Sep 17 00:00:00 2001 From: cahrens Date: Mon, 13 May 2013 15:35:55 -0400 Subject: [PATCH 033/117] Support display names for choices. --- .../metadata_option_entry.html | 6 ++- cms/static/js/models/metadata_model.js | 12 ++++- cms/static/js/views/metadata_editor_view.js | 46 +++++++++++++++---- common/lib/xmodule/xmodule/capa_module.py | 12 ++++- common/lib/xmodule/xmodule/x_module.py | 11 ++++- 5 files changed, 72 insertions(+), 15 deletions(-) diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/static/client_templates/metadata_option_entry.html index 3a1cd30337..b0c8d83ba9 100644 --- a/cms/static/client_templates/metadata_option_entry.html +++ b/cms/static/client_templates/metadata_option_entry.html @@ -2,7 +2,11 @@ +

    +<%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/static/client_templates/metadata_option_entry.html index b0c8d83ba9..d2053e497a 100644 --- a/cms/static/client_templates/metadata_option_entry.html +++ b/cms/static/client_templates/metadata_option_entry.html @@ -10,7 +10,7 @@ <% }) %>
    <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_string_entry.html b/cms/static/client_templates/metadata_string_entry.html index 647e48400a..74d64d58af 100644 --- a/cms/static/client_templates/metadata_string_entry.html +++ b/cms/static/client_templates/metadata_string_entry.html @@ -2,7 +2,7 @@
    <%= model.get('help') %> diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index b2d89c095b..d5fb7cbfbd 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -461,7 +461,7 @@ body.course.unit { .module-actions { @include box-shadow(inset 0 1px 1px $shadow); padding: 0px 0 10px 10px; - background-color: $gray-l4; + background-color: $gray-l6; .save-button { margin: 15px 8px 0 0; @@ -533,9 +533,7 @@ body.course.unit { } // Editor Wrapper -.wrapper-comp-editor { - //TO-DO -} +.wrapper-comp-editor { } // Settings Wrapper .wrapper-comp-settings { @@ -585,7 +583,6 @@ body.course.unit { } &:hover { - //TO-DO review existing patterns for hover on field @include transition(opacity 0.25s ease-in-out); opacity: 1; } @@ -595,9 +592,7 @@ body.course.unit { background-color: $white; //setting-label - .setting-label { - //color: $blue-l1; - } + .setting-label { } //setting-input .setting-input { @@ -605,9 +600,7 @@ body.course.unit { } //setting-clear - .setting-clear { - //... - } + .setting-clear { } } .wrapper-comp-setting{ @@ -620,9 +613,7 @@ body.course.unit { label.setting-label { @extend .t-copy-sub1; @include transition(color, 0.15s, ease-in-out); - //margin: 0 0 ($baseline/4) 0; WILL BE REMOVED PRIOR TO PUSH font-weight: 400; - display: inline-block; position: relative; left: 0; @@ -663,9 +654,8 @@ body.course.unit { } select { - //border: 1px solid $gray-l2; - background: none repeat scroll #F2F2F2; @include box-shadow(0 1px 2px rgba(0, 0, 0, .1) inset); + background: none repeat scroll #F2F2F2; &:focus { @include box-shadow(0 0 1px $shadow); @@ -682,6 +672,7 @@ body.course.unit { .action.setting-clear { @include font-size(11); + background-color: $gray-l4; color: $gray; width: 25px; height: 25px; @@ -695,7 +686,7 @@ body.course.unit { &:hover { @include box-shadow(0 1px 1px $shadow); - @include transition(opacity 0.25s ease-in-out); + @include transition(opacity 0.15s ease-in-out); background-color: $blue-s3; border: 1px solid $blue-s3; color: $white; @@ -706,11 +697,13 @@ body.course.unit { } } - tip.setting-help { + .tip.setting-help { @include font-size(12); + margin-top: 5px; display: inline-block; font-color: $gray-l6; - //max-width: 50%; + min-width: 280px; + width: 50%; vertical-align: top; } } @@ -942,15 +935,4 @@ body.unit { .view-button { display: none; } -} - - -//OLD Meta-data Styling -//TO-DO port over old styling -.metadata_edit { - - label { - display: inline-block; - margin-right: 10px; - } } \ No newline at end of file diff --git a/cms/templates/component.html b/cms/templates/component.html index 5883bd55d5..012618ec8c 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -2,16 +2,15 @@
    Editing: Name of Component -
    diff --git a/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css b/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css index c973248384..77afc23874 100644 --- a/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css +++ b/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css @@ -25,7 +25,7 @@ /* Layout */ .studioSkin table.mceLayout {border:0;} -.studioSkin table.mceLayout tr.mceFirst td {border-top: 1px solid #D1DCE6;} +.studioSkin table.mceLayout tr.mceFirst td {border-top: 1px solid #D1DCE6; border-left: none; border-right:none;} .studioSkin table.mceLayout tr.mceLast td {border-bottom:none;} .studioSkin table.mceToolbar, .studioSkin tr.mceFirst .mceToolbar tr td, .studioSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;} .studioSkin td.mceToolbar { From 8d8c8d83df59412b59744382eebdbb2703bc9f01 Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 14 May 2013 12:38:52 -0400 Subject: [PATCH 037/117] updated unit styling, added polyfill js library, updated javascript handling for modes swap --- .../coffee/src/views/module_edit.coffee | 12 +- cms/static/sass/views/_unit.scss | 24 +- cms/templates/base.html | 1 + cms/templates/component.html | 14 +- .../html5-input-polyfills/number-polyfill.js | 299 ++++++++++++++++++ 5 files changed, 328 insertions(+), 22 deletions(-) create mode 100644 common/static/js/vendor/html5-input-polyfills/number-polyfill.js diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index a6f93197f3..10e07081cb 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -7,7 +7,7 @@ class CMS.Views.ModuleEdit extends Backbone.View "click .component-editor .save-button": 'clickSaveButton' "click .component-actions .edit-button": 'clickEditButton' "click .component-actions .delete-button": 'onDelete' - "click .mode .not-set": 'clickModeButton' + "click .not-set ": 'clickModeButton' initialize: -> @onDelete = @options.onDelete @@ -86,5 +86,11 @@ class CMS.Views.ModuleEdit extends Backbone.View clickModeButton: (event) -> event.preventDefault() - @$el.find("a").removeClass('not-set') - @$el.find("a").addClass('is-set') + @$el.find("a").removeClass('not-set').addClass('is-set') + + previouslySetMode = @$el.siblings('li.active-mode').find('.is-set') + previouslySetMode.find("a").removeClass('is-set').addClass('not-set') + + activeTab = $component_editor.find('.xmodule_edit').find(".is-set") + activeTab.removeClass('is-set') + activeTab.siblings('.not-set').addClass('is-set') diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index d5fb7cbfbd..37db76568a 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -508,24 +508,24 @@ body.course.unit { .mode { display: inline-block; - .inactive-mode { + &.inactive-mode{ display: none; } - .active-mode { + &.active-mode a { + @include blue-button; - } - .is-set { - @include linear-gradient($blue, $blue); - box-shadow: inset 0 0 3px $shadow; - background-color: $blue; - - cursor: default; - - &:hover { + &.is-set { + @include linear-gradient($blue, $blue); box-shadow: inset 0 0 3px $shadow; background-color: $blue; + cursor: default; + + &:hover { + box-shadow: inset 0 0 3px $shadow; + background-color: $blue; + } } } } @@ -654,7 +654,7 @@ body.course.unit { } select { - @include box-shadow(0 1px 2px rgba(0, 0, 0, .1) inset); + @include box-shadow(0 1px 2px $shadow-l1 inset); background: none repeat scroll #F2F2F2; &:focus { diff --git a/cms/templates/base.html b/cms/templates/base.html index 88bbc56677..521bb8b1ff 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -49,6 +49,7 @@ + diff --git a/cms/templates/component.html b/cms/templates/component.html index 012618ec8c..ef0b62f4a4 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,16 +1,16 @@
    - Editing: Name of Component + Editing: Component
    diff --git a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js new file mode 100644 index 0000000000..080ae27be6 --- /dev/null +++ b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js @@ -0,0 +1,299 @@ +// Generated by CoffeeScript 1.4.0 + +/* +HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-polyfill +*/ + + +(function() { + + (function($) { + var i; + i = document.createElement("input"); + i.setAttribute("type", "number"); + if (i.type === "text") { + $.fn.inputNumber = function() { + var clipValues, decrement, domMouseScrollHandler, extractNumDecimalDigits, getParams, increment, matchStep, mouseWheelHandler; + getParams = function(elem) { + var $elem, max, min, step, val; + $elem = $(elem); + step = $elem.attr('step'); + min = $elem.attr('min'); + max = $elem.attr('max'); + val = parseFloat($elem.val()); + step = /^-?\d+(?:\.\d+)?$/.test(step) ? parseFloat(step) : null; + min = /^-?\d+(?:\.\d+)?$/.test(min) ? parseFloat(min) : null; + max = /^-?\d+(?:\.\d+)?$/.test(max) ? parseFloat(max) : null; + if (isNaN(val)) { + val = min || 0; + } + return { + min: min, + max: max, + step: step, + val: val + }; + }; + clipValues = function(value, min, max) { + if ((max != null) && value > max) { + return max; + } else if ((min != null) && value < min) { + return min; + } else { + return value; + } + }; + extractNumDecimalDigits = function(input) { + var num, raisedNum; + if (input != null) { + num = 0; + raisedNum = input; + while (raisedNum !== Math.round(raisedNum)) { + num += 1; + raisedNum = input * Math.pow(10, num); + } + return num; + } else { + return 0; + } + }; + matchStep = function(value, min, max, step) { + var mod, raiseTo, raisedMod, raisedStep, raisedStepDown, raisedStepUp, raisedValue, stepDecimalDigits, stepDown, stepUp; + stepDecimalDigits = extractNumDecimalDigits(step); + if (step == null) { + return value; + } else if (stepDecimalDigits === 0) { + mod = (value - (min || 0)) % step; + if (mod === 0) { + return value; + } else { + stepDown = value - mod; + stepUp = stepDown + step; + if ((stepUp > max) || ((value - stepDown) < (stepUp - value))) { + return stepDown; + } else { + return stepUp; + } + } + } else { + raiseTo = Math.pow(10, stepDecimalDigits); + raisedStep = step * raiseTo; + raisedMod = (value - (min || 0)) * raiseTo % raisedStep; + if (raisedMod === 0) { + return value; + } else { + raisedValue = value * raiseTo; + raisedStepDown = raisedValue - raisedMod; + raisedStepUp = raisedStepDown + raisedStep; + if (((raisedStepUp / raiseTo) > max) || ((raisedValue - raisedStepDown) < (raisedStepUp - raisedValue))) { + return raisedStepDown / raiseTo; + } else { + return raisedStepUp / raiseTo; + } + } + } + }; + increment = function(elem) { + var newVal, params, raiseTo; + if (!$(elem).is(":disabled")) { + params = getParams(elem); + raiseTo = Math.pow(10, Math.max(extractNumDecimalDigits(params['val']), extractNumDecimalDigits(params['step']))); + newVal = (Math.round(params['val'] * raiseTo) + Math.round((params['step'] || 1) * raiseTo)) / raiseTo; + if ((params['max'] != null) && newVal > params['max']) { + newVal = params['max']; + } + newVal = matchStep(newVal, params['min'], params['max'], params['step']); + $(elem).val(newVal).change(); + } + return null; + }; + decrement = function(elem) { + var newVal, params, raiseTo; + if (!$(elem).is(":disabled")) { + params = getParams(elem); + raiseTo = Math.pow(10, Math.max(extractNumDecimalDigits(params['val']), extractNumDecimalDigits(params['step']))); + newVal = (Math.round(params['val'] * raiseTo) - Math.round((params['step'] || 1) * raiseTo)) / raiseTo; + if ((params['min'] != null) && newVal < params['min']) { + newVal = params['min']; + } + newVal = matchStep(newVal, params['min'], params['max'], params['step']); + $(elem).val(newVal).change(); + } + return null; + }; + domMouseScrollHandler = function(e) { + e.preventDefault(); + if (e.originalEvent.detail < 0) { + increment(this); + } else { + decrement(this); + } + return null; + }; + mouseWheelHandler = function(e) { + e.preventDefault(); + if (e.originalEvent.wheelDelta > 0) { + increment(this); + } else { + decrement(this); + } + return null; + }; + $(this).filter('input[type="number"]').each(function() { + var $downBtn, $elem, $upBtn, attrMutationCallback, attrObserver, btnContainer, downBtn, elem, halfHeight, upBtn; + elem = this; + $elem = $(elem); + halfHeight = ($elem.outerHeight() / 2) + 'px'; + upBtn = document.createElement('div'); + downBtn = document.createElement('div'); + $upBtn = $(upBtn); + $downBtn = $(downBtn); + btnContainer = document.createElement('div'); + $upBtn.addClass('number-spin-btn number-spin-btn-up').css('height', halfHeight); + $downBtn.addClass('number-spin-btn number-spin-btn-down').css('height', halfHeight); + btnContainer.appendChild(upBtn); + btnContainer.appendChild(downBtn); + $(btnContainer).addClass('number-spin-btn-container').insertAfter(elem); + $elem.on({ + focus: function(e) { + $elem.on({ + DOMMouseScroll: domMouseScrollHandler, + mousewheel: mouseWheelHandler + }); + return null; + }, + blur: function(e) { + $elem.off({ + DOMMouseScroll: domMouseScrollHandler, + mousewheel: mouseWheelHandler + }); + return null; + }, + keypress: function(e) { + var _ref, _ref1; + if (e.keyCode === 38) { + increment(this); + } else if (e.keyCode === 40) { + decrement(this); + } else if (((_ref = e.keyCode) !== 8 && _ref !== 9 && _ref !== 35 && _ref !== 36 && _ref !== 37 && _ref !== 39) && ((_ref1 = e.which) !== 45 && _ref1 !== 46 && _ref1 !== 48 && _ref1 !== 49 && _ref1 !== 50 && _ref1 !== 51 && _ref1 !== 52 && _ref1 !== 53 && _ref1 !== 54 && _ref1 !== 55 && _ref1 !== 56 && _ref1 !== 57)) { + e.preventDefault(); + } + return null; + }, + change: function(e) { + var newVal, params; + if (e.originalEvent != null) { + params = getParams(this); + newVal = clipValues(params['val'], params['min'], params['max']); + newVal = matchStep(newVal, params['min'], params['max'], params['step'], params['stepDecimal']); + $(this).val(newVal); + } + return null; + } + }); + $upBtn.on("mousedown", function(e) { + var releaseFunc, timeoutFunc; + increment(elem); + timeoutFunc = function(elem, incFunc) { + incFunc(elem); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 10, elem, incFunc)); + return null; + }; + releaseFunc = function(e) { + window.clearTimeout($elem.data("timeoutID")); + $(document).off('mouseup', releaseFunc); + $upBtn.off('mouseleave', releaseFunc); + return null; + }; + $(document).on('mouseup', releaseFunc); + $upBtn.on('mouseleave', releaseFunc); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 700, elem, increment)); + return null; + }); + $downBtn.on("mousedown", function(e) { + var releaseFunc, timeoutFunc; + decrement(elem); + timeoutFunc = function(elem, decFunc) { + decFunc(elem); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 10, elem, decFunc)); + return null; + }; + releaseFunc = function(e) { + window.clearTimeout($elem.data("timeoutID")); + $(document).off('mouseup', releaseFunc); + $downBtn.off('mouseleave', releaseFunc); + return null; + }; + $(document).on('mouseup', releaseFunc); + $downBtn.on('mouseleave', releaseFunc); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 700, elem, decrement)); + return null; + }); + $elem.css("textAlign", 'right'); + if ($elem.css("opacity") !== "1") { + $(btnContainer).css("opacity", $elem.css("opacity")); + } + if ($elem.css("visibility") !== "visible") { + $(btnContainer).css("visibility", $elem.css("visibility")); + } + if (elem.style.display !== "") { + $(btnContainer).css("display", $elem.css("display")); + } + if ((typeof WebKitMutationObserver !== "undefined" && WebKitMutationObserver !== null) || (typeof MutationObserver !== "undefined" && MutationObserver !== null)) { + attrMutationCallback = function(mutations, observer) { + var mutation, _i, _len; + for (_i = 0, _len = mutations.length; _i < _len; _i++) { + mutation = mutations[_i]; + if (mutation.type === "attributes") { + if (mutation.attributeName === "class") { + $(btnContainer).removeClass(mutation.oldValue).addClass(elem.className); + } else if (mutation.attributeName === "style") { + $(btnContainer).css({ + "opacity": elem.style.opacity, + "visibility": elem.style.visibility, + "display": elem.style.display + }); + } + } + } + return null; + }; + attrObserver = (typeof WebKitMutationObserver !== "undefined" && WebKitMutationObserver !== null) ? new WebKitMutationObserver(attrMutationCallback) : ((typeof MutationObserver !== "undefined" && MutationObserver !== null) ? new MutationObserver(attrMutationCallback) : null); + attrObserver.observe(elem, { + attributes: true, + attributeOldValue: true, + attributeFilter: ["class", "style"] + }); + } else if (typeof MutationEvent !== "undefined" && MutationEvent !== null) { + $elem.on("DOMAttrModified", function(evt) { + if (evt.originalEvent.attrName === "class") { + $(btnContainer).removeClass(evt.originalEvent.prevValue).addClass(evt.originalEvent.newValue); + } else if (evt.originalEvent.attrName === "style") { + $(btnContainer).css({ + "display": elem.style.display, + "visibility": elem.style.visibility, + "opacity": elem.style.opacity + }); + } + return null; + }); + } + return null; + }); + return $(this); + }; + $(function() { + $('input[type="number"]').inputNumber(); + return null; + }); + null; + } else { + $.fn.inputNumber = function() { + return $(this); + }; + null; + } + return null; + })(jQuery); + +}).call(this); From 82899d6d2eb5f48d81fccd464ebd3b8433f8f010 Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 14 May 2013 12:40:17 -0400 Subject: [PATCH 038/117] Number view. --- .../metadata_number_entry.html | 2 +- cms/static/js/views/metadata_editor_view.js | 30 ++++++++++++++--- common/lib/xmodule/xmodule/capa_module.py | 6 ++-- .../xmodule/combined_open_ended_module.py | 3 +- common/lib/xmodule/xmodule/x_module.py | 32 +++++++++++++------ 5 files changed, 55 insertions(+), 18 deletions(-) diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html index 5ccea65d5d..040488cb39 100644 --- a/cms/static/client_templates/metadata_number_entry.html +++ b/cms/static/client_templates/metadata_number_entry.html @@ -1,6 +1,6 @@
    - + diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index a051255dd2..9a1c324732 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -30,15 +30,15 @@ CMS.Views.Metadata.Editor = Backbone.View.extend({ el: self.$el.find('.metadata_entry')[counter++], model: new CMS.Models.Metadata(item) }; - if (item.options.length > 0) { - // Right now, all our option types only hold strings. Should really support - // any type though. + if (item.type === 'Select') { self.views.push(new CMS.Views.Metadata.Option(data)); } + else if (item.type === 'Integer' || item.type === 'Float') { + self.views.push(new CMS.Views.Metadata.Number(data)); + } else { self.views.push(new CMS.Views.Metadata.String(data)); } - }); } ); @@ -151,6 +151,28 @@ CMS.Views.Metadata.String = CMS.Views.Metadata.AbstractEditor.extend({ } }); +CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ + + events : { + "change input" : "updateModel", + "keypress .setting-input" : "showClearButton" , + "click .setting-clear" : "clear" + }, + + getTemplateName : function () { + return "metadata_number_entry"; + }, + + getValueFromEditor : function () { + return this.$el.find('#' + this.uniqueId).val(); + }, + + setValueInEditor : function (value) { + this.$el.find('input').val(value); + } +}); + + CMS.Views.Metadata.Option = CMS.Views.Metadata.AbstractEditor.extend({ events : { diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py index 91deb45a46..b33cf5fb8c 100644 --- a/common/lib/xmodule/xmodule/capa_module.py +++ b/common/lib/xmodule/xmodule/capa_module.py @@ -63,7 +63,8 @@ class ComplexEncoder(json.JSONEncoder): class CapaFields(object): attempts = StringyInteger(help="Number of attempts taken by the student on this problem", default=0, scope=Scope.user_state) max_attempts = StringyInteger(display_name="Maximum Attempts", - help="When set, this specifies the number of times the student can try to answer this problem.", scope=Scope.settings) + help="This specifies the number of times the student can try to answer this problem. If unset, infinite attempts are allowed.", + values = {"min" : 1 }, scope=Scope.settings) due = Date(help="Date that this problem is due by", scope=Scope.settings) graceperiod = Timedelta(help="Amount of time after the due date that submissions will be accepted", scope=Scope.settings) showanswer = String(display_name="Show Answer", @@ -87,7 +88,8 @@ class CapaFields(object): done = Boolean(help="Whether the student has answered the problem", scope=Scope.user_state) seed = StringyInteger(help="Random seed for this student", scope=Scope.user_state) weight = StringyFloat(display_name="Problem Weight", - help="Specifies the number of points the problem is worth. By default, each response field in the problem is worth one point.", + help="Specifies the number of points the problem is worth. If unset, each response field in the problem is worth one point.", + values = {"min" : 0 }, scope=Scope.settings) markdown = String(help="Markdown source of this module", scope=Scope.settings) source_code = String(help="Source code for LaTeX and Word problems. This feature is not well-supported.", diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index 1e965e6c6b..b170fa9a7d 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -57,7 +57,8 @@ class CombinedOpenEndedFields(object): ready_to_reset = Boolean(help="If the problem is ready to be reset or not.", default=False, scope=Scope.user_state) attempts = Integer(display_name="Maximum Attempts", - help="Specifies the number of times the student can try to answer this problem.", default=1, scope=Scope.settings) + help="Specifies the number of times the student can try to answer this problem.", default=1, + scope=Scope.settings) # TODO: move values to Boolean in xblock. is_graded = Boolean(display_name="Graded", help="Whether or not the problem is graded.", default=False, scope=Scope.settings, values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}]) diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index 3b094e04a5..5c22106f75 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -9,7 +9,7 @@ from pkg_resources import resource_listdir, resource_string, resource_isdir from xmodule.modulestore import Location from xmodule.modulestore.exceptions import ItemNotFoundError -from xblock.core import XBlock, Scope, String +from xblock.core import XBlock, Scope, String, Integer, Float log = logging.getLogger(__name__) @@ -649,17 +649,29 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock): 'inheritable': inheritable, 'explicitly_set': explicitly_set} + # We support the following editors: + # 1. A select editor for fields with a list of possible values (includes Booleans). + # 2. Number editor for integers and floats. + # 3. A generic string editor for anything else (editing JSON representation of the value). + type = "Generic" + # TODO: test all this logic values = [] if field.values is None else field.values - for index, choice in enumerate(values): - json_choice = choice - # TODO: test this logic. - if hasattr(json_choice, 'value'): - json_choice['value'] = field.to_json(json_choice['value']) - else: - json_choice = field.to_json(json_choice) - values[index] = json_choice - + if isinstance(values, list): + if len(values) > 0: + type = "Select" + for index, choice in enumerate(values): + json_choice = choice + if hasattr(json_choice, 'value'): + json_choice['value'] = field.to_json(json_choice['value']) + else: + json_choice = field.to_json(json_choice) + values[index] = json_choice + elif isinstance(field, Integer): + type = "Integer" + elif isinstance(field, Float): + type = "Float" simple_metadata[field.name] = {'field_name' : field.name, + 'type' : type, 'display_name' : field.display_name, 'value': field.to_json(value), 'options' : values, From 17750a7d6d60d59d8600cf83ffc4b747e810e2f2 Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 14 May 2013 14:20:10 -0400 Subject: [PATCH 039/117] Use min, max, and step values from server. --- .../metadata_number_entry.html | 2 +- cms/static/js/models/metadata_model.js | 7 ++++- cms/static/js/views/metadata_editor_view.js | 27 +++++++++++++++++++ common/lib/xmodule/xmodule/capa_module.py | 2 +- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html index 040488cb39..981db06bd4 100644 --- a/cms/static/client_templates/metadata_number_entry.html +++ b/cms/static/client_templates/metadata_number_entry.html @@ -1,6 +1,6 @@
    - + diff --git a/cms/static/js/models/metadata_model.js b/cms/static/js/models/metadata_model.js index d2e3e52f66..90476431d4 100644 --- a/cms/static/js/models/metadata_model.js +++ b/cms/static/js/models/metadata_model.js @@ -8,7 +8,8 @@ CMS.Models.Metadata = Backbone.Model.extend({ "value" : null, "explicitly_set": null, "default_value" : null, - "options" : null + "options" : null, + "type" : null }, initialize: function() { @@ -55,6 +56,10 @@ CMS.Models.Metadata = Backbone.Model.extend({ return this.get('options'); }, + getType: function() { + return this.get('type'); + }, + clear: function() { this.set('explicitly_set', false); this.set('value', this.get('default_value')); diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index 9a1c324732..b4378bbbc7 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -159,6 +159,33 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ "click .setting-clear" : "clear" }, + render: function () { + CMS.Views.Metadata.AbstractEditor.prototype.render.apply(this); + if (!this.inputAttributesSet) { + var min = "min"; + var max = "max"; + var step = "step"; + var options = this.model.getOptions(); + if (options.hasOwnProperty(min)) { + this.$el.find('input').attr(min, options[min].toString()); + } + if (options.hasOwnProperty(max)) { + this.$el.find('input').attr(max, options[max].toString()); + } + var stepValue = undefined; + if (options.hasOwnProperty(step)) { + stepValue = options[step].toString(); + } + else if (this.model.getType() === 'Integer') { + stepValue = "1"; + } + if (stepValue !== undefined) { + this.$el.find('input').attr(step, stepValue); + } + this.inputAttributesSet = true; + } + }, + getTemplateName : function () { return "metadata_number_entry"; }, diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py index b33cf5fb8c..3433e6c88b 100644 --- a/common/lib/xmodule/xmodule/capa_module.py +++ b/common/lib/xmodule/xmodule/capa_module.py @@ -89,7 +89,7 @@ class CapaFields(object): seed = StringyInteger(help="Random seed for this student", scope=Scope.user_state) weight = StringyFloat(display_name="Problem Weight", help="Specifies the number of points the problem is worth. If unset, each response field in the problem is worth one point.", - values = {"min" : 0 }, + values = {"min" : 0 , "step": ".1"}, scope=Scope.settings) markdown = String(help="Markdown source of this module", scope=Scope.settings) source_code = String(help="Source code for LaTeX and Word problems. This feature is not well-supported.", From 064d21c4e28e8832fa56131d91f4a5330b6ced86 Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 14 May 2013 15:05:22 -0400 Subject: [PATCH 040/117] clean up of editor header styling --- cms/static/sass/views/_unit.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 37db76568a..655be20efc 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -480,10 +480,8 @@ body.course.unit { padding: 15px 0 15px 20px; top: 0; right: 0; - border-bottom: 1px solid $gray-l2; background-color: $blue; color: $white; - box-shadow: 0 1px 2px rgba(182, 182, 182, 0.75) inset; //Component Name .component-name { @@ -518,12 +516,13 @@ body.course.unit { &.is-set { @include linear-gradient($blue, $blue); - box-shadow: inset 0 0 3px $shadow; + color: $blue-d1; + box-shadow: inset 0 3px 3px $shadow-d1; background-color: $blue; cursor: default; &:hover { - box-shadow: inset 0 0 3px $shadow; + box-shadow: inset 0 3px 3px $shadow-d1; background-color: $blue; } } @@ -614,6 +613,7 @@ body.course.unit { @extend .t-copy-sub1; @include transition(color, 0.15s, ease-in-out); font-weight: 400; + vertical-align: middle; display: inline-block; position: relative; left: 0; @@ -702,7 +702,7 @@ body.course.unit { margin-top: 5px; display: inline-block; font-color: $gray-l6; - min-width: 280px; + min-width: 260px; width: 50%; vertical-align: top; } From 81e95f27db01bb6677365d49f9f18b59dd26258d Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 14 May 2013 22:31:11 -0400 Subject: [PATCH 041/117] basic tab switching added --- .../coffee/src/views/module_edit.coffee | 26 +++++++++++++------ cms/static/sass/views/_unit.scss | 15 +++++++++-- cms/templates/component.html | 9 +++---- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index 10e07081cb..5f935519d5 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -7,7 +7,7 @@ class CMS.Views.ModuleEdit extends Backbone.View "click .component-editor .save-button": 'clickSaveButton' "click .component-actions .edit-button": 'clickEditButton' "click .component-actions .delete-button": 'onDelete' - "click .not-set ": 'clickModeButton' + "click .mode a": 'clickModeButton' initialize: -> @onDelete = @options.onDelete @@ -28,6 +28,8 @@ class CMS.Views.ModuleEdit extends Backbone.View model: new CMS.Models.MetadataEditor(metadataEditor.data('metadata')) }); + ----> find id of the li that wraps the is-set A thinger, that thing's name, get the first word set to VAR, and then add is-active to the div whose class equals wrapper-comp-VAR + changedMetadata: -> return @metadataEditor.getModifiedMetadataValues() @@ -86,11 +88,19 @@ class CMS.Views.ModuleEdit extends Backbone.View clickModeButton: (event) -> event.preventDefault() - @$el.find("a").removeClass('not-set').addClass('is-set') + if $(this).hasClass(".is-set") + alert("Hey Sucka") + else + previousTab = @$el.find('li.active-mode .is-set') + previousTab.parent().siblings().find("a").addClass('is-set').attr({ + aria-selected: 'true', + tab-index: '1' + }) + previousTab.removeClass('is-set').attr({ + aria-selected: 'false', + tab-index: '0' + }) - previouslySetMode = @$el.siblings('li.active-mode').find('.is-set') - previouslySetMode.find("a").removeClass('is-set').addClass('not-set') - - activeTab = $component_editor.find('.xmodule_edit').find(".is-set") - activeTab.removeClass('is-set') - activeTab.siblings('.not-set').addClass('is-set') + previousTabContent = @$el.find('div.is-active') + previousTabContent.siblings().addClass('is-active') + previousTabContent.removeClass('is-active') diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 655be20efc..86758c5c68 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -532,10 +532,21 @@ body.course.unit { } // Editor Wrapper -.wrapper-comp-editor { } +.wrapper-comp-editor { + display: none; + + &.is-active { + display: block; + } + } // Settings Wrapper .wrapper-comp-settings { + display: none; + + &.is-active { + display: block; + } //settings-list .list-input.settings-list { @@ -625,7 +636,7 @@ body.course.unit { } } - input, select { + input, select, input[type="number"] { @include placeholder($gray-l4); @include font-size(16); @include size(100%,100%); diff --git a/cms/templates/component.html b/cms/templates/component.html index ef0b62f4a4..3aa8c322df 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -3,13 +3,10 @@
    Editing: Component From 98e692d15e31438ba3387ecc32052cb2c1b8a321 Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 14 May 2013 23:03:33 -0400 Subject: [PATCH 042/117] fixed broken coffee script caused by errant pseudo code I checked in --- cms/static/coffee/src/views/module_edit.coffee | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index 5f935519d5..d5b6ef1b52 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -28,8 +28,6 @@ class CMS.Views.ModuleEdit extends Backbone.View model: new CMS.Models.MetadataEditor(metadataEditor.data('metadata')) }); - ----> find id of the li that wraps the is-set A thinger, that thing's name, get the first word set to VAR, and then add is-active to the div whose class equals wrapper-comp-VAR - changedMetadata: -> return @metadataEditor.getModifiedMetadataValues() @@ -89,17 +87,11 @@ class CMS.Views.ModuleEdit extends Backbone.View clickModeButton: (event) -> event.preventDefault() if $(this).hasClass(".is-set") - alert("Hey Sucka") + alert("Hi There") else previousTab = @$el.find('li.active-mode .is-set') - previousTab.parent().siblings().find("a").addClass('is-set').attr({ - aria-selected: 'true', - tab-index: '1' - }) - previousTab.removeClass('is-set').attr({ - aria-selected: 'false', - tab-index: '0' - }) + previousTab.parent().siblings().find("a").addClass('is-set') + previousTab.removeClass('is-set') previousTabContent = @$el.find('div.is-active') previousTabContent.siblings().addClass('is-active') From 47a4d6b6a1e4bc4b837552db9657e201f6cd626e Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 14 May 2013 23:55:34 -0400 Subject: [PATCH 043/117] initial polyfill implementation and metadata number entry javascript validation --- .../metadata_number_entry.html | 2 +- cms/static/js/base.js | 14 ++++ cms/static/sass/views/_unit.scss | 8 +- cms/templates/base.html | 4 +- .../html5-input-polyfills/number-polyfill.css | 80 +++++++++++++++++++ 5 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 common/static/css/vendor/html5-input-polyfills/number-polyfill.css diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html index 981db06bd4..f60e47160f 100644 --- a/cms/static/client_templates/metadata_number_entry.html +++ b/cms/static/client_templates/metadata_number_entry.html @@ -1,6 +1,6 @@
    - + diff --git a/cms/static/js/base.js b/cms/static/js/base.js index c8371fcf64..a986f2ac00 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -896,3 +896,17 @@ function saveSetSectionScheduleDate(e) { hideModal(); }); } + +function checkNumberSettingValidity(e) { + e.preventDefault(); + + if (!e.checkNumberSettingValidity()) + { + alert("You have invalid input. Correct it!"); + obj.focus(); + + $('this').val(''); + } +} + + diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 86758c5c68..09a4a37abe 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -517,12 +517,12 @@ body.course.unit { &.is-set { @include linear-gradient($blue, $blue); color: $blue-d1; - box-shadow: inset 0 3px 3px $shadow-d1; + box-shadow: inset 0 2px 2px $shadow-d1; background-color: $blue; cursor: default; &:hover { - box-shadow: inset 0 3px 3px $shadow-d1; + box-shadow: inset 0 2px 2px $shadow-d1; background-color: $blue; } } @@ -664,6 +664,10 @@ body.course.unit { text-overflow: ellipsis; } + input[type="number"] { + width: 39%; + } + select { @include box-shadow(0 1px 2px $shadow-l1 inset); background: none repeat scroll #F2F2F2; diff --git a/cms/templates/base.html b/cms/templates/base.html index 521bb8b1ff..83627ba3e6 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -22,6 +22,7 @@ + <%include file="widgets/segment-io.html" /> @@ -38,6 +39,8 @@ + + <%static:js group='main'/> <%static:js group='module-js'/> @@ -49,7 +52,6 @@ - diff --git a/common/static/css/vendor/html5-input-polyfills/number-polyfill.css b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css new file mode 100644 index 0000000000..ceaa34a8e9 --- /dev/null +++ b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css @@ -0,0 +1,80 @@ +/* HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-polyfill*/ +div.number-spin-btn-container { + display: inline-block; + position: relative; + vertical-align: bottom; + margin: 0; + padding: 0; } + +div.number-spin-btn { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border-width: 2px; + border-color: #ededed #777777 #777777 #ededed; + border-style: solid; + background-color: #cccccc; + width: 1.2em; } + div.number-spin-btn:hover { + cursor: pointer; } + div.number-spin-btn:active { + border-width: 2px; + border-color: #5e5e5e #d8d8d8 #d8d8d8 #5e5e5e; + border-style: solid; + background-color: #999999; } + +div.number-spin-btn-up { + border-bottom-width: 1px; + -moz-border-radius: 3px 3px 0px 0px; + -webkit-border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; } + div.number-spin-btn-up:before { + border-width: 0 0.3em 0.3em 0.3em; + border-color: transparent transparent black transparent; + top: 25%; } + div.number-spin-btn-up:active { + border-bottom-width: 1px; } + div.number-spin-btn-up:active:before { + border-bottom-color: white; + top: 26%; + left: 51%; } + +div.number-spin-btn-down { + border-top-width: 1px; + -moz-border-radius: 0px 0px 3px 3px; + -webkit-border-radius: 0px 0px 3px 3px; + border-radius: 0px 0px 3px 3px; } + div.number-spin-btn-down:before { + border-width: 0.3em 0.3em 0 0.3em; + border-color: black transparent transparent transparent; + top: 75%; } + div.number-spin-btn-down:active { + border-top-width: 1px; } + div.number-spin-btn-down:active:before { + border-top-color: white; + top: 76%; + left: 51%; } + +div.number-spin-btn-up:before, +div.number-spin-btn-down:before { + content: ""; + width: 0; + height: 0; + border-style: solid; + position: absolute; + left: 50%; + margin: -0.15em 0 0 -0.3em; + padding: 0; } + +input:disabled + div.number-spin-btn-container > div.number-spin-btn-up:active, input:disabled + div.number-spin-btn-container > div.number-spin-btn-down:active { + border-color: #ededed #777777 #777777 #ededed; + border-style: solid; + background-color: #cccccc; } +input:disabled + div.number-spin-btn-container > div.number-spin-btn-up:before, input:disabled + div.number-spin-btn-container > div.number-spin-btn-up:active:before { + border-bottom-color: #999999; + top: 25%; + left: 50%; } +input:disabled + div.number-spin-btn-container > div.number-spin-btn-down:before, input:disabled + div.number-spin-btn-container > div.number-spin-btn-down:active:before { + border-top-color: #999999; + top: 75%; + left: 50%; } From b9fc3f9e073c13c4bd46e17e88cbd696ce1319ba Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 15 May 2013 00:04:41 -0400 Subject: [PATCH 044/117] updated styles for input type numbers --- cms/static/sass/views/_unit.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 09a4a37abe..e9049e9da5 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -666,6 +666,11 @@ body.course.unit { input[type="number"] { width: 39%; + @include box-shadow(0 1px 2px $shadow-l1 inset); + + &:active { + background-color: #FFFCF1; + } } select { From d4d38827b4344110e9f0c25076db1ec310e9dcef Mon Sep 17 00:00:00 2001 From: cahrens Date: Wed, 15 May 2013 10:35:40 -0400 Subject: [PATCH 045/117] Updates for showanswer. --- common/lib/xmodule/xmodule/capa_module.py | 13 ++++++++----- .../xmodule/templates/problem/circuitschematic.yaml | 2 +- .../xmodule/templates/problem/customgrader.yaml | 2 +- .../xmodule/xmodule/templates/problem/empty.yaml | 2 +- .../xmodule/templates/problem/emptyadvanced.yaml | 2 +- .../xmodule/templates/problem/forumularesponse.yaml | 2 +- .../xmodule/templates/problem/imageresponse.yaml | 2 +- .../xmodule/templates/problem/multiplechoice.yaml | 2 +- .../templates/problem/numericalresponse.yaml | 2 +- .../xmodule/templates/problem/optionresponse.yaml | 2 +- .../xmodule/templates/problem/string_response.yaml | 2 +- 11 files changed, 18 insertions(+), 15 deletions(-) diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py index 3433e6c88b..5d2fffe895 100644 --- a/common/lib/xmodule/xmodule/capa_module.py +++ b/common/lib/xmodule/xmodule/capa_module.py @@ -70,11 +70,14 @@ class CapaFields(object): showanswer = String(display_name="Show Answer", help="Specifies when to show the answer to this problem. A default value can be set course-wide in Advanced Settings.", scope=Scope.settings, default="closed", - values=[{"display_name": "Always", "value": "always"}, - {"display_name": "Answered", "value": "answered"}, - {"display_name": "Attempted", "value": "attempted"}, - {"display_name": "Closed", "value": "closed"}, - {"display_name": "Never", "value": "never"}]) + values=[ + {"display_name": "Always", "value": "always"}, + {"display_name": "Answered", "value": "answered"}, + {"display_name": "Attempted", "value": "attempted"}, + {"display_name": "Closed", "value": "closed"}, + {"display_name": "Finished", "value": "finished"}, + {"display_name": "Past Due", "value": "past_due"}, + {"display_name": "Never", "value": "never"}]) force_save_button = Boolean(help="Whether to force the save button to appear on the page", scope=Scope.settings, default=False) rerandomize = Randomization(display_name="Randomization", help="Specifies whether variable inputs for this problem are randomized each time a student loads the problem. This only applies to problems that have randomly generated numeric variables. A default value can be set course-wide in Advanced Settings.", default="always", scope=Scope.settings, values=[{"display_name": "Always", "value": "always"}, diff --git a/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml b/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml index 841bd5afcd..56f802a6a3 100644 --- a/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml @@ -3,7 +3,7 @@ metadata: display_name: Circuit Schematic Builder rerandomize: never - showanswer: always + showanswer: finished data: | Please make a voltage divider that splits the provided voltage evenly. diff --git a/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml b/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml index 6fa1779918..b5b0d71f4d 100644 --- a/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml @@ -2,7 +2,7 @@ metadata: display_name: Custom Python-Evaluated Input rerandomize: never - showanswer: always + showanswer: finished data: |

    diff --git a/common/lib/xmodule/xmodule/templates/problem/empty.yaml b/common/lib/xmodule/xmodule/templates/problem/empty.yaml index d372048ee5..97a2aef423 100644 --- a/common/lib/xmodule/xmodule/templates/problem/empty.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/empty.yaml @@ -2,7 +2,7 @@ metadata: display_name: Blank Common Problem rerandomize: never - showanswer: always + showanswer: finished markdown: "" data: | diff --git a/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml b/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml index 902b08e252..3d696ec2fd 100644 --- a/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml @@ -2,7 +2,7 @@ metadata: display_name: Blank Advanced Problem rerandomize: never - showanswer: always + showanswer: finished data: | diff --git a/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml b/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml index 890260d381..0401a01c31 100644 --- a/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml @@ -2,7 +2,7 @@ metadata: display_name: Math Expression Input rerandomize: never - showanswer: always + showanswer: finished data: |

    diff --git a/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml index 9086dd7426..ab1f22e3b2 100644 --- a/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml @@ -2,7 +2,7 @@ metadata: display_name: Image Mapped Input rerandomize: never - showanswer: always + showanswer: finished data: |

    diff --git a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml index 3a35a35199..df3eafc4a5 100644 --- a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml @@ -2,7 +2,7 @@ metadata: display_name: Multiple Choice rerandomize: never - showanswer: always + showanswer: finished weight: "" attempts: "" markdown: diff --git a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml index 4623e53e00..548fd94fab 100644 --- a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml @@ -2,7 +2,7 @@ metadata: display_name: Numerical Input rerandomize: never - showanswer: always + showanswer: finished markdown: "A numerical input problem accepts a line of text input from the student, and evaluates the input for correctness based on its diff --git a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml index a87885594a..c2edfb1cbc 100644 --- a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml @@ -2,7 +2,7 @@ metadata: display_name: Dropdown rerandomize: never - showanswer: always + showanswer: finished markdown: "Dropdown problems give a limited set of options for students to respond with, and present those options in a format that encourages them to search for a specific answer rather than being immediately presented diff --git a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml index 9519c192ac..64e3dc062f 100644 --- a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml @@ -2,7 +2,7 @@ metadata: display_name: Text Input rerandomize: never - showanswer: always + showanswer: finished # Note, the extra newlines are needed to make the yaml parser add blank lines instead of folding markdown: "A text input problem accepts a line of text from the From e157173c1119d0a10f3d85343586f1cfea8a57ca Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 15 May 2013 10:53:54 -0400 Subject: [PATCH 046/117] styling adjustments to codemirror and wrapped polyfill into a function --- cms/static/coffee/src/views/module_edit.coffee | 2 ++ cms/static/sass/views/_unit.scss | 11 +++++------ .../xmodule/xmodule/css/codemirror/codemirror.scss | 1 + common/lib/xmodule/xmodule/css/editor/edit.scss | 2 -- .../vendor/html5-input-polyfills/number-polyfill.js | 5 ++++- .../tiny_mce/themes/advanced/skins/studio/ui.css | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index d5b6ef1b52..22fb90c1b9 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -27,6 +27,8 @@ class CMS.Views.ModuleEdit extends Backbone.View el: metadataEditor, model: new CMS.Models.MetadataEditor(metadataEditor.data('metadata')) }); + # Checks for number input fields and adds polyfill + #triggerNumberPolyfill() changedMetadata: -> return @metadataEditor.getModifiedMetadataValues() diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index e9049e9da5..74a354d09d 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -234,7 +234,7 @@ body.course.unit { opacity:.8; &:hover { - opacity:1; + opacity:.9; background-color: tint($lightBluishGrey, 20%); } @@ -481,6 +481,7 @@ body.course.unit { top: 0; right: 0; background-color: $blue; + border-bottom: 1px solid $blue-d2; color: $white; //Component Name @@ -517,12 +518,12 @@ body.course.unit { &.is-set { @include linear-gradient($blue, $blue); color: $blue-d1; - box-shadow: inset 0 2px 2px $shadow-d1; + box-shadow: inset 1px 1px 1px $shadow-d1; background-color: $blue; cursor: default; &:hover { - box-shadow: inset 0 2px 2px $shadow-d1; + box-shadow: inset 1px 1px 1px $shadow-d1; background-color: $blue; } } @@ -575,7 +576,7 @@ body.course.unit { background-color: $white; padding: 20px; border-bottom: 1px solid $gray-l2; - opacity: .6; + opacity: .8; &:last-child { //margin-bottom: 0; @@ -688,8 +689,6 @@ body.course.unit { } } - //input[type=others] - .action.setting-clear { @include font-size(11); background-color: $gray-l4; diff --git a/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss b/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss index 0dc07919ae..91c79d970f 100644 --- a/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss +++ b/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss @@ -2,4 +2,5 @@ background: #fff; font-size: 13px; color: #3c3c3c; + padding: 15px; } \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/css/editor/edit.scss b/common/lib/xmodule/xmodule/css/editor/edit.scss index ac53bb5a70..d30f69bcd2 100644 --- a/common/lib/xmodule/xmodule/css/editor/edit.scss +++ b/common/lib/xmodule/xmodule/css/editor/edit.scss @@ -10,8 +10,6 @@ position: relative; @include linear-gradient(top, #d4dee8, #c9d5e2); padding: 5px; - border: 1px solid #3c3c3c; - border-radius: 3px 3px 0 0; border-bottom-color: #a5aaaf; @include clearfix; diff --git a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js index 080ae27be6..ab47dcdd94 100644 --- a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js +++ b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js @@ -4,7 +4,8 @@ HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-polyfill */ - +function triggerNumberPolyfill() { + (function() { (function($) { @@ -297,3 +298,5 @@ HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-poly })(jQuery); }).call(this); + +} \ No newline at end of file diff --git a/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css b/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css index 77afc23874..fc97eb6450 100644 --- a/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css +++ b/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css @@ -40,7 +40,7 @@ padding: 10px 10px 9px; vertical-align: top; } -.studioSkin .mceIframeContainer {border: 1px solid #3c3c3c; border-top: none;} +.studioSkin .mceIframeContainer {border: 1px solid white; border-top: none;} .studioSkin .mceStatusbar {background:#F0F0EE; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px} .studioSkin .mceStatusbar div {float:left; margin:2px} .studioSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/studio-icons.png) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0} From 63960ee4a276941e1a70b91c1baa3b2c55f19234 Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 15 May 2013 11:26:34 -0400 Subject: [PATCH 047/117] style change for is-set --- cms/static/sass/views/_unit.scss | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 74a354d09d..c320996095 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -506,6 +506,7 @@ body.course.unit { .mode { display: inline-block; + margin-left: 8px; &.inactive-mode{ display: none; @@ -518,13 +519,13 @@ body.course.unit { &.is-set { @include linear-gradient($blue, $blue); color: $blue-d1; - box-shadow: inset 1px 1px 1px $shadow-d1; - background-color: $blue; + box-shadow: inset 0 1px 2px 2px $shadow; + background-color: $blue-d4; cursor: default; &:hover { - box-shadow: inset 1px 1px 1px $shadow-d1; - background-color: $blue; + box-shadow: inset 0 1px 2px 2px $shadow; + background-color: $blue-d4; } } } From faf31d972868311602616b0a04a2923d536e1824 Mon Sep 17 00:00:00 2001 From: cahrens Date: Wed, 15 May 2013 11:34:49 -0400 Subject: [PATCH 048/117] Get toggling between Editor and Settings working. --- .../coffee/src/views/module_edit.coffee | 45 +++++++++++++++---- cms/templates/component.html | 6 +-- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index d5b6ef1b52..c5869fa9b9 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -1,6 +1,7 @@ class CMS.Views.ModuleEdit extends Backbone.View tagName: 'li' className: 'component' + editorMode: 'editor-mode' events: "click .component-editor .cancel-button": 'clickCancelButton' @@ -27,6 +28,12 @@ class CMS.Views.ModuleEdit extends Backbone.View el: metadataEditor, model: new CMS.Models.MetadataEditor(metadataEditor.data('metadata')) }); + # Need to update set "active" class on data editor if there is one. + # If we are only showing settings, hide the data editor controls and update settings accordingly. + if @hasDataEditor() + @selectMode(@editorMode) + else + @hideDataEditor() changedMetadata: -> return @metadataEditor.getModifiedMetadataValues() @@ -86,13 +93,33 @@ class CMS.Views.ModuleEdit extends Backbone.View clickModeButton: (event) -> event.preventDefault() - if $(this).hasClass(".is-set") - alert("Hi There") - else - previousTab = @$el.find('li.active-mode .is-set') - previousTab.parent().siblings().find("a").addClass('is-set') - previousTab.removeClass('is-set') + if not @hasDataEditor() + return + @selectMode(event.currentTarget.parentElement.id) - previousTabContent = @$el.find('div.is-active') - previousTabContent.siblings().addClass('is-active') - previousTabContent.removeClass('is-active') + hasDataEditor: => + return @$el.find('.wrapper-comp-editor').length > 0 + + selectMode: (mode) => + dataEditor = @$el.find('.wrapper-comp-editor') + settingsEditor = @$el.find('.wrapper-comp-settings') + editorModeButton = @$el.find('#editor-mode').find("a") + settingsModeButton = @$el.find('#settings-mode').find("a") + + if mode == @editorMode + dataEditor.addClass('is-active') + settingsEditor.removeClass('is-active') + editorModeButton.addClass('is-set') + settingsModeButton.removeClass('is-set') + else + dataEditor.removeClass('is-active') + settingsEditor.addClass('is-active') + editorModeButton.removeClass('is-set') + settingsModeButton.addClass('is-set') + + hideDataEditor: => + editorModeButtonParent = @$el.find('#editor-mode') + # Can it be enough to just remove active-mode? + editorModeButtonParent.addClass('inactive-mode') + editorModeButtonParent.removeClass('active-mode') + @$el.find('.wrapper-comp-settings').addClass('is-active') \ No newline at end of file diff --git a/cms/templates/component.html b/cms/templates/component.html index 3aa8c322df..cfdd40403d 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -3,11 +3,11 @@

    Editing: Component
    From a16740691f37f0f545124890c82ea14b4c9c640e Mon Sep 17 00:00:00 2001 From: cahrens Date: Wed, 15 May 2013 11:39:07 -0400 Subject: [PATCH 049/117] Minor update. --- cms/static/coffee/src/views/module_edit.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index c5869fa9b9..04d99299d2 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -122,4 +122,5 @@ class CMS.Views.ModuleEdit extends Backbone.View # Can it be enough to just remove active-mode? editorModeButtonParent.addClass('inactive-mode') editorModeButtonParent.removeClass('active-mode') - @$el.find('.wrapper-comp-settings').addClass('is-active') \ No newline at end of file + @$el.find('.wrapper-comp-settings').addClass('is-active') + @$el.find('#settings-mode').find("a").addClass('is-set') \ No newline at end of file From 56df114edbc5ebed03edfc96e5bfd85616af015f Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 15 May 2013 11:41:19 -0400 Subject: [PATCH 050/117] style changes to component header --- cms/static/sass/views/_unit.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index c320996095..590ce59cd4 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -477,7 +477,7 @@ body.course.unit { .component-edit-header { @include box-sizing(border-box); - padding: 15px 0 15px 20px; + padding: 18px 0 18px 20px; top: 0; right: 0; background-color: $blue; @@ -502,7 +502,7 @@ body.course.unit { right: 0; top: 0; position: absolute; - padding: 10px; + padding: 15px; .mode { display: inline-block; From 06d315484f1773df05de86673db49283f6092e14 Mon Sep 17 00:00:00 2001 From: cahrens Date: Wed, 15 May 2013 11:52:38 -0400 Subject: [PATCH 051/117] Set "editing" name. --- cms/static/coffee/src/views/module_edit.coffee | 1 + cms/static/js/views/metadata_editor_view.js | 6 ++++++ cms/templates/component.html | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index 04d99299d2..1d1ff936be 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -34,6 +34,7 @@ class CMS.Views.ModuleEdit extends Backbone.View @selectMode(@editorMode) else @hideDataEditor() + @$el.find('.component-name').html('Editing: ' + @metadataEditor.getDisplayName()) changedMetadata: -> return @metadataEditor.getModifiedMetadataValues() diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index b4378bbbc7..633c766923 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -54,6 +54,12 @@ CMS.Views.Metadata.Editor = Backbone.View.extend({ } ); return modified_values; + }, + + getDisplayName: function () { + // It is possible that there is no display name set. In that case, return empty string. + var displayNameValue = this.model.get('display_name').value; + return displayNameValue ? displayNameValue : ''; } }); diff --git a/cms/templates/component.html b/cms/templates/component.html index cfdd40403d..54c62dcba9 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,7 +1,7 @@
    - Editing: Component +
      • <% }) %> -
    \ No newline at end of file + +% if showHighLevelSource: + Edit High Level Source + <%include file="source-edit.html" /> +% endif \ No newline at end of file diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index 04d99299d2..6e5676ca82 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -28,6 +28,11 @@ class CMS.Views.ModuleEdit extends Backbone.View el: metadataEditor, model: new CMS.Models.MetadataEditor(metadataEditor.data('metadata')) }); + + #Manually runs polyfill for input number types to correct for Firefox non-support + #wrapperSettings = @$el.find(".wrapper-comp-settings") + #wrapperSettings.inputNumber() + # Need to update set "active" class on data editor if there is one. # If we are only showing settings, hide the data editor controls and update settings accordingly. if @hasDataEditor() diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index e19a49a0da..56c838f799 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -954,4 +954,19 @@ body.unit { .view-button { display: none; } +} + +// Latex Compiler +// ==================== +.launch-latex-compiler { + background-color: $white; + padding: 10px 0 10px 20px; + border-bottom: 1px solid $gray-l2; + opacity: .8; + + + &:hover { + @include transition(opacity 0.25s ease-in-out); + opacity: 1; + } } \ No newline at end of file diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html index 8367011c42..0f906ebed2 100644 --- a/cms/templates/widgets/metadata-edit.html +++ b/cms/templates/widgets/metadata-edit.html @@ -8,10 +8,12 @@ % if 'source_code' in json_metadata_data: <% del json_metadata_data['source_code'] %> % endif -
    - +
    % if showHighLevelSource: - Edit High Level Source +
    + + Launch Latex Source Compiler
    <%include file="source-edit.html" /> % endif +
    diff --git a/common/lib/xmodule/xmodule/css/editor/edit.scss b/common/lib/xmodule/xmodule/css/editor/edit.scss index dec070264a..e94d776035 100644 --- a/common/lib/xmodule/xmodule/css/editor/edit.scss +++ b/common/lib/xmodule/xmodule/css/editor/edit.scss @@ -5,7 +5,6 @@ .row { position: relative; - //testing .CodeMirror { padding: 15px; } diff --git a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js index ab47dcdd94..a9bc1b73d3 100644 --- a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js +++ b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js @@ -3,8 +3,6 @@ /* HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-polyfill */ - -function triggerNumberPolyfill() { (function() { @@ -298,5 +296,3 @@ function triggerNumberPolyfill() { })(jQuery); }).call(this); - -} \ No newline at end of file From ef14155306565d89d7724dad5fd68bec865126fc Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 16 May 2013 09:50:16 -0400 Subject: [PATCH 061/117] cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill --- cms/static/client_templates/metadata_editor.html | 8 ++------ cms/static/client_templates/metadata_number_entry.html | 2 +- cms/templates/widgets/metadata-edit.html | 7 +++---- common/lib/xmodule/xmodule/css/editor/edit.scss | 4 ---- common/lib/xmodule/xmodule/css/problem/edit.scss | 7 +++++++ .../js/vendor/html5-input-polyfills/number-polyfill.js | 2 +- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/cms/static/client_templates/metadata_editor.html b/cms/static/client_templates/metadata_editor.html index db355b38a7..34723edb8e 100644 --- a/cms/static/client_templates/metadata_editor.html +++ b/cms/static/client_templates/metadata_editor.html @@ -1,10 +1,6 @@
      <% _.each(metadata_entries, function(entry) { %> -
    • +
      • <% }) %> -
    -% if showHighLevelSource: - Edit High Level Source - <%include file="source-edit.html" /> -% endif \ No newline at end of file + \ No newline at end of file diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html index f60e47160f..df534135c7 100644 --- a/cms/static/client_templates/metadata_number_entry.html +++ b/cms/static/client_templates/metadata_number_entry.html @@ -1,6 +1,6 @@
    - + diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html index 744c619864..d85ca222e9 100644 --- a/cms/templates/widgets/metadata-edit.html +++ b/cms/templates/widgets/metadata-edit.html @@ -12,13 +12,12 @@ ## source-edit.html needs access to the 'source_code' value, so delete from a copy. <% del metadata_field_copy['source_code'] %> % endif -
    % if showHighLevelSource:
    - - Launch Latex Source Compiler
    + Launch Latex Source Compiler +
    <%include file="source-edit.html" /> % endif -
    +
    \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/css/editor/edit.scss b/common/lib/xmodule/xmodule/css/editor/edit.scss index e94d776035..d30f69bcd2 100644 --- a/common/lib/xmodule/xmodule/css/editor/edit.scss +++ b/common/lib/xmodule/xmodule/css/editor/edit.scss @@ -4,10 +4,6 @@ .row { position: relative; - - .CodeMirror { - padding: 15px; - } } .editor-bar { diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss index be5455e901..b7c8bdaba5 100644 --- a/common/lib/xmodule/xmodule/css/problem/edit.scss +++ b/common/lib/xmodule/xmodule/css/problem/edit.scss @@ -99,6 +99,13 @@ } } +.problem-editor { +// adding padding to simple editor only - adjacent selector is needed since there are no toggles for CodeMirror + .markdown-box+.CodeMirror { + padding: 10px; + } +} + .problem-editor-icon { display: inline-block; width: 26px; diff --git a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js index a9bc1b73d3..fbc7d4704b 100644 --- a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js +++ b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js @@ -3,7 +3,7 @@ /* HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-polyfill */ - + (function() { (function($) { From 235ecff28b49cc437feadb25ac7a827e9a2e6d3a Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 16 May 2013 10:40:48 -0400 Subject: [PATCH 062/117] In progress. --- cms/envs/common.py | 2 +- cms/static/coffee/spec/models/metadata_spec.coffee | 3 +++ cms/static/js/models/metadata_model.js | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 cms/static/coffee/spec/models/metadata_spec.coffee diff --git a/cms/envs/common.py b/cms/envs/common.py index a53830082b..05c17b9298 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -214,7 +214,7 @@ PIPELINE_JS = { 'source_filenames': sorted( rooted_glob(COMMON_ROOT / 'static/', 'coffee/src/**/*.js') + rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.js') - ) + ['js/hesitate.js', 'js/base.js'], + ) + ['js/hesitate.js', 'js/base.js', 'js/models/metadata_model.js'], 'output_filename': 'js/cms-application.js', 'test_order': 0 }, diff --git a/cms/static/coffee/spec/models/metadata_spec.coffee b/cms/static/coffee/spec/models/metadata_spec.coffee new file mode 100644 index 0000000000..8dc771b339 --- /dev/null +++ b/cms/static/coffee/spec/models/metadata_spec.coffee @@ -0,0 +1,3 @@ +describe "CMS.Models.Metadata", -> + it "has no url", -> + expect(new CMS.Models.Metadata().url).toEqual("/save_item") \ No newline at end of file diff --git a/cms/static/js/models/metadata_model.js b/cms/static/js/models/metadata_model.js index 90476431d4..2cf15178ca 100644 --- a/cms/static/js/models/metadata_model.js +++ b/cms/static/js/models/metadata_model.js @@ -1,6 +1,8 @@ +/** + * Model used for metadata setting editors. This model does not do its own saving, + * as that is done by module_edit.coffee. + */ CMS.Models.Metadata = Backbone.Model.extend({ - // This model class is not suited for restful operations and is considered just a server side initialized container - url: '', defaults: { "field_name": null, From 01ff8396e34328d0a52c3d7ac95073051c05bc36 Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 16 May 2013 12:34:39 -0400 Subject: [PATCH 063/117] Fix CodeMirror initialization problem. --- cms/static/coffee/src/views/module_edit.coffee | 10 ++++++---- cms/static/sass/views/_unit.scss | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index 1a68a00d4f..244d5b9576 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -113,14 +113,16 @@ class CMS.Views.ModuleEdit extends Backbone.View settingsModeButton = @$el.find('#settings-mode').find("a") if mode == @editorMode - dataEditor.addClass('is-active') - settingsEditor.removeClass('is-active') + # Because of CodeMirror editor, cannot hide the data editor when it is first loaded. Therefore + # we have to use a class of is-inactive instead of is-active. + dataEditor.removeClass('is-inactive') editorModeButton.addClass('is-set') + settingsEditor.removeClass('is-active') settingsModeButton.removeClass('is-set') else - dataEditor.removeClass('is-active') - settingsEditor.addClass('is-active') + dataEditor.addClass('is-inactive') editorModeButton.removeClass('is-set') + settingsEditor.addClass('is-active') settingsModeButton.addClass('is-set') hideDataEditor: => diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 56c838f799..042a5dbdd6 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -535,12 +535,14 @@ body.course.unit { // Editor Wrapper .wrapper-comp-editor { - display: none; + display: block; - &.is-active { - display: block; + // Because the editor may be a CodeMirror editor (which must be visible at the time it is created + // in order for it to properly initialize), we must toggle "is-inactive" instead of the more common "is-active". + &.is-inactive { + display: none; } - } +} // Settings Wrapper .wrapper-comp-settings { From a6c5e699ea39a69db0f2d6c254f561362b0451b2 Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 16 May 2013 13:28:48 -0400 Subject: [PATCH 064/117] Update combined open ended and peer grading per conversation with Vik. --- .../xmodule/combined_open_ended_module.py | 20 ++++++------- .../xmodule/xmodule/peer_grading_module.py | 28 +++++++++++-------- .../templates/peer_grading/default.yaml | 3 -- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index b170fa9a7d..2076cf777c 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -5,10 +5,10 @@ from pkg_resources import resource_string from xmodule.raw_module import RawDescriptor from .x_module import XModule -from xblock.core import Integer, Scope, String, Boolean, List +from xblock.core import Scope, String, Integer, Boolean, List from xmodule.open_ended_grading_classes.combined_open_ended_modulev1 import CombinedOpenEndedV1Module, CombinedOpenEndedV1Descriptor from collections import namedtuple -from .fields import Date, StringyFloat +from .fields import Date, StringyFloat, StringyInteger log = logging.getLogger("mitx.courseware") @@ -56,18 +56,18 @@ class CombinedOpenEndedFields(object): scope=Scope.user_state) ready_to_reset = Boolean(help="If the problem is ready to be reset or not.", default=False, scope=Scope.user_state) - attempts = Integer(display_name="Maximum Attempts", - help="Specifies the number of times the student can try to answer this problem.", default=1, + attempts = StringyInteger(display_name="Maximum Attempts", + help="The number of times the student can try to answer this problem.", default=1, scope=Scope.settings) # TODO: move values to Boolean in xblock. is_graded = Boolean(display_name="Graded", help="Whether or not the problem is graded.", default=False, scope=Scope.settings, values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}]) - accept_file_upload = Boolean(display_name="Accept File Upload", - help="If disabled, students cannot upload images to be graded with this problem.", default=False, scope=Scope.settings, + accept_file_upload = Boolean(display_name="Allow File Uploads", + help="Whether or not the student can submit files as a response.", default=False, scope=Scope.settings, values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}]) - skip_spelling_checks = Boolean(display_name="Basic Quality Filter", + skip_spelling_checks = Boolean(display_name="Disable Quality Filter", # TODO: passing of text failed with "won't". Need to make our code more robust. - help="If enabled, submissions with poor spelling, short length, or poor grammar will not be peer reviewed.", + help="If False, submissions with poor spelling, short length, or poor grammar will not be peer reviewed.", default=False, scope=Scope.settings, values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}]) due = Date(help="Date that this problem is due by", default=None, scope=Scope.settings) graceperiod = String(help="Amount of time after the due date that submissions will be accepted", default=None, @@ -75,8 +75,8 @@ class CombinedOpenEndedFields(object): version = VersionInteger(help="Current version number", default=DEFAULT_VERSION, scope=Scope.settings) data = String(help="XML data for the problem", scope=Scope.content) weight = StringyFloat(display_name="Problem Weight", - help="Specifies the number of points the problem is worth. By default, each response field in the problem is worth one point.", - scope=Scope.settings) + help="The number of points the problem is worth. By default, each problem is worth one point.", + scope=Scope.settings, values = {"min" : 0 , "step": ".1"}) class CombinedOpenEndedModule(CombinedOpenEndedFields, XModule): diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py index 0cb9c48f8f..98f0e33486 100644 --- a/common/lib/xmodule/xmodule/peer_grading_module.py +++ b/common/lib/xmodule/xmodule/peer_grading_module.py @@ -22,28 +22,33 @@ USE_FOR_SINGLE_LOCATION = False LINK_TO_LOCATION = "" TRUE_DICT = [True, "True", "true", "TRUE"] MAX_SCORE = 1 -IS_GRADED = True +IS_GRADED = False EXTERNAL_GRADER_NO_CONTACT_ERROR = "Failed to contact external graders. Please notify course staff." class PeerGradingFields(object): - use_for_single_location = StringyBoolean(help="Whether to use this for a single location or as a panel.", - default=USE_FOR_SINGLE_LOCATION, scope=Scope.settings) - link_to_location = String(help="The location this problem is linked to.", default=LINK_TO_LOCATION, - scope=Scope.settings) + use_for_single_location = StringyBoolean(display_name="Show Single Problem", + help='When True, only the single problem specified by "Link to Problem Location" is shown. ' + 'When False, a panel is displayed with all problems available for peer grading.', + values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}], + default=USE_FOR_SINGLE_LOCATION, scope=Scope.settings) + link_to_location = String(display_name="Link to Problem Location", + help='The location of the problem being graded. Only used when "Show Single Problem" is True.', + default=LINK_TO_LOCATION, scope=Scope.settings) # TODO: move boolean default into xfields - is_graded = StringyBoolean(display_name="Graded", help="Whether or not this module is scored.", default=IS_GRADED, + is_graded = StringyBoolean(display_name="Graded", + help='Whether the student gets credit for grading this problem. Only used when "Show Single Problem" is True.', default=IS_GRADED, values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}], scope=Scope.settings) due_date = Date(help="Due date that should be displayed.", default=None, scope=Scope.settings) grace_period_string = String(help="Amount of grace to give on the due date.", default=None, scope=Scope.settings) - max_grade = StringyInteger(help="The maximum grade that a student can receieve for this problem.", default=MAX_SCORE, - scope=Scope.settings) + max_grade = StringyInteger(help="The maximum grade that a student can receive for this problem.", default=MAX_SCORE, + scope=Scope.settings, values={"min" : 0 }) student_data_for_location = Object(help="Student data for a given peer grading problem.", scope=Scope.user_state) weight = StringyFloat(display_name="Problem Weight", - help="Specifies the number of points the problem is worth. By default, each response field in the problem is worth one point.", - scope=Scope.settings) + help="Specifies the number of points the problem is worth. By default, each problem is worth one point.", + scope=Scope.settings, values = {"min" : 0 , "step": ".1"}) class PeerGradingModule(PeerGradingFields, XModule): @@ -596,7 +601,6 @@ class PeerGradingDescriptor(PeerGradingFields, RawDescriptor): def non_editable_metadata_fields(self): non_editable_fields = super(PeerGradingDescriptor, self).non_editable_metadata_fields non_editable_fields.extend([PeerGradingFields.due_date, PeerGradingFields.grace_period_string, - PeerGradingFields.link_to_location, PeerGradingFields.max_grade, - PeerGradingFields.use_for_single_location]) + PeerGradingFields.max_grade]) return non_editable_fields diff --git a/common/lib/xmodule/xmodule/templates/peer_grading/default.yaml b/common/lib/xmodule/xmodule/templates/peer_grading/default.yaml index b544e58dd8..5d88a18ad8 100644 --- a/common/lib/xmodule/xmodule/templates/peer_grading/default.yaml +++ b/common/lib/xmodule/xmodule/templates/peer_grading/default.yaml @@ -1,9 +1,6 @@ --- metadata: display_name: Peer Grading Interface - use_for_single_location: False - link_to_location: None - is_graded: False max_grade: 1 data: | From f58deb4c3c6a15e91229020870f03718390d2ec4 Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 16 May 2013 15:42:29 -0400 Subject: [PATCH 065/117] removed latex compiler buttom from settings tab --- cms/static/sass/views/_unit.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 042a5dbdd6..2ee1d74cd9 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -971,4 +971,8 @@ body.unit { @include transition(opacity 0.25s ease-in-out); opacity: 1; } +} + +div.wrapper-comp-editor.is-inactive + div.launch-latex-compiler{ + display: none; } \ No newline at end of file From 29b77784619d2c1ae8b331adf9b1258071ad911d Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 16 May 2013 17:17:43 -0400 Subject: [PATCH 066/117] initial i18n changes to unit.html, component.html, and the individual setting type template files --- .../client_templates/advanced_entry.html | 3 +- .../metadata_number_entry.html | 5 +-- .../metadata_option_entry.html | 5 +-- .../metadata_string_entry.html | 5 +-- cms/static/sass/views/_unit.scss | 1 + cms/templates/component.html | 13 ++++---- cms/templates/unit.html | 31 ++++++++++--------- 7 files changed, 35 insertions(+), 28 deletions(-) diff --git a/cms/static/client_templates/advanced_entry.html b/cms/static/client_templates/advanced_entry.html index 6be22e2116..0a24be0f49 100644 --- a/cms/static/client_templates/advanced_entry.html +++ b/cms/static/client_templates/advanced_entry.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %>
  • @@ -5,7 +6,7 @@
    - +
    • \ No newline at end of file diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html index df534135c7..5629b212dc 100644 --- a/cms/static/client_templates/metadata_number_entry.html +++ b/cms/static/client_templates/metadata_number_entry.html @@ -1,8 +1,9 @@ +<%! from django.utils.translation import ugettext as _ %>
    -
    <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/static/client_templates/metadata_option_entry.html index d2053e497a..409bb94595 100644 --- a/cms/static/client_templates/metadata_option_entry.html +++ b/cms/static/client_templates/metadata_option_entry.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %>
    -
    <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_string_entry.html b/cms/static/client_templates/metadata_string_entry.html index 74d64d58af..bbad43f979 100644 --- a/cms/static/client_templates/metadata_string_entry.html +++ b/cms/static/client_templates/metadata_string_entry.html @@ -1,8 +1,9 @@ +<%! from django.utils.translation import ugettext as _ %>
    -
    <%= model.get('help') %> diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 2ee1d74cd9..cb914e74f8 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -973,6 +973,7 @@ body.unit { } } +//hides latex compiler button if settings mode is-active div.wrapper-comp-editor.is-inactive + div.launch-latex-compiler{ display: none; } \ No newline at end of file diff --git a/cms/templates/component.html b/cms/templates/component.html index 54c62dcba9..9e7508ae08 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,13 +1,14 @@ +<%! from django.utils.translation import ugettext as _ %>
    @@ -18,15 +19,15 @@
    - Save - Cancel + ${_("Save")} + ${_("Cancel")}
    - Edit - Delete + ${_("Edit")} + ${_("Delete")}
    ${preview} diff --git a/cms/templates/unit.html b/cms/templates/unit.html index cb34f42a09..02a204b9ba 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -1,5 +1,6 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> +<%! from django.utils.translation import ugettext as _ %> <%namespace name="units" file="widgets/units.html" /> <%block name="title">Individual Unit <%block name="bodyclass">is-signedin course unit @@ -35,23 +36,23 @@
    -

    You are editing a draft. +

    ${_("You are editing a draft.")} % if published_date: This unit was originally published on ${published_date}. % endif

    - View the Live Version + ${_("View the Live Version")}
    % endfor @@ -135,13 +136,13 @@
    -

    Unit Settings

    +

    ${_("Unit Settings")}

    - +
    @@ -156,14 +157,14 @@ with the subsection "${subsection.display_name_with_default}"

    - Delete Draft - Preview - View Live + ${_("Delete Draft")} + ${_("Preview")} + ${_("View Live")}
    -

    Unit Location

    +

    ${_("Unit Location")}

      From 1f43fa163a1eec91f0d1d834dc421bd51d1fa7e9 Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 17 May 2013 10:29:24 -0400 Subject: [PATCH 067/117] internationalization stripped out --- .../client_templates/advanced_entry.html | 3 +- .../metadata_number_entry.html | 5 ++- .../metadata_option_entry.html | 5 ++- .../metadata_string_entry.html | 5 ++- cms/templates/component.html | 13 ++++---- cms/templates/unit.html | 31 +++++++++---------- 6 files changed, 28 insertions(+), 34 deletions(-) diff --git a/cms/static/client_templates/advanced_entry.html b/cms/static/client_templates/advanced_entry.html index 0a24be0f49..6be22e2116 100644 --- a/cms/static/client_templates/advanced_entry.html +++ b/cms/static/client_templates/advanced_entry.html @@ -1,4 +1,3 @@ -<%! from django.utils.translation import ugettext as _ %>
    1. @@ -6,7 +5,7 @@
      - +
      2. \ No newline at end of file diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html index 5629b212dc..df534135c7 100644 --- a/cms/static/client_templates/metadata_number_entry.html +++ b/cms/static/client_templates/metadata_number_entry.html @@ -1,9 +1,8 @@ -<%! from django.utils.translation import ugettext as _ %>
      -
      <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/static/client_templates/metadata_option_entry.html index 409bb94595..d2053e497a 100644 --- a/cms/static/client_templates/metadata_option_entry.html +++ b/cms/static/client_templates/metadata_option_entry.html @@ -1,4 +1,3 @@ -<%! from django.utils.translation import ugettext as _ %>
      -
      <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_string_entry.html b/cms/static/client_templates/metadata_string_entry.html index bbad43f979..74d64d58af 100644 --- a/cms/static/client_templates/metadata_string_entry.html +++ b/cms/static/client_templates/metadata_string_entry.html @@ -1,9 +1,8 @@ -<%! from django.utils.translation import ugettext as _ %>
      -
      <%= model.get('help') %> diff --git a/cms/templates/component.html b/cms/templates/component.html index 9e7508ae08..54c62dcba9 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,14 +1,13 @@ -<%! from django.utils.translation import ugettext as _ %>
      @@ -19,15 +18,15 @@
      - ${_("Save")} - ${_("Cancel")} + Save + Cancel
    - ${_("Edit")} - ${_("Delete")} + Edit + Delete
    ${preview} diff --git a/cms/templates/unit.html b/cms/templates/unit.html index 02a204b9ba..d34b9ac3f2 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -1,6 +1,5 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%! from django.utils.translation import ugettext as _ %> <%namespace name="units" file="widgets/units.html" /> <%block name="title">Individual Unit <%block name="bodyclass">is-signedin course unit @@ -36,23 +35,23 @@
    -

    ${_("You are editing a draft.")} +

    You are editing a draft. % if published_date: This unit was originally published on ${published_date}. % endif

    - ${_("View the Live Version")} + View the Live Version
    % endfor @@ -136,13 +135,13 @@
    -

    ${_("Unit Settings")}

    +

    Unit Settings

    - +
    @@ -157,14 +156,14 @@ with the subsection "${subsection.display_name_with_default}"

    - ${_("Delete Draft")} - ${_("Preview")} - ${_("View Live")} + Delete Draft + Preview + View Live
    -

    ${_("Unit Location")}

    +

    Unit Location

      From 5920ea91ee689c751090e1c2e1dbabce7fc53b41 Mon Sep 17 00:00:00 2001 From: cahrens Date: Fri, 17 May 2013 11:00:00 -0400 Subject: [PATCH 068/117] One minor update. --- common/lib/xmodule/xmodule/combined_open_ended_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index 2076cf777c..5ecf84df9e 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -58,7 +58,7 @@ class CombinedOpenEndedFields(object): scope=Scope.user_state) attempts = StringyInteger(display_name="Maximum Attempts", help="The number of times the student can try to answer this problem.", default=1, - scope=Scope.settings) + scope=Scope.settings, values = {"min" : 1 }) # TODO: move values to Boolean in xblock. is_graded = Boolean(display_name="Graded", help="Whether or not the problem is graded.", default=False, scope=Scope.settings, values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}]) From 1c9ebbc9efc0e1bc5f145a24b702b683b5a5c306 Mon Sep 17 00:00:00 2001 From: cahrens Date: Fri, 17 May 2013 11:02:25 -0400 Subject: [PATCH 069/117] Put colon on Visibility back in. --- cms/templates/unit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/templates/unit.html b/cms/templates/unit.html index d34b9ac3f2..cb34f42a09 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -138,7 +138,7 @@

      Unit Settings

      - + + diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index c0ac56bb48..60f10dacde 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -30,8 +30,7 @@ class CMS.Views.ModuleEdit extends Backbone.View }); #Manually runs polyfill for input number types to correct for Firefox non-support - #wrapperSettings = @$el.find(".wrapper-comp-settings") - #wrapperSettings.inputNumber() + #numberPolyfill() # Need to update set "active" class on data editor if there is one. # If we are only showing settings, hide the data editor controls and update settings accordingly. diff --git a/cms/static/js/base.js b/cms/static/js/base.js index a986f2ac00..48e7a2d172 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -897,16 +897,9 @@ function saveSetSectionScheduleDate(e) { }); } -function checkNumberSettingValidity(e) { - e.preventDefault(); - - if (!e.checkNumberSettingValidity()) - { - alert("You have invalid input. Correct it!"); - obj.focus(); - - $('this').val(''); - } +function checkNumberValidity(e) { + e.preventDefault; + $(e).val($(e).val().match(/\d*\.?\d+/)); } diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index cb914e74f8..1e2feef03d 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -619,9 +619,11 @@ body.course.unit { .wrapper-comp-setting{ display: inline-block; - width: 360px; + min-width: 300px; + width: 45%; top: 0; vertical-align: top; + margin-bottom:5px; } label.setting-label { @@ -669,7 +671,7 @@ body.course.unit { } input[type="number"] { - width: 39%; + width: 36%; @include box-shadow(0 1px 2px $shadow-l1 inset); &:active { @@ -720,7 +722,6 @@ body.course.unit { .tip.setting-help { @include font-size(12); - margin-top: 5px; display: inline-block; font-color: $gray-l6; min-width: 260px; diff --git a/common/static/css/vendor/html5-input-polyfills/number-polyfill.css b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css index ceaa34a8e9..69b85beea7 100644 --- a/common/static/css/vendor/html5-input-polyfills/number-polyfill.css +++ b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css @@ -2,8 +2,9 @@ div.number-spin-btn-container { display: inline-block; position: relative; - vertical-align: bottom; + vertical-align: top; margin: 0; + margin-left: 3px; padding: 0; } div.number-spin-btn { @@ -13,9 +14,11 @@ div.number-spin-btn { border-width: 2px; border-color: #ededed #777777 #777777 #ededed; border-style: solid; - background-color: #cccccc; + background-color: #eeeeee; width: 1.2em; } div.number-spin-btn:hover { + /* added blue hover color */ + background-color: rgb(85, 151, 221); cursor: pointer; } div.number-spin-btn:active { border-width: 2px; diff --git a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js index fbc7d4704b..6cdbdb4ece 100644 --- a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js +++ b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js @@ -3,296 +3,299 @@ /* HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-polyfill */ +function numberPolyfill() { -(function() { + (function() { - (function($) { - var i; - i = document.createElement("input"); - i.setAttribute("type", "number"); - if (i.type === "text") { - $.fn.inputNumber = function() { - var clipValues, decrement, domMouseScrollHandler, extractNumDecimalDigits, getParams, increment, matchStep, mouseWheelHandler; - getParams = function(elem) { - var $elem, max, min, step, val; - $elem = $(elem); - step = $elem.attr('step'); - min = $elem.attr('min'); - max = $elem.attr('max'); - val = parseFloat($elem.val()); - step = /^-?\d+(?:\.\d+)?$/.test(step) ? parseFloat(step) : null; - min = /^-?\d+(?:\.\d+)?$/.test(min) ? parseFloat(min) : null; - max = /^-?\d+(?:\.\d+)?$/.test(max) ? parseFloat(max) : null; - if (isNaN(val)) { - val = min || 0; - } - return { - min: min, - max: max, - step: step, - val: val + (function($) { + var i; + i = document.createElement("input"); + i.setAttribute("type", "number"); + if (i.type === "text") { + $.fn.inputNumber = function() { + var clipValues, decrement, domMouseScrollHandler, extractNumDecimalDigits, getParams, increment, matchStep, mouseWheelHandler; + getParams = function(elem) { + var $elem, max, min, step, val; + $elem = $(elem); + step = $elem.attr('step'); + min = $elem.attr('min'); + max = $elem.attr('max'); + val = parseFloat($elem.val()); + step = /^-?\d+(?:\.\d+)?$/.test(step) ? parseFloat(step) : null; + min = /^-?\d+(?:\.\d+)?$/.test(min) ? parseFloat(min) : null; + max = /^-?\d+(?:\.\d+)?$/.test(max) ? parseFloat(max) : null; + if (isNaN(val)) { + val = min || 0; + } + return { + min: min, + max: max, + step: step, + val: val + }; }; - }; - clipValues = function(value, min, max) { - if ((max != null) && value > max) { - return max; - } else if ((min != null) && value < min) { - return min; - } else { - return value; - } - }; - extractNumDecimalDigits = function(input) { - var num, raisedNum; - if (input != null) { - num = 0; - raisedNum = input; - while (raisedNum !== Math.round(raisedNum)) { - num += 1; - raisedNum = input * Math.pow(10, num); - } - return num; - } else { - return 0; - } - }; - matchStep = function(value, min, max, step) { - var mod, raiseTo, raisedMod, raisedStep, raisedStepDown, raisedStepUp, raisedValue, stepDecimalDigits, stepDown, stepUp; - stepDecimalDigits = extractNumDecimalDigits(step); - if (step == null) { - return value; - } else if (stepDecimalDigits === 0) { - mod = (value - (min || 0)) % step; - if (mod === 0) { - return value; + clipValues = function(value, min, max) { + if ((max != null) && value > max) { + return max; + } else if ((min != null) && value < min) { + return min; } else { - stepDown = value - mod; - stepUp = stepDown + step; - if ((stepUp > max) || ((value - stepDown) < (stepUp - value))) { - return stepDown; - } else { - return stepUp; - } - } - } else { - raiseTo = Math.pow(10, stepDecimalDigits); - raisedStep = step * raiseTo; - raisedMod = (value - (min || 0)) * raiseTo % raisedStep; - if (raisedMod === 0) { return value; + } + }; + extractNumDecimalDigits = function(input) { + var num, raisedNum; + if (input != null) { + num = 0; + raisedNum = input; + while (raisedNum !== Math.round(raisedNum)) { + num += 1; + raisedNum = input * Math.pow(10, num); + } + return num; } else { - raisedValue = value * raiseTo; - raisedStepDown = raisedValue - raisedMod; - raisedStepUp = raisedStepDown + raisedStep; - if (((raisedStepUp / raiseTo) > max) || ((raisedValue - raisedStepDown) < (raisedStepUp - raisedValue))) { - return raisedStepDown / raiseTo; + return 0; + } + }; + matchStep = function(value, min, max, step) { + var mod, raiseTo, raisedMod, raisedStep, raisedStepDown, raisedStepUp, raisedValue, stepDecimalDigits, stepDown, stepUp; + stepDecimalDigits = extractNumDecimalDigits(step); + if (step == null) { + return value; + } else if (stepDecimalDigits === 0) { + mod = (value - (min || 0)) % step; + if (mod === 0) { + return value; } else { - return raisedStepUp / raiseTo; - } - } - } - }; - increment = function(elem) { - var newVal, params, raiseTo; - if (!$(elem).is(":disabled")) { - params = getParams(elem); - raiseTo = Math.pow(10, Math.max(extractNumDecimalDigits(params['val']), extractNumDecimalDigits(params['step']))); - newVal = (Math.round(params['val'] * raiseTo) + Math.round((params['step'] || 1) * raiseTo)) / raiseTo; - if ((params['max'] != null) && newVal > params['max']) { - newVal = params['max']; - } - newVal = matchStep(newVal, params['min'], params['max'], params['step']); - $(elem).val(newVal).change(); - } - return null; - }; - decrement = function(elem) { - var newVal, params, raiseTo; - if (!$(elem).is(":disabled")) { - params = getParams(elem); - raiseTo = Math.pow(10, Math.max(extractNumDecimalDigits(params['val']), extractNumDecimalDigits(params['step']))); - newVal = (Math.round(params['val'] * raiseTo) - Math.round((params['step'] || 1) * raiseTo)) / raiseTo; - if ((params['min'] != null) && newVal < params['min']) { - newVal = params['min']; - } - newVal = matchStep(newVal, params['min'], params['max'], params['step']); - $(elem).val(newVal).change(); - } - return null; - }; - domMouseScrollHandler = function(e) { - e.preventDefault(); - if (e.originalEvent.detail < 0) { - increment(this); - } else { - decrement(this); - } - return null; - }; - mouseWheelHandler = function(e) { - e.preventDefault(); - if (e.originalEvent.wheelDelta > 0) { - increment(this); - } else { - decrement(this); - } - return null; - }; - $(this).filter('input[type="number"]').each(function() { - var $downBtn, $elem, $upBtn, attrMutationCallback, attrObserver, btnContainer, downBtn, elem, halfHeight, upBtn; - elem = this; - $elem = $(elem); - halfHeight = ($elem.outerHeight() / 2) + 'px'; - upBtn = document.createElement('div'); - downBtn = document.createElement('div'); - $upBtn = $(upBtn); - $downBtn = $(downBtn); - btnContainer = document.createElement('div'); - $upBtn.addClass('number-spin-btn number-spin-btn-up').css('height', halfHeight); - $downBtn.addClass('number-spin-btn number-spin-btn-down').css('height', halfHeight); - btnContainer.appendChild(upBtn); - btnContainer.appendChild(downBtn); - $(btnContainer).addClass('number-spin-btn-container').insertAfter(elem); - $elem.on({ - focus: function(e) { - $elem.on({ - DOMMouseScroll: domMouseScrollHandler, - mousewheel: mouseWheelHandler - }); - return null; - }, - blur: function(e) { - $elem.off({ - DOMMouseScroll: domMouseScrollHandler, - mousewheel: mouseWheelHandler - }); - return null; - }, - keypress: function(e) { - var _ref, _ref1; - if (e.keyCode === 38) { - increment(this); - } else if (e.keyCode === 40) { - decrement(this); - } else if (((_ref = e.keyCode) !== 8 && _ref !== 9 && _ref !== 35 && _ref !== 36 && _ref !== 37 && _ref !== 39) && ((_ref1 = e.which) !== 45 && _ref1 !== 46 && _ref1 !== 48 && _ref1 !== 49 && _ref1 !== 50 && _ref1 !== 51 && _ref1 !== 52 && _ref1 !== 53 && _ref1 !== 54 && _ref1 !== 55 && _ref1 !== 56 && _ref1 !== 57)) { - e.preventDefault(); - } - return null; - }, - change: function(e) { - var newVal, params; - if (e.originalEvent != null) { - params = getParams(this); - newVal = clipValues(params['val'], params['min'], params['max']); - newVal = matchStep(newVal, params['min'], params['max'], params['step'], params['stepDecimal']); - $(this).val(newVal); - } - return null; - } - }); - $upBtn.on("mousedown", function(e) { - var releaseFunc, timeoutFunc; - increment(elem); - timeoutFunc = function(elem, incFunc) { - incFunc(elem); - $elem.data("timeoutID", window.setTimeout(timeoutFunc, 10, elem, incFunc)); - return null; - }; - releaseFunc = function(e) { - window.clearTimeout($elem.data("timeoutID")); - $(document).off('mouseup', releaseFunc); - $upBtn.off('mouseleave', releaseFunc); - return null; - }; - $(document).on('mouseup', releaseFunc); - $upBtn.on('mouseleave', releaseFunc); - $elem.data("timeoutID", window.setTimeout(timeoutFunc, 700, elem, increment)); - return null; - }); - $downBtn.on("mousedown", function(e) { - var releaseFunc, timeoutFunc; - decrement(elem); - timeoutFunc = function(elem, decFunc) { - decFunc(elem); - $elem.data("timeoutID", window.setTimeout(timeoutFunc, 10, elem, decFunc)); - return null; - }; - releaseFunc = function(e) { - window.clearTimeout($elem.data("timeoutID")); - $(document).off('mouseup', releaseFunc); - $downBtn.off('mouseleave', releaseFunc); - return null; - }; - $(document).on('mouseup', releaseFunc); - $downBtn.on('mouseleave', releaseFunc); - $elem.data("timeoutID", window.setTimeout(timeoutFunc, 700, elem, decrement)); - return null; - }); - $elem.css("textAlign", 'right'); - if ($elem.css("opacity") !== "1") { - $(btnContainer).css("opacity", $elem.css("opacity")); - } - if ($elem.css("visibility") !== "visible") { - $(btnContainer).css("visibility", $elem.css("visibility")); - } - if (elem.style.display !== "") { - $(btnContainer).css("display", $elem.css("display")); - } - if ((typeof WebKitMutationObserver !== "undefined" && WebKitMutationObserver !== null) || (typeof MutationObserver !== "undefined" && MutationObserver !== null)) { - attrMutationCallback = function(mutations, observer) { - var mutation, _i, _len; - for (_i = 0, _len = mutations.length; _i < _len; _i++) { - mutation = mutations[_i]; - if (mutation.type === "attributes") { - if (mutation.attributeName === "class") { - $(btnContainer).removeClass(mutation.oldValue).addClass(elem.className); - } else if (mutation.attributeName === "style") { - $(btnContainer).css({ - "opacity": elem.style.opacity, - "visibility": elem.style.visibility, - "display": elem.style.display - }); - } + stepDown = value - mod; + stepUp = stepDown + step; + if ((stepUp > max) || ((value - stepDown) < (stepUp - value))) { + return stepDown; + } else { + return stepUp; } } - return null; - }; - attrObserver = (typeof WebKitMutationObserver !== "undefined" && WebKitMutationObserver !== null) ? new WebKitMutationObserver(attrMutationCallback) : ((typeof MutationObserver !== "undefined" && MutationObserver !== null) ? new MutationObserver(attrMutationCallback) : null); - attrObserver.observe(elem, { - attributes: true, - attributeOldValue: true, - attributeFilter: ["class", "style"] - }); - } else if (typeof MutationEvent !== "undefined" && MutationEvent !== null) { - $elem.on("DOMAttrModified", function(evt) { - if (evt.originalEvent.attrName === "class") { - $(btnContainer).removeClass(evt.originalEvent.prevValue).addClass(evt.originalEvent.newValue); - } else if (evt.originalEvent.attrName === "style") { - $(btnContainer).css({ - "display": elem.style.display, - "visibility": elem.style.visibility, - "opacity": elem.style.opacity - }); + } else { + raiseTo = Math.pow(10, stepDecimalDigits); + raisedStep = step * raiseTo; + raisedMod = (value - (min || 0)) * raiseTo % raisedStep; + if (raisedMod === 0) { + return value; + } else { + raisedValue = value * raiseTo; + raisedStepDown = raisedValue - raisedMod; + raisedStepUp = raisedStepDown + raisedStep; + if (((raisedStepUp / raiseTo) > max) || ((raisedValue - raisedStepDown) < (raisedStepUp - raisedValue))) { + return raisedStepDown / raiseTo; + } else { + return raisedStepUp / raiseTo; + } } + } + }; + increment = function(elem) { + var newVal, params, raiseTo; + if (!$(elem).is(":disabled")) { + params = getParams(elem); + raiseTo = Math.pow(10, Math.max(extractNumDecimalDigits(params['val']), extractNumDecimalDigits(params['step']))); + newVal = (Math.round(params['val'] * raiseTo) + Math.round((params['step'] || 1) * raiseTo)) / raiseTo; + if ((params['max'] != null) && newVal > params['max']) { + newVal = params['max']; + } + newVal = matchStep(newVal, params['min'], params['max'], params['step']); + $(elem).val(newVal).change(); + } + return null; + }; + decrement = function(elem) { + var newVal, params, raiseTo; + if (!$(elem).is(":disabled")) { + params = getParams(elem); + raiseTo = Math.pow(10, Math.max(extractNumDecimalDigits(params['val']), extractNumDecimalDigits(params['step']))); + newVal = (Math.round(params['val'] * raiseTo) - Math.round((params['step'] || 1) * raiseTo)) / raiseTo; + if ((params['min'] != null) && newVal < params['min']) { + newVal = params['min']; + } + newVal = matchStep(newVal, params['min'], params['max'], params['step']); + $(elem).val(newVal).change(); + } + return null; + }; + domMouseScrollHandler = function(e) { + e.preventDefault(); + if (e.originalEvent.detail < 0) { + increment(this); + } else { + decrement(this); + } + return null; + }; + mouseWheelHandler = function(e) { + e.preventDefault(); + if (e.originalEvent.wheelDelta > 0) { + increment(this); + } else { + decrement(this); + } + return null; + }; + $(this).filter('input[type="number"]').each(function() { + var $downBtn, $elem, $upBtn, attrMutationCallback, attrObserver, btnContainer, downBtn, elem, halfHeight, upBtn; + elem = this; + $elem = $(elem); + halfHeight = ($elem.outerHeight() / 2) + 'px'; + upBtn = document.createElement('div'); + downBtn = document.createElement('div'); + $upBtn = $(upBtn); + $downBtn = $(downBtn); + btnContainer = document.createElement('div'); + $upBtn.addClass('number-spin-btn number-spin-btn-up').css('height', halfHeight); + $downBtn.addClass('number-spin-btn number-spin-btn-down').css('height', halfHeight); + btnContainer.appendChild(upBtn); + btnContainer.appendChild(downBtn); + $(btnContainer).addClass('number-spin-btn-container').insertAfter(elem); + $elem.on({ + focus: function(e) { + $elem.on({ + DOMMouseScroll: domMouseScrollHandler, + mousewheel: mouseWheelHandler + }); + return null; + }, + blur: function(e) { + $elem.off({ + DOMMouseScroll: domMouseScrollHandler, + mousewheel: mouseWheelHandler + }); + return null; + }, + keypress: function(e) { + var _ref, _ref1; + if (e.keyCode === 38) { + increment(this); + } else if (e.keyCode === 40) { + decrement(this); + } else if (((_ref = e.keyCode) !== 8 && _ref !== 9 && _ref !== 35 && _ref !== 36 && _ref !== 37 && _ref !== 39) && ((_ref1 = e.which) !== 45 && _ref1 !== 46 && _ref1 !== 48 && _ref1 !== 49 && _ref1 !== 50 && _ref1 !== 51 && _ref1 !== 52 && _ref1 !== 53 && _ref1 !== 54 && _ref1 !== 55 && _ref1 !== 56 && _ref1 !== 57)) { + e.preventDefault(); + } + return null; + }, + change: function(e) { + var newVal, params; + if (e.originalEvent != null) { + params = getParams(this); + newVal = clipValues(params['val'], params['min'], params['max']); + newVal = matchStep(newVal, params['min'], params['max'], params['step'], params['stepDecimal']); + $(this).val(newVal); + } + return null; + } + }); + $upBtn.on("mousedown", function(e) { + var releaseFunc, timeoutFunc; + increment(elem); + timeoutFunc = function(elem, incFunc) { + incFunc(elem); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 10, elem, incFunc)); + return null; + }; + releaseFunc = function(e) { + window.clearTimeout($elem.data("timeoutID")); + $(document).off('mouseup', releaseFunc); + $upBtn.off('mouseleave', releaseFunc); + return null; + }; + $(document).on('mouseup', releaseFunc); + $upBtn.on('mouseleave', releaseFunc); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 700, elem, increment)); return null; }); - } + $downBtn.on("mousedown", function(e) { + var releaseFunc, timeoutFunc; + decrement(elem); + timeoutFunc = function(elem, decFunc) { + decFunc(elem); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 10, elem, decFunc)); + return null; + }; + releaseFunc = function(e) { + window.clearTimeout($elem.data("timeoutID")); + $(document).off('mouseup', releaseFunc); + $downBtn.off('mouseleave', releaseFunc); + return null; + }; + $(document).on('mouseup', releaseFunc); + $downBtn.on('mouseleave', releaseFunc); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 700, elem, decrement)); + return null; + }); + $elem.css("textAlign", 'right'); + if ($elem.css("opacity") !== "1") { + $(btnContainer).css("opacity", $elem.css("opacity")); + } + if ($elem.css("visibility") !== "visible") { + $(btnContainer).css("visibility", $elem.css("visibility")); + } + if (elem.style.display !== "") { + $(btnContainer).css("display", $elem.css("display")); + } + if ((typeof WebKitMutationObserver !== "undefined" && WebKitMutationObserver !== null) || (typeof MutationObserver !== "undefined" && MutationObserver !== null)) { + attrMutationCallback = function(mutations, observer) { + var mutation, _i, _len; + for (_i = 0, _len = mutations.length; _i < _len; _i++) { + mutation = mutations[_i]; + if (mutation.type === "attributes") { + if (mutation.attributeName === "class") { + $(btnContainer).removeClass(mutation.oldValue).addClass(elem.className); + } else if (mutation.attributeName === "style") { + $(btnContainer).css({ + "opacity": elem.style.opacity, + "visibility": elem.style.visibility, + "display": elem.style.display + }); + } + } + } + return null; + }; + attrObserver = (typeof WebKitMutationObserver !== "undefined" && WebKitMutationObserver !== null) ? new WebKitMutationObserver(attrMutationCallback) : ((typeof MutationObserver !== "undefined" && MutationObserver !== null) ? new MutationObserver(attrMutationCallback) : null); + attrObserver.observe(elem, { + attributes: true, + attributeOldValue: true, + attributeFilter: ["class", "style"] + }); + } else if (typeof MutationEvent !== "undefined" && MutationEvent !== null) { + $elem.on("DOMAttrModified", function(evt) { + if (evt.originalEvent.attrName === "class") { + $(btnContainer).removeClass(evt.originalEvent.prevValue).addClass(evt.originalEvent.newValue); + } else if (evt.originalEvent.attrName === "style") { + $(btnContainer).css({ + "display": elem.style.display, + "visibility": elem.style.visibility, + "opacity": elem.style.opacity + }); + } + return null; + }); + } + return null; + }); + return $(this); + }; + $(function() { + $('input[type="number"]').inputNumber(); return null; }); - return $(this); - }; - $(function() { - $('input[type="number"]').inputNumber(); - return null; - }); - null; - } else { - $.fn.inputNumber = function() { - return $(this); - }; - null; - } - return null; - })(jQuery); + null; + } else { + $.fn.inputNumber = function() { + return $(this); + }; + null; + } + return null; + })(jQuery); -}).call(this); + }).call(this); + +}; From 3229aaf5037eba3364569731d5b2c2f74c34ab49 Mon Sep 17 00:00:00 2001 From: cahrens Date: Mon, 20 May 2013 11:16:20 -0400 Subject: [PATCH 072/117] Call polyfill at right time. --- .../coffee/src/views/module_edit.coffee | 3 - cms/static/js/views/metadata_editor_view.js | 22 +- .../html5-input-polyfills/number-polyfill.js | 569 +++++++++--------- 3 files changed, 297 insertions(+), 297 deletions(-) diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index 60f10dacde..242e25ec09 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -29,9 +29,6 @@ class CMS.Views.ModuleEdit extends Backbone.View model: new Backbone.Model(metadataEditor.data('metadata')) }); - #Manually runs polyfill for input number types to correct for Firefox non-support - #numberPolyfill() - # Need to update set "active" class on data editor if there is one. # If we are only showing settings, hide the data editor controls and update settings accordingly. if @hasDataEditor() diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index b02086f3bd..70244d2bd6 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -100,12 +100,15 @@ CMS.Views.Metadata.AbstractEditor = Backbone.View.extend({ showClearButton: function() { if (!this.$el.hasClass('is-set')) { this.$el.addClass('is-set'); - // TODO: can we use toggleclass? - this.$el.find('.setting-clear').removeClass('inactive'); - this.$el.find('.setting-clear').addClass('active'); + this.getClearButton().removeClass('inactive'); + this.getClearButton().addClass('active'); } }, + getClearButton: function () { + return this.$el.find('.setting-clear'); + }, + render: function () { if (!this.template) return; @@ -116,9 +119,8 @@ CMS.Views.Metadata.AbstractEditor = Backbone.View.extend({ } else { this.$el.removeClass('is-set'); - // TODO: can we use toggleclass? - this.$el.find('.setting-clear').addClass('inactive'); - this.$el.find('.setting-clear').removeClass('active'); + this.getClearButton().addClass('inactive'); + this.getClearButton().removeClass('active'); } } }); @@ -154,7 +156,7 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ render: function () { CMS.Views.Metadata.AbstractEditor.prototype.render.apply(this); - if (!this.inputAttributesSet) { + if (!this.initialized) { var min = "min"; var max = "max"; var step = "step"; @@ -175,7 +177,11 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ if (stepValue !== undefined) { this.$el.find('input').attr(step, stepValue); } - this.inputAttributesSet = true; + + // Manually runs polyfill for input number types to correct for Firefox non-support + this.$el.find('.setting-input-number').inputNumber(); + + this.initialized = true; } }, diff --git a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js index 6cdbdb4ece..fbc7d4704b 100644 --- a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js +++ b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js @@ -3,299 +3,296 @@ /* HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-polyfill */ -function numberPolyfill() { - (function() { +(function() { - (function($) { - var i; - i = document.createElement("input"); - i.setAttribute("type", "number"); - if (i.type === "text") { - $.fn.inputNumber = function() { - var clipValues, decrement, domMouseScrollHandler, extractNumDecimalDigits, getParams, increment, matchStep, mouseWheelHandler; - getParams = function(elem) { - var $elem, max, min, step, val; - $elem = $(elem); - step = $elem.attr('step'); - min = $elem.attr('min'); - max = $elem.attr('max'); - val = parseFloat($elem.val()); - step = /^-?\d+(?:\.\d+)?$/.test(step) ? parseFloat(step) : null; - min = /^-?\d+(?:\.\d+)?$/.test(min) ? parseFloat(min) : null; - max = /^-?\d+(?:\.\d+)?$/.test(max) ? parseFloat(max) : null; - if (isNaN(val)) { - val = min || 0; + (function($) { + var i; + i = document.createElement("input"); + i.setAttribute("type", "number"); + if (i.type === "text") { + $.fn.inputNumber = function() { + var clipValues, decrement, domMouseScrollHandler, extractNumDecimalDigits, getParams, increment, matchStep, mouseWheelHandler; + getParams = function(elem) { + var $elem, max, min, step, val; + $elem = $(elem); + step = $elem.attr('step'); + min = $elem.attr('min'); + max = $elem.attr('max'); + val = parseFloat($elem.val()); + step = /^-?\d+(?:\.\d+)?$/.test(step) ? parseFloat(step) : null; + min = /^-?\d+(?:\.\d+)?$/.test(min) ? parseFloat(min) : null; + max = /^-?\d+(?:\.\d+)?$/.test(max) ? parseFloat(max) : null; + if (isNaN(val)) { + val = min || 0; + } + return { + min: min, + max: max, + step: step, + val: val + }; + }; + clipValues = function(value, min, max) { + if ((max != null) && value > max) { + return max; + } else if ((min != null) && value < min) { + return min; + } else { + return value; + } + }; + extractNumDecimalDigits = function(input) { + var num, raisedNum; + if (input != null) { + num = 0; + raisedNum = input; + while (raisedNum !== Math.round(raisedNum)) { + num += 1; + raisedNum = input * Math.pow(10, num); } - return { - min: min, - max: max, - step: step, - val: val + return num; + } else { + return 0; + } + }; + matchStep = function(value, min, max, step) { + var mod, raiseTo, raisedMod, raisedStep, raisedStepDown, raisedStepUp, raisedValue, stepDecimalDigits, stepDown, stepUp; + stepDecimalDigits = extractNumDecimalDigits(step); + if (step == null) { + return value; + } else if (stepDecimalDigits === 0) { + mod = (value - (min || 0)) % step; + if (mod === 0) { + return value; + } else { + stepDown = value - mod; + stepUp = stepDown + step; + if ((stepUp > max) || ((value - stepDown) < (stepUp - value))) { + return stepDown; + } else { + return stepUp; + } + } + } else { + raiseTo = Math.pow(10, stepDecimalDigits); + raisedStep = step * raiseTo; + raisedMod = (value - (min || 0)) * raiseTo % raisedStep; + if (raisedMod === 0) { + return value; + } else { + raisedValue = value * raiseTo; + raisedStepDown = raisedValue - raisedMod; + raisedStepUp = raisedStepDown + raisedStep; + if (((raisedStepUp / raiseTo) > max) || ((raisedValue - raisedStepDown) < (raisedStepUp - raisedValue))) { + return raisedStepDown / raiseTo; + } else { + return raisedStepUp / raiseTo; + } + } + } + }; + increment = function(elem) { + var newVal, params, raiseTo; + if (!$(elem).is(":disabled")) { + params = getParams(elem); + raiseTo = Math.pow(10, Math.max(extractNumDecimalDigits(params['val']), extractNumDecimalDigits(params['step']))); + newVal = (Math.round(params['val'] * raiseTo) + Math.round((params['step'] || 1) * raiseTo)) / raiseTo; + if ((params['max'] != null) && newVal > params['max']) { + newVal = params['max']; + } + newVal = matchStep(newVal, params['min'], params['max'], params['step']); + $(elem).val(newVal).change(); + } + return null; + }; + decrement = function(elem) { + var newVal, params, raiseTo; + if (!$(elem).is(":disabled")) { + params = getParams(elem); + raiseTo = Math.pow(10, Math.max(extractNumDecimalDigits(params['val']), extractNumDecimalDigits(params['step']))); + newVal = (Math.round(params['val'] * raiseTo) - Math.round((params['step'] || 1) * raiseTo)) / raiseTo; + if ((params['min'] != null) && newVal < params['min']) { + newVal = params['min']; + } + newVal = matchStep(newVal, params['min'], params['max'], params['step']); + $(elem).val(newVal).change(); + } + return null; + }; + domMouseScrollHandler = function(e) { + e.preventDefault(); + if (e.originalEvent.detail < 0) { + increment(this); + } else { + decrement(this); + } + return null; + }; + mouseWheelHandler = function(e) { + e.preventDefault(); + if (e.originalEvent.wheelDelta > 0) { + increment(this); + } else { + decrement(this); + } + return null; + }; + $(this).filter('input[type="number"]').each(function() { + var $downBtn, $elem, $upBtn, attrMutationCallback, attrObserver, btnContainer, downBtn, elem, halfHeight, upBtn; + elem = this; + $elem = $(elem); + halfHeight = ($elem.outerHeight() / 2) + 'px'; + upBtn = document.createElement('div'); + downBtn = document.createElement('div'); + $upBtn = $(upBtn); + $downBtn = $(downBtn); + btnContainer = document.createElement('div'); + $upBtn.addClass('number-spin-btn number-spin-btn-up').css('height', halfHeight); + $downBtn.addClass('number-spin-btn number-spin-btn-down').css('height', halfHeight); + btnContainer.appendChild(upBtn); + btnContainer.appendChild(downBtn); + $(btnContainer).addClass('number-spin-btn-container').insertAfter(elem); + $elem.on({ + focus: function(e) { + $elem.on({ + DOMMouseScroll: domMouseScrollHandler, + mousewheel: mouseWheelHandler + }); + return null; + }, + blur: function(e) { + $elem.off({ + DOMMouseScroll: domMouseScrollHandler, + mousewheel: mouseWheelHandler + }); + return null; + }, + keypress: function(e) { + var _ref, _ref1; + if (e.keyCode === 38) { + increment(this); + } else if (e.keyCode === 40) { + decrement(this); + } else if (((_ref = e.keyCode) !== 8 && _ref !== 9 && _ref !== 35 && _ref !== 36 && _ref !== 37 && _ref !== 39) && ((_ref1 = e.which) !== 45 && _ref1 !== 46 && _ref1 !== 48 && _ref1 !== 49 && _ref1 !== 50 && _ref1 !== 51 && _ref1 !== 52 && _ref1 !== 53 && _ref1 !== 54 && _ref1 !== 55 && _ref1 !== 56 && _ref1 !== 57)) { + e.preventDefault(); + } + return null; + }, + change: function(e) { + var newVal, params; + if (e.originalEvent != null) { + params = getParams(this); + newVal = clipValues(params['val'], params['min'], params['max']); + newVal = matchStep(newVal, params['min'], params['max'], params['step'], params['stepDecimal']); + $(this).val(newVal); + } + return null; + } + }); + $upBtn.on("mousedown", function(e) { + var releaseFunc, timeoutFunc; + increment(elem); + timeoutFunc = function(elem, incFunc) { + incFunc(elem); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 10, elem, incFunc)); + return null; }; - }; - clipValues = function(value, min, max) { - if ((max != null) && value > max) { - return max; - } else if ((min != null) && value < min) { - return min; - } else { - return value; - } - }; - extractNumDecimalDigits = function(input) { - var num, raisedNum; - if (input != null) { - num = 0; - raisedNum = input; - while (raisedNum !== Math.round(raisedNum)) { - num += 1; - raisedNum = input * Math.pow(10, num); - } - return num; - } else { - return 0; - } - }; - matchStep = function(value, min, max, step) { - var mod, raiseTo, raisedMod, raisedStep, raisedStepDown, raisedStepUp, raisedValue, stepDecimalDigits, stepDown, stepUp; - stepDecimalDigits = extractNumDecimalDigits(step); - if (step == null) { - return value; - } else if (stepDecimalDigits === 0) { - mod = (value - (min || 0)) % step; - if (mod === 0) { - return value; - } else { - stepDown = value - mod; - stepUp = stepDown + step; - if ((stepUp > max) || ((value - stepDown) < (stepUp - value))) { - return stepDown; - } else { - return stepUp; - } - } - } else { - raiseTo = Math.pow(10, stepDecimalDigits); - raisedStep = step * raiseTo; - raisedMod = (value - (min || 0)) * raiseTo % raisedStep; - if (raisedMod === 0) { - return value; - } else { - raisedValue = value * raiseTo; - raisedStepDown = raisedValue - raisedMod; - raisedStepUp = raisedStepDown + raisedStep; - if (((raisedStepUp / raiseTo) > max) || ((raisedValue - raisedStepDown) < (raisedStepUp - raisedValue))) { - return raisedStepDown / raiseTo; - } else { - return raisedStepUp / raiseTo; - } - } - } - }; - increment = function(elem) { - var newVal, params, raiseTo; - if (!$(elem).is(":disabled")) { - params = getParams(elem); - raiseTo = Math.pow(10, Math.max(extractNumDecimalDigits(params['val']), extractNumDecimalDigits(params['step']))); - newVal = (Math.round(params['val'] * raiseTo) + Math.round((params['step'] || 1) * raiseTo)) / raiseTo; - if ((params['max'] != null) && newVal > params['max']) { - newVal = params['max']; - } - newVal = matchStep(newVal, params['min'], params['max'], params['step']); - $(elem).val(newVal).change(); - } - return null; - }; - decrement = function(elem) { - var newVal, params, raiseTo; - if (!$(elem).is(":disabled")) { - params = getParams(elem); - raiseTo = Math.pow(10, Math.max(extractNumDecimalDigits(params['val']), extractNumDecimalDigits(params['step']))); - newVal = (Math.round(params['val'] * raiseTo) - Math.round((params['step'] || 1) * raiseTo)) / raiseTo; - if ((params['min'] != null) && newVal < params['min']) { - newVal = params['min']; - } - newVal = matchStep(newVal, params['min'], params['max'], params['step']); - $(elem).val(newVal).change(); - } - return null; - }; - domMouseScrollHandler = function(e) { - e.preventDefault(); - if (e.originalEvent.detail < 0) { - increment(this); - } else { - decrement(this); - } - return null; - }; - mouseWheelHandler = function(e) { - e.preventDefault(); - if (e.originalEvent.wheelDelta > 0) { - increment(this); - } else { - decrement(this); - } - return null; - }; - $(this).filter('input[type="number"]').each(function() { - var $downBtn, $elem, $upBtn, attrMutationCallback, attrObserver, btnContainer, downBtn, elem, halfHeight, upBtn; - elem = this; - $elem = $(elem); - halfHeight = ($elem.outerHeight() / 2) + 'px'; - upBtn = document.createElement('div'); - downBtn = document.createElement('div'); - $upBtn = $(upBtn); - $downBtn = $(downBtn); - btnContainer = document.createElement('div'); - $upBtn.addClass('number-spin-btn number-spin-btn-up').css('height', halfHeight); - $downBtn.addClass('number-spin-btn number-spin-btn-down').css('height', halfHeight); - btnContainer.appendChild(upBtn); - btnContainer.appendChild(downBtn); - $(btnContainer).addClass('number-spin-btn-container').insertAfter(elem); - $elem.on({ - focus: function(e) { - $elem.on({ - DOMMouseScroll: domMouseScrollHandler, - mousewheel: mouseWheelHandler - }); - return null; - }, - blur: function(e) { - $elem.off({ - DOMMouseScroll: domMouseScrollHandler, - mousewheel: mouseWheelHandler - }); - return null; - }, - keypress: function(e) { - var _ref, _ref1; - if (e.keyCode === 38) { - increment(this); - } else if (e.keyCode === 40) { - decrement(this); - } else if (((_ref = e.keyCode) !== 8 && _ref !== 9 && _ref !== 35 && _ref !== 36 && _ref !== 37 && _ref !== 39) && ((_ref1 = e.which) !== 45 && _ref1 !== 46 && _ref1 !== 48 && _ref1 !== 49 && _ref1 !== 50 && _ref1 !== 51 && _ref1 !== 52 && _ref1 !== 53 && _ref1 !== 54 && _ref1 !== 55 && _ref1 !== 56 && _ref1 !== 57)) { - e.preventDefault(); - } - return null; - }, - change: function(e) { - var newVal, params; - if (e.originalEvent != null) { - params = getParams(this); - newVal = clipValues(params['val'], params['min'], params['max']); - newVal = matchStep(newVal, params['min'], params['max'], params['step'], params['stepDecimal']); - $(this).val(newVal); - } - return null; - } - }); - $upBtn.on("mousedown", function(e) { - var releaseFunc, timeoutFunc; - increment(elem); - timeoutFunc = function(elem, incFunc) { - incFunc(elem); - $elem.data("timeoutID", window.setTimeout(timeoutFunc, 10, elem, incFunc)); - return null; - }; - releaseFunc = function(e) { - window.clearTimeout($elem.data("timeoutID")); - $(document).off('mouseup', releaseFunc); - $upBtn.off('mouseleave', releaseFunc); - return null; - }; - $(document).on('mouseup', releaseFunc); - $upBtn.on('mouseleave', releaseFunc); - $elem.data("timeoutID", window.setTimeout(timeoutFunc, 700, elem, increment)); + releaseFunc = function(e) { + window.clearTimeout($elem.data("timeoutID")); + $(document).off('mouseup', releaseFunc); + $upBtn.off('mouseleave', releaseFunc); return null; - }); - $downBtn.on("mousedown", function(e) { - var releaseFunc, timeoutFunc; - decrement(elem); - timeoutFunc = function(elem, decFunc) { - decFunc(elem); - $elem.data("timeoutID", window.setTimeout(timeoutFunc, 10, elem, decFunc)); - return null; - }; - releaseFunc = function(e) { - window.clearTimeout($elem.data("timeoutID")); - $(document).off('mouseup', releaseFunc); - $downBtn.off('mouseleave', releaseFunc); - return null; - }; - $(document).on('mouseup', releaseFunc); - $downBtn.on('mouseleave', releaseFunc); - $elem.data("timeoutID", window.setTimeout(timeoutFunc, 700, elem, decrement)); - return null; - }); - $elem.css("textAlign", 'right'); - if ($elem.css("opacity") !== "1") { - $(btnContainer).css("opacity", $elem.css("opacity")); - } - if ($elem.css("visibility") !== "visible") { - $(btnContainer).css("visibility", $elem.css("visibility")); - } - if (elem.style.display !== "") { - $(btnContainer).css("display", $elem.css("display")); - } - if ((typeof WebKitMutationObserver !== "undefined" && WebKitMutationObserver !== null) || (typeof MutationObserver !== "undefined" && MutationObserver !== null)) { - attrMutationCallback = function(mutations, observer) { - var mutation, _i, _len; - for (_i = 0, _len = mutations.length; _i < _len; _i++) { - mutation = mutations[_i]; - if (mutation.type === "attributes") { - if (mutation.attributeName === "class") { - $(btnContainer).removeClass(mutation.oldValue).addClass(elem.className); - } else if (mutation.attributeName === "style") { - $(btnContainer).css({ - "opacity": elem.style.opacity, - "visibility": elem.style.visibility, - "display": elem.style.display - }); - } - } - } - return null; - }; - attrObserver = (typeof WebKitMutationObserver !== "undefined" && WebKitMutationObserver !== null) ? new WebKitMutationObserver(attrMutationCallback) : ((typeof MutationObserver !== "undefined" && MutationObserver !== null) ? new MutationObserver(attrMutationCallback) : null); - attrObserver.observe(elem, { - attributes: true, - attributeOldValue: true, - attributeFilter: ["class", "style"] - }); - } else if (typeof MutationEvent !== "undefined" && MutationEvent !== null) { - $elem.on("DOMAttrModified", function(evt) { - if (evt.originalEvent.attrName === "class") { - $(btnContainer).removeClass(evt.originalEvent.prevValue).addClass(evt.originalEvent.newValue); - } else if (evt.originalEvent.attrName === "style") { - $(btnContainer).css({ - "display": elem.style.display, - "visibility": elem.style.visibility, - "opacity": elem.style.opacity - }); - } - return null; - }); - } + }; + $(document).on('mouseup', releaseFunc); + $upBtn.on('mouseleave', releaseFunc); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 700, elem, increment)); return null; }); - return $(this); - }; - $(function() { - $('input[type="number"]').inputNumber(); + $downBtn.on("mousedown", function(e) { + var releaseFunc, timeoutFunc; + decrement(elem); + timeoutFunc = function(elem, decFunc) { + decFunc(elem); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 10, elem, decFunc)); + return null; + }; + releaseFunc = function(e) { + window.clearTimeout($elem.data("timeoutID")); + $(document).off('mouseup', releaseFunc); + $downBtn.off('mouseleave', releaseFunc); + return null; + }; + $(document).on('mouseup', releaseFunc); + $downBtn.on('mouseleave', releaseFunc); + $elem.data("timeoutID", window.setTimeout(timeoutFunc, 700, elem, decrement)); + return null; + }); + $elem.css("textAlign", 'right'); + if ($elem.css("opacity") !== "1") { + $(btnContainer).css("opacity", $elem.css("opacity")); + } + if ($elem.css("visibility") !== "visible") { + $(btnContainer).css("visibility", $elem.css("visibility")); + } + if (elem.style.display !== "") { + $(btnContainer).css("display", $elem.css("display")); + } + if ((typeof WebKitMutationObserver !== "undefined" && WebKitMutationObserver !== null) || (typeof MutationObserver !== "undefined" && MutationObserver !== null)) { + attrMutationCallback = function(mutations, observer) { + var mutation, _i, _len; + for (_i = 0, _len = mutations.length; _i < _len; _i++) { + mutation = mutations[_i]; + if (mutation.type === "attributes") { + if (mutation.attributeName === "class") { + $(btnContainer).removeClass(mutation.oldValue).addClass(elem.className); + } else if (mutation.attributeName === "style") { + $(btnContainer).css({ + "opacity": elem.style.opacity, + "visibility": elem.style.visibility, + "display": elem.style.display + }); + } + } + } + return null; + }; + attrObserver = (typeof WebKitMutationObserver !== "undefined" && WebKitMutationObserver !== null) ? new WebKitMutationObserver(attrMutationCallback) : ((typeof MutationObserver !== "undefined" && MutationObserver !== null) ? new MutationObserver(attrMutationCallback) : null); + attrObserver.observe(elem, { + attributes: true, + attributeOldValue: true, + attributeFilter: ["class", "style"] + }); + } else if (typeof MutationEvent !== "undefined" && MutationEvent !== null) { + $elem.on("DOMAttrModified", function(evt) { + if (evt.originalEvent.attrName === "class") { + $(btnContainer).removeClass(evt.originalEvent.prevValue).addClass(evt.originalEvent.newValue); + } else if (evt.originalEvent.attrName === "style") { + $(btnContainer).css({ + "display": elem.style.display, + "visibility": elem.style.visibility, + "opacity": elem.style.opacity + }); + } + return null; + }); + } return null; }); - null; - } else { - $.fn.inputNumber = function() { - return $(this); - }; - null; - } - return null; - })(jQuery); + return $(this); + }; + $(function() { + $('input[type="number"]').inputNumber(); + return null; + }); + null; + } else { + $.fn.inputNumber = function() { + return $(this); + }; + null; + } + return null; + })(jQuery); - }).call(this); - -}; +}).call(this); From 32f7691040204dd156a1864e4535656bf4332055 Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 20 May 2013 11:39:13 -0400 Subject: [PATCH 073/117] minor style changes for increment and decrement buttons on firefox number fields --- .../css/vendor/html5-input-polyfills/number-polyfill.css | 5 ++--- .../js/vendor/html5-input-polyfills/number-polyfill.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common/static/css/vendor/html5-input-polyfills/number-polyfill.css b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css index 69b85beea7..31dfdda23d 100644 --- a/common/static/css/vendor/html5-input-polyfills/number-polyfill.css +++ b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css @@ -2,9 +2,8 @@ div.number-spin-btn-container { display: inline-block; position: relative; - vertical-align: top; - margin: 0; - margin-left: 3px; + vertical-align: middle; + margin: 0 0 0 3px; padding: 0; } div.number-spin-btn { diff --git a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js index fbc7d4704b..80491a85a5 100644 --- a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js +++ b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js @@ -142,7 +142,7 @@ HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-poly var $downBtn, $elem, $upBtn, attrMutationCallback, attrObserver, btnContainer, downBtn, elem, halfHeight, upBtn; elem = this; $elem = $(elem); - halfHeight = ($elem.outerHeight() / 2) + 'px'; + halfHeight = ($elem.outerHeight() / 5) + 'px'; upBtn = document.createElement('div'); downBtn = document.createElement('div'); $upBtn = $(upBtn); From c356904027e2cd9c84b1345b0dfcd04a1fad120c Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 20 May 2013 12:06:30 -0400 Subject: [PATCH 074/117] css styles for firefox input number fields --- cms/static/js/base.js | 4 ++-- cms/static/sass/views/_unit.scss | 2 +- .../static/js/vendor/html5-input-polyfills/number-polyfill.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cms/static/js/base.js b/cms/static/js/base.js index 48e7a2d172..b5bbd8e99a 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -898,8 +898,8 @@ function saveSetSectionScheduleDate(e) { } function checkNumberValidity(e) { - e.preventDefault; - $(e).val($(e).val().match(/\d*\.?\d+/)); + //e.preventDefault; + //$(e).val($(e).val().match(/\d*\.?\d+/)); } diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 1e2feef03d..b97fde4f7b 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -671,7 +671,7 @@ body.course.unit { } input[type="number"] { - width: 36%; + width: 32%; @include box-shadow(0 1px 2px $shadow-l1 inset); &:active { diff --git a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js index 80491a85a5..d2d871cbb2 100644 --- a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js +++ b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js @@ -228,7 +228,7 @@ HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-poly $elem.data("timeoutID", window.setTimeout(timeoutFunc, 700, elem, decrement)); return null; }); - $elem.css("textAlign", 'right'); + $elem.css("textAlign", 'left'); if ($elem.css("opacity") !== "1") { $(btnContainer).css("opacity", $elem.css("opacity")); } From 2020923f2d81908f63d50a9cc9a1cbc12d412db6 Mon Sep 17 00:00:00 2001 From: cahrens Date: Mon, 20 May 2013 13:26:27 -0400 Subject: [PATCH 075/117] Prevent invalid numeric entries. --- .../metadata_number_entry.html | 2 +- cms/static/js/base.js | 4 -- cms/static/js/views/metadata_editor_view.js | 40 +++++++++++++++++-- common/lib/xmodule/xmodule/capa_module.py | 2 +- 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html index b429ee8b9d..5f50eb2c85 100644 --- a/cms/static/client_templates/metadata_number_entry.html +++ b/cms/static/client_templates/metadata_number_entry.html @@ -1,6 +1,6 @@
      - + diff --git a/cms/static/js/base.js b/cms/static/js/base.js index b5bbd8e99a..eb8209535a 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -897,9 +897,5 @@ function saveSetSectionScheduleDate(e) { }); } -function checkNumberValidity(e) { - //e.preventDefault; - //$(e).val($(e).val().match(/\d*\.?\d+/)); -} diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index 70244d2bd6..c2b354ed7f 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -150,7 +150,8 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ events : { "change input" : "updateModel", - "keypress .setting-input" : "showClearButton" , + "keypress .setting-input" : "keyPressed", + "change .setting-input" : "changed", "click .setting-clear" : "clear" }, @@ -162,14 +163,17 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ var step = "step"; var options = this.model.getOptions(); if (options.hasOwnProperty(min)) { - this.$el.find('input').attr(min, options[min].toString()); + this.min = Number(options[min]); + this.$el.find('input').attr(min, this.min.toFixed(4)); } if (options.hasOwnProperty(max)) { - this.$el.find('input').attr(max, options[max].toString()); + this.max = Number(options[max]); + this.$el.find('input').attr(max, this.max.toFixed(4)); } var stepValue = undefined; if (options.hasOwnProperty(step)) { - stepValue = options[step].toString(); + // Parse step and convert to String. Polyfill doesn't like float values like ".1" (expects "0.1"). + stepValue = Number(options[step]).toFixed(4); } else if (this.model.getType() === 'Integer') { stepValue = "1"; @@ -195,7 +199,35 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ setValueInEditor : function (value) { this.$el.find('input').val(value); + }, + + keyPressed: function (e) { + this.showClearButton(); + // This first filtering if statement is take from polyfill to prevent + // non-numeric input (for browsers that don't use polyfill because they DO have a number input type). + var _ref, _ref1; + if (((_ref = e.keyCode) !== 8 && _ref !== 9 && _ref !== 35 && _ref !== 36 && _ref !== 37 && _ref !== 39) && + ((_ref1 = e.which) !== 45 && _ref1 !== 46 && _ref1 !== 48 && _ref1 !== 49 && _ref1 !== 50 && _ref1 !== 51 + && _ref1 !== 52 && _ref1 !== 53 && _ref1 !== 54 && _ref1 !== 55 && _ref1 !== 56 && _ref1 !== 57)) { + e.preventDefault(); + } + // For integers, prevent decimal points. + if (this.model.getType() === 'Integer' && e.keyCode === 46) { + e.preventDefault(); + } + }, + + changed: function () { + // Limit value to the range specified by min and max (necessary for browsers that aren't using polyfill). + var value = this.getValueFromEditor(); + if ((this.max !== undefined) && value > this.max) { + value = this.max; + } else if ((this.min != undefined) && value < this.min) { + value = this.min; + } + this.setValueInEditor(value); } + }); diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py index 5d2fffe895..2ee0c6e699 100644 --- a/common/lib/xmodule/xmodule/capa_module.py +++ b/common/lib/xmodule/xmodule/capa_module.py @@ -92,7 +92,7 @@ class CapaFields(object): seed = StringyInteger(help="Random seed for this student", scope=Scope.user_state) weight = StringyFloat(display_name="Problem Weight", help="Specifies the number of points the problem is worth. If unset, each response field in the problem is worth one point.", - values = {"min" : 0 , "step": ".1"}, + values = {"min" : 0 , "step": .1}, scope=Scope.settings) markdown = String(help="Markdown source of this module", scope=Scope.settings) source_code = String(help="Source code for LaTeX and Word problems. This feature is not well-supported.", From 25388dec96c397c75604a2803cee98b77f6cfb00 Mon Sep 17 00:00:00 2001 From: cahrens Date: Mon, 20 May 2013 13:31:55 -0400 Subject: [PATCH 076/117] Minor cleanup. --- cms/static/js/views/metadata_editor_view.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index c2b354ed7f..61a2504c56 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -158,24 +158,27 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ render: function () { CMS.Views.Metadata.AbstractEditor.prototype.render.apply(this); if (!this.initialized) { + var numToString = function (val) { + return val.toFixed(4); + }; var min = "min"; var max = "max"; var step = "step"; var options = this.model.getOptions(); if (options.hasOwnProperty(min)) { this.min = Number(options[min]); - this.$el.find('input').attr(min, this.min.toFixed(4)); + this.$el.find('input').attr(min, numToString(this.min)); } if (options.hasOwnProperty(max)) { this.max = Number(options[max]); - this.$el.find('input').attr(max, this.max.toFixed(4)); + this.$el.find('input').attr(max, numToString(this.max.toFixed)); } var stepValue = undefined; if (options.hasOwnProperty(step)) { // Parse step and convert to String. Polyfill doesn't like float values like ".1" (expects "0.1"). - stepValue = Number(options[step]).toFixed(4); + stepValue = numToString(Number(options[step])); } - else if (this.model.getType() === 'Integer') { + else if (this.isIntegerField()) { stepValue = "1"; } if (stepValue !== undefined) { @@ -201,6 +204,10 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ this.$el.find('input').val(value); }, + isIntegerField : function () { + return this.model.getType() === 'Integer'; + }, + keyPressed: function (e) { this.showClearButton(); // This first filtering if statement is take from polyfill to prevent @@ -212,7 +219,7 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ e.preventDefault(); } // For integers, prevent decimal points. - if (this.model.getType() === 'Integer' && e.keyCode === 46) { + if (this.isIntegerField() && e.keyCode === 46) { e.preventDefault(); } }, From c0cff81e5e3b5038b047c68619379188da97c60f Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 20 May 2013 14:39:37 -0400 Subject: [PATCH 077/117] styled firefox number buttons --- cms/static/sass/views/_unit.scss | 8 +++++++- .../html5-input-polyfills/number-polyfill.css | 17 +++++++++++------ .../html5-input-polyfills/number-polyfill.js | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index b97fde4f7b..60b065d279 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -624,6 +624,7 @@ body.course.unit { top: 0; vertical-align: top; margin-bottom:5px; + position: relative; } label.setting-label { @@ -671,8 +672,13 @@ body.course.unit { } input[type="number"] { - width: 32%; + + width: 38.5%; @include box-shadow(0 1px 2px $shadow-l1 inset); + //For webkit browsers which render number fields differently, make input wider. + -moz-column-width: { + width: 32%; + } &:active { background-color: #FFFCF1; diff --git a/common/static/css/vendor/html5-input-polyfills/number-polyfill.css b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css index 31dfdda23d..2dacbb54c8 100644 --- a/common/static/css/vendor/html5-input-polyfills/number-polyfill.css +++ b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css @@ -1,10 +1,13 @@ /* HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-polyfill*/ div.number-spin-btn-container { display: inline-block; - position: relative; + position: absolute; vertical-align: middle; margin: 0 0 0 3px; - padding: 0; } + padding: 0; + right: 74px; + top: 6px; +} div.number-spin-btn { -moz-box-sizing: border-box; @@ -14,7 +17,8 @@ div.number-spin-btn { border-color: #ededed #777777 #777777 #ededed; border-style: solid; background-color: #eeeeee; - width: 1.2em; } + width: 1.2em; + font-size: 14px; } div.number-spin-btn:hover { /* added blue hover color */ background-color: rgb(85, 151, 221); @@ -27,9 +31,10 @@ div.number-spin-btn { div.number-spin-btn-up { border-bottom-width: 1px; - -moz-border-radius: 3px 3px 0px 0px; - -webkit-border-radius: 3px 3px 0px 0px; - border-radius: 3px 3px 0px 0px; } + -moz-border-radius: 0px; + -webkit-border-radius: 0px; + border-radius: 0px; + font-size: 14px; } div.number-spin-btn-up:before { border-width: 0 0.3em 0.3em 0.3em; border-color: transparent transparent black transparent; diff --git a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js index d2d871cbb2..9e95972c00 100644 --- a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js +++ b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js @@ -142,7 +142,7 @@ HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-poly var $downBtn, $elem, $upBtn, attrMutationCallback, attrObserver, btnContainer, downBtn, elem, halfHeight, upBtn; elem = this; $elem = $(elem); - halfHeight = ($elem.outerHeight() / 5) + 'px'; + halfHeight = ($elem.outerHeight() / 6) + 'px'; upBtn = document.createElement('div'); downBtn = document.createElement('div'); $upBtn = $(upBtn); From 79c78cbccd90756952f2f59972fa777d09a4846f Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 20 May 2013 15:22:21 -0400 Subject: [PATCH 078/117] made firefox input number increment objects positioned as % to respond to page size accordingly --- cms/static/sass/views/_unit.scss | 2 +- .../css/vendor/html5-input-polyfills/number-polyfill.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 60b065d279..2d40dc22b6 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -686,7 +686,7 @@ body.course.unit { } select { - @include box-shadow(0 1px 2px $shadow-l1 inset); + //@include box-shadow(0 1px 2px $shadow-l1 inset); &:focus { @include box-shadow(0 0 1px $shadow); diff --git a/common/static/css/vendor/html5-input-polyfills/number-polyfill.css b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css index 2dacbb54c8..f3d8805739 100644 --- a/common/static/css/vendor/html5-input-polyfills/number-polyfill.css +++ b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css @@ -5,7 +5,7 @@ div.number-spin-btn-container { vertical-align: middle; margin: 0 0 0 3px; padding: 0; - right: 74px; + left: 74%; top: 6px; } @@ -17,7 +17,7 @@ div.number-spin-btn { border-color: #ededed #777777 #777777 #ededed; border-style: solid; background-color: #eeeeee; - width: 1.2em; + width: 1em; font-size: 14px; } div.number-spin-btn:hover { /* added blue hover color */ From 4facd262bd53a125cd2297ba3ddfe76c51afc818 Mon Sep 17 00:00:00 2001 From: cahrens Date: Mon, 20 May 2013 16:26:48 -0400 Subject: [PATCH 079/117] Jasmine test for metadata model. --- .../coffee/spec/models/metadata_spec.coffee | 59 ++++++++++++++++++- .../coffee/spec/views/module_edit_spec.coffee | 10 ---- cms/static/js/models/metadata_model.js | 43 ++++++++++++-- cms/static/js/views/metadata_editor_view.js | 12 ++-- 4 files changed, 103 insertions(+), 21 deletions(-) diff --git a/cms/static/coffee/spec/models/metadata_spec.coffee b/cms/static/coffee/spec/models/metadata_spec.coffee index 8dc771b339..5ff65e1bfa 100644 --- a/cms/static/coffee/spec/models/metadata_spec.coffee +++ b/cms/static/coffee/spec/models/metadata_spec.coffee @@ -1,3 +1,58 @@ describe "CMS.Models.Metadata", -> - it "has no url", -> - expect(new CMS.Models.Metadata().url).toEqual("/save_item") \ No newline at end of file + it "knows when the value has not been modified", -> + model = new CMS.Models.Metadata( + {'value': 'original', 'explicitly_set': false}) + expect(model.isModified()).toBeFalsy() + + model = new CMS.Models.Metadata( + {'value': 'original', 'explicitly_set': true}) + model.setValue('original') + expect(model.isModified()).toBeFalsy() + + it "knows when the value has been modified", -> + model = new CMS.Models.Metadata( + {'value': 'original', 'explicitly_set': false}) + model.setValue('original') + expect(model.isModified()).toBeTruthy() + + model = new CMS.Models.Metadata( + {'value': 'original', 'explicitly_set': true}) + model.setValue('modified') + expect(model.isModified()).toBeTruthy() + + it "tracks when values have been explicitly set", -> + model = new CMS.Models.Metadata( + {'value': 'original', 'explicitly_set': false}) + expect(model.isExplicitlySet()).toBeFalsy() + model.setValue('original') + expect(model.isExplicitlySet()).toBeTruthy() + + it "has both 'display value' and a 'value' methods", -> + model = new CMS.Models.Metadata( + {'value': 'default', 'explicitly_set': false}) + expect(model.getValue()).toBeNull + expect(model.getDisplayValue()).toBe('default') + model.setValue('modified') + expect(model.getValue()).toBe('modified') + expect(model.getDisplayValue()).toBe('modified') + + it "has a clear method for reverting to the default", -> + model = new CMS.Models.Metadata( + {'value': 'original', 'default_value' : 'default', 'explicitly_set': true}) + model.clear() + expect(model.getValue()).toBeNull + expect(model.getDisplayValue()).toBe('default') + expect(model.isExplicitlySet()).toBeFalsy() + + it "has a getter for field name", -> + model = new CMS.Models.Metadata({'field_name': 'foo'}) + expect(model.getFieldName()).toBe('foo') + + it "has a getter for options", -> + model = new CMS.Models.Metadata({'options': ['foo', 'bar']}) + expect(model.getOptions()).toEqual(['foo', 'bar']) + + it "has a getter for type", -> + model = new CMS.Models.Metadata({'type': 'Integer'}) + expect(model.getType()).toBe(CMS.Models.Metadata.INTEGER_TYPE) + diff --git a/cms/static/coffee/spec/views/module_edit_spec.coffee b/cms/static/coffee/spec/views/module_edit_spec.coffee index baf9ee9c20..d2457d175f 100644 --- a/cms/static/coffee/spec/views/module_edit_spec.coffee +++ b/cms/static/coffee/spec/views/module_edit_spec.coffee @@ -73,13 +73,3 @@ describe "CMS.Views.ModuleEdit", -> expect(XModule.loadModule).toHaveBeenCalled() expect(XModule.loadModule.mostRecentCall.args[0]).toBe($('.xmodule_display')) - describe "changedMetadata", -> - it "returns empty if no metadata loaded", -> - expect(@moduleEdit.changedMetadata()).toEqual({}) - - it "returns only changed values", -> - @moduleEdit.originalMetadata = {'foo', 'bar'} - spyOn(@moduleEdit, 'metadata').andReturn({'a': '', 'b': 'before', 'c': ''}) - @moduleEdit.loadEdit() - @moduleEdit.metadata.andReturn({'a': '', 'b': 'after', 'd': 'only_after'}) - expect(@moduleEdit.changedMetadata()).toEqual({'b' : 'after', 'd' : 'only_after'}) diff --git a/cms/static/js/models/metadata_model.js b/cms/static/js/models/metadata_model.js index 2cf15178ca..a3f8136376 100644 --- a/cms/static/js/models/metadata_model.js +++ b/cms/static/js/models/metadata_model.js @@ -19,10 +19,10 @@ CMS.Models.Metadata = Backbone.Model.extend({ this.original_explicitly_set = this.get('explicitly_set'); }, - getOriginalValue: function() { - return this.originalValue; - }, - + /** + * Returns true if the stored value is different, or if the "explicitly_set" + * property has changed. + */ isModified : function() { if (!this.get('explicitly_set') && !this.original_explicitly_set) { return false; @@ -33,37 +33,72 @@ CMS.Models.Metadata = Backbone.Model.extend({ return true; }, + /** + * Returns true if a non-default/non-inherited value has been set. + */ isExplicitlySet: function() { return this.get('explicitly_set'); }, + /** + * The value, as shown in the UI. This may be an inherited or default value. + */ getDisplayValue : function () { return this.get('value'); }, + /** + * The value, as should be returned to the server. if 'isExplicitlySet' + * returns false, this method returns null to indicate that the value + * is not set at this level. + */ getValue: function() { return this.get('explicitly_set') ? this.get('value') : null; }, + /** + * Sets the displayed value. + */ setValue: function (value) { this.set('explicitly_set', true); this.set('value', value); }, + /** + * Returns the field name, which should be used for persisting the metadata + * field to the server. + */ getFieldName: function () { return this.get('field_name'); }, + /** + * Returns the options. This may be a array of possible values, or an object + * with properties like "max", "min" and "step". + */ getOptions: function () { return this.get('options'); }, + /** + * Returns the type of this metadata field. Possible values are SELECT_TYPE, + * INTEGER_TYPE, and FLOAT_TYPE, GENERIC_TYPE. + */ getType: function() { return this.get('type'); }, + /** + * Reverts the value to the default_value specified at construction, and updates the + * explicitly_set property. + */ clear: function() { this.set('explicitly_set', false); this.set('value', this.get('default_value')); } }); + +CMS.Models.Metadata.SELECT_TYPE = "Select"; +CMS.Models.Metadata.INTEGER_TYPE = "Integer"; +CMS.Models.Metadata.FLOAT_TYPE = "Float"; +CMS.Models.Metadata.GENERIC_TYPE = "Generic"; diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index 61a2504c56..fa2df079a9 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -2,9 +2,7 @@ if (!CMS.Views['Metadata']) CMS.Views.Metadata = {}; CMS.Views.Metadata.Editor = Backbone.View.extend({ - // Model class is ... - events : { - }, + // Model is simply a Backbone.Model instance. initialize : function() { var self = this; @@ -32,13 +30,15 @@ CMS.Views.Metadata.Editor = Backbone.View.extend({ el: self.$el.find('.metadata_entry')[counter++], model: model }; - if (item.type === 'Select') { + if (item.type === CMS.Models.Metadata.SELECT_TYPE) { new CMS.Views.Metadata.Option(data); } - else if (item.type === 'Integer' || item.type === 'Float') { + else if (item.type === CMS.Models.Metadata.INTEGER_TYPE || + item.type === CMS.Models.Metadata.FLOAT_TYPE) { new CMS.Views.Metadata.Number(data); } else { + // Everything else is treated as GENERIC_TYPE, which uses String editor. new CMS.Views.Metadata.String(data); } }); @@ -67,6 +67,8 @@ CMS.Views.Metadata.Editor = Backbone.View.extend({ CMS.Views.Metadata.AbstractEditor = Backbone.View.extend({ + // Model is CMS.Models.Metadata. + initialize : function() { var self = this; var templateName = this.getTemplateName(); From bb699f482dd67e31328e8729a68f59e2ec2626d5 Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 21 May 2013 09:37:55 -0400 Subject: [PATCH 080/117] Update xblock, start Selenium. --- .../features/problem-editor.feature | 5 +++++ .../contentstore/features/problem-editor.py | 19 +++++++++++++++++++ cms/envs/acceptance.py | 2 +- requirements/edx/github.txt | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 cms/djangoapps/contentstore/features/problem-editor.feature create mode 100644 cms/djangoapps/contentstore/features/problem-editor.py diff --git a/cms/djangoapps/contentstore/features/problem-editor.feature b/cms/djangoapps/contentstore/features/problem-editor.feature new file mode 100644 index 0000000000..6028fa4b02 --- /dev/null +++ b/cms/djangoapps/contentstore/features/problem-editor.feature @@ -0,0 +1,5 @@ +Feature: Problem Editor + As a course author, I want to be able to create problems. + + Scenario: User can view metadata + Given I have created a Blank Common Problem \ No newline at end of file diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py new file mode 100644 index 0000000000..4dc86709ba --- /dev/null +++ b/cms/djangoapps/contentstore/features/problem-editor.py @@ -0,0 +1,19 @@ +#pylint: disable=C0111 +#pylint: disable=W0621 + +from lettuce import world, step +from nose.tools import assert_true, assert_equal, assert_in +from terrain.steps import reload_the_page +from selenium.common.exceptions import StaleElementReferenceException +import time + + +############### ACTIONS #################### +@step('I have created a Blank Common Problem$') +def i_created_blank_common_problem(step): + step.given('I have opened a new course section in Studio') + step.given('I have added a new subsection') + step.given('I expand the first section') + world.css_click('a.new-unit-item') + time.sleep(float(2)) +# world.css_click('a.problem') diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index f4b867d3c6..0fe3d950cd 100644 --- a/cms/envs/acceptance.py +++ b/cms/envs/acceptance.py @@ -23,7 +23,7 @@ MODULESTORE_OPTIONS = { MODULESTORE = { 'default': { - 'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore', + 'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore', 'OPTIONS': MODULESTORE_OPTIONS }, 'direct': { diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index d3f90d5abc..6b28d3edd9 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -8,5 +8,5 @@ -e git://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk # Our libraries: --e git+https://github.com/edx/XBlock.git@483e0cb1#egg=XBlock +-e git+https://github.com/edx/XBlock.git@2144a25d#egg=XBlock -e git+https://github.com/edx/codejail.git@07494f1#egg=codejail From 3dc979138248454bdfba3a56d43780703b8894c7 Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 21 May 2013 09:38:56 -0400 Subject: [PATCH 081/117] Update xblock, start Selenium. --- common/lib/xmodule/xmodule/combined_open_ended_module.py | 9 +++------ common/lib/xmodule/xmodule/peer_grading_module.py | 5 ++--- common/lib/xmodule/xmodule/tests/test_xml_module.py | 3 +-- common/lib/xmodule/xmodule/x_module.py | 2 ++ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index 5ecf84df9e..1a4fc2e7b0 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -59,16 +59,13 @@ class CombinedOpenEndedFields(object): attempts = StringyInteger(display_name="Maximum Attempts", help="The number of times the student can try to answer this problem.", default=1, scope=Scope.settings, values = {"min" : 1 }) - # TODO: move values to Boolean in xblock. - is_graded = Boolean(display_name="Graded", help="Whether or not the problem is graded.", default=False, scope=Scope.settings, - values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}]) + is_graded = Boolean(display_name="Graded", help="Whether or not the problem is graded.", default=False, scope=Scope.settings) accept_file_upload = Boolean(display_name="Allow File Uploads", - help="Whether or not the student can submit files as a response.", default=False, scope=Scope.settings, - values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}]) + help="Whether or not the student can submit files as a response.", default=False, scope=Scope.settings) skip_spelling_checks = Boolean(display_name="Disable Quality Filter", # TODO: passing of text failed with "won't". Need to make our code more robust. help="If False, submissions with poor spelling, short length, or poor grammar will not be peer reviewed.", - default=False, scope=Scope.settings, values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}]) + default=False, scope=Scope.settings) due = Date(help="Date that this problem is due by", default=None, scope=Scope.settings) graceperiod = String(help="Amount of time after the due date that submissions will be accepted", default=None, scope=Scope.settings) diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py index 98f0e33486..33249c1fb9 100644 --- a/common/lib/xmodule/xmodule/peer_grading_module.py +++ b/common/lib/xmodule/xmodule/peer_grading_module.py @@ -31,15 +31,14 @@ class PeerGradingFields(object): use_for_single_location = StringyBoolean(display_name="Show Single Problem", help='When True, only the single problem specified by "Link to Problem Location" is shown. ' 'When False, a panel is displayed with all problems available for peer grading.', - values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}], default=USE_FOR_SINGLE_LOCATION, scope=Scope.settings) link_to_location = String(display_name="Link to Problem Location", help='The location of the problem being graded. Only used when "Show Single Problem" is True.', default=LINK_TO_LOCATION, scope=Scope.settings) # TODO: move boolean default into xfields is_graded = StringyBoolean(display_name="Graded", - help='Whether the student gets credit for grading this problem. Only used when "Show Single Problem" is True.', default=IS_GRADED, - values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}], scope=Scope.settings) + help='Whether the student gets credit for grading this problem. Only used when "Show Single Problem" is True.', + default=IS_GRADED, scope=Scope.settings) due_date = Date(help="Due date that should be displayed.", default=None, scope=Scope.settings) grace_period_string = String(help="Amount of grace to give on the due date.", default=None, scope=Scope.settings) max_grade = StringyInteger(help="The maximum grade that a student can receive for this problem.", default=MAX_SCORE, diff --git a/common/lib/xmodule/xmodule/tests/test_xml_module.py b/common/lib/xmodule/xmodule/tests/test_xml_module.py index 341d0e591b..2278672564 100644 --- a/common/lib/xmodule/xmodule/tests/test_xml_module.py +++ b/common/lib/xmodule/xmodule/tests/test_xml_module.py @@ -32,8 +32,7 @@ class TestFields(object): # Used for testing float type float_non_select = StringyFloat(scope=Scope.settings, default=.999, values={'min': 0 , 'step' : .3}) # Used for testing that Booleans get mapped to select type - # TODO: move default value into xblock! - boolean_select = Boolean(scope=Scope.settings, values=[{'display_name': "True", "value": True}, {'display_name': "False", "value": False}]) + boolean_select = Boolean(scope=Scope.settings) class EditableMetadataFieldsTest(unittest.TestCase): diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index 69a3750526..d398f8fc2f 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -649,6 +649,8 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock): # 3. A generic string editor for anything else (editing JSON representation of the value). type = "Generic" values = [] if field.values is None else copy.deepcopy(field.values) + if isinstance(values, tuple): + values = list(values) if isinstance(values, list): if len(values) > 0: type = "Select" From f3bd9ab234a80a32c2b016451bcfd85c8bec72b6 Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 21 May 2013 14:29:33 -0400 Subject: [PATCH 082/117] Get rid of empty, store ID. --- .../contentstore/features/problem-editor.py | 6 +-- .../contentstore/views/component.py | 3 +- cms/templates/unit.html | 42 ++++++------------- cms/xmodule_namespace.py | 2 +- 4 files changed, 16 insertions(+), 37 deletions(-) diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py index 4dc86709ba..ef3f73197d 100644 --- a/cms/djangoapps/contentstore/features/problem-editor.py +++ b/cms/djangoapps/contentstore/features/problem-editor.py @@ -4,8 +4,6 @@ from lettuce import world, step from nose.tools import assert_true, assert_equal, assert_in from terrain.steps import reload_the_page -from selenium.common.exceptions import StaleElementReferenceException -import time ############### ACTIONS #################### @@ -15,5 +13,5 @@ def i_created_blank_common_problem(step): step.given('I have added a new subsection') step.given('I expand the first section') world.css_click('a.new-unit-item') - time.sleep(float(2)) -# world.css_click('a.problem') + world.css_click('.large-problem-icon') + world.css_click('#i4x://edx/templates/problem/Blank_Common_Problem') diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py index 34a659ab29..3d348dc086 100644 --- a/cms/djangoapps/contentstore/views/component.py +++ b/cms/djangoapps/contentstore/views/component.py @@ -149,8 +149,7 @@ def edit_unit(request, location): component_templates[category].append(( template.display_name_with_default, template.location.url(), - hasattr(template, 'markdown') and template.markdown is not None, - template.cms.empty, + hasattr(template, 'markdown') and template.markdown is not None )) components = [ diff --git a/cms/templates/unit.html b/cms/templates/unit.html index cb34f42a09..36d643325d 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -78,22 +78,13 @@ % endif
        - % for name, location, has_markdown, is_empty in templates: + % for name, location, has_markdown in templates: % if has_markdown or type != "problem": - % if is_empty: -
      • - - ${name} - -
        • - - % else: -
      • - - ${name} - -
        • - % endif +
      • + + ${name} + +
        • % endif %endfor @@ -102,23 +93,14 @@ % if type == "problem":
          - % for name, location, has_markdown, is_empty in templates: + % for name, location, has_markdown in templates: % if not has_markdown: - % if is_empty: -
        • - - ${name} - -
          • +
        • + + ${name} + - % else: -
        • - - ${name} - - -
          • - % endif + % endif % endfor
        diff --git a/cms/xmodule_namespace.py b/cms/xmodule_namespace.py index 1b509a14f4..4857fe68ca 100644 --- a/cms/xmodule_namespace.py +++ b/cms/xmodule_namespace.py @@ -28,4 +28,4 @@ class CmsNamespace(Namespace): """ published_date = DateTuple(help="Date when the module was published", scope=Scope.settings) published_by = String(help="Id of the user who published this module", scope=Scope.settings) - empty = StringyBoolean(help="Whether this is an empty template", scope=Scope.settings, default=False) + From c8d6d5d283419e78a1bd7f8677e633736003e763 Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 23 May 2013 11:34:02 -0400 Subject: [PATCH 083/117] Selenium tests. --- .../component_settings_editor_helpers.py | 80 ++++++++++ .../features/discussion-editor.feature | 13 ++ .../features/discussion-editor.py | 18 +++ .../contentstore/features/html-editor.feature | 13 ++ .../contentstore/features/html-editor.py | 13 ++ .../features/problem-editor.feature | 64 +++++++- .../contentstore/features/problem-editor.py | 146 +++++++++++++++++- .../features/video-editor.feature | 13 ++ .../contentstore/features/video-editor.py | 13 ++ cms/static/js/views/metadata_editor_view.js | 1 + 10 files changed, 364 insertions(+), 10 deletions(-) create mode 100644 cms/djangoapps/contentstore/features/component_settings_editor_helpers.py create mode 100644 cms/djangoapps/contentstore/features/discussion-editor.feature create mode 100644 cms/djangoapps/contentstore/features/discussion-editor.py create mode 100644 cms/djangoapps/contentstore/features/html-editor.feature create mode 100644 cms/djangoapps/contentstore/features/html-editor.py create mode 100644 cms/djangoapps/contentstore/features/video-editor.feature create mode 100644 cms/djangoapps/contentstore/features/video-editor.py diff --git a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py new file mode 100644 index 0000000000..6e35d1711f --- /dev/null +++ b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py @@ -0,0 +1,80 @@ +#pylint: disable=C0111 +#pylint: disable=W0621 + +from lettuce import world +from nose.tools import assert_equal +from terrain.steps import reload_the_page + +import time + +@world.absorb +def create_component_instance(step, component_button_css, instance_id, expected_css): + click_new_component_button(step, component_button_css) + click_component_from_menu(instance_id, expected_css) + +@world.absorb +def click_new_component_button(step, component_button_css): + step.given('I have opened a new course section in Studio') + step.given('I have added a new subsection') + step.given('I expand the first section') + world.css_click('a.new-unit-item') + world.css_click(component_button_css) + +@world.absorb +def click_component_from_menu(instance_id, expected_css): + new_instance = world.browser.find_by_id(instance_id) + assert_equal(1, len(new_instance)) + # TODO: why is this sleep necessary? + time.sleep(float(1)) + new_instance[0].click() + assert_equal(1, len(world.css_find(expected_css))) + +@world.absorb +def edit_component_and_select_settings(): + world.css_click('a.edit-button') + world.css_click('#settings-mode') + +@world.absorb +def verify_setting_entry(setting, display_name, value, explicitly_set): + assert_equal(display_name, setting.find_by_css('.setting-label')[0].value) + assert_equal(value, setting.find_by_css('.setting-input')[0].value) + settingClearButton = setting.find_by_css('.setting-clear')[0] + assert_equal(explicitly_set, settingClearButton.has_class('active')) + assert_equal(not explicitly_set, settingClearButton.has_class('inactive')) + +@world.absorb +def verify_all_setting_entries(expected_entries): + settings = world.browser.find_by_css('.wrapper-comp-setting') + assert_equal(len(expected_entries), len(settings)) + for (counter, setting) in enumerate(settings): + world.verify_setting_entry(setting, expected_entries[counter][0], + expected_entries[counter][1], expected_entries[counter][2]) + +@world.absorb +def save_component_and_reopen(step): + world.css_click("a.save-button") + # We have a known issue that modifications are still shown within the edit window after cancel (though) + # they are not persisted. Refresh the browser to make sure the changes WERE persisted after Save. + reload_the_page(step) + edit_component_and_select_settings() + +@world.absorb +def cancel_component(step): + world.css_click("a.cancel-button") + # We have a known issue that modifications are still shown within the edit window after cancel (though) + # they are not persisted. Refresh the browser to make sure the changes were not persisted. + reload_the_page(step) + +@world.absorb +def revert_setting_entry(label): + get_setting_entry(label).find_by_css('.setting-clear')[0].click() + +@world.absorb +def get_setting_entry(label): + settings = world.browser.find_by_css('.wrapper-comp-setting') + for setting in settings: + if setting.find_by_css('.setting-label')[0].value == label: + return setting + return None + + diff --git a/cms/djangoapps/contentstore/features/discussion-editor.feature b/cms/djangoapps/contentstore/features/discussion-editor.feature new file mode 100644 index 0000000000..24683c3297 --- /dev/null +++ b/cms/djangoapps/contentstore/features/discussion-editor.feature @@ -0,0 +1,13 @@ +Feature: Discussion Component Editor + As a course author, I want to be able to create discussion components. + + Scenario: User can view metadata + Given I have created a Discussion Tag + And I edit and select Settings + Then I see three alphabetized settings and their expected values + + Scenario: User can modify display name + Given I have created a Discussion Tag + And I edit and select Settings + Then I can modify the display name + And my display name change is persisted on save diff --git a/cms/djangoapps/contentstore/features/discussion-editor.py b/cms/djangoapps/contentstore/features/discussion-editor.py new file mode 100644 index 0000000000..4e661a89e1 --- /dev/null +++ b/cms/djangoapps/contentstore/features/discussion-editor.py @@ -0,0 +1,18 @@ +#pylint: disable=C0111 +#pylint: disable=W0621 + +from lettuce import world, step + +@step('I have created a Discussion Tag$') +def i_created_blank_common_problem(step): + world.create_component_instance(step, '.large-discussion-icon', 'i4x://edx/templates/discussion/Discussion_Tag', + '.xmodule_DiscussionModule') + +@step('I see three alphabetized settings and their expected values$') +def i_see_only_the_display_name(step): + world.verify_all_setting_entries( + [ + ['Category', "Week 1", True], + ['Display Name', "Discussion Tag", True], + ['Subcategory', "Topic-Level Student-Visible Label", True] + ]) diff --git a/cms/djangoapps/contentstore/features/html-editor.feature b/cms/djangoapps/contentstore/features/html-editor.feature new file mode 100644 index 0000000000..6cd455d681 --- /dev/null +++ b/cms/djangoapps/contentstore/features/html-editor.feature @@ -0,0 +1,13 @@ +Feature: HTML Editor + As a course author, I want to be able to create HTML blocks. + + Scenario: User can view metadata + Given I have created a Blank HTML Page + And I edit and select Settings + Then I see only the HTML display name setting + + Scenario: User can modify display name + Given I have created a Blank HTML Page + And I edit and select Settings + Then I can modify the display name + And my display name change is persisted on save diff --git a/cms/djangoapps/contentstore/features/html-editor.py b/cms/djangoapps/contentstore/features/html-editor.py new file mode 100644 index 0000000000..564d4d986c --- /dev/null +++ b/cms/djangoapps/contentstore/features/html-editor.py @@ -0,0 +1,13 @@ +#pylint: disable=C0111 +#pylint: disable=W0621 + +from lettuce import world, step + +@step('I have created a Blank HTML Page$') +def i_created_blank_common_problem(step): + world.create_component_instance(step, '.large-html-icon', 'i4x://edx/templates/html/Blank_HTML_Page', + '.xmodule_HtmlModule') + +@step('I see only the HTML display name setting$') +def i_see_only_the_html_display_name(step): + world.verify_all_setting_entries([['Display Name', "Blank HTML Page", True]]) diff --git a/cms/djangoapps/contentstore/features/problem-editor.feature b/cms/djangoapps/contentstore/features/problem-editor.feature index 6028fa4b02..07438353d0 100644 --- a/cms/djangoapps/contentstore/features/problem-editor.feature +++ b/cms/djangoapps/contentstore/features/problem-editor.feature @@ -1,5 +1,65 @@ Feature: Problem Editor - As a course author, I want to be able to create problems. + As a course author, I want to be able to create problems and edit their settings. Scenario: User can view metadata - Given I have created a Blank Common Problem \ No newline at end of file + Given I have created a Blank Common Problem + And I edit and select Settings + Then I see five alphabetized settings and their expected values + And Edit High Level Source is not visible + + Scenario: User can modify String values + Given I have created a Blank Common Problem + And I edit and select Settings + Then I can modify the display name + And my display name change is persisted on save + + Scenario: User can revert display name to unset + Given I have created a Blank Common Problem + And I edit and select Settings + Then I can revert the display name to unset + And my display name is unset on save + + Scenario: User can select values in a Select + Given I have created a Blank Common Problem + And I edit and select Settings + Then I can select Per Student for Randomization + And my change to randomization is persisted + And I can revert to the default value for randomization + + Scenario: User can modify float input values + Given I have created a Blank Common Problem + And I edit and select Settings + Then I can set the weight to 3.5 + And my change to weight is persisted + And I can revert to the default value of unset for weight + + Scenario: User cannot type letters in float number field + Given I have created a Blank Common Problem + And I edit and select Settings + Then if I set the weight to abc, it remains unset + + Scenario: User cannot type decimal values integer number field + Given I have created a Blank Common Problem + And I edit and select Settings + Then if I set the max attempts to 2.34, the max attempts are persisted as 234 + + Scenario: User cannot type out of range values in an integer number field + Given I have created a Blank Common Problem + And I edit and select Settings + Then if I set the max attempts to -3, the max attempts are persisted as 1 + + + Scenario: Settings changes are not saved on Cancel + Given I have created a Blank Common Problem + And I edit and select Settings + Then I can set the weight to 3.5 + And I can modify the display name + Then If I press Cancel my changes are not persisted + + Scenario: Edit High Level source is available for LaTeX problem + Given I have created a LaTeX Problem + And I edit and select Settings + Then Edit High Level Source is visible + +# Future tests to add-- +# Check that code is shown in editor (type code, Save, check that code appears when re-edited). diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py index ef3f73197d..ade1f07b2d 100644 --- a/cms/djangoapps/contentstore/features/problem-editor.py +++ b/cms/djangoapps/contentstore/features/problem-editor.py @@ -2,16 +2,146 @@ #pylint: disable=W0621 from lettuce import world, step -from nose.tools import assert_true, assert_equal, assert_in -from terrain.steps import reload_the_page +from nose.tools import assert_equal +DISPLAY_NAME = "Display Name" +MAXIMUM_ATTEMPTS="Maximum Attempts" +PROBLEM_WEIGHT="Problem Weight" +RANDOMIZATION='Randomization' +SHOW_ANSWER="Show Answer" ############### ACTIONS #################### @step('I have created a Blank Common Problem$') def i_created_blank_common_problem(step): - step.given('I have opened a new course section in Studio') - step.given('I have added a new subsection') - step.given('I expand the first section') - world.css_click('a.new-unit-item') - world.css_click('.large-problem-icon') - world.css_click('#i4x://edx/templates/problem/Blank_Common_Problem') + world.create_component_instance(step, '.large-problem-icon', 'i4x://edx/templates/problem/Blank_Common_Problem', + '.xmodule_CapaModule') + +@step('I edit and select Settings$') +def i_edit_and_select_settings(step): + world.edit_component_and_select_settings() + +@step('I see five alphabetized settings and their expected values$') +def i_see_five_settings_with_values(step): + world.verify_all_setting_entries( + [ + [DISPLAY_NAME, "Blank Common Problem", True], + [MAXIMUM_ATTEMPTS, "", False], + [PROBLEM_WEIGHT, "", False], + [RANDOMIZATION, "Never", True], + [SHOW_ANSWER, "Finished", True] + ]) + +@step('I can modify the display name') +def i_can_modify_the_display_name(step): + world.get_setting_entry(DISPLAY_NAME).find_by_css('.setting-input')[0].fill('modified') + verify_modified_display_name() + +@step('my display name change is persisted on save') +def my_display_name_change_is_persisted_on_save(step): + world.save_component_and_reopen(step) + verify_modified_display_name() + +@step('I can revert the display name to unset') +def can_revert_display_name_to_unset(step): + world.revert_setting_entry(DISPLAY_NAME) + verify_unset_display_name() + +@step('my display name is unset on save') +def my_display_name_is_persisted_on_save(step): + world.save_component_and_reopen(step) + verify_unset_display_name() + +@step('I can select Per Student for Randomization') +def i_can_select_per_student_for_randomization(step): + world.browser.select(RANDOMIZATION, "Per Student") + verify_modified_randomization() + +@step('my change to randomization is persisted') +def my_change_to_randomization_is_persisted(step): + world.save_component_and_reopen(step) + verify_modified_randomization() + +@step('I can revert to the default value for randomization') +def i_can_revert_to_default_for_randomization(step): + world.revert_setting_entry(RANDOMIZATION) + world.save_component_and_reopen(step) + world.verify_setting_entry(world.get_setting_entry(RANDOMIZATION), RANDOMIZATION, "Always", False) + +@step('I can set the weight to 3.5') +def i_can_set_weight_to_3_5(step): + world.get_setting_entry(PROBLEM_WEIGHT).find_by_css('.setting-input')[0].fill('3.5') + verify_modified_weight() + +@step('my change to weight is persisted') +def my_change_to_randomization_is_persisted(step): + world.save_component_and_reopen(step) + verify_modified_weight() + +@step('I can revert to the default value of unset for weight') +def i_can_revert_to_default_for_randomization(step): + world.revert_setting_entry(PROBLEM_WEIGHT) + world.save_component_and_reopen(step) + world.verify_setting_entry(world.get_setting_entry(PROBLEM_WEIGHT), PROBLEM_WEIGHT, "", False) + +@step('if I set the weight to abc, it remains unset') +def set_the_weight_to_abc(step): + world.get_setting_entry(PROBLEM_WEIGHT).find_by_css('.setting-input')[0].fill('abc') + # We show the clear button immediately on type, hence the "True" here. + world.verify_setting_entry(world.get_setting_entry(PROBLEM_WEIGHT), PROBLEM_WEIGHT, "", True) + world.save_component_and_reopen(step) + # But no change was actually ever sent to the model, so on reopen, explicitly_set is False + world.verify_setting_entry(world.get_setting_entry(PROBLEM_WEIGHT), PROBLEM_WEIGHT, "", False) + +@step('if I set the max attempts to 2.34, the max attempts are persisted as 234') +def set_the_weight_to_abc(step): + world.get_setting_entry(MAXIMUM_ATTEMPTS).find_by_css('.setting-input')[0].fill('2.34') + world.verify_setting_entry(world.get_setting_entry(MAXIMUM_ATTEMPTS), MAXIMUM_ATTEMPTS, "234", True) + world.save_component_and_reopen(step) + world.verify_setting_entry(world.get_setting_entry(MAXIMUM_ATTEMPTS), MAXIMUM_ATTEMPTS, "234", True) + +@step('I set the max attempts to -3, the max attempts are persisted as 1') +def set_max_attempts_to_neg_3(step): + world.get_setting_entry(MAXIMUM_ATTEMPTS).find_by_css('.setting-input')[0].fill('-3') + world.verify_setting_entry(world.get_setting_entry(MAXIMUM_ATTEMPTS), MAXIMUM_ATTEMPTS, "-3", True) + world.save_component_and_reopen(step) + world.verify_setting_entry(world.get_setting_entry(MAXIMUM_ATTEMPTS), MAXIMUM_ATTEMPTS, "1", True) + +@step('Edit High Level Source is not visible') +def edit_high_level_source_not_visible(step): + verify_high_level_source(step, False) + +@step('Edit High Level Source is visible') +def edit_high_level_source_visible(step): + verify_high_level_source(step, True) + +@step('If I press Cancel my changes are not persisted') +def cancel_does_not_save_changes(step): + world.cancel_component(step) + step.given("I edit and select Settings") + step.given("I see five alphabetized settings and their expected values") + +@step('I have created a LaTeX Problem') +def create_latex_problem(step): + world.click_new_component_button(step, '.large-problem-icon') + # Go to advanced tab (waiting for the tab to be visible) + world.css_find('#ui-id-2') + world.css_click('#ui-id-2') + world.click_component_from_menu("i4x://edx/templates/problem/Problem_Written_in_LaTeX", '.xmodule_CapaModule') + +def verify_high_level_source(step, visible): + assert_equal(visible, world.is_css_present('.launch-latex-compiler')) + world.cancel_component(step) + assert_equal(visible, world.is_css_present('.upload-button')) + +def verify_modified_weight(): + world.verify_setting_entry(world.get_setting_entry(PROBLEM_WEIGHT), PROBLEM_WEIGHT, "3.5", True) + +def verify_modified_randomization(): + world.verify_setting_entry(world.get_setting_entry(RANDOMIZATION), RANDOMIZATION, "Per Student", True) + +def verify_modified_display_name(): + world.verify_setting_entry(world.get_setting_entry(DISPLAY_NAME), DISPLAY_NAME, 'modified', True) + +def verify_unset_display_name(): + world.verify_setting_entry(world.get_setting_entry(DISPLAY_NAME), DISPLAY_NAME, '', False) + diff --git a/cms/djangoapps/contentstore/features/video-editor.feature b/cms/djangoapps/contentstore/features/video-editor.feature new file mode 100644 index 0000000000..4c2a460042 --- /dev/null +++ b/cms/djangoapps/contentstore/features/video-editor.feature @@ -0,0 +1,13 @@ +Feature: Video Component Editor + As a course author, I want to be able to create video components. + + Scenario: User can view metadata + Given I have created a Video component + And I edit and select Settings + Then I see only the Video display name setting + + Scenario: User can modify display name + Given I have created a Video component + And I edit and select Settings + Then I can modify the display name + And my display name change is persisted on save diff --git a/cms/djangoapps/contentstore/features/video-editor.py b/cms/djangoapps/contentstore/features/video-editor.py new file mode 100644 index 0000000000..2bd2733e59 --- /dev/null +++ b/cms/djangoapps/contentstore/features/video-editor.py @@ -0,0 +1,13 @@ +#pylint: disable=C0111 +#pylint: disable=W0621 + +from lettuce import world, step + +@step('I have created a Video component$') +def i_created_a_video_component(step): + world.create_component_instance(step, '.large-video-icon', 'i4x://edx/templates/video/default', + '.xmodule_VideoModule') + +@step('I see only the video display name setting$') +def i_see_only_the_video_display_name(step): + world.verify_all_setting_entries([['Display Name', "default", True]]) diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index fa2df079a9..e1b380ef2a 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -235,6 +235,7 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ value = this.min; } this.setValueInEditor(value); + this.updateModel(); } }); From 48703af2348198b6332dd8bd46d81b60e57e4802 Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 23 May 2013 11:41:26 -0400 Subject: [PATCH 084/117] Merge. --- common/lib/xmodule/xmodule/combined_open_ended_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index bb81f04f18..fa5cf49009 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -8,7 +8,7 @@ from .x_module import XModule from xblock.core import Scope, String, Integer, Boolean, List from xmodule.open_ended_grading_classes.combined_open_ended_modulev1 import CombinedOpenEndedV1Module, CombinedOpenEndedV1Descriptor from collections import namedtuple -from .fields import Date, StringyFloat, StringyInteger +from .fields import Date, StringyFloat, StringyInteger, StringyBoolean log = logging.getLogger("mitx.courseware") From 1a8a72199857db868a28f5f97fa0558c92350323 Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 23 May 2013 12:31:20 -0400 Subject: [PATCH 085/117] Will not do unrelated test at this time. --- cms/djangoapps/contentstore/features/problem-editor.feature | 3 --- 1 file changed, 3 deletions(-) diff --git a/cms/djangoapps/contentstore/features/problem-editor.feature b/cms/djangoapps/contentstore/features/problem-editor.feature index 07438353d0..43131596cf 100644 --- a/cms/djangoapps/contentstore/features/problem-editor.feature +++ b/cms/djangoapps/contentstore/features/problem-editor.feature @@ -48,7 +48,6 @@ Feature: Problem Editor And I edit and select Settings Then if I set the max attempts to -3, the max attempts are persisted as 1 - Scenario: Settings changes are not saved on Cancel Given I have created a Blank Common Problem And I edit and select Settings @@ -61,5 +60,3 @@ Feature: Problem Editor And I edit and select Settings Then Edit High Level Source is visible -# Future tests to add-- -# Check that code is shown in editor (type code, Save, check that code appears when re-edited). From 7940ca54ad02ceeda93950f93dfb7910f72b6177 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 23 May 2013 12:58:24 -0400 Subject: [PATCH 086/117] studio - adjusts visual vertical spacing of save/cancel actions in modal editing windows on unit and page edits. --- cms/static/sass/views/_static-pages.scss | 8 +++--- cms/static/sass/views/_unit.scss | 35 +++++++++++++----------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/cms/static/sass/views/_static-pages.scss b/cms/static/sass/views/_static-pages.scss index 8dae7f3c7e..5a586bc3af 100644 --- a/cms/static/sass/views/_static-pages.scss +++ b/cms/static/sass/views/_static-pages.scss @@ -2,7 +2,7 @@ // ==================== body.course.static-pages { - + .new-static-page-button { @include grey-button; display: block; @@ -43,8 +43,8 @@ body.course.static-pages { display: none; padding: 0; border-radius: 2px 2px 0 0; - - //Overrides general edit-box mixin + + //Overrides general edit-box mixin .row { margin-bottom: 0px; } @@ -56,7 +56,7 @@ body.course.static-pages { background-color: $gray-l6; .save-button { - margin: 15px 8px 0 0; + margin: ($baseline/2) 8px 0 0; } } } diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 2d40dc22b6..a7522e360c 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -80,7 +80,7 @@ body.course.unit { letter-spacing: 1px; text-transform: uppercase; } - + // Component List Meta // ==================== // TODO: clean up organization of this page, to many levels/duplication @@ -457,14 +457,14 @@ body.course.unit { margin-bottom: 0px; } - // Module Actions, also used for Static Pages + // Module Actions, also used for Static Pages .module-actions { @include box-shadow(inset 0 1px 1px $shadow); padding: 0px 0 10px 10px; background-color: $gray-l6; .save-button { - margin: 15px 8px 0 0; + margin: ($baseline/2) 8px 0 0; } } @@ -487,11 +487,14 @@ body.course.unit { //Component Name .component-name { @extend .t-copy-sub1; - color: $white; width: 50%; + color: $white; + font-weight: 600; em { - font-weight: 600; + display: inline-block; + margin-right: ($baseline/4); + font-weight: 400; color: $white; } } @@ -502,7 +505,7 @@ body.course.unit { right: 0; top: 0; position: absolute; - padding: 15px; + padding: 12px ($baseline*0.75); .mode { display: inline-block; @@ -517,15 +520,15 @@ body.course.unit { @include blue-button; &.is-set { + @include transition(box-shadow 0.5 ease-in-out); @include linear-gradient($blue, $blue); color: $blue-d1; - box-shadow: inset 0 1px 2px 2px $shadow; + box-shadow: inset 0 1px 2px 1px $shadow-l1; background-color: $blue-d4; cursor: default; &:hover { - box-shadow: inset 0 1px 2px 2px $shadow; - background-color: $blue-d4; + box-shadow: inset 0 1px 2px 1px $shadow; } } } @@ -553,7 +556,7 @@ body.course.unit { } //settings-list - .list-input.settings-list { + .list-input.settings-list { margin: 0; padding: 0; list-style: none; @@ -574,7 +577,7 @@ body.course.unit { background-color: rgba(0, 0, 0, .5); } - //component-setting-entry + //component-setting-entry .field.comp-setting-entry { background-color: $white; padding: 20px; @@ -612,7 +615,7 @@ body.course.unit { .setting-input { color: $blue-l1; } - + //setting-clear .setting-clear { } } @@ -675,7 +678,7 @@ body.course.unit { width: 38.5%; @include box-shadow(0 1px 2px $shadow-l1 inset); - //For webkit browsers which render number fields differently, make input wider. + //For webkit browsers which render number fields differently, make input wider. -moz-column-width: { width: 32%; } @@ -738,7 +741,7 @@ body.course.unit { } } -// Editing Units from Courseware +// Editing Units from Courseware // ==================== body.unit { @@ -763,7 +766,7 @@ body.unit { } } -// Unit Page Sidebar +// Unit Page Sidebar // ==================== .unit-settings { @@ -983,4 +986,4 @@ body.unit { //hides latex compiler button if settings mode is-active div.wrapper-comp-editor.is-inactive + div.launch-latex-compiler{ display: none; -} \ No newline at end of file +} From 1371c8d0da53094751d3ec9b017de61e88bea7ae Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 23 May 2013 13:17:29 -0400 Subject: [PATCH 087/117] revises alignment of advanced editor and cheatsheet toggle --- common/lib/xmodule/xmodule/css/problem/edit.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss index b7c8bdaba5..249b767e5e 100644 --- a/common/lib/xmodule/xmodule/css/problem/edit.scss +++ b/common/lib/xmodule/xmodule/css/problem/edit.scss @@ -5,7 +5,7 @@ .advanced-toggle { @include white-button; height: auto; - margin-top: -1px; + margin-top: -4px; padding: 3px 9px; font-size: 12px; @@ -16,7 +16,7 @@ color: $darkGrey !important; pointer-events: none; cursor: none; - + &:hover { box-shadow: 0 0 0 0 !important; } @@ -27,7 +27,7 @@ width: 21px; height: 21px; padding: 0; - margin: 0 5px 0 15px; + margin: -1px 5px 0 15px; border-radius: 22px; border: 1px solid #a5aaaf; background: #e5ecf3; From 8b76afb9386fdcbd5c3616f9a4db7d66e61d64db Mon Sep 17 00:00:00 2001 From: Frances Botsford Date: Fri, 24 May 2013 08:51:14 -0400 Subject: [PATCH 088/117] converted undo image in component settings list to FontAwesome --- .../metadata_number_entry.html | 2 +- .../metadata_option_entry.html | 2 +- .../metadata_string_entry.html | 2 +- cms/static/sass/views/_unit.scss | 28 +++++++++---------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html index 5f50eb2c85..ed233214d8 100644 --- a/cms/static/client_templates/metadata_number_entry.html +++ b/cms/static/client_templates/metadata_number_entry.html @@ -2,7 +2,7 @@
        <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/static/client_templates/metadata_option_entry.html index d2053e497a..1d2351dab9 100644 --- a/cms/static/client_templates/metadata_option_entry.html +++ b/cms/static/client_templates/metadata_option_entry.html @@ -10,7 +10,7 @@ <% }) %>
      <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_string_entry.html b/cms/static/client_templates/metadata_string_entry.html index 74d64d58af..60b1f306df 100644 --- a/cms/static/client_templates/metadata_string_entry.html +++ b/cms/static/client_templates/metadata_string_entry.html @@ -2,7 +2,7 @@
      <%= model.get('help') %> diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 2d40dc22b6..e2330d045d 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -80,7 +80,7 @@ body.course.unit { letter-spacing: 1px; text-transform: uppercase; } - + // Component List Meta // ==================== // TODO: clean up organization of this page, to many levels/duplication @@ -185,7 +185,7 @@ body.course.unit { &.new-component-problem { padding-bottom:10px; - .ss-icon, .editor-indicator { + [class^="icon-"], .editor-indicator { display: inline-block; } @@ -245,7 +245,7 @@ body.course.unit { } } - a{ + a { display: block; padding: 15px 25px; font-size: 15px; @@ -299,7 +299,7 @@ body.course.unit { .name { float: left; - .ss-icon { + [class^="icon-"] { @include transition(opacity .15s); display: inline-block; top: 1px; @@ -320,14 +320,14 @@ body.course.unit { opacity: 0.3; } - .ss-icon, .editor-indicator { + [class^="icon-"], .editor-indicator { display: none; } &:hover { color: #fff; - .ss-icon { + [class^="icon-"] { opacity: 1.0; } @@ -457,7 +457,7 @@ body.course.unit { margin-bottom: 0px; } - // Module Actions, also used for Static Pages + // Module Actions, also used for Static Pages .module-actions { @include box-shadow(inset 0 1px 1px $shadow); padding: 0px 0 10px 10px; @@ -553,7 +553,7 @@ body.course.unit { } //settings-list - .list-input.settings-list { + .list-input.settings-list { margin: 0; padding: 0; list-style: none; @@ -574,7 +574,7 @@ body.course.unit { background-color: rgba(0, 0, 0, .5); } - //component-setting-entry + //component-setting-entry .field.comp-setting-entry { background-color: $white; padding: 20px; @@ -612,7 +612,7 @@ body.course.unit { .setting-input { color: $blue-l1; } - + //setting-clear .setting-clear { } } @@ -675,7 +675,7 @@ body.course.unit { width: 38.5%; @include box-shadow(0 1px 2px $shadow-l1 inset); - //For webkit browsers which render number fields differently, make input wider. + //For webkit browsers which render number fields differently, make input wider. -moz-column-width: { width: 32%; } @@ -738,7 +738,7 @@ body.course.unit { } } -// Editing Units from Courseware +// Editing Units from Courseware // ==================== body.unit { @@ -763,7 +763,7 @@ body.unit { } } -// Unit Page Sidebar +// Unit Page Sidebar // ==================== .unit-settings { @@ -983,4 +983,4 @@ body.unit { //hides latex compiler button if settings mode is-active div.wrapper-comp-editor.is-inactive + div.launch-latex-compiler{ display: none; -} \ No newline at end of file +} From 599a215ad0e1cb812b4383e9a2ae1acad3ac2e6b Mon Sep 17 00:00:00 2001 From: cahrens Date: Mon, 27 May 2013 19:36:02 -0400 Subject: [PATCH 089/117] Move includes to right place. --- cms/templates/base.html | 7 ------- cms/templates/component.html | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cms/templates/base.html b/cms/templates/base.html index 34653f64bb..5fa347b6bf 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -22,7 +22,6 @@ - <%include file="widgets/segment-io.html" /> @@ -46,7 +45,6 @@ - <%static:js group='main'/> <%static:js group='module-js'/> @@ -60,11 +58,6 @@ - - - - - diff --git a/cms/templates/component.html b/cms/templates/component.html index fc97e90502..088748d342 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,4 +1,11 @@ <%! from django.utils.translation import ugettext as _ %> +<%namespace name='static' file='static_content.html'/> + + + + + +
      From 34082efad51a77b99fdcac727583963992815e65 Mon Sep 17 00:00:00 2001 From: cahrens Date: Mon, 27 May 2013 20:08:19 -0400 Subject: [PATCH 090/117] Merge branch 'master' into feature/christina/metadata-ui Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py common/lib/xmodule/xmodule/peer_grading_module.py common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml --- .../xmodule/combined_open_ended_module.py | 18 +++++---------- .../xmodule/xmodule/peer_grading_module.py | 22 ++++++------------- .../templates/combinedopenended/default.yaml | 2 -- 3 files changed, 12 insertions(+), 30 deletions(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index 3e7aba97b6..094698561f 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -5,7 +5,7 @@ from pkg_resources import resource_string from xmodule.raw_module import RawDescriptor from .x_module import XModule -from xblock.core import Integer, Scope, String, Boolean, List +from xblock.core import Integer, Scope, String, List from xmodule.open_ended_grading_classes.combined_open_ended_modulev1 import CombinedOpenEndedV1Module, CombinedOpenEndedV1Descriptor from collections import namedtuple from .fields import Date, StringyFloat, StringyInteger, StringyBoolean @@ -57,24 +57,16 @@ class CombinedOpenEndedFields(object): scope=Scope.user_state) ready_to_reset = StringyBoolean(help="If the problem is ready to be reset or not.", default=False, scope=Scope.user_state) - // do merge attempts = StringyInteger(display_name="Maximum Attempts", help="The number of times the student can try to answer this problem.", default=1, scope=Scope.settings, values = {"min" : 1 }) - is_graded = Boolean(display_name="Graded", help="Whether or not the problem is graded.", default=False, scope=Scope.settings) - accept_file_upload = Boolean(display_name="Allow File Uploads", + is_graded = StringyBoolean(display_name="Graded", help="Whether or not the problem is graded.", default=False, scope=Scope.settings) + accept_file_upload = StringyBoolean(display_name="Allow File Uploads", help="Whether or not the student can submit files as a response.", default=False, scope=Scope.settings) - skip_spelling_checks = Boolean(display_name="Disable Quality Filter", + skip_spelling_checks = StringyBoolean(display_name="Disable Quality Filter", # TODO: passing of text failed with "won't". Need to make our code more robust. help="If False, submissions with poor spelling, short length, or poor grammar will not be peer reviewed.", default=False, scope=Scope.settings) - - attempts = StringyInteger(help="Maximum number of attempts that a student is allowed.", default=1, scope=Scope.settings) - is_graded = StringyBoolean(help="Whether or not the problem is graded.", default=False, scope=Scope.settings) - accept_file_upload = StringyBoolean(help="Whether or not the problem accepts file uploads.", default=False, - scope=Scope.settings) - skip_spelling_checks = StringyBoolean(help="Whether or not to skip initial spelling checks.", default=True, - scope=Scope.settings) due = Date(help="Date that this problem is due by", default=None, scope=Scope.settings) graceperiod = String(help="Amount of time after the due date that submissions will be accepted", default=None, scope=Scope.settings) @@ -83,7 +75,7 @@ class CombinedOpenEndedFields(object): weight = StringyFloat(display_name="Problem Weight", help="The number of points the problem is worth. By default, each problem is worth one point.", scope=Scope.settings, values = {"min" : 0 , "step": ".1"}) - markdown = String(help="Markdown source of this module", scope=Scope.settings) + markdown = String(help="Markdown source of this module", default="", scope=Scope.settings) class CombinedOpenEndedModule(CombinedOpenEndedFields, XModule): diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py index 531c4a167b..0ff766d328 100644 --- a/common/lib/xmodule/xmodule/peer_grading_module.py +++ b/common/lib/xmodule/xmodule/peer_grading_module.py @@ -10,7 +10,7 @@ from .x_module import XModule from xmodule.raw_module import RawDescriptor from xmodule.modulestore.django import modulestore from .timeinfo import TimeInfo -from xblock.core import Object, Integer, Boolean, String, Scope +from xblock.core import Object, String, Scope from xmodule.fields import Date, StringyFloat, StringyInteger, StringyBoolean from xmodule.open_ended_grading_classes.peer_grading_service import PeerGradingService, GradingServiceError, MockPeerGradingService @@ -32,20 +32,12 @@ class PeerGradingFields(object): help='When True, only the single problem specified by "Link to Problem Location" is shown. ' 'When False, a panel is displayed with all problems available for peer grading.', default=USE_FOR_SINGLE_LOCATION, scope=Scope.settings) -link_to_location = String(display_name="Link to Problem Location", - help='The location of the problem being graded. Only used when "Show Single Problem" is True.', - default=LINK_TO_LOCATION, scope=Scope.settings) -# TODO: move boolean default into xfields -is_graded = StringyBoolean(display_name="Graded", - help='Whether the student gets credit for grading this problem. Only used when "Show Single Problem" is True.', - default=IS_GRADED, scope=Scope.settings) - - - use_for_single_location = StringyBoolean(help="Whether to use this for a single location or as a panel.", - default=USE_FOR_SINGLE_LOCATION, scope=Scope.settings) - link_to_location = String(help="The location this problem is linked to.", default=LINK_TO_LOCATION, - scope=Scope.settings) - is_graded = StringyBoolean(help="Whether or not this module is scored.", default=IS_GRADED, scope=Scope.settings) + link_to_location = String(display_name="Link to Problem Location", + help='The location of the problem being graded. Only used when "Show Single Problem" is True.', + default=LINK_TO_LOCATION, scope=Scope.settings) + is_graded = StringyBoolean(display_name="Graded", + help='Whether the student gets credit for grading this problem. Only used when "Show Single Problem" is True.', + default=IS_GRADED, scope=Scope.settings) due_date = Date(help="Due date that should be displayed.", default=None, scope=Scope.settings) grace_period_string = String(help="Amount of grace to give on the due date.", default=None, scope=Scope.settings) max_grade = StringyInteger(help="The maximum grade that a student can receive for this problem.", default=MAX_SCORE, diff --git a/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml b/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml index 789a186402..719849b0de 100644 --- a/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml +++ b/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml @@ -1,8 +1,6 @@ --- metadata: display_name: Open Ended Response - version: 1 - markdown: "" data: | From 851ed6722a47c2dc019a04810bcfbf164a5e10a4 Mon Sep 17 00:00:00 2001 From: cahrens Date: Mon, 27 May 2013 20:28:56 -0400 Subject: [PATCH 091/117] Continue merge. --- cms/templates/widgets/open-ended-edit.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cms/templates/widgets/open-ended-edit.html b/cms/templates/widgets/open-ended-edit.html index 5d0dfcd48b..456bdd3c32 100644 --- a/cms/templates/widgets/open-ended-edit.html +++ b/cms/templates/widgets/open-ended-edit.html @@ -1,4 +1,4 @@ -<%include file="metadata-edit.html" /> +
      %if enable_markdown: @@ -93,3 +93,5 @@
      +
      +<%include file="metadata-edit.html" /> From a195c4f55f643a381793191045573bcd7983d4c0 Mon Sep 17 00:00:00 2001 From: cahrens Date: Mon, 27 May 2013 20:36:10 -0400 Subject: [PATCH 092/117] Continue merge. --- common/lib/xmodule/xmodule/combined_open_ended_module.py | 2 +- .../xmodule/xmodule/templates/combinedopenended/default.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index 094698561f..7d8625ef71 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -75,7 +75,7 @@ class CombinedOpenEndedFields(object): weight = StringyFloat(display_name="Problem Weight", help="The number of points the problem is worth. By default, each problem is worth one point.", scope=Scope.settings, values = {"min" : 0 , "step": ".1"}) - markdown = String(help="Markdown source of this module", default="", scope=Scope.settings) + markdown = String(help="Markdown source of this module", scope=Scope.settings) class CombinedOpenEndedModule(CombinedOpenEndedFields, XModule): diff --git a/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml b/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml index 719849b0de..7c1ae65284 100644 --- a/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml +++ b/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml @@ -1,6 +1,7 @@ --- metadata: display_name: Open Ended Response + markdown: "" data: | From 6be9463eca03c1d9f3c816d4ee44280b646153fc Mon Sep 17 00:00:00 2001 From: cahrens Date: Mon, 27 May 2013 21:50:56 -0400 Subject: [PATCH 093/117] Cleanup. --- cms/templates/base.html | 4 ---- .../xmodule/templates/word_cloud/default.yaml | 4 ---- .../lib/xmodule/xmodule/word_cloud_module.py | 22 ++++++++++--------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/cms/templates/base.html b/cms/templates/base.html index 5fa347b6bf..e0e3e94d26 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -20,8 +20,6 @@ <%static:css group='base-style'/> - - <%include file="widgets/segment-io.html" /> @@ -43,8 +41,6 @@ - - <%static:js group='main'/> <%static:js group='module-js'/> diff --git a/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml b/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml index 7f1c838ca9..53e9eeaae4 100644 --- a/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml +++ b/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml @@ -1,9 +1,5 @@ --- metadata: display_name: Word cloud - version: 1 - num_inputs: 5 - num_top_words: 250 - display_student_percents: True data: {} children: [] diff --git a/common/lib/xmodule/xmodule/word_cloud_module.py b/common/lib/xmodule/xmodule/word_cloud_module.py index 440da8b887..c1f0db8c50 100644 --- a/common/lib/xmodule/xmodule/word_cloud_module.py +++ b/common/lib/xmodule/xmodule/word_cloud_module.py @@ -14,7 +14,8 @@ from xmodule.raw_module import RawDescriptor from xmodule.editing_module import MetadataOnlyEditingDescriptor from xmodule.x_module import XModule -from xblock.core import Scope, String, Object, Boolean, List, Integer +from xblock.core import Scope, Object, Boolean, List +from fields import StringyBoolean, StringyInteger log = logging.getLogger(__name__) @@ -31,21 +32,22 @@ def pretty_bool(value): class WordCloudFields(object): """XFields for word cloud.""" - display_name = String( - help="Display name for this module", - scope=Scope.settings - ) - num_inputs = Integer( + num_inputs = StringyInteger( + display_name="Inputs", help="Number of inputs.", scope=Scope.settings, - default=5 + default=5, + values = {"min" : 1 } ) - num_top_words = Integer( + num_top_words = StringyInteger( + display_name="Maximum Words", help="Number of max words, which will be displayed.", scope=Scope.settings, - default=250 + default=250, + values = {"min" : 1 } ) - display_student_percents = Boolean( + display_student_percents = StringyBoolean( + display_name="Show Usage", help="Display usage percents for each word?", scope=Scope.settings, default=True From 2c32200cce79f13900c63fabf0298e5629d4faea Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 28 May 2013 11:12:22 -0400 Subject: [PATCH 094/117] Updated text per Alex's e-mail. --- common/lib/xmodule/xmodule/word_cloud_module.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/lib/xmodule/xmodule/word_cloud_module.py b/common/lib/xmodule/xmodule/word_cloud_module.py index c1f0db8c50..55ffa81f7c 100644 --- a/common/lib/xmodule/xmodule/word_cloud_module.py +++ b/common/lib/xmodule/xmodule/word_cloud_module.py @@ -2,7 +2,7 @@ generate and view word cloud. On the client side we show: -If student does not yet anwered - `num_inputs` numbers of text inputs. +If student does not yet answered - `num_inputs` numbers of text inputs. If student have answered - words he entered and cloud. """ @@ -34,21 +34,21 @@ class WordCloudFields(object): """XFields for word cloud.""" num_inputs = StringyInteger( display_name="Inputs", - help="Number of inputs.", + help="Number of text boxes for student to input words/sentences.", scope=Scope.settings, default=5, values = {"min" : 1 } ) num_top_words = StringyInteger( display_name="Maximum Words", - help="Number of max words, which will be displayed.", + help="Maximum number of words to be displayed in generated word cloud.", scope=Scope.settings, default=250, values = {"min" : 1 } ) display_student_percents = StringyBoolean( - display_name="Show Usage", - help="Display usage percents for each word?", + display_name="Show Percents", + help="Show statistics for entered words near every word separately at the top.", scope=Scope.settings, default=True ) From f3d4381fde4a8e6aa3ef90209368e06ba6160592 Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 28 May 2013 12:53:00 -0400 Subject: [PATCH 095/117] Minor cleanup. --- common/lib/xmodule/xmodule/word_cloud_module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/lib/xmodule/xmodule/word_cloud_module.py b/common/lib/xmodule/xmodule/word_cloud_module.py index 55ffa81f7c..5d65c0244d 100644 --- a/common/lib/xmodule/xmodule/word_cloud_module.py +++ b/common/lib/xmodule/xmodule/word_cloud_module.py @@ -207,7 +207,7 @@ class WordCloudModule(WordCloudFields, XModule): # Update top_words. self.top_words = self.top_dict( temp_all_words, - int(self.num_top_words) + self.num_top_words ) # Save all_words in database. @@ -228,7 +228,7 @@ class WordCloudModule(WordCloudFields, XModule): 'element_id': self.location.html_id(), 'element_class': self.location.category, 'ajax_url': self.system.ajax_url, - 'num_inputs': int(self.num_inputs), + 'num_inputs': self.num_inputs, 'submitted': self.submitted } self.content = self.system.render_template('word_cloud.html', context) From 625c6b518cea7764e484fb6eb152105510d74057 Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 28 May 2013 14:07:35 -0400 Subject: [PATCH 096/117] Cleanup, change how we load templates. --- cms/envs/common.py | 2 +- .../spec/views/metadata_edit_spec.coffee | 35 ++++++ .../coffee/src/views/module_edit.coffee | 2 +- cms/static/js/views/metadata_editor_view.js | 105 +++++++++--------- cms/templates/component.html | 1 - .../js/metadata-editor.underscore} | 0 .../js/metadata-number-entry.underscore} | 0 .../js/metadata-option-entry.underscore} | 0 .../js/metadata-string-entry.underscore} | 0 cms/templates/widgets/metadata-edit.html | 18 +++ .../xmodule/combined_open_ended_module.py | 2 +- 11 files changed, 109 insertions(+), 56 deletions(-) create mode 100644 cms/static/coffee/spec/views/metadata_edit_spec.coffee rename cms/{static/client_templates/metadata_editor.html => templates/js/metadata-editor.underscore} (100%) rename cms/{static/client_templates/metadata_number_entry.html => templates/js/metadata-number-entry.underscore} (100%) rename cms/{static/client_templates/metadata_option_entry.html => templates/js/metadata-option-entry.underscore} (100%) rename cms/{static/client_templates/metadata_string_entry.html => templates/js/metadata-string-entry.underscore} (100%) diff --git a/cms/envs/common.py b/cms/envs/common.py index 0c66717760..8c218bc7ea 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -224,7 +224,7 @@ PIPELINE_JS = { ) + ['js/hesitate.js', 'js/base.js', 'js/models/feedback.js', 'js/views/feedback.js', 'js/models/section.js', 'js/views/section.js', - 'js/models/metadata_model.js'], + 'js/models/metadata_model.js', 'js/views/metadata_editor_view.js'], 'output_filename': 'js/cms-application.js', 'test_order': 0 }, diff --git a/cms/static/coffee/spec/views/metadata_edit_spec.coffee b/cms/static/coffee/spec/views/metadata_edit_spec.coffee new file mode 100644 index 0000000000..39893ceef1 --- /dev/null +++ b/cms/static/coffee/spec/views/metadata_edit_spec.coffee @@ -0,0 +1,35 @@ +beforeEach -> + # TODO: update these + setFixtures(sandbox({id: "page-alert"})) + appendSetFixtures(sandbox({id: "page-notification"})) + +describe "CMS.Views.Metadata.Editor creates editors for each field", -> + beforeEach -> + @model = new Backbone.Model({ + display_name: { + default_value: null, + display_name: "Display Name", + explicitly_set: true, + field_name: "display_name", + help: "Specifies the name for this component. The name appears as a tooltip in the course ribbon at the top of the page.", + inheritable: false, + options: [], + type: "Generic", + value: "Word cloud" + }, + num_inputs: { + default_value: 5, + display_name: "Inputs", + explicitly_set: false, + field_name: "num_inputs", + help: "Number of text boxes for student to input words/sentences.", + inheritable: false, + options: {min: 1}, + type: "Integer", + value: 5 + } + }) + + it "renders on initalize", -> + view = new CMS.Views.Metadata.Editor({model: @model}) + expect(view.models).toBeDefined() diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index 242e25ec09..b04d333c24 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -27,7 +27,7 @@ class CMS.Views.ModuleEdit extends Backbone.View @metadataEditor = new CMS.Views.Metadata.Editor({ el: metadataEditor, model: new Backbone.Model(metadataEditor.data('metadata')) - }); + }) # Need to update set "active" class on data editor if there is one. # If we are only showing settings, hide the data editor controls and update settings accordingly. diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index e1b380ef2a..c955ad6397 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -5,45 +5,44 @@ CMS.Views.Metadata.Editor = Backbone.View.extend({ // Model is simply a Backbone.Model instance. initialize : function() { + var tpl = $("#metadata-editor-tpl").text(); + if(!tpl) { + console.error("Couldn't load metadata editor template"); + } + this.template = _.template(tpl); + + this.$el.html(this.template({metadata_entries: this.model.attributes})); + var counter = 0; + + // Sort entries by display name. + var sortedObject = _.sortBy(this.model.attributes, + function (val) { + return val.display_name + }); + + this.models = []; + var self = this; - // instantiates an editor template for each update in the collection - window.templateLoader.loadRemoteTemplate("metadata_editor", - "/static/client_templates/metadata_editor.html", - function (raw_template) { - self.template = _.template(raw_template); - self.$el.append(self.template({metadata_entries: self.model.attributes})); - var counter = 0; - - // Sort entries by display name. - var sortedObject = _.sortBy(self.model.attributes, - function (val) { - return val.display_name - }); - - self.models = []; - - _.each(sortedObject, - function (item) { - var model = new CMS.Models.Metadata(item); - self.models.push(model); - var data = { - el: self.$el.find('.metadata_entry')[counter++], - model: model - }; - if (item.type === CMS.Models.Metadata.SELECT_TYPE) { - new CMS.Views.Metadata.Option(data); - } - else if (item.type === CMS.Models.Metadata.INTEGER_TYPE || - item.type === CMS.Models.Metadata.FLOAT_TYPE) { - new CMS.Views.Metadata.Number(data); - } - else { - // Everything else is treated as GENERIC_TYPE, which uses String editor. - new CMS.Views.Metadata.String(data); - } - }); - } - ); + _.each(sortedObject, + function (item) { + var model = new CMS.Models.Metadata(item); + self.models.push(model); + var data = { + el: self.$el.find('.metadata_entry')[counter++], + model: model + }; + if (item.type === CMS.Models.Metadata.SELECT_TYPE) { + new CMS.Views.Metadata.Option(data); + } + else if (item.type === CMS.Models.Metadata.INTEGER_TYPE || + item.type === CMS.Models.Metadata.FLOAT_TYPE) { + new CMS.Views.Metadata.Number(data); + } + else { + // Everything else is treated as GENERIC_TYPE, which uses String editor. + new CMS.Views.Metadata.String(data); + } + }); }, getModifiedMetadataValues: function () { @@ -73,14 +72,14 @@ CMS.Views.Metadata.AbstractEditor = Backbone.View.extend({ var self = this; var templateName = this.getTemplateName(); this.uniqueId = _.uniqueId(templateName + "_"); - window.templateLoader.loadRemoteTemplate(templateName, - "/static/client_templates/" + templateName + ".html", - function (raw_template) { - self.template = _.template(raw_template); - self.$el.append(self.template({model: self.model, uniqueId: self.uniqueId})); - self.render(); - } - ); + + var tpl = $("#"+templateName).text(); + if(!tpl) { + console.error("Couldn't load template: " + templateName); + } + this.template = _.template(tpl); + this.$el.append(this.template({model: this.model, uniqueId: this.uniqueId})); + this.render(); }, getTemplateName : function () {}, @@ -136,7 +135,7 @@ CMS.Views.Metadata.String = CMS.Views.Metadata.AbstractEditor.extend({ }, getTemplateName : function () { - return "metadata_string_entry"; + return "metadata-string-entry"; }, getValueFromEditor : function () { @@ -187,15 +186,18 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ this.$el.find('input').attr(step, stepValue); } - // Manually runs polyfill for input number types to correct for Firefox non-support - this.$el.find('.setting-input-number').inputNumber(); + // Manually runs polyfill for input number types to correct for Firefox non-support. + // inputNumber will be undefined when unit test is running. + if ($.fn.inputNumber) { + this.$el.find('.setting-input-number').inputNumber(); + } this.initialized = true; } }, getTemplateName : function () { - return "metadata_number_entry"; + return "metadata-number-entry"; }, getValueFromEditor : function () { @@ -240,7 +242,6 @@ CMS.Views.Metadata.Number = CMS.Views.Metadata.AbstractEditor.extend({ }); - CMS.Views.Metadata.Option = CMS.Views.Metadata.AbstractEditor.extend({ events : { @@ -249,7 +250,7 @@ CMS.Views.Metadata.Option = CMS.Views.Metadata.AbstractEditor.extend({ }, getTemplateName : function () { - return "metadata_option_entry"; + return "metadata-option-entry"; }, getValueFromEditor : function () { diff --git a/cms/templates/component.html b/cms/templates/component.html index 088748d342..512847aa3d 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -3,7 +3,6 @@ - diff --git a/cms/static/client_templates/metadata_editor.html b/cms/templates/js/metadata-editor.underscore similarity index 100% rename from cms/static/client_templates/metadata_editor.html rename to cms/templates/js/metadata-editor.underscore diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/templates/js/metadata-number-entry.underscore similarity index 100% rename from cms/static/client_templates/metadata_number_entry.html rename to cms/templates/js/metadata-number-entry.underscore diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/templates/js/metadata-option-entry.underscore similarity index 100% rename from cms/static/client_templates/metadata_option_entry.html rename to cms/templates/js/metadata-option-entry.underscore diff --git a/cms/static/client_templates/metadata_string_entry.html b/cms/templates/js/metadata-string-entry.underscore similarity index 100% rename from cms/static/client_templates/metadata_string_entry.html rename to cms/templates/js/metadata-string-entry.underscore diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html index 4572e40ab9..6274ee6a38 100644 --- a/cms/templates/widgets/metadata-edit.html +++ b/cms/templates/widgets/metadata-edit.html @@ -1,4 +1,5 @@ <%! from django.utils.translation import ugettext as _ %> +<%namespace name='static' file='../static_content.html'/> <% import hashlib @@ -7,6 +8,23 @@ hlskey = hashlib.md5(module.location.url()).hexdigest() %> +## js templates + + + + + + + + <% showHighLevelSource='source_code' in editable_metadata_fields and editable_metadata_fields['source_code']['explicitly_set'] %> <% metadata_field_copy = copy.deepcopy(editable_metadata_fields) %> ## Delete 'source_code' field (if it exists) so metadata editor view does not attempt to render it. diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index 7d8625ef71..d8d129a3a1 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -250,6 +250,6 @@ class CombinedOpenEndedDescriptor(CombinedOpenEndedFields, RawDescriptor): def non_editable_metadata_fields(self): non_editable_fields = super(CombinedOpenEndedDescriptor, self).non_editable_metadata_fields non_editable_fields.extend([CombinedOpenEndedDescriptor.due, CombinedOpenEndedDescriptor.graceperiod, - CombinedOpenEndedDescriptor.markdown]) + CombinedOpenEndedDescriptor.markdown, CombinedOpenEndedDescriptor.version]) return non_editable_fields From 24707f8f85f48d1c2865bd8b7c8b58714b265030 Mon Sep 17 00:00:00 2001 From: cahrens Date: Wed, 29 May 2013 12:09:42 -0400 Subject: [PATCH 097/117] Jasmine test for views. --- .../fixtures/metadata-editor.underscore | 1 + .../fixtures/metadata-number-entry.underscore | 1 + .../fixtures/metadata-option-entry.underscore | 1 + .../fixtures/metadata-string-entry.underscore | 1 + .../spec/views/metadata_edit_spec.coffee | 317 ++++++++++++++++-- cms/static/js/views/metadata_editor_view.js | 47 ++- 6 files changed, 337 insertions(+), 31 deletions(-) create mode 120000 cms/static/coffee/fixtures/metadata-editor.underscore create mode 120000 cms/static/coffee/fixtures/metadata-number-entry.underscore create mode 120000 cms/static/coffee/fixtures/metadata-option-entry.underscore create mode 120000 cms/static/coffee/fixtures/metadata-string-entry.underscore diff --git a/cms/static/coffee/fixtures/metadata-editor.underscore b/cms/static/coffee/fixtures/metadata-editor.underscore new file mode 120000 index 0000000000..9696774d0a --- /dev/null +++ b/cms/static/coffee/fixtures/metadata-editor.underscore @@ -0,0 +1 @@ +../../../templates/js/metadata-editor.underscore \ No newline at end of file diff --git a/cms/static/coffee/fixtures/metadata-number-entry.underscore b/cms/static/coffee/fixtures/metadata-number-entry.underscore new file mode 120000 index 0000000000..99138aa9c1 --- /dev/null +++ b/cms/static/coffee/fixtures/metadata-number-entry.underscore @@ -0,0 +1 @@ +../../../templates/js/metadata-number-entry.underscore \ No newline at end of file diff --git a/cms/static/coffee/fixtures/metadata-option-entry.underscore b/cms/static/coffee/fixtures/metadata-option-entry.underscore new file mode 120000 index 0000000000..c6cd499801 --- /dev/null +++ b/cms/static/coffee/fixtures/metadata-option-entry.underscore @@ -0,0 +1 @@ +../../../templates/js/metadata-option-entry.underscore \ No newline at end of file diff --git a/cms/static/coffee/fixtures/metadata-string-entry.underscore b/cms/static/coffee/fixtures/metadata-string-entry.underscore new file mode 120000 index 0000000000..f713ab5387 --- /dev/null +++ b/cms/static/coffee/fixtures/metadata-string-entry.underscore @@ -0,0 +1 @@ +../../../templates/js/metadata-string-entry.underscore \ No newline at end of file diff --git a/cms/static/coffee/spec/views/metadata_edit_spec.coffee b/cms/static/coffee/spec/views/metadata_edit_spec.coffee index 39893ceef1..4e4c5f8b36 100644 --- a/cms/static/coffee/spec/views/metadata_edit_spec.coffee +++ b/cms/static/coffee/spec/views/metadata_edit_spec.coffee @@ -1,35 +1,298 @@ -beforeEach -> - # TODO: update these - setFixtures(sandbox({id: "page-alert"})) - appendSetFixtures(sandbox({id: "page-notification"})) +editorTemplate = readFixtures('metadata-editor.underscore') +numberEntryTemplate = readFixtures('metadata-number-entry.underscore') +stringEntryTemplate = readFixtures('metadata-string-entry.underscore') +optionEntryTemplate = readFixtures('metadata-option-entry.underscore') +beforeEach -> + setFixtures($(" <% showHighLevelSource='source_code' in editable_metadata_fields and editable_metadata_fields['source_code']['explicitly_set'] %> -<% metadata_field_copy = copy.deepcopy(editable_metadata_fields) %> +<% metadata_field_copy = copy.copy(editable_metadata_fields) %> ## Delete 'source_code' field (if it exists) so metadata editor view does not attempt to render it. % if 'source_code' in editable_metadata_fields: ## source-edit.html needs access to the 'source_code' value, so delete from a copy. From 6627ca5635947aca187e0988207230bca9134cc6 Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Thu, 30 May 2013 12:26:18 -0400 Subject: [PATCH 107/117] Tidy up the new lettuce tests for metadata editing a bit. --- .../component_settings_editor_helpers.py | 22 +++++++----- .../features/discussion-editor.py | 6 ++-- .../contentstore/features/html-editor.py | 6 ++-- .../contentstore/features/problem-editor.py | 36 +++++++++++++++---- common/djangoapps/terrain/ui_helpers.py | 19 ++++++++-- 5 files changed, 67 insertions(+), 22 deletions(-) diff --git a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py index 6e35d1711f..69c9f40ae2 100644 --- a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py +++ b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py @@ -5,13 +5,13 @@ from lettuce import world from nose.tools import assert_equal from terrain.steps import reload_the_page -import time @world.absorb def create_component_instance(step, component_button_css, instance_id, expected_css): click_new_component_button(step, component_button_css) click_component_from_menu(instance_id, expected_css) + @world.absorb def click_new_component_button(step, component_button_css): step.given('I have opened a new course section in Studio') @@ -20,20 +20,21 @@ def click_new_component_button(step, component_button_css): world.css_click('a.new-unit-item') world.css_click(component_button_css) + @world.absorb def click_component_from_menu(instance_id, expected_css): - new_instance = world.browser.find_by_id(instance_id) - assert_equal(1, len(new_instance)) - # TODO: why is this sleep necessary? - time.sleep(float(1)) - new_instance[0].click() + elem_css = "a[data-location='%s']" % instance_id + assert_equal(1, len(world.css_find(elem_css))) + world.css_click(elem_css) assert_equal(1, len(world.css_find(expected_css))) + @world.absorb def edit_component_and_select_settings(): world.css_click('a.edit-button') world.css_click('#settings-mode') + @world.absorb def verify_setting_entry(setting, display_name, value, explicitly_set): assert_equal(display_name, setting.find_by_css('.setting-label')[0].value) @@ -42,13 +43,15 @@ def verify_setting_entry(setting, display_name, value, explicitly_set): assert_equal(explicitly_set, settingClearButton.has_class('active')) assert_equal(not explicitly_set, settingClearButton.has_class('inactive')) + @world.absorb def verify_all_setting_entries(expected_entries): settings = world.browser.find_by_css('.wrapper-comp-setting') assert_equal(len(expected_entries), len(settings)) for (counter, setting) in enumerate(settings): world.verify_setting_entry(setting, expected_entries[counter][0], - expected_entries[counter][1], expected_entries[counter][2]) + expected_entries[counter][1], expected_entries[counter][2]) + @world.absorb def save_component_and_reopen(step): @@ -58,6 +61,7 @@ def save_component_and_reopen(step): reload_the_page(step) edit_component_and_select_settings() + @world.absorb def cancel_component(step): world.css_click("a.cancel-button") @@ -65,10 +69,12 @@ def cancel_component(step): # they are not persisted. Refresh the browser to make sure the changes were not persisted. reload_the_page(step) + @world.absorb def revert_setting_entry(label): get_setting_entry(label).find_by_css('.setting-clear')[0].click() + @world.absorb def get_setting_entry(label): settings = world.browser.find_by_css('.wrapper-comp-setting') @@ -76,5 +82,3 @@ def get_setting_entry(label): if setting.find_by_css('.setting-label')[0].value == label: return setting return None - - diff --git a/cms/djangoapps/contentstore/features/discussion-editor.py b/cms/djangoapps/contentstore/features/discussion-editor.py index 4e661a89e1..a7ec923192 100644 --- a/cms/djangoapps/contentstore/features/discussion-editor.py +++ b/cms/djangoapps/contentstore/features/discussion-editor.py @@ -3,10 +3,12 @@ from lettuce import world, step + @step('I have created a Discussion Tag$') -def i_created_blank_common_problem(step): +def i_created_discussion_tag(step): world.create_component_instance(step, '.large-discussion-icon', 'i4x://edx/templates/discussion/Discussion_Tag', - '.xmodule_DiscussionModule') + '.xmodule_DiscussionModule') + @step('I see three alphabetized settings and their expected values$') def i_see_only_the_display_name(step): diff --git a/cms/djangoapps/contentstore/features/html-editor.py b/cms/djangoapps/contentstore/features/html-editor.py index 564d4d986c..ea5064b27d 100644 --- a/cms/djangoapps/contentstore/features/html-editor.py +++ b/cms/djangoapps/contentstore/features/html-editor.py @@ -3,10 +3,12 @@ from lettuce import world, step + @step('I have created a Blank HTML Page$') -def i_created_blank_common_problem(step): +def i_created_blank_html_page(step): world.create_component_instance(step, '.large-html-icon', 'i4x://edx/templates/html/Blank_HTML_Page', - '.xmodule_HtmlModule') + '.xmodule_HtmlModule') + @step('I see only the HTML display name setting$') def i_see_only_the_html_display_name(step): diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py index ade1f07b2d..f75a60415c 100644 --- a/cms/djangoapps/contentstore/features/problem-editor.py +++ b/cms/djangoapps/contentstore/features/problem-editor.py @@ -5,21 +5,24 @@ from lettuce import world, step from nose.tools import assert_equal DISPLAY_NAME = "Display Name" -MAXIMUM_ATTEMPTS="Maximum Attempts" -PROBLEM_WEIGHT="Problem Weight" -RANDOMIZATION='Randomization' -SHOW_ANSWER="Show Answer" +MAXIMUM_ATTEMPTS = "Maximum Attempts" +PROBLEM_WEIGHT = "Problem Weight" +RANDOMIZATION = 'Randomization' +SHOW_ANSWER = "Show Answer" + ############### ACTIONS #################### @step('I have created a Blank Common Problem$') def i_created_blank_common_problem(step): world.create_component_instance(step, '.large-problem-icon', 'i4x://edx/templates/problem/Blank_Common_Problem', - '.xmodule_CapaModule') + '.xmodule_CapaModule') + @step('I edit and select Settings$') def i_edit_and_select_settings(step): world.edit_component_and_select_settings() + @step('I see five alphabetized settings and their expected values$') def i_see_five_settings_with_values(step): world.verify_all_setting_entries( @@ -31,58 +34,69 @@ def i_see_five_settings_with_values(step): [SHOW_ANSWER, "Finished", True] ]) + @step('I can modify the display name') def i_can_modify_the_display_name(step): world.get_setting_entry(DISPLAY_NAME).find_by_css('.setting-input')[0].fill('modified') verify_modified_display_name() + @step('my display name change is persisted on save') def my_display_name_change_is_persisted_on_save(step): world.save_component_and_reopen(step) verify_modified_display_name() + @step('I can revert the display name to unset') def can_revert_display_name_to_unset(step): world.revert_setting_entry(DISPLAY_NAME) verify_unset_display_name() + @step('my display name is unset on save') def my_display_name_is_persisted_on_save(step): world.save_component_and_reopen(step) verify_unset_display_name() + @step('I can select Per Student for Randomization') def i_can_select_per_student_for_randomization(step): world.browser.select(RANDOMIZATION, "Per Student") verify_modified_randomization() + @step('my change to randomization is persisted') def my_change_to_randomization_is_persisted(step): world.save_component_and_reopen(step) verify_modified_randomization() + @step('I can revert to the default value for randomization') def i_can_revert_to_default_for_randomization(step): world.revert_setting_entry(RANDOMIZATION) world.save_component_and_reopen(step) world.verify_setting_entry(world.get_setting_entry(RANDOMIZATION), RANDOMIZATION, "Always", False) + @step('I can set the weight to 3.5') def i_can_set_weight_to_3_5(step): world.get_setting_entry(PROBLEM_WEIGHT).find_by_css('.setting-input')[0].fill('3.5') verify_modified_weight() + @step('my change to weight is persisted') def my_change_to_randomization_is_persisted(step): world.save_component_and_reopen(step) verify_modified_weight() + @step('I can revert to the default value of unset for weight') def i_can_revert_to_default_for_randomization(step): world.revert_setting_entry(PROBLEM_WEIGHT) world.save_component_and_reopen(step) world.verify_setting_entry(world.get_setting_entry(PROBLEM_WEIGHT), PROBLEM_WEIGHT, "", False) + @step('if I set the weight to abc, it remains unset') def set_the_weight_to_abc(step): world.get_setting_entry(PROBLEM_WEIGHT).find_by_css('.setting-input')[0].fill('abc') @@ -92,6 +106,7 @@ def set_the_weight_to_abc(step): # But no change was actually ever sent to the model, so on reopen, explicitly_set is False world.verify_setting_entry(world.get_setting_entry(PROBLEM_WEIGHT), PROBLEM_WEIGHT, "", False) + @step('if I set the max attempts to 2.34, the max attempts are persisted as 234') def set_the_weight_to_abc(step): world.get_setting_entry(MAXIMUM_ATTEMPTS).find_by_css('.setting-input')[0].fill('2.34') @@ -99,6 +114,7 @@ def set_the_weight_to_abc(step): world.save_component_and_reopen(step) world.verify_setting_entry(world.get_setting_entry(MAXIMUM_ATTEMPTS), MAXIMUM_ATTEMPTS, "234", True) + @step('I set the max attempts to -3, the max attempts are persisted as 1') def set_max_attempts_to_neg_3(step): world.get_setting_entry(MAXIMUM_ATTEMPTS).find_by_css('.setting-input')[0].fill('-3') @@ -106,20 +122,24 @@ def set_max_attempts_to_neg_3(step): world.save_component_and_reopen(step) world.verify_setting_entry(world.get_setting_entry(MAXIMUM_ATTEMPTS), MAXIMUM_ATTEMPTS, "1", True) + @step('Edit High Level Source is not visible') def edit_high_level_source_not_visible(step): verify_high_level_source(step, False) + @step('Edit High Level Source is visible') def edit_high_level_source_visible(step): verify_high_level_source(step, True) + @step('If I press Cancel my changes are not persisted') def cancel_does_not_save_changes(step): world.cancel_component(step) step.given("I edit and select Settings") step.given("I see five alphabetized settings and their expected values") + @step('I have created a LaTeX Problem') def create_latex_problem(step): world.click_new_component_button(step, '.large-problem-icon') @@ -128,20 +148,24 @@ def create_latex_problem(step): world.css_click('#ui-id-2') world.click_component_from_menu("i4x://edx/templates/problem/Problem_Written_in_LaTeX", '.xmodule_CapaModule') + def verify_high_level_source(step, visible): assert_equal(visible, world.is_css_present('.launch-latex-compiler')) world.cancel_component(step) assert_equal(visible, world.is_css_present('.upload-button')) + def verify_modified_weight(): world.verify_setting_entry(world.get_setting_entry(PROBLEM_WEIGHT), PROBLEM_WEIGHT, "3.5", True) + def verify_modified_randomization(): world.verify_setting_entry(world.get_setting_entry(RANDOMIZATION), RANDOMIZATION, "Per Student", True) + def verify_modified_display_name(): world.verify_setting_entry(world.get_setting_entry(DISPLAY_NAME), DISPLAY_NAME, 'modified', True) + def verify_unset_display_name(): world.verify_setting_entry(world.get_setting_entry(DISPLAY_NAME), DISPLAY_NAME, '', False) - diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py index 79e9b0afdb..45252dbb7b 100644 --- a/common/djangoapps/terrain/ui_helpers.py +++ b/common/djangoapps/terrain/ui_helpers.py @@ -4,7 +4,7 @@ from lettuce import world import time from urllib import quote_plus -from selenium.common.exceptions import WebDriverException +from selenium.common.exceptions import WebDriverException, StaleElementReferenceException from selenium.webdriver.support import expected_conditions as EC from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import WebDriverWait @@ -63,7 +63,7 @@ def css_click(css_selector): # Occassionally, MathJax or other JavaScript can cover up # an element temporarily. # If this happens, wait a second, then try again - time.sleep(1) + world.wait(1) world.browser.find_by_css(css_selector).click() @@ -79,6 +79,14 @@ def css_click_at(css, x=10, y=10): e.action_chains.perform() +@world.absorb +def id_click(elem_id): + """ + Perform a click on an element as specified by its id + """ + world.css_click('#%s' % elem_id) + + @world.absorb def css_fill(css_selector, text): world.browser.find_by_css(css_selector).first.fill(text) @@ -94,7 +102,12 @@ def css_text(css_selector): # Wait for the css selector to appear if world.is_css_present(css_selector): - return world.browser.find_by_css(css_selector).first.text + try: + return world.browser.find_by_css(css_selector).first.text + except StaleElementReferenceException: + # The DOM was still redrawing. Wait a second and try again. + world.wait(1) + return world.browser.find_by_css(css_selector).first.text else: return "" From 2f504ec4bf1dcef55852cafdd004c8baf0ef61c0 Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Thu, 30 May 2013 12:42:50 -0400 Subject: [PATCH 108/117] fix merge conflict --- cms/djangoapps/contentstore/features/problem-editor.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py index 584af92a55..27fe5fcec8 100644 --- a/cms/djangoapps/contentstore/features/problem-editor.py +++ b/cms/djangoapps/contentstore/features/problem-editor.py @@ -14,17 +14,14 @@ SHOW_ANSWER = "Show Answer" ############### ACTIONS #################### @step('I have created a Blank Common Problem$') def i_created_blank_common_problem(step): -<<<<<<< HEAD world.create_component_instance(step, '.large-problem-icon', 'i4x://edx/templates/problem/Blank_Common_Problem', '.xmodule_CapaModule') -======= world.create_component_instance( step, '.large-problem-icon', 'i4x://edx/templates/problem/Blank_Common_Problem', '.xmodule_CapaModule' ) ->>>>>>> a0efd3a5d7045dd9369869fd15fc2cc4ecdb6cc1 @step('I edit and select Settings$') @@ -56,8 +53,6 @@ def my_display_name_change_is_persisted_on_save(step): verify_modified_display_name() -<<<<<<< HEAD -======= @step('I can specify special characters in the display name') def i_can_modify_the_display_name_with_special_chars(step): world.get_setting_entry(DISPLAY_NAME).find_by_css('.setting-input')[0].fill("updated ' \" &") @@ -70,7 +65,6 @@ def special_chars_persisted_on_save(step): verify_modified_display_name_with_special_chars() ->>>>>>> a0efd3a5d7045dd9369869fd15fc2cc4ecdb6cc1 @step('I can revert the display name to unset') def can_revert_display_name_to_unset(step): world.revert_setting_entry(DISPLAY_NAME) @@ -198,12 +192,9 @@ def verify_modified_display_name(): world.verify_setting_entry(world.get_setting_entry(DISPLAY_NAME), DISPLAY_NAME, 'modified', True) -<<<<<<< HEAD -======= def verify_modified_display_name_with_special_chars(): world.verify_setting_entry(world.get_setting_entry(DISPLAY_NAME), DISPLAY_NAME, "updated ' \" &", True) ->>>>>>> a0efd3a5d7045dd9369869fd15fc2cc4ecdb6cc1 def verify_unset_display_name(): world.verify_setting_entry(world.get_setting_entry(DISPLAY_NAME), DISPLAY_NAME, '', False) From c0c5e920a3ffc69c23eefc6cd0e019714b8b1a41 Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 30 May 2013 12:56:55 -0400 Subject: [PATCH 109/117] Go back to setFixtures. --- cms/static/coffee/spec/main_spec.coffee | 2 +- .../coffee/spec/views/feedback_spec.coffee | 2 +- .../spec/views/metadata_edit_spec.coffee | 505 +++++++++--------- .../coffee/spec/views/module_edit_spec.coffee | 2 +- .../coffee/spec/views/section_spec.coffee | 2 +- 5 files changed, 257 insertions(+), 256 deletions(-) diff --git a/cms/static/coffee/spec/main_spec.coffee b/cms/static/coffee/spec/main_spec.coffee index cee591642e..9383f2547e 100644 --- a/cms/static/coffee/spec/main_spec.coffee +++ b/cms/static/coffee/spec/main_spec.coffee @@ -27,7 +27,7 @@ describe "AJAX Errors", -> tpl = readFixtures('system-feedback.underscore') beforeEach -> - appendSetFixtures($("
    Setting LabelSetting InputSetting Help
    Example DropdownInput/Form stuff to be children here. Example Numerical Input