Move contentmanager to contents

IPython/html/base/handlers.py

@@ -138,11 +138,11 class IPythonHandler(AuthenticatedHandler):
         return self.settings.get('websocket_url', '')
 
     @property
-    def contentmanager_js_source(self):
-        self.log.debug("Using contentmanager: %s", self.settings.get('contentmanager_js_source',
-            'base/js/contentmanager'))
-        return self.settings.get('contentmanager_js_source',
-            'base/js/contentmanager')
+    def contents_js_source(self):
+        self.log.debug("Using contents: %s", self.settings.get('contents_js_source',
+            'base/js/contents'))
+        return self.settings.get('contents_js_source',
+            'base/js/contents')
     
     #---------------------------------------------------------------
     # Manager objects
@@ -232,7 +232,7 class IPythonHandler(AuthenticatedHandler):
             login_available=self.login_available,
             static_url=self.static_url,
             sys_info=sys_info,
-            contentmanager_js_source=self.contentmanager_js_source,
+            contents_js_source=self.contents_js_source,
         )
     
     def get_json_body(self):

IPython/html/static/base/js/contents.js

@@ -7,10 +7,10 define([
     'base/js/utils',
     'base/js/dialog',
 ], function(IPython, $, utils, dialog) {
-    var ContentManager = function(options) {
+    var Contents = function(options) {
         // Constructor
         //
-        // A contentmanager handles passing file operations
+        // A contents handles passing file operations
         // to the back-end.  This includes checkpointing
         // with the normal file operations.
         //
@@ -40,7 +40,7 define([
      * @param {Function} success_callback
      * @param {Function} error_callback
      */
-    ContentManager.prototype.load_notebook = function (path, name, success_callback, 
+    Contents.prototype.load_notebook = function (path, name, success_callback, 
         error_callback) {
         // We do the call with settings so we can set cache to false.
         var settings = {
@@ -69,7 +69,7 define([
      * @method scroll_to_cell
      * @param {String} path The path to create the new notebook at
      */
-    ContentManager.prototype.new_notebook = function(path) {
+    Contents.prototype.new_notebook = function(path) {
         var base_url = this.base_url;
         var settings = {
             processData : false,
@@ -112,14 +112,14 define([
         $.ajax(url,settings);
     };
 
-    ContentManager.prototype.delete_notebook = function(name, path) {
+    Contents.prototype.delete_notebook = function(name, path) {
         var settings = {
             processData : false,
             cache : false,
             type : "DELETE",
             dataType : "json",
             success : $.proxy(this.events.trigger, this.events,
-                'notebook_deleted.ContentManager',
+                'notebook_deleted.Contents',
                 {
                     name: name,
                     path: path
@@ -135,7 +135,7 define([
         $.ajax(url, settings);
     };
 
-    ContentManager.prototype.rename_notebook = function(path, name, new_name) {
+    Contents.prototype.rename_notebook = function(path, name, new_name) {
         var that = this;
         var data = {name: new_name};
         var settings = {
@@ -146,11 +146,11 define([
             dataType: "json",
             contentType: 'application/json',
             success :  function (json, status, xhr) {
-                that.events.trigger('notebook_rename_success.ContentManager',
+                that.events.trigger('notebook_rename_success.Contents',
                     json);
             },
             error : function (xhr, status, error) {
-                that.events.trigger('notebook_rename_error.ContentManager',
+                that.events.trigger('notebook_rename_error.Contents',
                     [xhr, status, error]);
             }
         };
@@ -163,7 +163,7 define([
         $.ajax(url, settings);
     };
 
-    ContentManager.prototype.save_notebook = function(path, name, content,
+    Contents.prototype.save_notebook = function(path, name, content,
         extra_settings) {
         var that = content;
         // Create a JSON model to be sent to the server.
@@ -183,10 +183,10 define([
             data : JSON.stringify(model),
             contentType: 'application/json',
             success : $.proxy(this.events.trigger, this.events,
-                'notebook_save_success.ContentManager',
+                'notebook_save_success.Contents',
                 $.extend(model, { start : start })),
             error : function (xhr, status, error) {
-                that.events.trigger('notebook_save_error.ContentManager',
+                that.events.trigger('notebook_save_error.Contents',
                     [xhr, status, error, model]);
             }
         };
@@ -208,11 +208,11 define([
      * Checkpointing Functions
      */
 
-    ContentManager.prototype.save_checkpoint = function() {
+    Contents.prototype.save_checkpoint = function() {
         // This is not necessary - integrated into save
     };
 
-    ContentManager.prototype.restore_checkpoint = function(notebook, id) {
+    Contents.prototype.restore_checkpoint = function(notebook, id) {
         that = notebook;
         this.events.trigger('notebook_restoring.Notebook', checkpoint);
         var url = utils.url_join_encode(
@@ -230,7 +230,7 define([
         );
     };
 
-    ContentManager.prototype.list_checkpoints = function(notebook) {
+    Contents.prototype.list_checkpoints = function(notebook) {
         that = notebook;
         var url = utils.url_join_encode(
             that.base_url,
@@ -266,7 +266,7 define([
      * @param {Function} load_callback called with list of notebooks on success
      * @param {Function} error_callback called with ajax results on error
      */
-    ContentManager.prototype.list_contents = function(path, load_callback,
+    Contents.prototype.list_contents = function(path, load_callback,
         error_callback) {
         var that = this;
         var settings = {
@@ -284,7 +284,7 define([
     }
 
 
-    IPython.ContentManager = ContentManager;
+    IPython.Contents = Contents;
 
-    return {'ContentManager': ContentManager};
+    return {'Contents': Contents};
 }); 

IPython/html/static/notebook/js/main.js

@@ -5,7 +5,7 require([
     'base/js/namespace',
     'jquery',
     'notebook/js/notebook',
-    'contentmanager',
+    'contents',
     'base/js/utils',
     'base/js/page',
     'notebook/js/layoutmanager',
@@ -28,7 +28,7 require([
     IPython, 
     $,
     notebook, 
-    contentmanager,
+    contents,
     utils, 
     page, 
     layoutmanager, 
@@ -72,14 +72,14 require([
     var save_widget = new savewidget.SaveWidget('span#save_widget', {
         events: events, 
         keyboard_manager: keyboard_manager});
-    var content_manager = new contentmanager.ContentManager($.extend({
+    var contents = new contents.Contents($.extend({
         events: events},
         common_options));
     var notebook = new notebook.Notebook('div#notebook', $.extend({
         events: events,
         keyboard_manager: keyboard_manager,
         save_widget: save_widget,
-        content_manager: content_manager,
+        contents: contents,
         config: user_config},
         common_options));
     var login_widget = new loginwidget.LoginWidget('span#login_widget', common_options);
@@ -92,7 +92,7 require([
         notebook: notebook});
     var menubar = new menubar.MenuBar('#menubar', $.extend({
         notebook: notebook, 
-        content_manager: content_manager,
+        contents: contents,
         layout_manager: layout_manager, 
         events: events, 
         save_widget: save_widget, 
@@ -138,7 +138,7 require([
     IPython.page = page;
     IPython.layout_manager = layout_manager;
     IPython.notebook = notebook;
-    IPython.content_manager = content_manager;
+    IPython.contents = contents;
     IPython.pager = pager;
     IPython.quick_help = quick_help;
     IPython.login_widget = login_widget;

IPython/html/static/notebook/js/menubar.js

@@ -21,7 +21,7 define([
         //  options: dictionary
         //      Dictionary of keyword arguments.
         //          notebook: Notebook instance
-        //          content_manager: ContentManager instance
+        //          contents: ContentManager instance
         //          layout_manager: LayoutManager instance
         //          events: $(Events) instance
         //          save_widget: SaveWidget instance
@@ -33,7 +33,7 define([
         this.base_url = options.base_url || utils.get_body_data("baseUrl");
         this.selector = selector;
         this.notebook = options.notebook;
-        this.content_manager = options.content_manager;
+        this.contents = options.contents;
         this.layout_manager = options.layout_manager;
         this.events = options.events;
         this.save_widget = options.save_widget;
@@ -89,7 +89,7 define([
         this.element.find('#new_notebook').click(function () {
             // Create a new notebook in the same path as the current
             // notebook's path.
-            that.content_manager.new_notebook(that.notebook.notebook_path);
+            that.contents.new_notebook(that.notebook.notebook_path);
         });
         this.element.find('#open_notebook').click(function () {
             window.open(utils.url_join_encode(

IPython/html/static/notebook/js/notebook.js

@@ -50,7 +50,7 define([
         //      Dictionary of keyword arguments.
         //          events: $(Events) instance
         //          keyboard_manager: KeyboardManager instance
-        //          content_manager: ContentManager instance
+        //          contents: Contents instance
         //          save_widget: SaveWidget instance
         //          config: dictionary
         //          base_url : string
@@ -62,7 +62,7 define([
         this.notebook_name = options.notebook_name;
         this.events = options.events;
         this.keyboard_manager = options.keyboard_manager;
-        this.content_manager = options.content_manager;
+        this.contents = options.contents;
         this.save_widget = options.save_widget;
         this.tooltip = new tooltip.Tooltip(this.events);
         this.ws_url = options.ws_url;
@@ -178,7 +178,7 define([
     Notebook.prototype.bind_events = function () {
         var that = this;
 
-        this.content_manager.events.on('notebook_rename_success.ContentManager',
+        this.contents.events.on('notebook_rename_success.Contents',
             function (event, data) {
                 var name = that.notebook_name = data.name;
                 var path = data.path;
@@ -186,15 +186,15 define([
                 that.events.trigger('notebook_renamed.Notebook', data);
             });
 
-        this.content_manager.events.on('notebook_rename_error.ContentManager',
+        this.contents.events.on('notebook_rename_error.Contents',
             function (event, data) {
                 that.rename_error(data[0], data[1], data[2]);
             });
 
-        this.content_manager.events.on('notebook_save_success.ContentManager',
+        this.contents.events.on('notebook_save_success.Contents',
             $.proxy(this.save_notebook_success, this));
 
-        this.content_manager.events.on('notebook_save_error.ContentManager',
+        this.contents.events.on('notebook_save_error.Contents',
             $.proxy(this.events.trigger, this.events,
                 'notebook_save_failed.Notebook'));
 
@@ -1929,7 +1929,7 define([
             nbformat : this.nbformat,
             nbformat_minor : this.nbformat_minor
         })
-        this.content_manager.save_notebook(this.notebook_path,
+        this.contents.save_notebook(this.notebook_path,
             this.notebook_name,
             content,
             extra_settings);
@@ -2092,12 +2092,12 define([
             nbname = nbname + ".ipynb";
         }
 
-        this.content_manager.rename_notebook(this.notebook_path,
+        this.contents.rename_notebook(this.notebook_path,
             this.notebook_name, nbname);
     };
 
     Notebook.prototype.delete = function () {
-        this.content_manager.delete_notebook(this.notebook_name,
+        this.contents.delete_notebook(this.notebook_name,
             this.notebook_path);
     };
 
@@ -2142,7 +2142,7 define([
     Notebook.prototype.load_notebook = function (notebook_name, notebook_path) {
         this.notebook_name = notebook_name;
         this.notebook_path = notebook_path;
-        this.content_manager.load_notebook(
+        this.contents.load_notebook(
             notebook_path,
             notebook_name,
             $.proxy(this.load_notebook_success,this),

IPython/html/static/tree/js/main.js

@@ -7,7 +7,7 require([
     'base/js/events',
     'base/js/page',
     'base/js/utils',
-    'contentmanager',
+    'contents',
     'tree/js/notebooklist',
     'tree/js/clusterlist',
     'tree/js/sessionlist',
@@ -24,7 +24,7 require([
     events,
     page, 
     utils, 
-    contentmanager,
+    contents,
     notebooklist, 
     clusterlist, 
     sesssionlist, 
@@ -41,11 +41,11 require([
     session_list = new sesssionlist.SesssionList($.extend({
         events: events}, 
         common_options));
-    content_manager = new contentmanager.ContentManager($.extend({
+    contents = new contents.Contents($.extend({
         events: events},
         common_options));
     notebook_list = new notebooklist.NotebookList('#notebook_list', $.extend({
-        content_manager: content_manager,
+        contents: contents,
         session_list:  session_list}, 
         common_options));
     cluster_list = new clusterlist.ClusterList('#cluster_list', common_options);
@@ -60,7 +60,7 require([
     login_widget = new loginwidget.LoginWidget('#login_widget', common_options);
 
     $('#new_notebook').button().click(function (e) {
-        content_manager.new_notebook(common_options.notebook_path);
+        contents.new_notebook(common_options.notebook_path);
     });
 
     var interval_id=0;
@@ -127,7 +127,7 require([
 
     // For backwards compatability.
     IPython.page = page;
-    IPython.content_manager = content_manager;
+    IPython.contents = contents;
     IPython.notebook_list = notebook_list;
     IPython.cluster_list = cluster_list;
     IPython.session_list = session_list;

IPython/html/static/tree/js/notebooklist.js

@@ -20,7 +20,7 define([
         //          element_name: string
         //          base_url: string
         //          notebook_path: string
-        //          content_manager: ContentManager instance
+        //          contents: Contents instance
         var that = this;
         this.session_list = options.session_list;
         // allow code re-use by just changing element_name in kernellist.js
@@ -35,15 +35,15 define([
         this.sessions = {};
         this.base_url = options.base_url || utils.get_body_data("baseUrl");
         this.notebook_path = options.notebook_path || utils.get_body_data("notebookPath");
-        this.content_manager = options.content_manager;
+        this.contents = options.contents;
         if (this.session_list && this.session_list.events) {
             this.session_list.events.on('sessions_loaded.Dashboard', 
                 function(e, d) { that.sessions_loaded(d); });
         }
 
 
-        if (this.content_manager && this.content_manager.events) {
-            this.content_manager.events.on('notebook_deleted.ContentManager',
+        if (this.contents && this.contents.events) {
+            this.contents.events.on('notebook_deleted.Contents',
                 function(e, d) {
                     // Remove the deleted notebook.
                     $( ":data(nbname)" ).each(function() {
@@ -157,7 +157,7 define([
 
     NotebookList.prototype.load_list = function () {
         var that = this
-        this.content_manager.list_contents(
+        this.contents.list_contents(
             that.notebook_path,
             $.proxy(that.draw_notebook_list, that),
             $.proxy( function(xhr, status, error) { 
@@ -347,7 +347,7 define([
                         Delete : {
                             class: "btn-danger",
                             click: function() {
-                                notebooklist.content_manager.delete_notebook(nbname, path);
+                                notebooklist.contents.delete_notebook(nbname, path);
                             }
                         },
                         Cancel : {}

IPython/html/templates/page.html

@@ -30,7 +30,7
             moment: "components/moment/moment",
             codemirror: 'components/codemirror',
             termjs: "components/term.js/src/term"
-            contentmanager: '{{ contentmanager_js_source }}',
+            contents: '{{ contents_js_source }}',
           },
           shim: {
             underscore: {