New Terminal into new new button

IPython/html/static/tree/js/terminallist.js

@@ -1,121 +1,121 b''
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
 define([
     'base/js/namespace',
     'base/js/utils',
     'jquery',
     'tree/js/notebooklist',
 ], function(IPython, utils, $, notebooklist) {
     "use strict";
 
     var TerminalList = function (selector, options) {
         /**
          * Constructor
          *
          * Parameters:
          *  selector: string
          *  options: dictionary
          *      Dictionary of keyword arguments.
          *          base_url: string
          */
         this.base_url = options.base_url || utils.get_body_data("baseUrl");
         this.element_name = options.element_name || 'running';
         this.selector = selector;
         this.terminals = [];
         if (this.selector !== undefined) {
             this.element = $(selector);
             this.style();
             this.bind_events();
             this.load_terminals();
         }
     };
 
     TerminalList.prototype = Object.create(notebooklist.NotebookList.prototype);
 
     TerminalList.prototype.bind_events = function () {
         var that = this;
         $('#refresh_' + this.element_name + '_list').click(function () {
             that.load_terminals();
         });
-        $('#new_terminal').click($.proxy(this.new_terminal, this));
+        $('#new-terminal').click($.proxy(this.new_terminal, this));
     };
 
     TerminalList.prototype.new_terminal = function () {
         var w = window.open();
         var base_url = this.base_url;
         var settings = {
             type : "POST",
             dataType: "json",
             success : function (data, status, xhr) {
                 var name = data.name;
                 w.location = utils.url_join_encode(base_url, 'terminals', name);
             },
             error : function(jqXHR, status, error){
                 w.close();
                 utils.log_ajax_error(jqXHR, status, error);
             },
         };
         var url = utils.url_join_encode(
             this.base_url,
             'api/terminals'
         );
         $.ajax(url, settings);
     };
     
     TerminalList.prototype.load_terminals = function() {
         var url = utils.url_join_encode(this.base_url, 'api/terminals');
         $.ajax(url, {
             type: "GET",
             cache: false,
             dataType: "json",
             success: $.proxy(this.terminals_loaded, this),
             error : utils.log_ajax_error
         });
     };
 
     TerminalList.prototype.terminals_loaded = function (data) {
         this.terminals = data;
         this.clear_list();
         var item, term;
         for (var i=0; i < this.terminals.length; i++) {
             term = this.terminals[i];
             item = this.new_item(-1);
             this.add_link(term.name, item);
             this.add_shutdown_button(term.name, item);
         }
         $('#terminal_list_header').toggle(data.length === 0);
     };
     
     TerminalList.prototype.add_link = function(name, item) {
         item.data('term-name', name);
         item.find(".item_name").text("terminals/" + name);
         item.find(".item_icon").addClass("fa fa-terminal");
         var link = item.find("a.item_link")
             .attr('href', utils.url_join_encode(this.base_url, "terminals", name));
         link.attr('target', '_blank');
         this.add_shutdown_button(name, item);
     };
     
     TerminalList.prototype.add_shutdown_button = function(name, item) {
         var that = this;
         var shutdown_button = $("<button/>").text("Shutdown").addClass("btn btn-xs btn-warning").
             click(function (e) {
                 var settings = {
                     processData : false,
                     type : "DELETE",
                     dataType : "json",
                     success : function () {
                         that.load_terminals();
                     },
                     error : utils.log_ajax_error,
                 };
                 var url = utils.url_join_encode(that.base_url, 'api/terminals', name);
                 $.ajax(url, settings);
                 return false;
             });
         item.find(".item_buttons").text("").append(shutdown_button);
     };
 
     return {TerminalList: TerminalList};
 });

IPython/html/templates/tree.html

@@ -1,158 +1,158 b''
 {% extends "page.html" %}
 
 {% block title %}{{page_title}}{% endblock %}
 
 
 {% block params %}
 
 data-base-url="{{base_url}}"
 data-notebook-path="{{notebook_path}}"
 data-terminals-available="{{terminals_available}}"
 
 {% endblock %}
 
 
 {% block site %}
 
   <div id="ipython-main-app" class="container">
     <div id="tab_content" class="tabbable">
       <ul id="tabs" class="nav nav-tabs">
         <li class="active"><a href="#notebooks" data-toggle="tab">Files</a></li>
         <li><a href="#running" data-toggle="tab">Running</a></li>
         <li><a href="#clusters" data-toggle="tab">Clusters</a></li>
       </ul>
       <div class="tab-content">
         <div id="notebooks" class="tab-pane active">
           <div id="notebook_toolbar" class="row">
             <div class="col-sm-8 no-padding">
               <form id='alternate_upload'  class='alternate_upload'>
                 <span id="notebook_list_info">
                 To import a notebook, drag the file onto the listing below or
                 <span class="input-overlay">
                 <input type="file" name="datafile" class="fileinput" multiple='multiple'>
                 click here.
                 </span>
                 </span>
               </form>
             </div>
             <div class="col-sm-4 no-padding tree-buttons">
               <div class="pull-right">
                 <div id="new-buttons" class="btn-group">
                   <button class="dropdown-toggle btn btn-default btn-xs" data-toggle="dropdown">
                   <span>New</span>
                   <span class="caret"></span>
                   </button>
                   <ul id="new-menu" class="dropdown-menu">
                     <li role="presentation" id="new-file">
                       <a role="menuitem" tabindex="-1" href="#">File</a>
                     </li>
                     <li role="presentation" id="new-folder">
                       <a role="menuitem" tabindex="-1" href="#">Folder</a>
                     </li>
+                    {% if terminals_available %}
+                    <li role="presentation" id="new-terminal">
+                      <a role="menuitem" tabindex="-1" href="#">Terminal</a>
+                    </li>
+                    {% endif %}
                     <li role="presentation" class="divider"></li>
                     <li role="presentation" class="dropdown-header" id="notebook-kernels">Notebooks</li>
                   </ul>
                 </div>
                 <div class="btn-group">
                     <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
                 </div>
               </div>
             </div>
           </div>
           <div id="notebook_list">
             <div id="notebook_list_header" class="row list_header">
               <div id="project_name">
                 <ul class="breadcrumb">
                   <li><a href="{{breadcrumbs[0][0]}}"><i class="fa fa-home"></i></a></li>
                 {% for crumb in breadcrumbs[1:] %}
                   <li><a href="{{crumb[0]}}">{{crumb[1]}}</a></li>
                 {% endfor %}
                 </ul>
               </div>
             </div>
           </div>
         </div>
         <div id="running" class="tab-pane">
           <div id="running_toolbar" class="row">
             <div class="col-sm-8 no-padding">
               <span id="running_list_info">Currently running Jupyter processes</span>
             </div>
             <div class="col-sm-4 no-padding tree-buttons">
               <span id="running_buttons" class="pull-right">
-              {% if terminals_available %}
-              <button id="new_terminal" title="New terminal" class="btn btn-default btn-xs">
-              New Terminal
-              </button>
-              {% endif %}
               <button id="refresh_running_list" title="Refresh running list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
               </span>
             </div>
           </div>
           <div class="panel-group" id="accordion" >
             <div class="panel panel-default">
               <div class="panel-heading">
                 <a data-toggle="collapse" data-target="#collapseOne" href="#">
                   Terminals
                 </a>
               </div>
               <div id="collapseOne" class=" collapse in">
                 <div class="panel-body">
                   {% if terminals_available %}
                     <div id="terminal_list">
                       <div id="terminal_list_header" class="row list_header">
                         <div> There are no terminals running. </div>
                       </div>
                     </div>
                     {% endif %}
                 </div>
               </div>
             </div>
             <div class="panel panel-default">
               <div class="panel-heading">
                 <a data-toggle="collapse" data-target="#collapseTwo" href="#">
                   Notebooks
                 </a>
               </div>
               <div id="collapseTwo" class=" collapse in">
                 <div class="panel-body">
                   <div id="running_list">
                     <div id="running_list_header" class="row list_header">
                       <div> There are no notebooks running. </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
           </div>   
         </div>
         <div id="clusters" class="tab-pane">
           <div id="cluster_toolbar" class="row">
             <div class="col-xs-8 no-padding">
               <span id="cluster_list_info">IPython parallel computing clusters</span>
             </div>
             <div class="col-xs-4 no-padding tree-buttons">
               <span id="cluster_buttons" class="pull-right">
               <button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
               </span>
             </div>
           </div>
           <div id="cluster_list">
             <div id="cluster_list_header" class="row list_header">
               <div class="profile_col col-xs-4">profile</div>
               <div class="status_col col-xs-3">status</div>
               <div class="engines_col col-xs-3" title="Enter the number of engines to start or empty for default"># of engines</div>
               <div class="action_col col-xs-2">action</div>
             </div>
           </div>
         </div>
       </div><!-- class:tab-content -->
     </div><!-- id:tab_content --> 
   </div><!-- ipython-main-app  -->
 
 {% endblock %}
 
 {% block script %}
     {{super()}}
 
 <script src="{{ static_url("tree/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
 {% endblock %}