Commit 2dd77656 by Calen Pennington

Make all edits on unit page happen immediately, and restore the delete draft button

parent fb063442
...@@ -5,11 +5,10 @@ class CMS.Views.UnitEdit extends Backbone.View ...@@ -5,11 +5,10 @@ class CMS.Views.UnitEdit extends Backbone.View
'click .new-component-templates .new-component-template a': 'saveNewComponent' 'click .new-component-templates .new-component-template a': 'saveNewComponent'
'click .new-component-templates .cancel-button': 'closeNewComponent' 'click .new-component-templates .cancel-button': 'closeNewComponent'
'click .new-component-button': 'showNewComponentForm' 'click .new-component-button': 'showNewComponentForm'
'click #save-draft': 'saveDraft' 'click .delete-draft': 'deleteDraft'
'click #delete-draft': 'deleteDraft' 'click .create-draft': 'createDraft'
'click #create-draft': 'createDraft' 'click .publish-draft': 'publishDraft'
'click #publish-draft': 'publishDraft' 'change .visibility-select': 'setVisibility'
'change #visibility': 'setVisibility'
initialize: => initialize: =>
@visibilityView = new CMS.Views.UnitEdit.Visibility( @visibilityView = new CMS.Views.UnitEdit.Visibility(
...@@ -17,11 +16,6 @@ class CMS.Views.UnitEdit extends Backbone.View ...@@ -17,11 +16,6 @@ class CMS.Views.UnitEdit extends Backbone.View
model: @model model: @model
) )
@saveView = new CMS.Views.UnitEdit.SaveDraftButton(
el: @$('#save-draft')
model: @model
)
@locationView = new CMS.Views.UnitEdit.LocationState( @locationView = new CMS.Views.UnitEdit.LocationState(
el: @$('.section-item.editing a') el: @$('.section-item.editing a')
model: @model model: @model
...@@ -41,7 +35,7 @@ class CMS.Views.UnitEdit extends Backbone.View ...@@ -41,7 +35,7 @@ class CMS.Views.UnitEdit extends Backbone.View
@$('.components').sortable( @$('.components').sortable(
handle: '.drag-handle' handle: '.drag-handle'
update: (event, ui) => @model.set('children', @components()) update: (event, ui) => @model.save(children: @components())
helper: 'clone' helper: 'clone'
opacity: '0.5' opacity: '0.5'
placeholder: 'component-placeholder' placeholder: 'component-placeholder'
...@@ -58,7 +52,6 @@ class CMS.Views.UnitEdit extends Backbone.View ...@@ -58,7 +52,6 @@ class CMS.Views.UnitEdit extends Backbone.View
id: $(element).data('id'), id: $(element).data('id'),
) )
) )
update: (event, ui) => @model.set('children', @components())
) )
# New component creation # New component creation
...@@ -124,7 +117,7 @@ class CMS.Views.UnitEdit extends Backbone.View ...@@ -124,7 +117,7 @@ class CMS.Views.UnitEdit extends Backbone.View
id: $component.data('id') id: $component.data('id')
}, => }, =>
$component.remove() $component.remove()
@model.set('children', @components()) @model.save(children: @components())
) )
deleteDraft: (event) -> deleteDraft: (event) ->
...@@ -167,7 +160,7 @@ class CMS.Views.UnitEdit extends Backbone.View ...@@ -167,7 +160,7 @@ class CMS.Views.UnitEdit extends Backbone.View
$.post(target_url, { $.post(target_url, {
id: @$el.data('id') id: @$el.data('id')
}, => }, =>
@model.set('state', @$('#visibility').val()) @model.set('state', @$('.visibility-select').val())
) )
class CMS.Views.UnitEdit.NameEdit extends Backbone.View class CMS.Views.UnitEdit.NameEdit extends Backbone.View
...@@ -187,7 +180,6 @@ class CMS.Views.UnitEdit.NameEdit extends Backbone.View ...@@ -187,7 +180,6 @@ class CMS.Views.UnitEdit.NameEdit extends Backbone.View
metadata = $.extend({}, @model.get('metadata')) metadata = $.extend({}, @model.get('metadata'))
metadata.display_name = @$('.unit-display-name-input').val() metadata.display_name = @$('.unit-display-name-input').val()
$('.unit-location .editing .unit-name').html(metadata.display_name) $('.unit-location .editing .unit-name').html(metadata.display_name)
@model.set 'metadata', metadata
inputField = this.$el.find('input') inputField = this.$el.find('input')
...@@ -204,7 +196,7 @@ class CMS.Views.UnitEdit.NameEdit extends Backbone.View ...@@ -204,7 +196,7 @@ class CMS.Views.UnitEdit.NameEdit extends Backbone.View
if @timer if @timer
clearTimeout @timer clearTimeout @timer
@timer = setTimeout( => @timer = setTimeout( =>
@model.save() @model.save(metadata: metadata)
@timer = null @timer = null
@$spinner.delay(500).fadeOut(150) @$spinner.delay(500).fadeOut(150)
, 500) , 500)
...@@ -223,18 +215,3 @@ class CMS.Views.UnitEdit.Visibility extends Backbone.View ...@@ -223,18 +215,3 @@ class CMS.Views.UnitEdit.Visibility extends Backbone.View
render: => render: =>
@$el.val(@model.get('state')) @$el.val(@model.get('state'))
class CMS.Views.UnitEdit.SaveDraftButton extends Backbone.View
initialize: =>
@model.on('change:children', @enable)
@model.on('change:metadata', @enable)
@model.on('sync', @disable)
@disable()
disable: =>
@$el.addClass('disabled')
enable: =>
@$el.removeClass('disabled')
@model.save()
\ No newline at end of file
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
font-weight: 700; font-weight: 700;
} }
.save-button { .ave-button {
margin-top: 10px; margin-top: 10px;
margin: 15px 8px 0 0; margin: 15px 8px 0 0;
} }
...@@ -321,16 +321,15 @@ ...@@ -321,16 +321,15 @@
@include orange-button; @include orange-button;
} }
.save-button { .delete-button {
@include blue-button; @include blue-button;
display: none;
} }
#delete-draft { .delete-draft {
display: inline-block; display: inline-block;
} }
.save-button, .delete-button,
.preview-button, .preview-button,
.publish-button, .publish-button,
.view-button { .view-button {
...@@ -447,11 +446,10 @@ ...@@ -447,11 +446,10 @@
} }
.edit-state-public { .edit-state-public {
#save-draft, .delete-draft,
#delete-draft,
.component-actions, .component-actions,
.new-component-item, .new-component-item,
#published-alert, .editing-draft-alert,
.publish-draft-message, .publish-draft-message,
.preview-button { .preview-button {
display: none; display: none;
...@@ -467,10 +465,10 @@ ...@@ -467,10 +465,10 @@
} }
.edit-state-private { .edit-state-private {
#delete-draft, .delete-draft,
#publish-draft, .publish-draft,
#published-alert, .editing-draft-alert,
#create-draft, .create-draft,
.view-button { .view-button {
display: none; display: none;
} }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<%block name="content"> <%block name="content">
<div class="main-wrapper edit-state-${unit_state}" data-id="${unit_location}"> <div class="main-wrapper edit-state-${unit_state}" data-id="${unit_location}">
<div class="inner-wrapper"> <div class="inner-wrapper">
<div class="alert" id="published-alert"> <div class="alert editing-draft-alert">
<p class="alert-message"><strong>You are editing a draft.</strong> <p class="alert-message"><strong>You are editing a draft.</strong>
% if published_date: % if published_date:
This unit was originally published on ${published_date}. This unit was originally published on ${published_date}.
...@@ -75,21 +75,20 @@ ...@@ -75,21 +75,20 @@
<div class="window-contents"> <div class="window-contents">
<div class="row visibility"> <div class="row visibility">
<label class="inline-label">Visibility:</label> <label class="inline-label">Visibility:</label>
<select id='visibility'> <select class='visibility-select'>
<option value="public">Public</option> <option value="public">Public</option>
<option value="private">Private</option> <option value="private">Private</option>
</select> </select>
</div> </div>
<div class="row published-alert"> <div class="row published-alert">
<p class="edit-draft-message">This unit has been published. To make changes, you must <a href="#" id="create-draft">edit a draft</a>.</p> <p class="edit-draft-message">This unit has been published. To make changes, you must <a href="#" class="create-draft">edit a draft</a>.</p>
<p class="publish-draft-message">This is a draft of the published unit. To update the live version, you must <a href="#" id="publish-draft">replace it with this draft</a>.</p> <p class="publish-draft-message">This is a draft of the published unit. To update the live version, you must <a href="#" class="publish-draft">replace it with this draft</a>.</p>
</div> </div>
<div class="row status"> <div class="row status">
<p>This unit is scheduled to be released to <strong>students</strong> on <strong>${release_date}</strong> with the subsection <a href="${reverse('edit_subsection', kwargs={'location': subsection.location})}">"${subsection.display_name}"</a></p> <p>This unit is scheduled to be released to <strong>students</strong> on <strong>${release_date}</strong> with the subsection <a href="${reverse('edit_subsection', kwargs={'location': subsection.location})}">"${subsection.display_name}"</a></p>
</div> </div>
<div class="row unit-actions"> <div class="row unit-actions">
<a id="save-draft" href="#" class="save-button">Save Draft</a> <a href="#" class="delete-draft delete-button">Delete Draft</a>
<a id="delete-draft" href="#" class="save-button">Delete Draft</a>
<a href="${draft_preview_link}" target="_blank" class="preview-button">Preview</a> <a href="${draft_preview_link}" target="_blank" class="preview-button">Preview</a>
<a href="${published_preview_link}" target="_blank" class="view-button">View Live</a> <a href="${published_preview_link}" target="_blank" class="view-button">View Live</a>
</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