Draft of the cluster list UI.

Not functional yet, but the idea is there.

IPython/frontend/html/notebook/static/js/clusterlist.js

@@ -0,0 +1,128 b''
+//----------------------------------------------------------------------------
+//  Copyright (C) 2008-2011  The IPython Development Team
+//
+//  Distributed under the terms of the BSD License.  The full license is in
+//  the file COPYING, distributed as part of this software.
+//----------------------------------------------------------------------------
+
+//============================================================================
+// NotebookList
+//============================================================================
+
+var IPython = (function (IPython) {
+
+    var ClusterList = function (selector) {
+        this.selector = selector;
+        if (this.selector !== undefined) {
+            this.element = $(selector);
+            this.style();
+            this.bind_events();
+        }
+    };
+
+    ClusterList.prototype.style = function () {
+        $('#cluster_toolbar').addClass('list_toolbar');
+        $('#cluster_list_info').addClass('toolbar_info');
+        $('#cluster_buttons').addClass('toolbar_buttons');
+        $('div#cluster_header').addClass('list_header ui-widget ui-widget-header');
+        $('#refresh_cluster_list').button({
+            icons : {primary: 'ui-icon-arrowrefresh-1-s'},
+            text : false
+        });
+    };
+
+
+    ClusterList.prototype.bind_events = function () {
+        var that = this;
+        $('#refresh_cluster_list').click(function () {
+            that.load_list();
+        });
+    };
+
+
+    ClusterList.prototype.load_list = function () {
+        var settings = {
+            processData : false,
+            cache : false,
+            type : "GET",
+            dataType : "json",
+            success : $.proxy(this.load_list_success, this)
+        };
+        var url = $('body').data('baseProjectUrl') + 'clusters';
+        $.ajax(url, settings);
+    };
+
+
+    ClusterList.prototype.clear_list = function () {
+        this.element.children('.list_item').remove();
+    }
+
+    ClusterList.prototype.load_list_success = function (data, status, xhr) {
+        console.log(data);
+        this.clear_list();
+        var len = data.length;
+        for (var i=0; i<len; i++) {
+            var item_div = $('<div/>');
+            item_div.addClass('list_item ui-widget ui-widget-content ui-helper-clearfix');
+            item_div.css('border-top-style','none');
+            var item = new ClusterItem(item_div);
+            item.update_state(data[i]);
+            item_div.data('item', item);
+            console.log('appending item', item);
+            this.element.append(item_div);
+        };
+    };
+
+
+    var ClusterItem = function (element) {
+        this.element = $(element);
+        this.data = null;
+    };
+
+
+    ClusterItem.prototype.update_state = function (data) {
+        this.data = data;
+        if (data.status === 'running') {
+            this.state_running();
+        } else if (data.status === 'stopped') {
+            this.state_stopped();
+        };
+
+    }
+
+
+    ClusterItem.prototype.state_stopped = function () {
+        var item_name = $('<span/>').addClass('item_name').text(this.data.profile);
+        var item_buttons = $('<span/>').addClass('item_buttons');
+        var start_button = $('<button>Start</button>').button();
+        item_buttons.append(start_button);
+        this.element.append(item_name).append(item_buttons);
+        start_button.click(function (e) {
+            console.log('start');
+        });
+    }
+
+
+    ClusterItem.prototype.start_success = function () {
+        
+    };
+
+    ClusterItem.prototype.state_running = function () {
+        var item_name = $('<span/>').addClass('item_name').text(this.data.profile);
+        var item_buttons = $('<span/>').addClass('item_buttons');
+        var stop_button = $('<button>Stop</button>').button();
+        item_buttons.append(start_button);
+        this.element.append(item_name).append(item_buttons);
+        start_button.click(function (e) {
+            console.log('stop');
+        });
+    };
+
+
+    IPython.ClusterList = ClusterList;
+    IPython.ClusterItem = ClusterItem;
+
+    return IPython;
+
+}(IPython));
+

IPython/frontend/html/notebook/static/css/projectdashboard.css

@@ -1,57 +1,57 b''
 
 /**
  * Primary styles
  *
  * Author: IPython Development Team
  */
 
 #main_app {
     width: 920px;
     margin: 30px auto 0px auto;
 }
 
-#notebooks_toolbar {
+.list_toolbar {
     padding: 5px;
     height: 25px;
     line-height: 25px;
 }
 
-#drag_info {
+.toolbar_info {
     float: left;
 }
 
-#notebooks_buttons {
+.toolbar_buttons {
     float: right;
 }
 
-#project_name {
+.list_header {
     height: 25px;
     line-height: 25px;
-    padding: 3px;
+    padding: 3px 5px;
 }
 
-.notebook_item {
+.list_item {
     height: 25px;
     line-height: 25px;
-    padding: 3px;
+    padding: 3px 5px;
 }
 
 .notebook_item a {
     text-decoration: none;
 }
 
 .item_buttons {
     float: right;
 }
 
 .item_buttons .upload_button {
     color: darkred;
 }
 
 .highlight_text {
     color: blue;
 }
 
 .ui-tabs .ui-tabs-nav li a {
     padding: .3em .5em;
 }

IPython/frontend/html/notebook/static/js/notebooklist.js

@@ -1,251 +1,267 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2008-2011  The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // NotebookList
 //============================================================================
 
 var IPython = (function (IPython) {
 
     var NotebookList = function (selector) {
         this.selector = selector;
         if (this.selector !== undefined) {
             this.element = $(selector);
             this.style();
             this.bind_events();
         }
     };
 
     NotebookList.prototype.style = function () {
-        $('div#project_name').addClass('ui-widget ui-widget-header');
+        $('#notebook_toolbar').addClass('list_toolbar');
+        $('#drag_info').addClass('toolbar_info');
+        $('#notebook_buttons').addClass('toolbar_buttons');
+        $('div#project_name').addClass('list_header ui-widget ui-widget-header');
+        $('#refresh_notebook_list').button({
+            icons : {primary: 'ui-icon-arrowrefresh-1-s'},
+            text : false
+        });
     };
 
 
     NotebookList.prototype.bind_events = function () {
         if (IPython.read_only){
             return;
         }
         var that = this;
+        $('#refresh_notebook_list').click(function () {
+            that.load_list();
+        });
         this.element.bind('dragover', function () {
             return false;
         });
         this.element.bind('drop', function (event) {
             var files = event.originalEvent.dataTransfer.files;
             for (var i = 0, f; f = files[i]; i++) {
                 var reader = new FileReader();
                 reader.readAsText(f);
                 var fname = f.name.split('.'); 
                 var nbname = fname.slice(0,-1).join('.');
                 var nbformat = fname.slice(-1)[0];
                 if (nbformat === 'ipynb') {nbformat = 'json';};
                 if (nbformat === 'py' || nbformat === 'json') {
                     var item = that.new_notebook_item(0);
                     that.add_name_input(nbname, item);
                     item.data('nbformat', nbformat);
                     // Store the notebook item in the reader so we can use it later
                     // to know which item it belongs to.
                     $(reader).data('item', item);
                     reader.onload = function (event) {
                         var nbitem = $(event.target).data('item');
                         that.add_notebook_data(event.target.result, nbitem);
                         that.add_upload_button(nbitem);
                     };
                 };
             }
             return false;
         });
     };
 
 
+    NotebookList.prototype.clear_list = function () {
+        this.element.children('.list_item').remove();
+    }
+
+
     NotebookList.prototype.load_list = function () {
+        this.clear_list();
         var settings = {
             processData : false,
             cache : false,
             type : "GET",
             dataType : "json",
             success : $.proxy(this.list_loaded, this)
         };
         var url = $('body').data('baseProjectUrl') + 'notebooks';
         $.ajax(url, settings);
     };
 
 
     NotebookList.prototype.list_loaded = function (data, status, xhr) {
         var len = data.length;
         // Todo: remove old children
         for (var i=0; i<len; i++) {
             var notebook_id = data[i].notebook_id;
             var nbname = data[i].name;
             var item = this.new_notebook_item(i);
             this.add_link(notebook_id, nbname, item);
             if (!IPython.read_only){
                 // hide delete buttons when readonly
                 this.add_delete_button(item);
             }
         };
     };
 
 
     NotebookList.prototype.new_notebook_item = function (index) {
         var item = $('<div/>');
-        item.addClass('notebook_item ui-widget ui-widget-content ui-helper-clearfix');
+        item.addClass('list_item ui-widget ui-widget-content ui-helper-clearfix');
         item.css('border-top-style','none');
         var item_name = $('<span/>').addClass('item_name');
 
         item.append(item_name);
         if (index === -1) {
             this.element.append(item);
         } else {
             this.element.children().eq(index).after(item);
         }
         return item;
     };
 
 
     NotebookList.prototype.add_link = function (notebook_id, nbname, item) {
         item.data('nbname', nbname);
         item.data('notebook_id', notebook_id);
         var new_item_name = $('<span/>').addClass('item_name');
         new_item_name.append(
             $('<a/>').
             attr('href', $('body').data('baseProjectUrl')+notebook_id).
             attr('target','_blank').
             text(nbname)
         );
         var e = item.find('.item_name');
         if (e.length === 0) {
             item.append(new_item_name);
         } else {
             e.replaceWith(new_item_name);
         };
     };
 
 
     NotebookList.prototype.add_name_input = function (nbname, item) {
         item.data('nbname', nbname);
         var new_item_name = $('<span/>').addClass('item_name');
         new_item_name.append(
             $('<input/>').addClass('ui-widget ui-widget-content').
             attr('value', nbname).
             attr('size', '30').
             attr('type', 'text')
         );
         var e = item.find('.item_name');
         if (e.length === 0) {
             item.append(new_item_name);
         } else {
             e.replaceWith(new_item_name);
         };
     };
 
 
     NotebookList.prototype.add_notebook_data = function (data, item) {
         item.data('nbdata',data);
     };
 
 
     NotebookList.prototype.add_delete_button = function (item) {
         var new_buttons = $('<span/>').addClass('item_buttons');
         var delete_button = $('<button>Delete</button>').button().
             click(function (e) {
                 // $(this) is the button that was clicked.
                 var that = $(this);
                 // We use the nbname and notebook_id from the parent notebook_item element's
                 // data because the outer scopes values change as we iterate through the loop.
-                var parent_item = that.parents('div.notebook_item');
+                var parent_item = that.parents('div.list_item');
                 var nbname = parent_item.data('nbname');
                 var notebook_id = parent_item.data('notebook_id');
                 var dialog = $('<div/>');
                 dialog.html('Are you sure you want to permanently delete the notebook: ' + nbname + '?');
                 parent_item.append(dialog);
                 dialog.dialog({
                     resizable: false,
                     modal: true,
                     title: "Delete notebook",
                     buttons : {
                         "Delete": function () {
                             var settings = {
                                 processData : false,
                                 cache : false,
                                 type : "DELETE",
                                 dataType : "json",
                                 success : function (data, status, xhr) {
                                     parent_item.remove();
                                 }
                             };
                             var url = $('body').data('baseProjectUrl') + 'notebooks/' + notebook_id;
                             $.ajax(url, settings);
                             $(this).dialog('close');
                         },
                         "Cancel": function () {
                             $(this).dialog('close');
                         }
                     }
                 });
             });
         new_buttons.append(delete_button);
         var e = item.find('.item_buttons');
         if (e.length === 0) {
             item.append(new_buttons);
         } else {
             e.replaceWith(new_buttons);
         };
     };
 
 
     NotebookList.prototype.add_upload_button = function (item) {
         var that = this;
         var new_buttons = $('<span/>').addClass('item_buttons');
         var upload_button = $('<button>Upload</button>').button().
             click(function (e) {
                 var nbname = item.find('.item_name > input').attr('value');
                 var nbformat = item.data('nbformat');
                 var nbdata = item.data('nbdata');
                 var content_type = 'text/plain';
                 if (nbformat === 'json') {
                     content_type = 'application/json';
                 } else if (nbformat === 'py') {
                     content_type = 'application/x-python';
                 };
                 var settings = {
                     processData : false,
                     cache : false,
                     type : 'POST',
                     dataType : 'json',
                     data : nbdata,
                     headers : {'Content-Type': content_type},
                     success : function (data, status, xhr) {
                         that.add_link(data, nbname, item);
                         that.add_delete_button(item);
                     }
                 };
 
                 var qs = $.param({name:nbname, format:nbformat});
                 var url = $('body').data('baseProjectUrl') + 'notebooks?' + qs;
                 $.ajax(url, settings);
             });
         var cancel_button = $('<button>Cancel</button>').button().
             click(function (e) {
                 item.remove();
             });
         upload_button.addClass('upload_button');
         new_buttons.append(upload_button).append(cancel_button);
         var e = item.find('.item_buttons');
         if (e.length === 0) {
             item.append(new_buttons);
         } else {
             e.replaceWith(new_buttons);
         };
     };
 
 
     IPython.NotebookList = NotebookList;
 
     return IPython;
 
 }(IPython));
 

IPython/frontend/html/notebook/static/js/projectdashboardmain.js

@@ -1,33 +1,35 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2008-2011  The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // On document ready
 //============================================================================
 
 
 $(document).ready(function () {
 
     IPython.page = new IPython.Page();
 
     $('div#tabs').tabs();
     $('div#main_app').addClass('border-box-sizing ui-widget');
     $('div#notebooks_toolbar').addClass('ui-widget ui-helper-clearfix');    
     $('#new_notebook').button().click(function (e) {
         window.open($('body').data('baseProjectUrl')+'new');
     });
 
     IPython.read_only = $('body').data('readOnly') === 'True';
     IPython.notebook_list = new IPython.NotebookList('div#notebook_list');
+    IPython.cluster_list = new IPython.ClusterList('div#cluster_list');
     IPython.login_widget = new IPython.LoginWidget('span#login_widget');
 
     IPython.notebook_list.load_list();
+    IPython.cluster_list.load_list();
 
     IPython.page.show();
 
 });
 

IPython/frontend/html/notebook/templates/projectdashboard.html

@@ -1,57 +1,72 b''
 {% extends page.html %}
 
 {% block title %}IPython Dashboard{% end %}
 
 {% block stylesheet %}
     <link rel="stylesheet" href="{{static_url("css/projectdashboard.css") }}" type="text/css" />
 {% end %}
 
 
 {% block params %}
 
 data-project={{project}}
 data-base-project-url={{base_project_url}}
 data-base-kernel-url={{base_kernel_url}}
 data-read-only={{read_only}}
 
 {% end %}
 
 
 {% block site %}
 
 <div id="main_app">
 
 <div id="tabs">
     <ul>
         <li><a href="#tab1">Notebooks</a></li>
         <li><a href="#tab2">Clusters</a></li>
     </ul>
 
     <div id="tab1">
         {% if logged_in or not read_only %}
-        <div id="notebooks_toolbar">
+        <div id="notebook_toolbar">
             <span id="drag_info">Drag files onto the list to import
             notebooks.</span>
 
-            <span id="notebooks_buttons">
-              <button id="new_notebook">New Notebook</button>
+            <span id="notebook_buttons">
+                <button id="refresh_notebook_list" title="Refresh notebook list">Refresh</button>
+                <button id="new_notebook" title="Create new notebook">New Notebook</button>
             </span>
         </div>
         {% end %}
 
         <div id="notebook_list">
             <div id="project_name"><h2>{{project}}</h2></div>
         </div>
     </div>
     <div id="tab2">
+
+        <div id="cluster_toolbar">
+            <span id="cluster_list_info">IPython parallel computing clusters</span>
+
+            <span id="cluster_buttons">
+                <button id="refresh_cluster_list" title="Refresh cluster list">Refresh</button>
+            </span>
+        </div>
+
+        <div id="cluster_list">
+            <div id="cluster_header"><h2>Clusters</h2></div>
+        </div>
+
     </div>
 </div>
 
 </div>
 
 {% end %}
 
 {% block script %}
     <script src="{{static_url("js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{static_url("js/clusterlist.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("js/projectdashboardmain.js") }}" type="text/javascript" charset="utf-8"></script>
 {% end %}