Skip to content

E
edx-platform
Commit 0230ee40 by Frances Botsford Committed by cahrens
Options

unit publishing widget cleanup

parent 00549158
Showing with 289 additions and 29 deletions
cms/static/sass/elements/_modules.scss
...@@ -22,10 +22,16 @@ ...@@ -22,10 +22,16 @@
padding: ($baseline*.75) ($baseline*.75) $baseline ($baseline*.75); padding: ($baseline*.75) ($baseline*.75) $baseline ($baseline*.75);
.title { .title {
@extend %t-title7; @extend %t-title8;
margin-bottom: ($baseline/2); margin-bottom: ($baseline/4);
font-weight: 600; font-weight: 600;
color: $gray-d1; color: $gray-l2;
text-transform: uppercase;
}
.meta {
@extend %t-copy-sub2;
color: $gray-l1;
} }
} }
} }
...@@ -40,7 +46,6 @@ ...@@ -40,7 +46,6 @@
} }
} }
// green bar and title bg version // green bar and title bg version
%bar-module-green { %bar-module-green {
@extend %bar-module; @extend %bar-module;
...@@ -51,7 +56,6 @@ ...@@ -51,7 +56,6 @@
} }
} }
// yellow bar and title bg version // yellow bar and title bg version
%bar-module-yellow { %bar-module-yellow {
@extend %bar-module; @extend %bar-module;
...@@ -62,8 +66,6 @@ ...@@ -62,8 +66,6 @@
} }
} }
// red bar and title bg version // red bar and title bg version
%bar-module-red { %bar-module-red {
@extend %bar-module; @extend %bar-module;
...@@ -74,6 +76,16 @@ ...@@ -74,6 +76,16 @@
} }
} }
// black bar and title bg version
%bar-module-black {
@extend %bar-module;
border-top: 5px solid $black;
.bar-mod-title {
background-color: $gray-l4;
}
}
// Add new component menu with big green buttons // Add new component menu with big green buttons
// outermost wrapper for add a new component menu // outermost wrapper for add a new component menu
.add-xblock-component { .add-xblock-component {
......
cms/static/sass/views/_container.scss
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
} }
&.staff-only { &.staff-only {
@extend %bar-module; @extend %bar-module-black;
} }
.bar-mod-content { .bar-mod-content {
...@@ -125,15 +125,7 @@ ...@@ -125,15 +125,7 @@
padding: ($baseline/2) ($baseline*.75) ($baseline*.75) ($baseline*.75); padding: ($baseline/2) ($baseline*.75) ($baseline*.75) ($baseline*.75);
.title { .title {
@extend %t-title8;
margin-bottom: ($baseline/10); margin-bottom: ($baseline/10);
text-transform: uppercase;
color: $gray-l3;
}
.meta {
@extend %t-copy-sub2;
color: $gray-l1;
} }
} }
...@@ -156,8 +148,14 @@ ...@@ -156,8 +148,14 @@
.wrapper-visibility { .wrapper-visibility {
.copy { .copy {
margin-bottom: ($baseline/10);
font-weight: 600; font-weight: 600;
} }
.action-inline [class^="icon-"] {
margin: 0 ($baseline/4);
}
} }
.wrapper-pub-actions { .wrapper-pub-actions {
...@@ -218,7 +216,6 @@ ...@@ -218,7 +216,6 @@
.unit-id-value { .unit-id-value {
@extend %t-copy-sub1; @extend %t-copy-sub1;
display: inline-block; display: inline-block;
margin: ($baseline/4) 0;
} }
.tip { .tip {
...@@ -235,7 +232,7 @@ ...@@ -235,7 +232,7 @@
display: none; display: none;
} }
// need to explicitly set this since the html sturcture is different than the others // need to explicitly set this since the html structure is different than the others
.section-name:hover { .section-name:hover {
background: $blue-l5; background: $blue-l5;
color: $blue; color: $blue;
......
cms/templates/ux/reference/container.html
<%inherit file="../../base.html" /> <%inherit file="../../base.html" />
<%! <%!
from django.core.urlresolvers import reverse import logging
from util.date_utils import get_default_time_display
from django.utils.translation import ugettext as _
from contentstore.utils import reverse_usage_url
%> %>
<%block name="title">Container</%block> <%block name="title">Container</%block>
<%block name="bodyclass">is-signedin course uploads view-container</%block> <%block name="bodyclass">is-signedin course uploads view-container</%block>
...@@ -11,22 +16,38 @@ from django.core.urlresolvers import reverse ...@@ -11,22 +16,38 @@ from django.core.urlresolvers import reverse
<%block name="content"> <%block name="content">
<div id="content"> <div id="content">
<div class="wrapper-mast wrapper"> <div class="wrapper-mast wrapper">
<header class="mast has-navigation"> <header class="mast has-actions has-navigation has-subtitle">
<h1 class="page-header"> <div class="page-header">
<small class="navigation navigation-parents"> <small class="navigation navigation-parents subtitle">
<a href="#" class="navigation-link navigation-parent-previous">Parent of Unit Page</a> <a href="" class="navigation-item navigation-link navigation-parent">
<a href="#" class="navigation-link navigation-parent">Unit Page Super Long Title Name Goes Here Yeah Whats Up Parent</a> Section parent
<a href="#" class="navigation-link navigation-current">Container Name</a> </a>
<span class="navigation-item navigation-parent">Subsection parent</span>
</small> </small>
</h1> <div class="wrapper-xblock-field" data-field="display_name">
<h1 class="page-header-title is-editable xblock-field-value">Unit Example</h1>
</div>
</div>
<nav class="nav-actions"> <nav class="nav-actions">
<h3 class="sr">Page Actions</h3> <h3 class="sr">${_("Page Actions")}</h3>
<ul> <ul>
<li class="sr nav-item">
No Actions <!-- begin publishing changes -->
<li class="action-item action-view nav-item">
<a href="#" class="button view-button action-button">
<span class="action-button-text">${_("View Published Version")}</span>
</a>
</li>
<li class="action-item action-preview nav-item">
<a href="#" class="button preview-button action-button">
<span class="action-button-text">${_("Preview Changes")}</span>
</a>
</li> </li>
<!-- end publishing changes -->
</ul> </ul>
</nav> </nav>
</header> </header>
...@@ -432,6 +453,236 @@ from django.core.urlresolvers import reverse ...@@ -432,6 +453,236 @@ from django.core.urlresolvers import reverse
</section> </section>
</article> </article>
<aside class="content-supplementary" role="complimentary"> <aside class="content-supplementary" role="complimentary">
<!-- begin publishing changes 1 -->
<!-- case never published, future release no staff lock -->
<div class="bit-publishing ">
<h3 class="bar-mod-title pub-status"><span class="sr">${_("Publishing Status")} </span>${_("Draft (Never published)")}</h3>
<div class="wrapper-last-draft bar-mod-content">
<!-- case: unpubbed changes -->
<p class="copy meta">
Draft saved on 6/15/2014 at 12:45pm by amako
</p>
</div>
<!-- case: future release -->
<div class="wrapper-release bar-mod-content">
<h5 class="title">Scheduled to Release:</h5>
<p class="copy">
<span class="release-date">July 25, 2014</span> with
<span class="release-with">Section "Week 1"</span>
</p>
</div>
<!-- case: staff and students - no lock -->
<div class="wrapper-visibility bar-mod-content">
<h5 class="title">Will be Visible to:</h5>
<p class="copy">Staff and Students</p>
<p class="action-inline">
<a href="">
<i class="icon-unlock"></i> Hide from Students
</a>
</p>
</div>
<!-- case: future release -->
<div class="wrapper-pub-actions bar-mod-actions">
<ul class="action-list">
<li class="action-item"><a class="action-publish action-primary" href="">Publish</a></li>
<li class="action-item"><a class="action-discard action-secondary is-disabled" href="">Discard Changes</a></li>
</ul>
</div>
</div>
<!-- end publishing changes 1 -->
<!-- begin publishing changes 2 -->
<!-- case published no changes, future release no staff lock -->
<div class="bit-publishing published">
<h3 class="bar-mod-title pub-status"><span class="sr">${_("Publishing Status")} </span>${_("Published")}</h3>
<div class="wrapper-last-draft bar-mod-content">
<!-- case: unpubbed changes -->
<p class="copy meta">
Last published on 6/15/2014 at 12:45pm by amako
</p>
</div>
<!-- case: future release -->
<div class="wrapper-release bar-mod-content">
<h5 class="title">Scheduled to Release:</h5>
<p class="copy">
<span class="release-date">July 25, 2014</span> with
<span class="release-with">Section "Week 1"</span>
</p>
</div>
<!-- case: staff and students - no lock -->
<div class="wrapper-visibility bar-mod-content">
<h5 class="title">Will be Visible to:</h5>
<p class="copy">Staff and Students</p>
<p class="action-inline">
<a href="">
<i class="icon-unlock"></i> Hide from Students
</a>
</p>
</div>
<!-- case: future release -->
<div class="wrapper-pub-actions bar-mod-actions">
<ul class="action-list">
<li class="action-item"><a class="action-publish action-primary is-disabled" href="">Publish</a></li>
<li class="action-item"><a class="action-discard action-secondary is-disabled" href="">Discard Changes</a></li>
</ul>
</div>
</div>
<!-- end publishing changes 2 -->
<!-- begin publishing changes 3 -->
<!-- case unpubbed changes, future release no staff lock -->
<div class="bit-publishing draft">
<h3 class="bar-mod-title pub-status"><span class="sr">${_("Publishing Status")} </span>${_("Draft (Unpublished changes)")}</h3>
<div class="wrapper-last-draft bar-mod-content">
<!-- case: unpubbed changes -->
<p class="copy meta">
Draft saved on 6/15/2014 at 12:45pm by amako
</p>
</div>
<!-- case: future release -->
<div class="wrapper-release bar-mod-content">
<h5 class="title">Scheduled to Release:</h5>
<p class="copy">
<span class="release-date">July 25, 2014</span> with
<span class="release-with">Section "Week 1"</span>
</p>
</div>
<!-- case: staff and students - no lock -->
<div class="wrapper-visibility bar-mod-content">
<h5 class="title">Will be Visible to:</h5>
<p class="copy">Staff and Students</p>
<p class="action-inline">
<a href="">
<i class="icon-unlock"></i> Hide from Students
</a>
</p>
</div>
<!-- case: future release -->
<div class="wrapper-pub-actions bar-mod-actions">
<ul class="action-list">
<li class="action-item"><a class="action-publish action-primary" href="">Publish</a></li>
<li class="action-item"><a class="action-discard action-secondary" href="">Discard Changes</a></li>
</ul>
</div>
</div>
<!-- end publishing changes 3 -->
<!-- begin publishing changes 4 -->
<!-- case unpubbed changes, future release with staff lock -->
<div class="bit-publishing draft staff-only">
<h3 class="bar-mod-title pub-status"><span class="sr">${_("Publishing Status")} </span>${_("Draft (Unpublished changes)")}</h3>
<div class="wrapper-last-draft bar-mod-content">
<!-- case: unpubbed changes -->
<p class="copy meta">
Draft saved on 6/15/2014 at 12:45pm by amako
</p>
</div>
<!-- case: future release -->
<div class="wrapper-release bar-mod-content">
<h5 class="title">Scheduled to Release:</h5>
<p class="copy">
<span class="release-date">July 25, 2014</span> with
<span class="release-with">Section "Week 1"</span>
</p>
</div>
<!-- case: staff and students - no lock -->
<div class="wrapper-visibility bar-mod-content">
<h5 class="title">Will be Visible to:</h5>
<p class="copy">Staff only</p>
<p class="action-inline">
<a href="">
<i class="icon-lock"></i> Hidden from Students
</a>
</p>
</div>
<!-- case: future release -->
<div class="wrapper-pub-actions bar-mod-actions">
<ul class="action-list">
<li class="action-item"><a class="action-publish action-primary" href="">Publish</a></li>
<li class="action-item"><a class="action-discard action-secondary" href="">Discard Changes</a></li>
</ul>
</div>
</div>
<!-- end publishing changes 4 -->
<!-- begin publishing changes 5 -->
<!-- case published no changes, release in past no staff lock -->
<div class="bit-publishing published">
<h3 class="bar-mod-title pub-status"><span class="sr">${_("Publishing Status")} </span>${_("Published")}</h3>
<div class="wrapper-last-draft bar-mod-content">
<!-- case: unpubbed changes -->
<p class="copy meta">
Last published on 6/15/2014 at 12:45pm by amako
</p>
</div>
<!-- case: future release -->
<div class="wrapper-release bar-mod-content">
<h5 class="title">Released:</h5>
<p class="copy">
<span class="release-date">May 25, 2014</span> with
<span class="release-with">Section "Week 1"</span>
</p>
</div>
<!-- case: staff and students - no lock -->
<div class="wrapper-visibility bar-mod-content">
<h5 class="title">Currently Visible to:</h5>
<p class="copy">Staff and Students</p>
<p class="action-inline">
<a href="">
<i class="icon-unlock"></i> Hide from Students
</a>
</p>
</div>
<!-- case: future release -->
<div class="wrapper-pub-actions bar-mod-actions">
<ul class="action-list">
<li class="action-item"><a class="action-publish action-primary is-disabled" href="">Publish</a></li>
<li class="action-item"><a class="action-discard action-secondary is-disabled" href="">Discard Changes</a></li>
</ul>
</div>
</div>
<!-- end publishing changes 2 -->
<div class="bit-publishing"> <div class="bit-publishing">
<h3 class="title-3">Publishing Status</h3> <h3 class="title-3">Publishing Status</h3>
<p class="copy">This content is published with unit <a href="">Unit 1</a>. To make changes to the content of this container, place <a href="">Unit 1</a> in draft mode.</p> <p class="copy">This content is published with unit <a href="">Unit 1</a>. To make changes to the content of this container, place <a href="">Unit 1</a> in draft mode.</p>
......
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