added release button; cleaned up toggle button

This commit is contained in:
Tom Giannattasio
2012-10-01 15:49:34 -04:00
parent f4b8bfe428
commit 4d985dc0c7
5 changed files with 39 additions and 12 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@@ -17,13 +17,17 @@
line-height: 18px;
}
a {
a,
.username {
float: left;
display: inline-block;
height: 29px;
padding: 7px 15px 0;
color: #e4e6ee;
box-shadow: 1px 0 0 rgba(255, 255, 255, 0.2) inset, -1px 0 0 rgba(0, 0, 0, 0.3) inset;
}
a {
box-shadow: 1px 0 0 #787981 inset, -1px 0 0 #3d3e44 inset, 1px 0 0 #787981, -1px 0 0 #3d3e44;
&:hover {
background: rgba(255, 255, 255, .1);

View File

@@ -263,6 +263,10 @@
}
}
.status {
display: none;
}
.visibility-options .option {
margin-right: 10px;
padding: 3px 13px 6px;
@@ -279,7 +283,7 @@
}
.save-button {
@include blue-button;
@include white-button;
margin-top: 10px;
}
@@ -292,6 +296,10 @@
@include orange-button;
margin-top: 10px;
}
.release-button {
@include blue-button;
}
}
.unit-history {

View File

@@ -1,5 +1,6 @@
<%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %>
<%block name="bodyclass">unit</%block>
<%block name="title">CMS Unit</%block>
<%block name="content">
<div class="main-wrapper">
@@ -62,11 +63,19 @@
</div>
<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>
<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>
<option>Draft</option>
<option>Released</option>
</select>
</div>
<div class="row unit-actions">
<a href="#" class="save-button">Save</a>
<a href="#" class="save-button">Save Draft</a>
<a href="preview.html" target="_blank" class="preview-button">Preview</a>
<a href="#" class="release-button">Release</a>
</div>
</div>
</div>

View File

@@ -1,12 +1,18 @@
<%! from django.core.urlresolvers import reverse %>
<header>
<nav>
<a href="/">Home</a>
<h2><a href="#">edX CMS: TODO:-course-name-here</a></h2>
<ul class="user-nav">
<li><a href="#" class="wip">Tasks</a></li>
<li><a href="#" class="wip">Settings</a></li>
<header class="primary-header">
<nav class="inner-wrapper">
<div class="left">
<a href="/"><span class="home-icon"></span></a>
<a href="#" class="class-name wip-box">6.002x Circuits and Electronics <span class="drop-icon"></span></a>
<ul class="class-nav">
<li><a href="overview-full.html" class="active">Courseware</a></li>
<li><a href="updates.html" class="wip-box">Course Info</a></li>
<li><a href="textbook.html" class="wip-box">Textbook</a></li>
</ul>
</div>
<div class="right">
<span class="username">${ user.username }</span>
% if user.is_authenticated():
<li><a href="${reverse('logout')}">Log out</a></li>
% else: