Commit c8b4e885 by Tom Giannattasio

added modal cover for editors

parent 75b413b5
...@@ -56,6 +56,7 @@ class CMS.Views.ModuleEdit extends Backbone.View ...@@ -56,6 +56,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
event.preventDefault() event.preventDefault()
data = @module.save() data = @module.save()
data.metadata = @metadata() data.metadata = @metadata()
$modalCover.hide()
@model.save(data).done( => @model.save(data).done( =>
# # showToastMessage("Your changes have been saved.", null, 3) # # showToastMessage("Your changes have been saved.", null, 3)
@module = null @module = null
...@@ -69,9 +70,11 @@ class CMS.Views.ModuleEdit extends Backbone.View ...@@ -69,9 +70,11 @@ class CMS.Views.ModuleEdit extends Backbone.View
event.preventDefault() event.preventDefault()
@$el.removeClass('editing') @$el.removeClass('editing')
@$component_editor().slideUp(150) @$component_editor().slideUp(150)
$modalCover.hide()
clickEditButton: (event) -> clickEditButton: (event) ->
event.preventDefault() event.preventDefault()
@$el.addClass('editing') @$el.addClass('editing')
$modalCover.show()
@$component_editor().slideDown(150) @$component_editor().slideDown(150)
@loadEdit() @loadEdit()
...@@ -5,14 +5,6 @@ ...@@ -5,14 +5,6 @@
background-color: #fff; background-color: #fff;
} }
.upload-button {
@include blue-button;
float: left;
margin-right: 20px;
padding: 8px 30px 10px;
font-size: 12px;
}
.asset-library { .asset-library {
@include clearfix; @include clearfix;
......
...@@ -34,6 +34,14 @@ ...@@ -34,6 +34,14 @@
background: url(../img/video-icon.png) no-repeat; background: url(../img/video-icon.png) no-repeat;
} }
.upload-icon {
display: inline-block;
width: 22px;
height: 13px;
margin-right: 5px;
background: url(../img/upload-icon.png) no-repeat;
}
.list-icon { .list-icon {
display: inline-block; display: inline-block;
width: 14px; width: 14px;
......
...@@ -5,7 +5,6 @@ body.no-header { ...@@ -5,7 +5,6 @@ body.no-header {
} }
@mixin active { @mixin active {
color: $blue;
@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
background-color: rgba(255, 255, 255, .3); background-color: rgba(255, 255, 255, .3);
@include box-shadow(0 -1px 0 rgba(0, 0, 0, .2) inset, 0 1px 0 #fff inset); @include box-shadow(0 -1px 0 rgba(0, 0, 0, .2) inset, 0 1px 0 #fff inset);
......
...@@ -65,6 +65,9 @@ ...@@ -65,6 +65,9 @@
} }
.component.editing { .component.editing {
border-left: 1px solid $mediumGrey;
border-right: 1px solid $mediumGrey;
.xmodule_display { .xmodule_display {
display: none; display: none;
} }
......
...@@ -187,6 +187,7 @@ ...@@ -187,6 +187,7 @@
&.editing { &.editing {
border: 1px solid $lightBluishGrey2; border: 1px solid $lightBluishGrey2;
z-index: 9999;
.drag-handle, .drag-handle,
.component-actions { .component-actions {
......
...@@ -4,14 +4,10 @@ ...@@ -4,14 +4,10 @@
padding: 30px 40px; padding: 30px 40px;
} }
.new-user-button {
margin-bottom: 15px;
}
.new-user-form { .new-user-form {
display: none; display: none;
padding: 15px 20px; padding: 15px 20px;
background: $mediumGrey; background-color: $lightBluishGrey2;
#result { #result {
display: none; display: none;
...@@ -41,12 +37,12 @@ ...@@ -41,12 +37,12 @@
.add-button { .add-button {
@include blue-button; @include blue-button;
padding: 6px 20px 8px; padding: 5px 20px 9px;
} }
.cancel-button { .cancel-button {
@include white-button; @include white-button;
padding: 6px 20px 8px; padding: 5px 20px 9px;
} }
} }
......
...@@ -35,10 +35,11 @@ ...@@ -35,10 +35,11 @@
<div class="main-wrapper"> <div class="main-wrapper">
<div class="inner-wrapper"> <div class="inner-wrapper">
<h1>Asset Library</h1>
<div class="page-actions"> <div class="page-actions">
<a href="#" class="upload-button">Upload New File</a> <a href="#" class="upload-button new-button">
<input type="text" class="asset-search-input search wip-box" placeholder="search assets" style="display:none"/> <span class="upload-icon"></span>Upload New Asset
</a>
<input type="text" class="asset-search-input search wip-box" placeholder="search assets" style="display:none"/>
</div> </div>
<article class="asset-library"> <article class="asset-library">
<table> <table>
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
<div class="main-wrapper"> <div class="main-wrapper">
<div class="inner-wrapper"> <div class="inner-wrapper">
<div class="page-actions"> <div class="page-actions">
<a href="#" class="new-button new-tab"> <a href="#" class="new-button new-tab">
<span class="plus-icon white"></span>New Tab <span class="plus-icon white"></span>New Tab
</a> </a>
</div> </div>
<article class="unit-body"> <article class="unit-body">
<div class="details"> <div class="details">
<p>Here you can add and manage additional pages for your course. These pages will be added to the primary navigation menu alongside Courseware, Course Info, Discussion, etc.</p> <p>Here you can add and manage additional pages for your course. These pages will be added to the primary navigation menu alongside Courseware, Course Info, Discussion, etc.</p>
......
...@@ -5,17 +5,18 @@ ...@@ -5,17 +5,18 @@
<%block name="content"> <%block name="content">
<div class="main-wrapper"> <div class="main-wrapper">
<div class="inner-wrapper"> <div class="inner-wrapper">
<h1>Users</h1> <div class="page-actions">
<article class="user-overview">
<div class="details">
<p>The following list of users have been designated as course staff. This means that these users will have permissions to modify course content. You may add additional course staff below, if you are the course instructor. Please note that they must have already registered and verified their account.</p>
</div>
%if allow_actions: %if allow_actions:
<a href="#" class="new-button new-user-button"> <a href="#" class="new-button new-user-button">
<span class="plus-icon white"></span>New User <span class="plus-icon white"></span>New User
</a> </a>
%endif %endif
</div>
<article class="user-overview">
<div class="details">
<p>The following list of users have been designated as course staff. This means that these users will have permissions to modify course content. You may add additional course staff below, if you are the course instructor. Please note that they must have already registered and verified their account.</p>
</div>
%if allow_actions: %if allow_actions:
<form class="new-user-form"> <form class="new-user-form">
<div id="result"></div> <div id="result"></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