Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/static-tab-edit

cms/static/coffee/src/main.coffee

@@ -6,28 +6,6 @@ AjaxPrefix.addAjaxPrefix(jQuery, -> CMS.prefix)
 
   prefix: $("meta[name='path_prefix']").attr('content')
 
-  viewStack: []
-
-  start: (el) ->
-    new CMS.Views.Course(el: el).render()
-
-  replaceView: (view) ->
-    @viewStack = [view]
-    CMS.trigger('content.show', view)
-
-  pushView: (view) ->
-    @viewStack.push(view)
-    CMS.trigger('content.show', view)
-
-  popView: ->
-    @viewStack.pop()
-    if _.isEmpty(@viewStack)
-      CMS.trigger('content.hide')
-    else
-      view = _.last(@viewStack)
-      CMS.trigger('content.show', view)
-      view.delegateEvents()
-
 _.extend CMS, Backbone.Events
 
 $ ->
@@ -41,7 +19,3 @@ $ ->
     navigator.userAgent.match /iPhone|iPod|iPad/i
 
   $('body').addClass 'touch-based-device' if onTouchBasedDevice()
-
-
-  CMS.start($('section.main-container'))
-

cms/static/coffee/src/models/new_module.coffee

@@ -1,5 +0,0 @@
-class CMS.Models.NewModule extends Backbone.Model
-  url: '/clone_item'
-
-  newUrl: ->
-    "/new_item?#{$.param(parent_location: @get('parent_location'))}"

cms/static/coffee/src/views/course.coffee

@@ -1,28 +0,0 @@
-class CMS.Views.Course extends Backbone.View
-  initialize: ->
-    CMS.on('content.show', @showContent)
-    CMS.on('content.hide', @hideContent)
-
-  render: ->
-    @$('#weeks > li').each (index, week) =>
-      new CMS.Views.Week(el: week, height: @maxWeekHeight()).render()
-    return @
-
-  showContent: (subview) =>
-    $('body').addClass('content')
-    @$('.main-content').html(subview.render().el)
-    @$('.cal').css height: @contentHeight()
-    @$('>section').css minHeight: @contentHeight()
-
-  hideContent: =>
-    $('body').removeClass('content')
-    @$('.main-content').empty()
-    @$('.cal').css height: ''
-    @$('>section').css minHeight: ''
-
-  maxWeekHeight: ->
-    weekElementBorderSize = 1
-    _.max($('#weeks > li').map -> $(this).height()) + weekElementBorderSize
-
-  contentHeight: ->
-    $(window).height() - $('body>header').outerHeight()

cms/static/coffee/src/views/module.coffee

@@ -1,14 +0,0 @@
-class CMS.Views.Module extends Backbone.View
-  events:
-    "click .module-edit": "edit"
-
-  edit: (event) =>
-    event.preventDefault()
-    previewType = @$el.data('preview-type')
-    moduleType = @$el.data('type')
-    CMS.replaceView new CMS.Views.ModuleEdit
-      model: new CMS.Models.Module
-        id: @$el.data('id')
-        type: if moduleType == 'None' then null else moduleType
-        previewType: if previewType == 'None' then null else previewType
-

cms/static/coffee/src/views/module_add.coffee

@@ -1,26 +0,0 @@
-class CMS.Views.ModuleAdd extends Backbone.View
-  tagName: 'section'
-  className: 'add-pane'
-
-  events:
-    'click .cancel': 'cancel'
-    'click .save': 'save'
-
-  initialize: ->
-    @$el.load @model.newUrl()
-
-  save: (event) ->
-    event.preventDefault()
-    @model.save({
-      name: @$el.find('.name').val()
-      template: $(event.target).data('template-id')
-    }, {
-      success: -> CMS.popView()
-      error: -> alert('Create failed')
-    })
-
-  cancel: (event) ->
-    event.preventDefault()
-    CMS.popView()
-
-

cms/static/coffee/src/views/unit.coffee

@@ -169,12 +169,21 @@ class CMS.Views.UnitEdit.NameEdit extends Backbone.View
 
   initialize: =>
     @model.on('change:metadata', @render)
+    @model.on('change:state', @setEnabled)
+    @setEnabled()
     @saveName
     @$spinner = $('<span class="spinner-in-field-icon"></span>');
 
   render: =>
     @$('.unit-display-name-input').val(@model.get('metadata').display_name)
 
+  setEnabled: =>
+    disabled = @model.get('state') == 'public'
+    if disabled
+      @$('.unit-display-name-input').attr('disabled', true)
+    else
+      @$('.unit-display-name-input').removeAttr('disabled')
+
   saveName: =>
     # Treat the metadata dictionary as immutable
     metadata = $.extend({}, @model.get('metadata'))
@@ -191,6 +200,7 @@ class CMS.Views.UnitEdit.NameEdit extends Backbone.View
         'margin-top': '-10px'
     });
     inputField.after(@$spinner);
+    @$spinner.fadeIn(10)
 
     # save the name after a slight delay
     if @timer

cms/static/coffee/src/views/week.coffee

@@ -1,32 +0,0 @@
-class CMS.Views.Week extends Backbone.View
-  events:
-    'click .week-edit': 'edit'
-    'click .new-module': 'new'
-
-  initialize: ->
-    CMS.on('content.show', @resetHeight)
-    CMS.on('content.hide', @setHeight)
-
-  render: ->
-    @setHeight()
-    @$('.editable').inlineEdit()
-    @$('.editable-textarea').inlineEdit(control: 'textarea')
-    @$('.modules .module').each ->
-      new CMS.Views.Module(el: this).render()
-    return @
-
-  edit: (event) ->
-    event.preventDefault()
-    CMS.replaceView(new CMS.Views.WeekEdit())
-
-  setHeight: =>
-    @$el.height(@options.height)
-
-  resetHeight: =>
-    @$el.height('')
-
-  new: (event) =>
-    event.preventDefault()
-    CMS.replaceView new CMS.Views.ModuleAdd
-      model: new CMS.Models.NewModule
-        parent_location: @$el.data('id')

cms/static/coffee/src/views/week_edit.coffee

@@ -1,3 +0,0 @@
-class CMS.Views.WeekEdit extends Backbone.View
-  tagName: 'section'
-  className: 'edit-pane'