Skip to content

E
edx-platform
Commit aa0aa653 by Calen Pennington
Options

Clean up unit.html with layout/css from tom

parent 96a91421
Showing with 57 additions and 30 deletions
cms/static/sass/_unit.scss
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
&.new-component-item { &.new-component-item {
padding: 0; padding: 0;
border: 1px solid $darkGrey; border: 1px solid #8891a1;
border-radius: 3px; border-radius: 3px;
background: -webkit-linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0)) #d1dae3; 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; box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset;
...@@ -150,11 +150,10 @@ ...@@ -150,11 +150,10 @@
} }
.new-component-button { .new-component-button {
@include grey-button;
display: block; display: block;
padding: 20px;
text-align: center; text-align: center;
padding: 20px 0; color: #6d788b;
border: none;
} }
h5 { h5 {
...@@ -169,7 +168,7 @@ ...@@ -169,7 +168,7 @@
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
} }
.new-component-type { .new-component-type, .new-component-template {
@include clearfix; @include clearfix;
a { a {
...@@ -202,22 +201,27 @@ ...@@ -202,22 +201,27 @@
} }
} }
.new-component-step-1, .new-component-template {
.new-component-step-2 { a {
height: 60px;
}
}
.new-component,
.new-component-templates {
display: none; display: none;
padding: 20px; padding: 20px;
.cancel-button {
@include blue-button;
border-color: #30649c;
} }
} }
} }
.video-unit img,
.discussion-unit img {
width: 100%;
} }
} }
.component-editor, .component-editor {
.new-component-step-2 {
@include edit-box; @include edit-box;
display: none; display: none;
padding: 20px; padding: 20px;
......
cms/templates/unit.html
...@@ -4,14 +4,9 @@ ...@@ -4,14 +4,9 @@
<%block name="content"> <%block name="content">
<div class="main-wrapper"> <div class="main-wrapper">
<div class="inner-wrapper"> <div class="inner-wrapper">
<div class="main-column">
<article class="unit-body window"> <article class="unit-body window">
<nav class="breadcrumbs"> <p class="unit-name-input"><label>Display Name:</label><input type="text" value="${unit.display_name}" class="unit-display-name-input" /></p>
<ul>
<li><a href="#">Week 2</a></li>
<li><a href="#">Linearity and Superposition</a></li>
<li><span class="current-page">${unit.display_name}</span></li>
</ul>
</nav>
<ol class="components" data-id="${unit.location.url()}"> <ol class="components" data-id="${unit.location.url()}">
% for id in components: % for id in components:
<li class="component" data-id="${id}"/> <li class="component" data-id="${id}"/>
...@@ -51,28 +46,56 @@ ...@@ -51,28 +46,56 @@
</li> </li>
</ol> </ol>
</article> </article>
</div>
<div class="sidebar"> <div class="sidebar">
<div class="unit-properties window"> <div class="unit-properties window">
<h4>Properties</h4> <h4>Unit Properties</h4>
<div class="window-contents"> <div class="window-contents">
<div class="row"><label>Display Name:</label><input type="text" value="${unit.display_name}" /></div> <div class="due-date-input row">
<div class="row"> <label>Due date:</label>
<label>State:</label> <a href="#" class="set-date">Set a due date</a>
<div class="visibility-options"> <div class="date-setter">
<span class="option checked"><input type="radio" name="visibility" id="visibility-hidden" checked /><label for="visibility-hidden">Draft</label></span> <p class="date-description"><input type="text" value="10/20/2012" class="date-input" /> <input type="text" value="6:00 am" class="time-input" />
<span class="option"><input type="radio" name="visibility" id="visibility-visible" /><label for="visibility-visible">Final</label></span> <a href="#" class="remove-date">Remove due date</a>
</div> </div>
</div> </div>
<div class="row"> <div class="visibility row">
<label>Visibility:<!-- <span class="description">Shows or hides this subsection and the units within it.</span>--></label>
<a href="#" class="toggle-off">hide</a><a href="#" class="large-toggle"></a><a href="#" class="toggle-on">show</a>
</div>
<div class="row unit-actions">
<a href="#" class="save-button">Save</a> <a href="#" class="save-button">Save</a>
<a href="preview.html" target="_blank" class="preview-button">Preview</a>
</div> </div>
</div> </div>
</div> </div>
<div class="unit-history window collapsed"> <div class="window unit-location">
<h4><a href="#" class="expand-collapse-icon expand"></a>History</h4> <h4>Unit Location</h4>
<div class="window-contents"> <div class="window-contents">
<div><input type="text" class="url" value="/courseware/Week_1/My_Unit" disabled /></div>
<ol>
<li>
<a href="#" class="section-item">Week 1</a>
<ol>
<li>
<a href="#" class="section-item"><span class="folder-icon"></span>Administrivia and Circuit Elements</a>
<ol> <ol>
<li><a href="#" class="section-item"><span class="file-icon"></span>Motiviation for 6.002</a></li>
<li><a href="#" class="section-item"><span class="file-icon"></span>Administrivia</a></li>
<li><a href="#" class="section-item"><span class="file-icon"></span>Course Overview</a></li>
<li><a href="#" class="section-item"><span class="file-icon"></span>Lumped Element Abstraction</a></li>
<li><a href="#" class="section-item"><span class="file-icon"></span>Simple Power</a></li>
<li><a href="#" class="current section-item"><span class="file-icon"></span>New Unit</a></li>
<li>
<a href="unit.html" class="new-unit-item">
<span class="new-unit-icon"></span>New Unit
</a>
</li>
</ol>
</li>
</ol>
</li>
</ol> </ol>
</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