From b95374c7036f6754d39824ae7ac25e6e1d839cf9 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 10 Oct 2012 10:31:55 -0400 Subject: [PATCH 1/9] tightened unit treeview styles --- cms/static/sass/_content-types.scss | 1 + cms/static/sass/_unit.scss | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/cms/static/sass/_content-types.scss b/cms/static/sass/_content-types.scss index eda947e380..7cca469350 100644 --- a/cms/static/sass/_content-types.scss +++ b/cms/static/sass/_content-types.scss @@ -5,6 +5,7 @@ padding-left: 14px; background-position: 8px center; background-repeat: no-repeat; + vertical-align: middle; } .videosequence-icon { diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index 5acc7f54b0..a04fc1095b 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -382,6 +382,11 @@ .window-contents > ol { @include tree-view; + .section-item { + font-size: 11px; + padding: 2px 8px 4px 16px; + } + ol { .section-item { padding-left: 30px; From f98963aa8b3ab85f50fd082b50f92adaadc87632 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 10 Oct 2012 10:45:18 -0400 Subject: [PATCH 2/9] tightened unit tree nesting --- cms/static/sass/_unit.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index a04fc1095b..b23e171772 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -384,26 +384,26 @@ .section-item { font-size: 11px; - padding: 2px 8px 4px 16px; + padding: 2px 8px 4px; } ol { .section-item { - padding-left: 30px; + padding-left: 20px; } .new-unit-item { - margin-left: 30px; + margin-left: 20px; } } ol ol { .section-item { - padding-left: 50px; + padding-left: 34px; } .new-unit-item { - margin: 0 0 15px 50px; + margin: 0 0 10px 41px; } } } From 2efe4cf640460b4446cb11380108d4fa1264cce8 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 10 Oct 2012 13:04:44 -0400 Subject: [PATCH 3/9] added ellipsis text overflow in unit tree --- cms/static/sass/_unit.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index b23e171772..f582cd95bb 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -379,12 +379,25 @@ @include box-shadow(none); } + .draft-tag, + .hidden-tag, + .private-tag, + .has-new-draft-tag { + font-size: 8px; + } + .window-contents > ol { @include tree-view; .section-item { + display: inline-block; + width: 100%; font-size: 11px; padding: 2px 8px 4px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + @include box-sizing(border-box); } ol { From 07ac0d0642f2d87e7ff83b972e2197d9c490247d Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 10 Oct 2012 13:53:18 -0400 Subject: [PATCH 4/9] styled/tweaked users page --- cms/static/sass/_users.scss | 83 +++++++++++++++++++++ cms/static/sass/base-style.scss | 1 + cms/templates/manage_users.html | 128 +++++++++++++++++++------------- 3 files changed, 162 insertions(+), 50 deletions(-) create mode 100644 cms/static/sass/_users.scss diff --git a/cms/static/sass/_users.scss b/cms/static/sass/_users.scss new file mode 100644 index 0000000000..98c9be9fda --- /dev/null +++ b/cms/static/sass/_users.scss @@ -0,0 +1,83 @@ +.users { + .user-overview { + @extend .window; + padding: 30px 40px; + + .details { + margin-bottom: 20px; + font-size: 14px; + } + } + + .new-user-button { + @include grey-button; + margin: 5px 8px; + padding: 3px 10px 4px 10px; + font-size: 12px; + + .plus-icon { + position: relative; + top: 1px; + } + } + + .list-header { + @include linear-gradient(top, transparent, rgba(0, 0, 0, .1)); + background-color: #ced2db; + border-radius: 3px 3px 0 0; + } + + .new-user-form { + display: none; + padding: 15px 20px; + background: $mediumGrey; + + label { + display: inline-block; + margin-right: 10px; + } + + .email-input { + width: 350px; + padding: 8px 8px 10px; + border-color: $darkGrey; + } + + .add-button { + @include blue-button; + } + + .cancel-button { + @include white-button; + } + } + + .user-list { + border: 1px solid $mediumGrey; + border-top: none; + background: $lightGrey; + + li { + position: relative; + padding: 10px 20px; + border-bottom: 1px solid $mediumGrey; + + &:last-child { + border-bottom: none; + } + + span { + display: inline-block; + } + + .user-name { + width: 30%; + font-weight: 700; + } + + .item-actions { + top: 9px; + } + } + } +} \ No newline at end of file diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index 628332d9ee..4acdc320c7 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -15,6 +15,7 @@ @import "unit"; @import "assets"; @import "static-pages"; +@import "users"; @import "course-info"; @import "landing"; @import "graphics"; diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index b647d629b8..e479bc0942 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -1,65 +1,93 @@ <%inherit file="base.html" /> <%block name="title">Course Staff Manager +<%block name="bodyclass">users <%include file="widgets/header.html"/> <%block name="content"> -
+
+
+

Users

-

Course Staff

-
-

- The following list of users have been designated as course staff. This means that these users will - have permissions to modify course content. You may add additional source staff below. Please note that they - must have already registered and verified their account. -

+
+
+

The following list of users have been designated as course staff. This means that these users will have permissions to modify course content. You may add additional source staff below. Please note that they must have already registered and verified their account.

+
+
+ + New User + +
+
+ + save + cancel +
+
+
    + % for user in staff: +
  1. + ${user.username} + ${user.email} +
    + +
    +
    2. + % endfor +
+
+ +
+
-
-
    - % for user in staff: -
  1. ${user.email} (${user.username}) remove
    2. - % endfor -
-
- - - - add as course staff - -
- -
+ <%block name="jsextra"> - \ No newline at end of file From bbed49dbd3ac3143aae205b131e04c62dd7c72ca Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 10 Oct 2012 14:23:36 -0400 Subject: [PATCH 5/9] styled log in and sign up errors; fixed expand/collapse transition bug --- cms/static/sass/_courseware.scss | 1 + cms/static/sass/_graphics.scss | 1 + cms/static/sass/_login.scss | 11 +++++++ cms/templates/login.html | 54 +++++++++++++++++--------------- cms/templates/signup.html | 2 +- 5 files changed, 43 insertions(+), 26 deletions(-) diff --git a/cms/static/sass/_courseware.scss b/cms/static/sass/_courseware.scss index 9cf69eca96..4251f25f90 100644 --- a/cms/static/sass/_courseware.scss +++ b/cms/static/sass/_courseware.scss @@ -65,6 +65,7 @@ input.courseware-unit-search-input { .expand-collapse-icon { float: left; margin: 16px 6px 16px 16px; + @include transition(none); } .drag-handle { diff --git a/cms/static/sass/_graphics.scss b/cms/static/sass/_graphics.scss index 83f8816b47..25ca880598 100644 --- a/cms/static/sass/_graphics.scss +++ b/cms/static/sass/_graphics.scss @@ -5,6 +5,7 @@ height: 11px; margin-right: 10px; background: url(../img/expand-collapse-icons.png) no-repeat; + @include transition(none); &.expand { top: 1px; diff --git a/cms/static/sass/_login.scss b/cms/static/sass/_login.scss index c155efe7d3..0bccaea0f0 100644 --- a/cms/static/sass/_login.scss +++ b/cms/static/sass/_login.scss @@ -77,4 +77,15 @@ text-align: right; font-size: 13px; } + + #login_error, + #register_error { + display: none; + margin-bottom: 30px; + padding: 5px 10px; + border-radius: 3px; + background: $error-red; + font-size: 14px; + color: #fff; + } } \ No newline at end of file diff --git a/cms/templates/login.html b/cms/templates/login.html index 7d225678dc..2821dc2fe5 100644 --- a/cms/templates/login.html +++ b/cms/templates/login.html @@ -30,36 +30,40 @@ diff --git a/cms/templates/signup.html b/cms/templates/signup.html index 77a5df7856..864db25956 100644 --- a/cms/templates/signup.html +++ b/cms/templates/signup.html @@ -81,7 +81,7 @@ if(json.success) { $('#register').html(json.value); } else { - $('#register_error').html(json.value).stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000); + $('#register_error').html(json.value).stop().slideDown(150); } } ); From 8f488c3f7fab7eaf0e8dc3872fbd723b613375e7 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 10 Oct 2012 15:15:39 -0400 Subject: [PATCH 6/9] added html icon --- cms/static/img/html-icon.png | Bin 0 -> 1400 bytes cms/static/sass/_graphics.scss | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 cms/static/img/html-icon.png diff --git a/cms/static/img/html-icon.png b/cms/static/img/html-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e739f2fc11a7395d390d266ceb77cb1ea5b32ea5 GIT binary patch literal 1400 zcmeAS@N?(olHy`uVBq!ia0vp^IzTMW!3HD?EZ61(DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_cg49qH-ArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp< z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC z!8&|>tvvIJOA_;vQ$1a5m4IgGWoD*WIT@K5T9_Id8(6xy8XCG9Il8#HI$1bdS{hlH zI-59}!1TK0Czs}?=9R$orXcj1;M5CB47mkBn_W_iGRsm^+=}vZ6~Lah%Eav!L!9P8 z^`_ujdwLld7+-n1IEGZ* z+A`hNo7qvIt=N;NLy1GF$wOdmPL9wT7FO1+UaCJDBO)R)9?Pc?c-f}XAFWCh)q7qd?M?5 zs)1vX%mfDB$!&#)J1;*Fe8RG6m74RrSc6UK4|r61cdZiTQ{;`iv;PO9WwX@LdB5$| zwidFBY}r^mf#~0ogTA{Q>z^qvqNO`E^dpy>b4t78UU zY~$%GX)|m#mZ+zQmM_^RG(mgPyOuWspUW*cRvJ#*rn~w^T9uFF6-m$A(?ah|k_&w= zDz;fMH@b}BisyXi#D0g&Jl7~g^*J6JkA9h%x7h#Q@l1E#zJ~O)0NYcB4_(Zc9GC9k zu3qzFO#!D$l&9H}-;TXkp68yrwB04-rSGz`FooSxYNz+MFZPI^JgdA`NqSSAb*%NJ z+6S|ri07PUtM&F+dVR*7pB$T9_b(T|;-ggSS!CxpJvY+zLg!+xG>6tZ@+^;UmFh<* zScWfPJ*xymzSI8)W^W`lL1m$* LtDnm{r-UW|cWv|N literal 0 HcmV?d00001 diff --git a/cms/static/sass/_graphics.scss b/cms/static/sass/_graphics.scss index 25ca880598..1f07f4433c 100644 --- a/cms/static/sass/_graphics.scss +++ b/cms/static/sass/_graphics.scss @@ -205,6 +205,14 @@ background: url(../img/large-slide-icon.png) center no-repeat; } +.large-html-icon { + display: inline-block; + width: 100px; + height: 60px; + margin-right: 5px; + background: url(../img/html-icon.png) center no-repeat; +} + .large-textbook-icon { display: inline-block; width: 100px; From 564c138bf59cd919a12dcd44237acd29d72ccc7e Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 10 Oct 2012 15:20:27 -0400 Subject: [PATCH 7/9] white drag handles for components --- cms/static/img/white-drag-handles.png | Bin 0 -> 952 bytes cms/static/sass/_unit.scss | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 cms/static/img/white-drag-handles.png diff --git a/cms/static/img/white-drag-handles.png b/cms/static/img/white-drag-handles.png new file mode 100644 index 0000000000000000000000000000000000000000..802a6638931f9162f1610763f109ebd12b438b9b GIT binary patch literal 952 zcmaJ=O^=g67{;u2&1M^o2b1+Qp~kqz0>c)zkm80ycb7z(rfp)6OJUk#7Y1Rvr9Evt z82vLIj5iN@@SyQ(qVYc%|9}UFZs~fk5@2TDJkRrf&Z}1QsJL}!i(#0eb!@ijx=Fv= z*9-K&{r$yHy6lifk96>WOr01px`+D+Sb;M{ZRB{fXP;4xVK(mi-5%-Lk5v~3oReX= zG>9mhVQL3y(0ln;;{#hKrL0N zK!At?(%>{q)Kp^^x+>jgW}XEL2pMbaMNmDv1q>V`AaQ$TSAY=6G6yS?EW?LD6rjip z^p(r7qDrzV?t|sSQg5+0P}}C=(ic5x?1+#^<@xD!%1!q;91nS@C`zUwie-u@C$o?^ zX*o>`?llyVP@D} zFl<}3!h|@Xi!4)PsRrl!o>~`WSe4+upqLE^8=`I=HtJPFQN*fbRP;*DHL*JhP)KsF zcgd};0vecD5Ucq)4@JUp1!1);(=xA-SkKQ_l>LDH$QwjXHMX~LhbyTy}9vbH=W$7oPE_x bA9dzRf%(!e))?dMx9l!iji&j!e)9YeeUBlu literal 0 HcmV?d00001 diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index f582cd95bb..265f70c6c5 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -129,7 +129,7 @@ height: 100%; border-radius: 0 3px 3px 0; border: 1px solid #d1ddec; - background: url(../img/drag-handles.png) center no-repeat #d1ddec; + background: url(../img/white-drag-handles.png) center no-repeat #d1ddec; cursor: move; @include transition(all .15s); } From edc32e9db5a008ec30507e6f886e7e9ce0ac5dd2 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 10 Oct 2012 15:45:04 -0400 Subject: [PATCH 8/9] tweaks to new component animations --- cms/static/coffee/src/views/unit.coffee | 10 ++++++---- cms/static/sass/_unit.scss | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee index 53eb11d511..2b0f7668a2 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -65,24 +65,26 @@ class CMS.Views.UnitEdit extends Backbone.View showNewComponentForm: (event) => event.preventDefault() @$newComponentItem.addClass('adding') - $(event.target).slideUp(150) + $(event.target).fadeOut(150) + @$newComponentItem.css('height', @$newComponentTypePicker.outerHeight()) @$newComponentTypePicker.slideDown(250) showComponentTemplates: (event) => event.preventDefault() type = $(event.currentTarget).data('type') - @$newComponentTypePicker.slideUp(250) - @$(".new-component-#{type}").slideDown(250) + @$newComponentTypePicker.fadeOut(250) + @$(".new-component-#{type}").fadeIn(250) closeNewComponent: (event) => event.preventDefault() @$newComponentTypePicker.slideUp(250) @$newComponentTemplatePickers.slideUp(250) - @$newComponentButton.slideDown(250) + @$newComponentButton.fadeIn(250) @$newComponentItem.removeClass('adding') @$newComponentItem.find('.rendered-component').remove() + @$newComponentItem.css('height', @$newComponentButton.outerHeight()) saveNewComponent: (event) => event.preventDefault() diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index 265f70c6c5..91e5d52026 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -209,7 +209,10 @@ .new-component, .new-component-templates { display: none; + position: absolute; + width: 100%; padding: 20px; + @include clearfix; .cancel-button { @include blue-button; From 8d78073a64fe20d33dd9d14b6c12a114745d6df1 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 10 Oct 2012 15:52:49 -0400 Subject: [PATCH 9/9] removed console logs --- cms/templates/login.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/cms/templates/login.html b/cms/templates/login.html index 2821dc2fe5..a3a7a8cb4f 100644 --- a/cms/templates/login.html +++ b/cms/templates/login.html @@ -51,14 +51,11 @@ submit_data, function(json) { if(json.success) { - console.log('success'); location.href = "${reverse('index')}"; } else if($('#login_error').length == 0) { - console.log('error 1'); $('#login_form').prepend('
Email or password is incorrect.
'); $('#login_error').slideDown(150); } else { - console.log('error 2'); $('#login_error').stop().slideDown(150); } }