Minors fixes and initial work on save widget.

* Fixed width of buttons in left panel.
* Started to create a save widget for the header.

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

@@ -0,0 +1,37
+
+//============================================================================
+// Cell
+//============================================================================
+
+var IPython = (function (IPython) {
+
+    var utils = IPython.utils;
+
+    var SaveWidget = function (selector) {
+        this.element = $(selector);
+        this.create_element();
+        if (this.element !== undefined) {
+            this.element.data("cell", this);
+            this.bind_events();
+        }
+    };
+
+
+    SaveWidget.prototype.bind_events = function () {
+        var that = this;
+    };
+
+
+    // Subclasses must implement create_element.
+    SaveWidget.prototype.create_element = function () {
+        this.element.
+            append($('textarea')).
+            append($('<button>Save</button>').button());
+    };
+
+    IPython.SaveWidget = SaveWidget;
+
+    return IPython;
+
+}(IPython));
+

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

@@ -1,296 +1,303
 /**
  * HTML5 ✰ Boilerplate
  *
  * style.css contains a reset, font normalization and some base styles.
  *
  * Credit is left where credit is due.
  * Much inspiration was taken from these projects:
  * - yui.yahooapis.com/2.8.1/build/base/base.css
  * - camendesign.com/design/
  * - praegnanz.de/weblog/htmlcssjs-kickstart
  */
 
 
 /**
  * html5doctor.com Reset Stylesheet (Eric Meyer's Reset Reloaded + HTML5 baseline)
  * v1.6.1 2010-09-17 | Authors: Eric Meyer & Richard Clark
  * html5doctor.com/html-5-reset-stylesheet/
  */
 
 html, body, div, span, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp,
 small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0;
   border: 0;
 /*  font-size: 100%;*/
   font: inherit;
   vertical-align: baseline;
 }
 
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block;
 }
 
 blockquote, q { quotes: none; }
 
 blockquote:before, blockquote:after,
 q:before, q:after { content: ""; content: none; }
 
 ins { background-color: #ff9; color: #000; text-decoration: none; }
 
 mark { background-color: #ff9; color: #000; font-style: italic; font-weight: bold; }
 
 del { text-decoration: line-through; }
 
 abbr[title], dfn[title] { border-bottom: 1px dotted; cursor: help; }
 
 table { border-collapse: collapse; border-spacing: 0; }
 
 hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
 
 input, select { vertical-align: middle; }
 
 body {
     background-color: white;
     /* This won't propagate to all children so we also set it below */
     font-size: 11pt;
     /* This makes sure that the body covers the entire window and needs to
        be in a different element than the display: box in wrapper below */
     position: absolute;
     left: 0px;
     right: 0px;
     top: 0px;
     bottom: 0px;
     overflow: hidden;
 }
 
 
-span#ipython_notebook h1 {
-    font-family: Verdana, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
-    font-size: 22pt;
+div#header {
     height: 35px;
     padding: 5px;
     margin: 0px;
+    width: 100%
+}
 
+span#ipython_notebook {
+}
+
+span#ipython_notebook h1 {
+    font-family: Verdana, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
+    font-size: 22pt;
 }
 
 span#kernel_status {
     position: absolute;
     top: 12%;
     right: 10px;
 	font-weight: bold;
 }
 
 .status_idle {
     color: gray;
 }
 
 .status_busy {
     color: red;
 }
 
 .status_restarting {
     color: black;
 }
 
 div#notebook_app {
     width: 100%;
     position: relative;
 }
 
 div#left_panel {
     overflow-y: auto;
     top: 0px;
     left: 0px;
     margin: 0px;
     padding: 0px;
     position: absolute;
 }
 
 h3.section_header {
     padding: 5px;
 }
 
 div.section_content {
     padding: 5px;
 }
 
 #expand_cell, #collapse_cell, #insert_cell_above, #insert_cell_below,
 #move_cell_up, #move_cell_down, #to_code, #to_text, #run_selected_cell,
-#run_all_cells {
+#run_all_cells, #int_kernel, #restart_kernel, #python_help, #ipython_help,
+#numpy_help, #matplotlib_help, #scipy_help, #sympy_help {
     width: 65px;
 }
 
 .cell_section_row {
     margin: 5px 0px;
 }
 
 .cell_section_row_buttons {
     float: right;
 }
 
 .cell_section_row_header {
     float: left;
     font-size: 0.8em;
     padding: 0.2em 0em;
     font-weight: bold;
 }
 
 span.button_label {
     padding: 0.2em 1em;
     font-size: 0.8em;
     float: right;
 }
 
 /* This is needed because FF was adding a 2px margin top and bottom. */
 .cell_section_row .ui-button {
     margin-top: 0px;
     margin-bottom: 0px;
 }
 
 
 .ui-button .ui-button-text {
     padding: 0.2em 0.8em;
     font-size: 0.7em;
 }
 
 div#left_panel_splitter {
     width: 8px;
     top: 0px;
     left: 202px;
     margin: 0px;
     padding: 0px;
     position: absolute;
 }
 
 div#notebook_panel {
 /*    The L margin will be set in the Javascript code*/
     margin: 0px 0px 0px 0px;
     padding: 0px;
 }
 
 div#notebook {
     overflow-y: scroll;
     overflow-x: auto;
     width: 100%;
     padding: 0px 15px 0px 15px;
     margin: 0px
     background-color: white;
     font-size: 11pt;
 }
 
 div#pager_splitter {
     height: 8px;
 }
 
 div#pager {
     padding: 15px;
     overflow: auto;
 }
 
 .monospace-font {
     font-family: monospace;
     font-size: 11pt;
 }
 
 div.cell {
     width: 100%;
     padding: 5px;
     /* This acts as a spacer between cells, that is outside the border */
     margin: 15px 0px 15px 0px;
 }
 
 div.code_cell {
     background-color: white;
 }
 
 div.prompt {
     width: 90px;
     padding: 0.4em;
     margin: 0px;
     line-height: 1em;
 }
 
 div.input_prompt {
     color: navy;
 }
 
 div.output {
     /* This is a spacer between the input and output of each cell */
     margin-top: 15px;
 }
 
 div.output_prompt {
     color: darkred;
 }
 
 div.output_area {
     text-align: left;
     color: black;
 }
 
 div.output_latex {
     /* Slightly bigger than the rest of the notebook */
     font-size: 12pt;
 }
 
 div.output_png {
 }
 
 div.text_cell {
     background-color: white;
 }
 
 textarea.text_cell_input {
     /* Slightly bigger than the rest of the notebook */
     font-size: 12pt;
     outline: none;
     resize: none;
     width:  inherit;
     border-style: none;
     padding: 0px;
     margin: 0px;
     color: black;
 }
 
 div.text_cell_render {
     font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
     /* Slightly bigger than the rest of the notebook */
     font-size: 12pt;
     outline: none;
     resize: none;
     width:  inherit;
     border-style: none;
     padding: 5px;
     color: black;
 }
 
 div.text_cell_render em {font-style: italic;}
 div.text_cell_render strong {font-weight: bold;}
 div.text_cell_render u {text-decoration: underline;}
 div.text_cell_render :link { text-decoration: underline }
 div.text_cell_render :visited { text-decoration: underline }
 div.text_cell_render h1 {font-size: 2.0em; margin: .67em 0; font-weight: bold;}
 div.text_cell_render h2 {font-size: 1.5em; margin: .75em 0; font-weight: bold;}
 div.text_cell_render h3 {font-size: 1.17em; margin: .83em 0; font-weight: bold;}
 div.text_cell_render h4 {margin: 1.12em 0; font-weight: bold;}
 div.text_cell_render h5 {font-size: .83em; margin: 1.5em 0; font-weight: bold;}
 div.text_cell_render h6 {font-size: .75em; margin: 1.67em 0; font-weight: bold;}
 div.text_cell_render ul {list-style:disc; margin-left: 40px;}
 div.text_cell_render ul ul {list-style:square; margin-left: 40px;}
 div.text_cell_render ul ul ul {list-style:circle; margin-left: 40px;}
 div.text_cell_render ol {list-style:upper-roman; margin-left: 40px;}
 div.text_cell_render ol ol {list-style:upper-alpha;}
 div.text_cell_render ol ol ol {list-style:decimal;}
 div.text_cell_render ol ol ol ol {list-style:lower-alpha;}
 div.text_cell_render ol ol ol ol ol {list-style:lower-roman;}
 
 

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

@@ -1,32 +1,33
 
 //============================================================================
 // On document ready
 //============================================================================
 
 
 $(document).ready(function () {
 
     MathJax.Hub.Config({
         tex2jax: {
             inlineMath: [ ['$','$'], ["\\(","\\)"] ],
             displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
         },
         displayAlign: 'left', // Change this to 'center' to center equations.
         "HTML-CSS": {
             styles: {'.MathJax_Display': {"margin": 0}}
         }
     });
 
     $('div#notebook_app').addClass('border-box-sizing ui-widget ui-widget-content');
     $('div#notebook_panel').addClass('border-box-sizing ui-widget');
 
     IPython.layout_manager = new IPython.LayoutManager();
+//    IPython.save_widget = new IPython.SaveWidget('span#save_widget');
     IPython.pager = new IPython.Pager('div#pager', 'div#pager_splitter');
     IPython.left_panel = new IPython.LeftPanel('div#left_panel', 'div#left_panel_splitter');
     IPython.notebook = new IPython.Notebook('div#notebook');
 
     IPython.notebook.insert_code_cell_after();
     IPython.layout_manager.do_resize();
     IPython.pager.collapse();
 });
 

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

@@ -1,285 +1,285
 
 //============================================================================
 // Cell
 //============================================================================
 
 var IPython = (function (IPython) {
 
     var utils = IPython.utils;
 
     // Base PanelSection class
 
     var PanelSection = function () {
         if (this.section_name === undefined) {
             this.section_name = 'section';
         };
         this.create_element();
         if (this.element !== undefined) {
             this.bind_events();
         }
         this.expanded = true;
     };
 
 
     PanelSection.prototype.bind_events = function () {
         var that = this;
         this.header.click(function () {
             that.toggle();
         });
         this.header.hover(function () {
             that.header.toggleClass('ui-state-hover');
         });
     };
 
 
     PanelSection.prototype.create_element = function () {
         this.element = $('<div/>').attr('id',this.id());
         this.header = $('<h3>'+this.section_name+'</h3>').
             addClass('ui-widget ui-state-default section_header');
         this.content = $('<div/>').
             addClass('ui-widget section_content');
         this.element.append(this.header).append(this.content);
         this.create_children();
     };
 
 
     PanelSection.prototype.id = function () {
         return this.section_name.toLowerCase() + "_section";
     };
 
 
     PanelSection.prototype.expand = function () {
         if (!this.expanded) {
             this.content.slideDown('fast');
 //            this.header.addClass('ui-state-active');
 //            this.header.removeClass('ui-state-default');
             this.expanded = true;
         };
     };
 
 
     PanelSection.prototype.collapse = function () {
         if (this.expanded) {
             this.content.slideUp('fast');
 //            this.header.removeClass('ui-state-active');
 //            this.header.addClass('ui-state-default');
             this.expanded = false;
         };
     };
 
 
     PanelSection.prototype.toggle = function () {
         if (this.expanded === true) {
             this.collapse();
         } else {
             this.expand();
         };
     };
 
 
     PanelSection.prototype.create_children = function () {};
 
 
     // NotebookSection
 
     var NotebookSection = function () {
         this.section_name = "Notebook";
         PanelSection.apply(this, arguments);
     };
 
 
     NotebookSection.prototype = new PanelSection();
 
 
     // CellSection
 
     var CellSection = function () {
         this.section_name = "Cell";
         PanelSection.apply(this, arguments);
     };
 
 
     CellSection.prototype = new PanelSection();
 
 
     CellSection.prototype.bind_events = function () {
         PanelSection.prototype.bind_events.apply(this);
         this.content.find('#collapse_cell').click(function () {
             IPython.notebook.collapse();
         });
         this.content.find('#expand_cell').click(function () {
             IPython.notebook.expand();
         });
         this.content.find('#delete_cell').click(function () {
             IPython.notebook.delete_cell();
         });
         this.content.find('#insert_cell_above').click(function () {
             IPython.notebook.insert_code_cell_before();
         });
         this.content.find('#insert_cell_below').click(function () {
             IPython.notebook.insert_code_cell_after();
         });
         this.content.find('#move_cell_up').click(function () {
             IPython.notebook.move_cell_up();
         });
         this.content.find('#move_cell_down').click(function () {
             IPython.notebook.move_cell_down();
         });
         this.content.find('#to_code').click(function () {
             IPython.notebook.text_to_code();
         });
         this.content.find('#to_text').click(function () {
             IPython.notebook.code_to_text();
         });
         this.content.find('#run_selected_cell').click(function () {
             alert("Not Implemented");
         });
         this.content.find('#run_all_cells').click(function () {
             alert("Not Implemented");
         });
     };
 
 
     CellSection.prototype.create_children = function () {
 
         this.content.addClass('ui-helper-clearfix');
 
         var row0 = $('<div>').addClass('cell_section_row ui-helper-clearfix').
             append($('<span/>').addClass('cell_section_row_buttons').
                 append($('<button>X</button>').attr('id','delete_cell'))).
             append($('<span/>').html('Actions').addClass('cell_section_row_header'));
         row0.find('#delete_cell').button();
         this.content.append(row0);
 
         var row1 = $('<div>').addClass('cell_section_row ui-helper-clearfix').
             append($('<span/>').attr('id','insert').addClass('cell_section_row_buttons').
                 append( $('<button>Above</button>').attr('id','insert_cell_above') ).
                 append( $('<button>Below</button>').attr('id','insert_cell_below') )).
             append($('<span/>').html('Insert').addClass('button_label'));
         row1.find('#insert').buttonset();
         this.content.append(row1);
 
         var row2 = $('<div>').addClass('cell_section_row ui-helper-clearfix').
             append($('<span/>').attr('id','move').addClass('cell_section_row_buttons').
                 append( $('<button>Up</button>').attr('id','move_cell_up') ).
                 append( $('<button>Down</button>').attr('id','move_cell_down') ) ).
             append($('<span/>').html('Move').addClass('button_label'));
         row2.find('#move').buttonset();
         this.content.append(row2);
 
         var row3 = $('<div>').addClass('cell_section_row ui-helper-clearfix').
             append($('<span/>').attr('id','cell_type').addClass('cell_section_row_buttons').
                 append( $('<button>Code</button>').attr('id','to_code') ).
                 append( $('<button>Text</button>').attr('id','to_text') ) ).
             append($('<span/>').html('Cell Type').addClass('button_label'));
         row3.find('#cell_type').buttonset();
         this.content.append(row3);
 
         var row1 = $('<div>').addClass('cell_section_row ui-helper-clearfix').
             append($('<span/>').attr('id','toggle_output').addClass('cell_section_row_buttons').
                 append( $('<button>Collapse</button>').attr('id','collapse_cell') ).
                 append( $('<button>Expand</button>').attr('id','expand_cell') ) ).
             append($('<span/>').html('Output').addClass('button_label'));
         row1.find('#toggle_output').buttonset();
         this.content.append(row1);
 
         var row0 = $('<div>').addClass('cell_section_row').
             append($('<span/>').attr('id','run_cells').addClass('cell_section_row_buttons').
                 append( $('<button>Selected</button>').attr('id','run_selected_cell') ).
                 append( $('<button>All</button>').attr('id','run_all_cells') ) ).
             append($('<span/>').html('Run').addClass('button_label'));
         row0.find('#run_cells').buttonset();
         this.content.append(row0);
     };
 
 
     // KernelSection
 
     var KernelSection = function () {
         this.section_name = "Kernel";
         PanelSection.apply(this, arguments);
     };
 
 
     KernelSection.prototype = new PanelSection();
 
 
     KernelSection.prototype.bind_events = function () {
         PanelSection.prototype.bind_events.apply(this);
         this.content.find('#restart_kernel').click(function () {
             IPython.notebook.kernel.restart();
         });
         this.content.find('#int_kernel').click(function () {
             IPython.notebook.kernel.interrupt();
         });
     };
 
 
     KernelSection.prototype.create_children = function () {
 
         this.content.addClass('ui-helper-clearfix');
 
         var row0 = $('<div>').addClass('cell_section_row ui-helper-clearfix').
             append($('<span/>').attr('id','int_restart').addClass('cell_section_row_buttons').
                 append( $('<button>Interrupt</button>').attr('id','int_kernel') ).
                 append( $('<button>Restart</button>').attr('id','restart_kernel') )).
             append($('<span/>').html('Actions').addClass('cell_section_row_header'));
         row0.find('#int_restart').buttonset();
         this.content.append(row0);
     };
 
 
     // HelpSection
 
     var HelpSection = function () {
         this.section_name = "Help";
         PanelSection.apply(this, arguments);
     };
 
 
     HelpSection.prototype = new PanelSection();
 
 
     HelpSection.prototype.bind_events = function () {
         PanelSection.prototype.bind_events.apply(this);
     };
 
 
     HelpSection.prototype.create_children = function () {
 
         this.content.addClass('ui-helper-clearfix');
 
         var row0 = $('<div>').addClass('cell_section_row ui-helper-clearfix').
             append($('<span/>').attr('id','help_buttons0').addClass('cell_section_row_buttons').
                 append( $('<button/>').attr('id','python_help').
                     append( $('<a>Python</a>').attr('href','http://docs.python.org').attr('target','_blank') )).
                 append( $('<button/>').attr('id','ipython_help').
                     append( $('<a>IPython</a>').attr('href','http://ipython.org/documentation.html').attr('target','_blank') )).
                 append( $('<button/>').attr('id','numpy_help').
                     append( $('<a>NumPy</a>').attr('href','http://docs.scipy.org/doc/numpy/reference/').attr('target','_blank') ))).
             append($('<span/>').html('Links').addClass('cell_section_row_header'));
         row0.find('#help_buttons0').buttonset();
         this.content.append(row0);
 
         var row1 = $('<div>').addClass('cell_section_row ui-helper-clearfix').
             append($('<span/>').attr('id','help_buttons1').addClass('cell_section_row_buttons').
                 append( $('<button/>').attr('id','matplotlib_help').
-                    append( $('<a>Matplotlib</a>').attr('href','http://matplotlib.sourceforge.net/').attr('target','_blank') )).
+                    append( $('<a>MPL</a>').attr('href','http://matplotlib.sourceforge.net/').attr('target','_blank') )).
                 append( $('<button/>').attr('id','scipy_help').
                     append( $('<a>SciPy</a>').attr('href','http://docs.scipy.org/doc/scipy/reference/').attr('target','_blank') )).
                 append( $('<button/>').attr('id','sympy_help').
                     append( $('<a>SymPy</a>').attr('href','http://docs.sympy.org/dev/index.html').attr('target','_blank') )));
         row1.find('#help_buttons1').buttonset();
         this.content.append(row1);
     };
 
     IPython.PanelSection = PanelSection;
     IPython.NotebookSection = NotebookSection;
     IPython.CellSection = CellSection;
     IPython.KernelSection = KernelSection;
     IPython.HelpSection = HelpSection;
 
     return IPython;
 
 }(IPython));
 

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

@@ -1,70 +1,72
 <!DOCTYPE HTML>
 <html>
 
 <head>
     <meta charset="utf-8">
 
     <title>IPython Notebook</title>
 
     <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" />
     <!-- <link rel="stylesheet" href="static/jquery/css/themes/rocket/jquery-wijmo.css" type="text/css" /> -->
 <!--    <link rel="stylesheet" href="static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css" type="text/css" />-->
 
     <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" charset="utf-8"></script>
     <!-- <script type='text/javascript' src='static/mathjax/MathJax.js?config=TeX-AMS_HTML' charset='utf-8'></script> -->
     <script type="text/javascript">
     if (typeof MathJax == 'undefined') {
         console.log("Trying to load local copy of MathJax");
         document.write(unescape("%3Cscript type='text/javascript' src='static/mathjax/MathJax.js%3Fconfig=TeX-AMS_HTML' charset='utf-8'%3E%3C/script%3E"));
     }
     </script>
 
     <link rel="stylesheet" href="static/codemirror2/lib/codemirror.css">
     <link rel="stylesheet" href="static/codemirror2/mode/python/python.css">
 
     <link rel="stylesheet" href="static/css/layout.css" type="text/css" />
     <link rel="stylesheet" href="static/css/notebook.css" type="text/css" />
 
 </head>
 
 <body>
 
 <div id="header">
     <span id="ipython_notebook"><h1>IPython Notebook</h1></span>
+    <span id="save_widget"></span>
 </div>
 
 <div id="notebook_app">
 
     <div id="left_panel"></div>
     <div id="left_panel_splitter"></div>
     <div id="notebook_panel">
         <div id="notebook"></div>
         <div id="pager_splitter"></div>
         <div id="pager"></div>
     </div>
 
 </div>
 
 <script src="static/jquery/js/jquery-1.6.2.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/jquery/js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/jquery/js/jquery.autogrow.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/namespace.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/utils.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/cell.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/codecell.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/textcell.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/kernel.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/layout.js" type="text/javascript" charset="utf-8"></script>
+<script src="static/js/savewidget.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/pager.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/panelsection.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/leftpanel.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/notebook.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/notebook_main.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/codemirror2/lib/codemirror.js"></script>
 <script src="static/codemirror2/mode/python/python.js"></script>
 
 </body>
 
 </html>