Skip to content

E
edx-platform
Commit 9f5eeaf8 by Don Mitchell
Options

Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into… 

Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding

Conflicts:
	cms/templates/settings.html
	cms/templates/widgets/header.html
parents 31393043 ed42fa88
Showing with 104 additions and 54 deletions
cms/static/js/base.js
...@@ -63,7 +63,7 @@ $(document).ready(function() { ...@@ -63,7 +63,7 @@ $(document).ready(function() {
}); });
// general link management - new window/tab // general link management - new window/tab
$('a[rel="external"]').attr('title','This link will open in a new browser/window tab').click(function(e) { $('a[rel="external"]').attr('title','This link will open in a new browser window/tab').click(function(e) {
window.open($(this).attr('href')); window.open($(this).attr('href'));
e.preventDefault(); e.preventDefault();
}); });
......
cms/static/sass/_cms_mixins.scss
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
} }
} }
&:hover { &:hover, &.active {
@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 1px 1px rgba(0, 0, 0, .15)); @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 1px 1px rgba(0, 0, 0, .15));
} }
} }
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
background-color: $blue; background-color: $blue;
color: #fff; color: #fff;
&:hover { &:hover, &.active {
background-color: #62aaf5; background-color: #62aaf5;
color: #fff; color: #fff;
} }
......
cms/static/sass/_header.scss
...@@ -63,12 +63,9 @@ nav .nav-item { ...@@ -63,12 +63,9 @@ nav .nav-item {
vertical-align: top; vertical-align: top;
} }
.branding, .info-course {
margin: 0 ($baseline*0.75) 0 0;
}
.branding { .branding {
position: relative; position: relative;
margin: 0 ($baseline*0.75) 0 0;
padding-right: ($baseline*0.75); padding-right: ($baseline*0.75);
a { a {
...@@ -85,7 +82,7 @@ nav .nav-item { ...@@ -85,7 +82,7 @@ nav .nav-item {
// specific elements - course name/info // specific elements - course name/info
.info-course { .info-course {
position: relative; position: relative;
margin-top: -3px; margin: -3px ($baseline/2) 0 0;
padding-right: ($baseline*0.75); padding-right: ($baseline*0.75);
@include font-size(14); @include font-size(14);
...@@ -172,14 +169,6 @@ nav .nav-item { ...@@ -172,14 +169,6 @@ nav .nav-item {
} }
} }
// current state
&.is-current {
.title, .icon-expanded {
color: $blue;
}
}
// specific nav items // specific nav items
&.nav-course-courseware { &.nav-course-courseware {
} }
...@@ -204,6 +193,13 @@ nav .nav-item { ...@@ -204,6 +193,13 @@ nav .nav-item {
.nav-account-username { .nav-account-username {
width: 100%; width: 100%;
.icon-user {
display: inline-block;
vertical-align: middle;
margin-right: 3px;
@include font-size(12);
}
.account-username { .account-username {
display: inline-block; display: inline-block;
width: 80%; width: 80%;
...@@ -473,17 +469,67 @@ nav .nav-item { ...@@ -473,17 +469,67 @@ nav .nav-item {
// ==================== // ====================
// STATE: active/current nav states // STATE: active/current nav states
.nav-item.is-current,
body.howitworks .nav-not-signedin-hiw, body.howitworks .nav-not-signedin-hiw,
body.signin .nav-not-signedin-signin,
body.signup .nav-not-signedin-signup, // dashboard
body.course.outline .nav-course-courseware body.dashboard .nav-account-dashboard,
// course content
body.course.outline .nav-course-courseware .title,
body.course.updates .nav-course-courseware .title,
body.course.pages .nav-course-courseware .title,
body.course.uploads .nav-course-courseware .title,
body.course.outline .nav-course-courseware-outline,
body.course.updates .nav-course-courseware-updates,
body.course.pages .nav-course-courseware-pages,
body.course.uploads .nav-course-courseware-uploads,
// course settings
body.course.schedule .nav-course-settings .title,
body.course.grading .nav-course-settings .title,
body.course.team .nav-course-settings .title,
body.course.advanced .nav-course-settings .title,
body.course.schedule .nav-course-settings-schedule,
body.course.grading .nav-course-settings-grading,
body.course.team .nav-course-settings-team,
body.course.advanced .nav-course-settings-advanced,
// course tools
body.course.import .nav-course-tools .title,
body.course.export .nav-course-tools .title,
body.course.import .nav-course-tools-import,
body.course.export .nav-course-tools-export,
{ {
color: $blue;
a { a {
color: $blue; color: $blue;
} }
} }
body.signup .nav-not-signedin-signin {
a {
background-color: #d9e3ee;
color: #6d788b;
}
}
body.signin .nav-not-signedin-signup {
a {
background-color: #62aaf5;
color: #fff;
}
}
// ==================== // ====================
// STATE: js enabled // STATE: js enabled
......
cms/static/sass/_static-pages.scss
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
&.new-component-item { &.new-component-item {
margin-top: 20px; margin-top: 20px;
background: transparent;
} }
} }
......
cms/templates/asset_index.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="bodyclass">assets</%block> <%block name="bodyclass">is-signedin course uploads</%block>
<%block name="title">Courseware Assets</%block> <%block name="title">Uploads &amp; Files</%block>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
......
cms/templates/base.html
...@@ -5,7 +5,14 @@ ...@@ -5,7 +5,14 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><%block name="title"></%block></title> <title>
<%block name="title"></%block> |
% if context_course:
<% ctx_loc = context_course.location %>
${context_course.display_name} |
% endif
edX Studio
</title>
<meta name="viewport" content="width=device-width,initial-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="path_prefix" content="${MITX_ROOT_URL}"> <meta name="path_prefix" content="${MITX_ROOT_URL}">
......
cms/templates/course_index.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%block name="title">Course Manager</%block>
<%include file="widgets/header.html"/> <%include file="widgets/header.html"/>
......
cms/templates/course_info.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<!-- TODO decode course # from context_course into title --> <!-- TODO decode course # from context_course into title -->
<%block name="title">Course Info</%block> <%block name="title">Updates</%block>
<%block name="bodyclass">is-signedin course course-info updates</%block> <%block name="bodyclass">is-signedin course course-info updates</%block>
......
cms/templates/edit-static-page.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">Edit Static Page</%block> <%block name="title">Editing Static Page</%block>
<%block name="bodyclass">is-signedin course pages edit-static-page</%block> <%block name="bodyclass">is-signedin course pages edit-static-page</%block>
<%block name="content"> <%block name="content">
......
cms/templates/edit-tabs.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">Tabs</%block> <%block name="title">Static Pages</%block>
<%block name="bodyclass">is-signedin course pages static-pages</%block> <%block name="bodyclass">is-signedin course pages static-pages</%block>
<%block name="jsextra"> <%block name="jsextra">
......
cms/templates/export.html
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">Export</%block> <%block name="title">Export Course</%block>
<%block name="bodyclass">is-signedin course export</%block> <%block name="bodyclass">is-signedin course tools export</%block>
<%block name="content"> <%block name="content">
<div class="main-wrapper"> <div class="main-wrapper">
......
cms/templates/howitworks.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">Welcome to edX Studio</%block> <%block name="title">Welcome</%block>
<%block name="bodyclass">not-signedin index howitworks</%block> <%block name="bodyclass">not-signedin index howitworks</%block>
<%block name="content"> <%block name="content">
......
cms/templates/import.html
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">Import</%block> <%block name="title">Import Course</%block>
<%block name="bodyclass">is-signedin course import</%block> <%block name="bodyclass">is-signedin course tools import</%block>
<%block name="content"> <%block name="content">
<div class="main-wrapper"> <div class="main-wrapper">
......
cms/templates/login.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">Sign in</%block> <%block name="title">Sign In</%block>
<%block name="bodyclass">not-signedin signin</%block> <%block name="bodyclass">not-signedin signin</%block>
<%block name="content"> <%block name="content">
......
cms/templates/manage_users.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%block name="title">Course Staff Manager</%block> <%block name="title">Course Staff Manager</%block>
<%block name="bodyclass">is-signedin course users team</%block> <%block name="bodyclass">is-signedin course users settings team</%block>
<%block name="content"> <%block name="content">
......
cms/templates/overview.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
from datetime import datetime from datetime import datetime
%> %>
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">CMS Courseware Overview</%block> <%block name="title">Course Outline</%block>
<%block name="bodyclass">is-signedin course outline</%block> <%block name="bodyclass">is-signedin course outline</%block>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
......
cms/templates/signup.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">Sign up</%block> <%block name="title">Sign Up</%block>
<%block name="bodyclass">not-signedin signup</%block> <%block name="bodyclass">not-signedin signup</%block>
<%block name="content"> <%block name="content">
......
cms/templates/unit.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%namespace name="units" file="widgets/units.html" /> <%namespace name="units" file="widgets/units.html" />
<%block name="title">CMS Unit</%block> <%block name="title">Individual Unit</%block>
<%block name="bodyclass">is-signedin course unit</%block> <%block name="bodyclass">is-signedin course unit</%block>
<%block name="jsextra"> <%block name="jsextra">
......
cms/templates/widgets/footer.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="wrapper-footer wrapper"> <div class="wrapper-footer wrapper">
<footer class="primary" role="contentinfo"> <footer class="primary" role="contentinfo">
<div class="colophon"> <div class="colophon">
<p>&copy; 2013 <a href="http://www.edx.org" rel="external">edX</a>. All rights reversed.</p> <p>&copy; 2013 <a href="http://www.edx.org" rel="external">edX</a>. All rights reserved.</p>
</div> </div>
<nav class="nav-peripheral"> <nav class="nav-peripheral">
......
cms/templates/widgets/header.html
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
<div class="wrapper wrapper-nav-sub"> <div class="wrapper wrapper-nav-sub">
<div class="nav-sub"> <div class="nav-sub">
<ul> <ul>
<li class="nav-item"><a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Outline</a></li> <li class="nav-item nav-course-courseware-outline"><a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Outline</a></li>
<li class="nav-item"><a href="${reverse('course_info', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Updates</a></li> <li class="nav-item nav-course-courseware-updates"><a href="${reverse('course_info', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Updates</a></li>
<li class="nav-item"><a href="${reverse('edit_tabs', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, coursename=ctx_loc.name))}">Static Pages</a></li> <li class="nav-item nav-course-courseware-pages"><a href="${reverse('edit_tabs', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, coursename=ctx_loc.name))}">Static Pages</a></li>
<li class="nav-item"><a href="${reverse('asset_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Files &amp; Uploads</a></li> <li class="nav-item nav-course-courseware-uploads"><a href="${reverse('asset_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Files &amp; Uploads</a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -41,10 +41,10 @@ ...@@ -41,10 +41,10 @@
<div class="wrapper wrapper-nav-sub"> <div class="wrapper wrapper-nav-sub">
<div class="nav-sub"> <div class="nav-sub">
<ul> <ul>
<li class="nav-item"><a href="${reverse('contentstore.views.get_course_settings', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Schedule &amp; Details</a></li> <li class="nav-item nav-course-settings-schedule"><a href="${reverse('contentstore.views.get_course_settings', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Schedule &amp; Details</a></li>
<li class="nav-item"><a href="${reverse('contentstore.views.course_config_graders_page', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Grading</a></li> <li class="nav-item nav-course-settings-grading"><a href="${reverse('contentstore.views.course_config_graders_page', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Grading</a></li>
<li class="nav-item"><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}">Course Team</a></li> <li class="nav-item nav-course-settings-team"><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}">Course Team</a></li>
<li class="nav-item"><a href="${reverse('course_settings', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Advanced Settings</a></li> <li class="nav-item nav-course-settings-advanced"><a href="${reverse('course_settings', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Advanced Settings</a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
<div class="wrapper wrapper-nav-sub"> <div class="wrapper wrapper-nav-sub">
<div class="nav-sub"> <div class="nav-sub">
<ul> <ul>
<li class="nav-item"><a href="${reverse('import_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Import</a></li> <li class="nav-item nav-course-tools-import"><a href="${reverse('import_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Import</a></li>
<li class="nav-item"><a href="${reverse('export_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Export</a></li> <li class="nav-item nav-course-tools-export"><a href="${reverse('export_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Export</a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<li class="nav-item nav-account-username"> <li class="nav-item nav-account-username">
<a href="#" class="title"> <a href="#" class="title">
<span class="account-username"> <span class="account-username">
<i class="ss-icon ss-symbolicons-standard">&#x1F464;</i> <i class="ss-icon ss-symbolicons-standard icon-user">&#x1F464;</i>
${ user.username } ${ user.username }
</span> </span>
<i class="ss-icon ss-symbolicons-block icon-expand">&#x25BE;</i> <i class="ss-icon ss-symbolicons-block icon-expand">&#x25BE;</i>
...@@ -84,12 +84,9 @@ ...@@ -84,12 +84,9 @@
<div class="wrapper wrapper-nav-sub"> <div class="wrapper wrapper-nav-sub">
<div class="nav-sub"> <div class="nav-sub">
<ul> <ul>
% if context_course: <li class="nav-item nav-account-dashboard"><a href="#">My Courses</a></li>
<% ctx_loc = context_course.location %> <li class="nav-item nav-account-help"><a href="http://help.edge.edx.org/" rel="external">Studio Help</a></li>
<li class="nav-item"><a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">My Courses</a></li> <li class="nav-item nav-account-signout"><a class="action action-signout" href="${reverse('logout')}">Sign Out</a></li>
% endif
<li class="nav-item"><a href="http://help.edge.edx.org/" rel="external">Help</a></li>
<li class="nav-item"><a class="action action-logout" href="${reverse('logout')}">Logout</a></li>
</ul> </ul>
</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