Skip to content

E
edx-platform
Commit 93478d53 by Kyle Fiedler
Options

Added scratch on the calendar view and added handles on the calendar view

parent 57b605db
Showing with 325 additions and 171 deletions
cms/static/css/base-style.css
......@@ -256,7 +256,9 @@ section.sequence-edit > section.content > div section.scratch-pad ol li ul li.em
width: 7px;
min-height: 14px;
background: url("../img/drag-handle.png") no-repeat center;
text-indent: -9999px; }
text-indent: -9999px;
display: block;
float: right; }
section.cal {
-webkit-box-sizing: border-box;
......@@ -679,14 +681,27 @@ section.sequence-edit > section.content {
section.week-new > section.content > div section header,
section.sequence-edit > section.content > div section header {
background: #eee;
padding: 10px;
border-bottom: 1px solid #ccc; }
padding: 6px;
border-bottom: 1px solid #ccc;
zoom: 1; }
section.week-edit > section.content > div section header:before, section.week-edit > section.content > div section header:after,
section.week-new > section.content > div section header:before,
section.week-new > section.content > div section header:after,
section.sequence-edit > section.content > div section header:before,
section.sequence-edit > section.content > div section header:after {
content: "";
display: table; }
section.week-edit > section.content > div section header:after,
section.week-new > section.content > div section header:after,
section.sequence-edit > section.content > div section header:after {
clear: both; }
section.week-edit > section.content > div section header h2,
section.week-new > section.content > div section header h2,
section.sequence-edit > section.content > div section header h2 {
text-transform: uppercase;
letter-spacing: 1px;
font-size: 12px; }
font-size: 12px;
float: left; }
section.week-edit > section.content > div section.modules,
section.week-new > section.content > div section.modules,
section.sequence-edit > section.content > div section.modules {
......@@ -737,26 +752,37 @@ section.sequence-edit > section.content {
section.week-new > section.content > div section.modules ol li ol li,
section.sequence-edit > section.content > div section.modules ol li ol li {
padding: 6px; }
section.week-edit > section.content > div section.modules ol li ol li:hover a.draggable,
section.week-new > section.content > div section.modules ol li ol li:hover a.draggable,
section.sequence-edit > section.content > div section.modules ol li ol li:hover a.draggable {
opacity: 1; }
section.week-edit > section.content > div section.modules ol li ol li a.draggable,
section.week-new > section.content > div section.modules ol li ol li a.draggable,
section.sequence-edit > section.content > div section.modules ol li ol li a.draggable {
float: right;
opacity: .5; }
section.week-edit > section.content > div section.modules ol li ol li.group,
section.week-new > section.content > div section.modules ol li ol li.group,
section.sequence-edit > section.content > div section.modules ol li ol li.group {
padding: 0;
border-left: 4px solid #999; }
padding: 0; }
section.week-edit > section.content > div section.modules ol li ol li.group header,
section.week-new > section.content > div section.modules ol li ol li.group header,
section.sequence-edit > section.content > div section.modules ol li ol li.group header {
padding: 3px 6px;
padding: 6px;
background: none; }
section.week-edit > section.content > div section.modules ol li ol li.group header h3,
section.week-new > section.content > div section.modules ol li ol li.group header h3,
section.sequence-edit > section.content > div section.modules ol li ol li.group header h3 {
text-transform: uppercase;
letter-spacing: 1px;
font-size: 12px; }
section.week-edit > section.content > div section.modules ol li ol li.group ol li:last-child,
section.week-new > section.content > div section.modules ol li ol li.group ol li:last-child,
section.sequence-edit > section.content > div section.modules ol li ol li.group ol li:last-child {
font-size: 14px; }
section.week-edit > section.content > div section.modules ol li ol li.group ol,
section.week-new > section.content > div section.modules ol li ol li.group ol,
section.sequence-edit > section.content > div section.modules ol li ol li.group ol {
border-left: 4px solid #999;
border-bottom: 0; }
section.week-edit > section.content > div section.modules ol li ol li.group ol li:last-child,
section.week-new > section.content > div section.modules ol li ol li.group ol li:last-child,
section.sequence-edit > section.content > div section.modules ol li ol li.group ol li:last-child {
border-bottom: 0; }
section.week-edit > section.content > div section.scratch-pad,
section.week-new > section.content > div section.scratch-pad,
section.sequence-edit > section.content > div section.scratch-pad {
......
cms/static/sass/_base.scss
......@@ -108,4 +108,6 @@ input[type="submit"], .button {
min-height: 14px;
background: url('../img/drag-handle.png') no-repeat center;
text-indent: -9999px;
display: block;
float: right;
}
cms/static/sass/_week.scss
......@@ -67,16 +67,19 @@ section.sequence-edit {
display: table;
border: 1px solid;
width: 100%;
section {
header {
background: #eee;
padding: 10px;
padding: 6px;
border-bottom: 1px solid #ccc;
@include clearfix;
h2 {
text-transform: uppercase;
letter-spacing: 1px;
font-size: 12px;
float: left;
}
}
......@@ -118,22 +121,34 @@ section.sequence-edit {
li {
padding: 6px;
&:hover {
a.draggable {
opacity: 1;
}
}
a.draggable {
float: right;
opacity: .5;
}
&.group {
padding: 0;
border-left: 4px solid #999;
header {
padding: 3px 6px;
padding: 6px;
background: none;
h3 {
text-transform: uppercase;
letter-spacing: 1px;
font-size: 12px;
font-size: 14px;
}
}
ol {
border-left: 4px solid #999;
border-bottom: 0;
li {
&:last-child {
border-bottom: 0;
......@@ -185,9 +200,9 @@ section.sequence-edit {
padding: 12px;
a {
@extend .button;
display: block;
text-align: center;
@extend .button;
display: block;
text-align: center;
}
}
......
cms/templates/widgets/navigation.html
......@@ -45,10 +45,22 @@
</header>
<ul>
<li class="seq"><a href="#" class="sequence-edit">Lecture Sequence</a></li>
<li class="seq"><a href="#" class="sequence-edit">Lecture Sequence</a></li>
<li class="lab"><a href="#" class="lab-edit">Lab</a></li>
<li class="hw">Homework</li>
<li class="seq">
<a href="#" class="sequence-edit">Lecture Sequence</a>
<a href="#" class="draggable">handle</a>
</li>
<li class="seq">
<a href="#" class="sequence-edit">Lecture Sequence
<a href="#" class="draggable">handle</a>
</a></li>
<li class="lab">
<a href="#" class="lab-edit">Lab</a>
<a href="#" class="draggable">handle</a>
</li>
<li class="hw">
<a href="#">Homework</a>
<a href="#" class="draggable">handle</a>
</li>
<%include file="module-dropdown.html"/>
</ul>
</li>
......@@ -61,10 +73,22 @@
</header>
<ul>
<li class="seq">Lecture Sequence</li>
<li class="seq">Lecture Sequence</li>
<li class="lab">Lab</li>
<li class="hw">Homework</li>
<li class="seq">
<a href="#" class="sequence-edit">Lecture Sequence</a>
<a href="#" class="draggable">handle</a>
</li>
<li class="seq">
<a href="#" class="sequence-edit">Lecture Sequence
<a href="#" class="draggable">handle</a>
</a></li>
<li class="lab">
<a href="#" class="lab-edit">Lab</a>
<a href="#" class="draggable">handle</a>
</li>
<li class="hw">
<a href="#">Homework</a>
<a href="#" class="draggable">handle</a>
</li>
<%include file="module-dropdown.html"/>
</ul>
</li>
......@@ -77,9 +101,19 @@
</header>
<ul>
<li class="lab">Lab</li>
<li class="lab">Lab</li>
<li class="hw">Homework</li>
<li class="lab">
<a href="#" class="lab-edit">Lab</a>
<a href="#" class="draggable">handle</a>
</li>
<li class="lab">
<a href="#" class="lab-edit">Lab</a>
<a href="#" class="draggable">handle</a>
</li>
<li class="hw">
<a href="#">Homework</a>
<a href="#" class="draggable">handle</a>
</li>
<%include file="module-dropdown.html"/>
</ul>
</li>
......@@ -93,10 +127,22 @@
</header>
<ul>
<li class="seq">Lecture Sequence</li>
<li class="lab">Lab</li>
<li class="hw">Homework</li>
<li class="hw">Homework</li>
<li class="seq">
<a href="#" class="sequence-edit">Lecture Sequence</a>
<a href="#" class="draggable">handle</a>
</li>
<li class="lab">
<a href="#" class="lab-edit">Lab</a>
<a href="#" class="draggable">handle</a>
</li>
<li class="hw">
<a href="#">Homework</a>
<a href="#" class="draggable">handle</a>
</li>
<li class="hw">
<a href="#">Homework</a>
<a href="#" class="draggable">handle</a>
</li>
<%include file="module-dropdown.html"/>
</ul>
</li>
......@@ -137,6 +183,30 @@
<%include file="module-dropdown.html"/>
</ul>
</li>
<li>
<header>
<h1>Course Scratch Pad</h1>
</header>
<ul>
<li>
<a href="#" class="problem-edit">Problem title 11</a>
<a href="#" class="draggable">handle</a>
</li>
<li>
<a href="#" class="problem-edit">Problem title 13 </a>
<a href="#" class="draggable">handle</a>
</li>
<li>
<a href="#" class="problem-edit"> Problem title 14</a>
<a href="#" class="draggable">handle</a>
</li>
<li>
<a href="" class="video-edit">Video 3</a>
<a href="#" class="draggable">handle</a>
</li>
</ul>
</li>
</ol>
<section class="new-section">
......
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