Skip to content

E
edx-platform
Commit 423dbd17 by Tom Giannattasio
Options

new unit publish settings

parent d108af88
Showing with 329 additions and 322 deletions
cms/static/sass/_base.scss
...@@ -183,8 +183,8 @@ label { ...@@ -183,8 +183,8 @@ label {
} }
.row { .row {
margin-bottom: 15px; margin-bottom: 10px;
padding-bottom: 15px; padding-bottom: 10px;
border-bottom: 1px solid #cbd1db; border-bottom: 1px solid #cbd1db;
} }
} }
......
cms/static/sass/_subsection.scss
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
label { label {
display: inline-block !important; display: inline-block !important;
margin-right: 10px; margin-right: 10px;
line-height: 31px; line-height: 21px;
} }
a { a {
...@@ -100,6 +100,10 @@ ...@@ -100,6 +100,10 @@
.large-toggle { .large-toggle {
width: 41px; width: 41px;
background: url(../img/large-toggles.png) no-repeat; background: url(../img/large-toggles.png) no-repeat;
background-position: 0 -5px; background-position: 0 -50px;
.hidden {
background-position: 0 -5px;
}
} }
} }
cms/static/sass/_unit.scss
.unit .main-wrapper, .unit .main-wrapper,
.subsection .main-wrapper { .subsection .main-wrapper {
margin: 40px; margin: 40px;
} }
.main-column { .main-column {
float: left; float: left;
width: 70%; width: 70%;
} }
.unit-body.published { .unit-body.published {
.components > li { .components > li {
border: none; border: none;
.rendered-component { .rendered-component {
padding: 0 20px; padding: 0 20px;
}
} }
}
} }
.unit-body { .unit-body {
.breadcrumbs { .breadcrumbs {
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
border-bottom: 1px solid #cbd1db; border-bottom: 1px solid #cbd1db;
background: -webkit-linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0) 70%) #edf1f5; background: -webkit-linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0) 70%) #edf1f5;
box-shadow: 0 1px 0 rgba(255, 255, 255, .7) inset; box-shadow: 0 1px 0 rgba(255, 255, 255, .7) inset;
@include clearfix; @include clearfix;
li { li {
float: left; float: left;
}
a,
.current-page {
display: block;
padding: 15px 35px 15px 30px;
font-size: 14px;
background: url(../img/breadcrumb-arrow.png) no-repeat right center;
}
} }
h2 { a,
margin: 30px 40px; .current-page {
color: #646464; display: block;
font-size: 19px; padding: 15px 35px 15px 30px;
font-weight: 300; font-size: 14px;
letter-spacing: 1px; background: url(../img/breadcrumb-arrow.png) no-repeat right center;
text-transform: uppercase;
} }
}
h2 {
margin: 30px 40px;
color: #646464;
font-size: 19px;
font-weight: 300;
letter-spacing: 1px;
text-transform: uppercase;
}
.components {
> li {
position: relative;
z-index: 10;
margin: 20px 40px;
border: 1px solid #d1ddec;
border-radius: 3px;
background: #fff;
-webkit-transition: border-color .15s;
&:hover {
border-color: #6696d7;
.drag-handle,
.component-actions a {
background-color: $blue;
}
.components { .drag-handle {
> li { border-color: $blue;
position: relative; }
z-index: 10; }
margin: 20px 40px;
border: 1px solid #d1ddec;
border-radius: 3px;
background: #fff;
-webkit-transition: border-color .15s;
&:hover { &.editing {
border-color: #6696d7; border-color: #6696d7;
.drag-handle, &:hover {
.component-actions a { .drag-handle,
background-color: $blue; .component-actions a {
} background-color: $blue;
}
.drag-handle { .drag-handle {
border-color: $blue; border-color: $blue;
} }
} }
}
.rendered-component {
padding: 40px 20px 20px;
}
.component-actions {
position: absolute;
top: 4px;
right: 4px;
-webkit-transition: opacity .15s;
}
.edit-button,
.delete-button {
float: left;
padding: 3px 10px 4px;
margin-left: 3px;
border: 1px solid #fff;
border-radius: 3px;
background: #d1ddec;
font-size: 12px;
color: #fff;
-webkit-transition: all .15s;
&:hover {
background-color: $blue;
color: #fff;
}
&.editing { .edit-icon,
border-color: #6696d7; .delete-icon {
margin-right: 4px;
}
}
.drag-handle {
position: absolute;
display: block;
top: -1px;
right: -16px;
z-index: -1;
width: 15px;
height: 100%;
border-radius: 0 3px 3px 0;
border: 1px solid #d1ddec;
background: url(../img/drag-handles.png) center no-repeat #d1ddec;
cursor: move;
-webkit-transition: all .15s;
}
&.new-component-item {
padding: 0;
border: 1px solid #8891a1;
border-radius: 3px;
background: -webkit-linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0)) #d1dae3;
box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset;
-webkit-transition: background-color .15s, border-color .15s;
&:hover { &.adding {
.drag-handle, background-color: $blue;
.component-actions a { border-color: #437fbf;
background-color: $blue; }
}
.drag-handle { .new-component-button {
border-color: $blue; display: block;
} padding: 20px;
} text-align: center;
} color: #6d788b;
}
.rendered-component { h5 {
padding: 40px 20px 20px; margin-bottom: 8px;
} color: #fff;
font-weight: 700;
}
.component-actions { .rendered-component {
position: absolute; display: none;
top: 4px; background: #fff;
right: 4px; border-radius: 3px 3px 0 0;
-webkit-transition: opacity .15s; }
}
.edit-button, .new-component-type, .new-component-template {
.delete-button { @include clearfix;
float: left;
padding: 3px 10px 4px; a {
margin-left: 3px; position: relative;
border: 1px solid #fff; float: left;
border-radius: 3px; width: 100px;
// background: $blue; height: 100px;
background: #d1ddec; margin-right: 10px;
font-size: 12px; margin-bottom: 10px;
color: #fff; border-radius: 8px;
-webkit-transition: all .15s; font-size: 13px;
line-height: 14px;
&:hover { color: #fff;
background-color: $blue; text-align: center;
color: #fff; box-shadow: 0 1px 1px rgba(0, 0, 0, .4), 0 1px 0 rgba(255, 255, 255, .4) inset;
} -webkit-transition: background-color .15s;
.edit-icon,
.delete-icon {
margin-right: 4px;
}
}
.drag-handle { &:hover {
position: absolute; background-color: rgba(255, 255, 255, .2);
display: block;
top: -1px;
right: -16px;
z-index: -1;
width: 15px;
height: 100%;
border-radius: 0 3px 3px 0;
border: 1px solid #d1ddec;
background: url(../img/drag-handles.png) center no-repeat #d1ddec;
cursor: move;
-webkit-transition: all .15s;
} }
&.new-component-item { .name {
padding: 0; position: absolute;
border: 1px solid #8891a1; bottom: 5px;
border-radius: 3px; left: 0;
background: -webkit-linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0)) #d1dae3; width: 100%;
box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset; padding: 10px;
-webkit-transition: background-color .15s, border-color .15s; box-sizing: border-box;
&.adding {
background-color: $blue;
border-color: #437fbf;
}
.new-component-button {
display: block;
padding: 20px;
text-align: center;
color: #6d788b;
}
h5 {
margin-bottom: 8px;
color: #fff;
font-weight: 700;
}
.rendered-component {
display: none;
background: #fff;
border-radius: 3px 3px 0 0;
}
.new-component-type, .new-component-template {
@include clearfix;
a {
position: relative;
float: left;
width: 100px;
height: 100px;
margin-right: 10px;
margin-bottom: 10px;
border-radius: 8px;
font-size: 13px;
line-height: 14px;
color: #fff;
text-align: center;
box-shadow: 0 1px 1px rgba(0, 0, 0, .4), 0 1px 0 rgba(255, 255, 255, .4) inset;
-webkit-transition: background-color .15s;
&:hover {
background-color: rgba(255, 255, 255, .2);
}
.name {
position: absolute;
bottom: 5px;
left: 0;
width: 100%;
padding: 10px;
box-sizing: border-box;
}
}
}
.new-component-template {
a {
height: 60px;
}
}
.new-component,
.new-component-templates {
display: none;
padding: 20px;
.cancel-button {
@include blue-button;
border-color: #30649c;
}
}
} }
}
} }
}
.component-editor { .new-component-template {
@include edit-box; a {
display: none; height: 60px;
padding: 20px; }
border-radius: 0 0 3px 3px;
background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, .1)) $blue;
.module-editor {
background: white;
} }
h5 { .new-component,
margin-bottom: 8px; .new-component-templates {
color: #fff; display: none;
font-weight: 700; padding: 20px;
}
.save-button { .cancel-button {
margin-right: 8px; @include blue-button;
border-color: #30649c;
}
} }
}
} }
} }
.unit-properties { .component-editor {
.window-contents { @include edit-box;
padding: 10px 20px; display: none;
} padding: 20px;
border-radius: 0 0 3px 3px;
background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, .1)) $blue;
.unit-actions { .module-editor {
border-bottom: none; background: white;
padding-bottom: 0;
} }
.published-alert { h5 {
padding: 10px; margin-bottom: 8px;
border: 1px solid #edbd3c; color: #fff;
border-radius: 3px; font-weight: 700;
background: #fbf6e1;
font-size: 14px;
line-height: 1.4;
div {
margin-top: 15px;
}
} }
.status { .save-button {
display: none; margin-right: 8px;
} }
}
}
.visibility-options .option { .unit-properties {
margin-right: 10px; .window-contents {
padding: 3px 13px 6px; padding: 10px 20px;
border-radius: 3px; }
background: #edf1f5;
.unit-actions {
&.checked { border-bottom: none;
background: #d1dae3; padding-bottom: 0;
} }
input[type="radio"] { .published-alert {
margin-right: 7px; padding: 10px;
} border: 1px solid #edbd3c;
border-radius: 3px;
background: #fbf6e1;
font-size: 14px;
line-height: 1.4;
div {
margin-top: 15px;
} }
}
.save-button { .visibility-options .option {
@include white-button; margin-right: 10px;
margin-top: 10px; padding: 3px 13px 6px;
} border-radius: 3px;
background: #edf1f5;
.preview-button { &.checked {
@include white-button; background: #d1dae3;
margin-top: 10px;
} }
.publish-button { input[type="radio"] {
@include orange-button; margin-right: 7px;
margin-top: 10px;
} }
}
.status {
font-size: 12px;
.release-button { strong {
@include blue-button; font-weight: 700;
} }
}
.preview-button {
@include white-button;
margin-bottom: 10px;
}
.publish-button {
@include orange-button;
}
.save-button {
@include blue-button;
}
.save-button,
.preview-button,
.publish-button {
font-size: 11px;
margin-top: 10px;
padding: 6px 15px 8px;
}
} }
.unit-history { .unit-history {
&.collapsed { &.collapsed {
h4 { h4 {
border-bottom: none; border-bottom: none;
border-radius: 3px; border-radius: 3px;
} }
.window-contents { .window-contents {
display: none; display: none;
}
} }
}
ol { ol {
border: 1px solid #ced2db; border: 1px solid #ced2db;
li { li {
display: block; display: block;
padding: 6px 8px 8px 10px; padding: 6px 8px 8px 10px;
background: #edf1f5; background: #edf1f5;
font-size: 12px; font-size: 12px;
&:hover { &:hover {
background: #fffcf1; background: #fffcf1;
.item-actions { .item-actions {
display: block; display: block;
} }
} }
&.checked { &.checked {
background: #d1dae3; background: #d1dae3;
} }
.item-actions { .item-actions {
display: none; display: none;
} }
input[type="radio"] { input[type="radio"] {
margin-right: 7px; margin-right: 7px;
} }
}
} }
}
} }
.unit-location { .unit-location {
.url { .url {
width: 100%; width: 100%;
margin-bottom: 10px; margin-bottom: 10px;
box-shadow: none; box-shadow: none;
} }
.window-contents > ol { .window-contents > ol {
@include tree-view; @include tree-view;
ol { ol {
.section-item { .section-item {
padding-left: 30px; padding-left: 30px;
} }
.new-unit-item { .new-unit-item {
margin-left: 30px; margin-left: 30px;
} }
} }
ol ol { ol ol {
.section-item { .section-item {
padding-left: 50px; padding-left: 50px;
} }
.new-unit-item { .new-unit-item {
margin-left: 50px; margin-left: 50px;
} }
}
} }
}
} }
cms/templates/unit.html
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</article> </article>
</div> </div>
<div class="sidebar wip-box"> <div class="sidebar">
<div class="unit-properties window"> <div class="unit-properties window">
<h4>Unit Properties</h4> <h4>Unit Properties</h4>
<div class="window-contents"> <div class="window-contents">
...@@ -61,21 +61,19 @@ ...@@ -61,21 +61,19 @@
<a href="#" class="remove-date">Remove due date</a> <a href="#" class="remove-date">Remove due date</a>
</div> </div>
</div> </div>
<div class="visibility row"> <div class="row visibility">
<label>Visibility:<!-- <span class="description">Shows or hides this subsection and the units within it.</span>--></label> <label class="inline-label">Visibility:</label>
<a href="#" class="toggle-off">hidden</a><a href="#" class="large-toggle"></a><a href="#" class="toggle-on">shown</a>
</div>
<div class="status row">
<label class="inline-label">Status:</label>
<select> <select>
<option>Draft</option> <option>Public</option>
<option>Released</option> <option>Private</option>
</select> </select>
</div> </div>
<div class="row status">
<p>This unit is scheduled to be released to <strong>students</strong> on <strong>10/12/2012</strong> with the subsection <a href="#">"Administrivia and Circuit Elements."</a></p>
</div>
<div class="row unit-actions"> <div class="row unit-actions">
<a href="#" class="save-button">Save Draft</a> <a href="#" class="save-button">Save</a>
<a href="preview.html" target="_blank" class="preview-button">Preview</a> <a href="preview.html" target="_blank" class="preview-button">Preview</a>
<a href="#" class="release-button">Release</a>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment