Starting to refactor the notebook layout

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

@@ -1,220 +1,238 b''
 /**
  * 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: 12pt;
     /* 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;
 }
 
 div#wrapper {
     /* This is needed to make sure the wrapper fills the body */
     width: 100%;
     height: 100%;
 }
 
 span#ipython_notebook h1 {
     font-family: Verdana, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
-    font-size: 26pt;
+    font-size: 22pt;
     padding: 10px;
     margin: 10px;
 }
 
 div#tools {
     font-size: 11pt;
 }
 
 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 {
-    /* This is a trick from Google Docs. We set the height artificially low
-       and set overflow-y: auto to force scrolling of this dev when needed,
-       but prevent the browser window from scrolling. Crazy hack */
-    height: 15px;
+div#notebook_app {
+}
+
+div#left_panel {
+    width: 200px;
     overflow-y: auto;
-    overflow-x: hidden;
+}
+
+div#pager_splitter {
+    height: 7px;
+}
+
+div#left_panel_splitter {
+    width: 7px;
+}
+
+div#pager {
+    height: 200px;
+    overflow: auto;
+
+}
+
+div#notebook {
+    overflow-y: scroll;
+    overflow-x: auto;
     padding: 0px 40px;
     background-color: white;
     font-size: 12pt;
 }
 
 .monospace-font {
     font-family: monospace;
-/*    font-family: Monaco, Consolas, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace;*/
     font-size: 12pt;
 }
 
 div.cell {
     width: 100%;
     padding: 5px;
     /* This acts as a spacer between cells, that is outside the border */
     margin: 15px 0px 15px 0px;
     position: relative;
 }
 
 div.code_cell {
     background-color: white;
 }
 
 div.prompt {
     width: 90px;
     padding: 0px;
     margin: 0px;
 }
 
 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: 13pt;
 }
 
 div.output_png {
 }
 
 div.text_cell {
     background-color: white;
 }
 
 textarea.text_cell_input {
     /* Slightly bigger than the rest of the notebook */
     font-size: 13pt;
     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: 13pt;
     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,62 +1,96 b''
 
 //============================================================================
 // On document ready
 //============================================================================
 
 
 $(document).ready(function () {
 
     $('div#wrapper').addClass('vbox border-box-sizing')
-    $('div.notebook').addClass('box-flex1 border-box-sizing')
+    $('div#notebook_app').addClass('hbox box-flex1 border-box-sizing')
+    $('div#left_panel').addClass('vbox border-box-sizing ui-widget ui-widget-content')
+    $('div#pager_splitter').addClass('border-box-sizing ui-widget ui-widget-header')
+    $('div#notebook_panel').addClass('vbox box-flex1 border-box-sizing ui-widget ui-widget-content')
+    $('div#notebook').addClass('vbox box-flex1 border-box-sizing')
+    $('div#left_panel_splitter').addClass('border-box-sizing ui-widget ui-widget-header')
+    $('div#pager').addClass('border-box-sizing')
+
+    $('div#pager_splitter').click(function () {
+        $('div#pager').toggle('fast');
+    });
+
+    $('div#pager_splitter').hover(
+        function () {
+            $('div#pager_splitter').addClass('ui-state-hover');
+        },
+        function () {
+            $('div#pager_splitter').removeClass('ui-state-hover');
+        }
+    );
+
+    $('div#pager').hide();
+
+    $('div#left_panel_splitter').click(function () {
+        $('div#left_panel').toggle('fast');
+    });
+
+    $('div#left_panel_splitter').hover(
+        function () {
+            $('div#left_panel_splitter').addClass('ui-state-hover');
+        },
+        function () {
+            $('div#left_panel_splitter').removeClass('ui-state-hover');
+        }
+    );
 
     MathJax.Hub.Config({
         tex2jax: {
             inlineMath: [ ['$','$'], ["\\(","\\)"] ],
             displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
         },
         displayAlign: 'left', // Change this to 'center' to center equations.
         "HTML-CSS": {
             styles: {'.MathJax_Display': {"margin": 0}}
         }
     });
 
-    IPython.notebook = new IPython.Notebook('div.notebook');
+    IPython.notebook = new IPython.Notebook('div#notebook');
     IPython.notebook.insert_code_cell_after();
 
     $("#menu_tabs").tabs();
 
     $("#help_toolbar").buttonset();
 
     $("#kernel_toolbar").buttonset();
     $("#interrupt_kernel").click(function () {IPython.notebook.kernel.interrupt();});
     $("#restart_kernel").click(function () {IPython.notebook.kernel.restart();});
     $("#kernel_status").addClass("status_idle");
 
     $("#move_cell").buttonset();
     $("#move_up").button("option", "icons", {primary:"ui-icon-arrowthick-1-n"});
     $("#move_up").button("option", "text", false);
     $("#move_up").click(function () {IPython.notebook.move_cell_up();});
     $("#move_down").button("option", "icons", {primary:"ui-icon-arrowthick-1-s"});
     $("#move_down").button("option", "text", false);
     $("#move_down").click(function () {IPython.notebook.move_cell_down();});
 
     $("#insert_delete").buttonset();
     $("#insert_cell_before").click(function () {IPython.notebook.insert_code_cell_before();});
     $("#insert_cell_after").click(function () {IPython.notebook.insert_code_cell_after();});
     $("#delete_cell").button("option", "icons", {primary:"ui-icon-closethick"});
     $("#delete_cell").button("option", "text", false);
     $("#delete_cell").click(function () {IPython.notebook.delete_cell();});
 
     $("#cell_type").buttonset();
     $("#to_code").click(function () {IPython.notebook.text_to_code();});
     $("#to_text").click(function () {IPython.notebook.code_to_text();});
 
     $("#sort").buttonset();
     $("#sort_cells").click(function () {IPython.notebook.sort_cells();});
 
     $("#toggle").buttonset();
     $("#collapse").click(function () {IPython.notebook.collapse();});
     $("#expand").click(function () {IPython.notebook.expand();});
 
 });
 

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

@@ -1,112 +1,123 b''
 <!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.11.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="wrapper">
 
 <div id="header">
-    <span id="ipython_notebook"><h1>[I]:Python Notebook</h1></span>
+    <span id="ipython_notebook"><h1>IPython Notebook</h1></span>
 </div>
 
+<div id="notebook_app">
 
-<div id="tools">
-
-<div id="menu_tabs">
-    <span id="kernel_status">Idle</span>
-    <ul>
-        <li><a href="#cell_tab">Cell</a></li>
-        <li><a href="#kernel_tab">Kernel</a></li>
-        <li><a href="#help_tab">Help</a></li>
-    </ul>
-    <div id="cell_tab">
-        <span id="cell_toolbar">
-            <span id="move_cell">
-                <button id="move_up">Move up</button>
-                <button id="move_down">Move down</button>
-            </span>
-            <span id="insert_delete">
-                <button id="insert_cell_before">Before</button>
-                <button id="insert_cell_after">After</button>
-                <button id="delete_cell">Delete</button>
-            </span>
-            <span id="cell_type">
-                <button id="to_code">Code</button>
-                <button id="to_text">Text</button>
-            </span>
-            <span id="sort">
-                <button id="sort_cells">Sort</button>
-            </span>
-            <span id="toggle">
-                <button id="collapse">Collapse</button>
-                <button id="expand">Expand</button>
-            </span>
-        </span>
+    <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">This is a test</div>
     </div>
-    <div id="kernel_tab">
-        <span id="kernel_toolbar">
-            <button id="interrupt_kernel">Interrupt</button>
-            <button id="restart_kernel">Restart</button>
-        </span>
-    </div>
-    <div id="help_tab">
-        <span id="help_toolbar">
-            <button><a href="http://docs.python.org" target="_blank">Python</a></button>
-            <button><a href="http://ipython.github.com/ipython-doc/dev/index.html" target="_blank">IPython</a></button>
-            <button><a href="http://matplotlib.sourceforge.net/" target="_blank">Matplotlib</a></button>
-            <button><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></button>
-            <button><a href="http://docs.scipy.org/doc/scipy/reference/" target="_blank">SciPy</a></button>
-            <button><a href="http://docs.sympy.org/dev/index.html" target="_blank">SymPy</a></button>
-        </span>
-    </div>
-</div>
 
 </div>
 
-<div class="notebook"></div>
-
 </div>
 
 <script src="static/jquery/js/jquery-1.5.1.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/jquery/js/jquery-ui-1.8.11.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/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>
+
+
+<!--<div id="tools">-->
+
+<!--<div id="menu_tabs">-->
+<!--    <span id="kernel_status">Idle</span>-->
+<!--    <ul>-->
+<!--        <li><a href="#cell_tab">Cell</a></li>-->
+<!--        <li><a href="#kernel_tab">Kernel</a></li>-->
+<!--        <li><a href="#help_tab">Help</a></li>-->
+<!--    </ul>-->
+<!--    <div id="cell_tab">-->
+<!--        <span id="cell_toolbar">-->
+<!--            <span id="move_cell">-->
+<!--                <button id="move_up">Move up</button>-->
+<!--                <button id="move_down">Move down</button>-->
+<!--            </span>-->
+<!--            <span id="insert_delete">-->
+<!--                <button id="insert_cell_before">Before</button>-->
+<!--                <button id="insert_cell_after">After</button>-->
+<!--                <button id="delete_cell">Delete</button>-->
+<!--            </span>-->
+<!--            <span id="cell_type">-->
+<!--                <button id="to_code">Code</button>-->
+<!--                <button id="to_text">Text</button>-->
+<!--            </span>-->
+<!--            <span id="sort">-->
+<!--                <button id="sort_cells">Sort</button>-->
+<!--            </span>-->
+<!--            <span id="toggle">-->
+<!--                <button id="collapse">Collapse</button>-->
+<!--                <button id="expand">Expand</button>-->
+<!--            </span>-->
+<!--        </span>-->
+<!--    </div>-->
+<!--    <div id="kernel_tab">-->
+<!--        <span id="kernel_toolbar">-->
+<!--            <button id="interrupt_kernel">Interrupt</button>-->
+<!--            <button id="restart_kernel">Restart</button>-->
+<!--        </span>-->
+<!--    </div>-->
+<!--    <div id="help_tab">-->
+<!--        <span id="help_toolbar">-->
+<!--            <button><a href="http://docs.python.org" target="_blank">Python</a></button>-->
+<!--            <button><a href="http://ipython.github.com/ipython-doc/dev/index.html" target="_blank">IPython</a></button>-->
+<!--            <button><a href="http://matplotlib.sourceforge.net/" target="_blank">Matplotlib</a></button>-->
+<!--            <button><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></button>-->
+<!--            <button><a href="http://docs.scipy.org/doc/scipy/reference/" target="_blank">SciPy</a></button>-->
+<!--            <button><a href="http://docs.sympy.org/dev/index.html" target="_blank">SymPy</a></button>-->
+<!--        </span>-->
+<!--    </div>-->
+<!--</div>-->
+
+<!--</div>-->
+