##// END OF EJS Templates
Merge pull request #1934 from minrk/cellmd...
Merge pull request #1934 from minrk/cellmd Cell/Worksheet metadata * metadata dicts are attached to cells and worksheets * restores collapsed flag to the nbformat - this change happened in the refactor, and was undocumented, and possibly accidental. But we should either document it or fix it, and this includes a fix. * adds a new field, `nbformat_minor`, used to denote minor bumps of the notebook format that expose new capabilities but don't prevent loading by older clients. * Add a warning in Javascript if loading a multiworksheet notebook (which will exist in the future) as current JS code will only save the first. closes #1915

File last commit:

r7202:f229c422
r7612:ca7d2a9c merge
Show More
notebook.html
241 lines | 10.8 KiB | text/html | HtmlLexer
Brian Granger
Major refactoring of notebook....
r6193 {% extends page.html %}
{% block stylesheet %}
{% if mathjax_url %}
<script type="text/javascript" src="{{mathjax_url}}?config=TeX-AMS_HTML" charset="utf-8"></script>
{% end %}
<script type="text/javascript">
// MathJax disabled, set as null to distingish from *missing* MathJax,
// where it will be undefined, and should prompt a dialog later.
window.mathjax_url = "{{mathjax_url}}";
</script>
<link rel="stylesheet" href="{{ static_url("codemirror/lib/codemirror.css") }}">
<link rel="stylesheet" href="{{ static_url("codemirror/theme/ipython.css") }}">
<link rel="stylesheet" href="{{ static_url("prettify/prettify.css") }}"/>
<link rel="stylesheet" href="{{ static_url("css/notebook.css") }}" type="text/css" />
Matthias BUSSONNIER
change new tooltip appearence...
r7148 <link rel="stylesheet" href="{{ static_url("css/tooltip.css") }}" type="text/css" />
Brian Granger
Major refactoring of notebook....
r6193 <link rel="stylesheet" href="{{ static_url("css/renderedhtml.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 and not logged_in}}
data-notebook-id={{notebook_id}}
{% end %}
{% block header %}
<span id="save_widget">
<span id="notebook_name"></span>
<span id="save_status"></span>
</span>
{% end %}
{% block site %}
Brian Granger
Initial draft of HTML5/JS/CSS3 notebook.
r4292
Brian Granger
Major refactoring of saving, notification....
r6047 <div id="menubar_container">
Brian Granger
Implemented menu based UI using Wijmo.
r5857 <div id="menubar">
Brian Granger
Initial work to add Wijmo based menu.
r5856 <ul id="menus">
<li><a href="#">File</a>
<ul>
Brian Granger
Solid first go at jquery-ui based menus.
r5869 <li id="new_notebook"><a href="#">New</a></li>
<li id="open_notebook"><a href="#">Open...</a></li>
<hr/>
<li id="copy_notebook"><a href="#">Make a Copy...</a></li>
<li id="rename_notebook"><a href="#">Rename...</a></li>
<li id="save_notebook"><a href="#">Save</a></li>
<hr/>
Brian Granger
Initial work to add Wijmo based menu.
r5856 <li><a href="#">Download as</a>
<ul>
Brian Granger
Implemented menu based UI using Wijmo.
r5857 <li id="download_ipynb"><a href="#">IPython (.ipynb)</a></li>
<li id="download_py"><a href="#">Python (.py)</a></li>
Brian Granger
Initial work to add Wijmo based menu.
r5856 </ul>
</li>
Brian Granger
Solid first go at jquery-ui based menus.
r5869 <hr/>
Brian Granger
Created new print view for notebook printing.
r5875 <li id="print_notebook"><a href="/{{notebook_id}}/print" target="_blank">Print View</a></li>
Matthias BUSSONNIER
add 'Close and halt' in notebook filemenu
r6850 <hr/>
<li id="kill_and_exit"><a href="#" >Close and halt</a></li>
Brian Granger
Initial work to add Wijmo based menu.
r5856 </ul>
</li>
<li><a href="#">Edit</a>
<ul>
Brian Granger
Adding "Cell" to cell related Edit actions.
r5996 <li id="cut_cell"><a href="#">Cut Cell</a></li>
<li id="copy_cell"><a href="#">Copy Cell</a></li>
<li id="paste_cell" class="ui-state-disabled"><a href="#">Paste Cell</a></li>
<li id="paste_cell_above" class="ui-state-disabled"><a href="#">Paste Cell Above</a></li>
<li id="paste_cell_below" class="ui-state-disabled"><a href="#">Paste Cell Below</a></li>
Brian Granger
Solid first go at jquery-ui based menus.
r5869 <li id="delete_cell"><a href="#">Delete</a></li>
<hr/>
Brian Granger
Adding "Cell" to cell related Edit actions.
r5996 <li id="split_cell"><a href="#">Split Cell</a></li>
<li id="merge_cell_above"><a href="#">Merge Cell Above</a></li>
<li id="merge_cell_below"><a href="#">Merge Cell Below</a></li>
Brian Granger
Basic code cell splitting implemented.
r5896 <hr/>
Brian Granger
Adding "Cell" to cell related Edit actions.
r5996 <li id="move_cell_up"><a href="#">Move Cell Up</a></li>
<li id="move_cell_down"><a href="#">Move Cell Down</a></li>
Brian Granger
Solid first go at jquery-ui based menus.
r5869 <hr/>
Brian Granger
Adding "Cell" to cell related Edit actions.
r5996 <li id="select_previous"><a href="#">Select Previous Cell</a></li>
<li id="select_next"><a href="#">Select Next Cell</a></li>
Brian Granger
Initial work to add Wijmo based menu.
r5856 </ul>
</li>
Brian Granger
Further work on the toolbar UI....
r5994 <li><a href="#">View</a>
<ul>
<li id="toggle_header"><a href="#">Toggle Header</a></li>
<li id="toggle_toolbar"><a href="#">Toggle Toolbar</a></li>
</ul>
</li>
Brian Granger
Initial work to add Wijmo based menu.
r5856 <li><a href="#">Insert</a>
<ul>
Brian Granger
Solid first go at jquery-ui based menus.
r5869 <li id="insert_cell_above"><a href="#">Insert Cell Above</a></li>
<li id="insert_cell_below"><a href="#">Insert Cell Below</a></li>
Brian Granger
Initial work to add Wijmo based menu.
r5856 </ul>
</li>
<li><a href="#">Cell</a>
<ul>
Brian Granger
Solid first go at jquery-ui based menus.
r5869 <li id="run_cell"><a href="#">Run</a></li>
<li id="run_cell_in_place"><a href="#">Run in Place</a></li>
Brian Granger
Implemented menu based UI using Wijmo.
r5857 <li id="run_all_cells"><a href="#">Run All</a></li>
Brian Granger
Solid first go at jquery-ui based menus.
r5869 <hr/>
Brian Granger
Finishing first draft of RST and heading cells.
r6019 <li id="to_code"><a href="#">Code</a></li>
<li id="to_markdown"><a href="#">Markdown </a></li>
MinRK
denote raw cell with 'Raw Text' in UI
r6258 <li id="to_raw"><a href="#">Raw Text</a></li>
Brian Granger
Finishing first draft of RST and heading cells.
r6019 <li id="to_heading1"><a href="#">Heading 1</a></li>
<li id="to_heading2"><a href="#">Heading 2</a></li>
<li id="to_heading3"><a href="#">Heading 3</a></li>
<li id="to_heading4"><a href="#">Heading 4</a></li>
<li id="to_heading5"><a href="#">Heading 5</a></li>
<li id="to_heading6"><a href="#">Heading 6</a></li>
Brian Granger
Solid first go at jquery-ui based menus.
r5869 <hr/>
<li id="toggle_output"><a href="#">Toggle Output</a></li>
Brian Granger
Implemented menu based UI using Wijmo.
r5857 <li id="clear_all_output"><a href="#">Clear All Output</a></li>
Brian Granger
Initial work to add Wijmo based menu.
r5856 </ul>
</li>
<li><a href="#">Kernel</a>
<ul>
Brian Granger
Solid first go at jquery-ui based menus.
r5869 <li id="int_kernel"><a href="#">Interrupt</a></li>
<li id="restart_kernel"><a href="#">Restart</a></li>
Brian Granger
Initial work to add Wijmo based menu.
r5856 </ul>
</li>
<li><a href="#">Help</a>
<ul>
Brian Granger
Implemented menu based UI using Wijmo.
r5857 <li><a href="http://ipython.org/documentation.html" target="_blank">IPython Help</a></li>
<li><a href="http://ipython.org/ipython-doc/stable/interactive/htmlnotebook.html" target="_blank">Notebook Help</a></li>
Brian Granger
Solid first go at jquery-ui based menus.
r5869 <li id="keyboard_shortcuts"><a href="#">Keyboard Shortcuts</a></li>
<hr/>
Brian Granger
Implemented menu based UI using Wijmo.
r5857 <li><a href="http://docs.python.org" target="_blank">Python</a></li>
<li><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></li>
<li><a href="http://docs.scipy.org/doc/scipy/reference/" target="_blank">SciPy</a></li>
<li><a href="http://docs.sympy.org/dev/index.html" target="_blank">SymPy</a></li>
<li><a href="http://matplotlib.sourceforge.net/" target="_blank">Matplotlib</a></li>
Brian Granger
Initial work to add Wijmo based menu.
r5856 </ul>
</li>
</ul>
</div>
Brian Granger
Major refactoring of saving, notification....
r6047 <div id="notification"></div>
</div>
Brian Granger
Initial work to add Wijmo based menu.
r5856
Brian Granger
First draft of toolbar....
r5993 <div id="toolbar">
<span>
<button id="save_b">Save</button>
</span>
<span id="cut_copy_paste">
Brian Granger
Adding "Cell" to cell related Edit actions.
r5996 <button id="cut_b" title="Cut Cell">Cut Cell</button>
<button id="copy_b" title="Copy Cell">Copy Cell</button>
<button id="paste_b" title="Paste Cell">Paste Cell</button>
Brian Granger
First draft of toolbar....
r5993 </span>
<span id="move_up_down">
Brian Granger
Adding "Cell" to cell related Edit actions.
r5996 <button id="move_up_b" title="Move Cell Up">Move Cell Up</button>
<button id="move_down_b" title="Move Cell Down">Move Down</button>
Brian Granger
First draft of toolbar....
r5993 </span>
<span id="insert_above_below">
Brian Granger
Adding "Cell" to cell related Edit actions.
r5996 <button id="insert_above_b" title="Insert Cell Above">Insert Cell Above</button>
<button id="insert_below_b" title="Insert Cell Below">Insert Cell Below</button>
Brian Granger
First draft of toolbar....
r5993 </span>
<span id="run_int">
Brian Granger
Adding "Cell" to cell related Edit actions.
r5996 <button id="run_b" title="Run Cell">Run Cell</button>
Brian Granger
First draft of toolbar....
r5993 <button id="interrupt_b" title="Interrupt">Interrupt</button>
</span>
<span>
<select id="cell_type">
<option value="code">Code</option>
<option value="markdown">Markdown</option>
MinRK
denote raw cell with 'Raw Text' in UI
r6258 <option value="raw">Raw Text</option>
Brian Granger
Heading/plaintext cells now wired up to toolbar UI.
r6028 <option value="heading1">Heading 1</option>
<option value="heading2">Heading 2</option>
<option value="heading3">Heading 3</option>
<option value="heading4">Heading 4</option>
<option value="heading5">Heading 5</option>
<option value="heading6">Heading 6</option>
Brian Granger
First draft of toolbar....
r5993 </select>
</span>
</div>
Brian E. Granger
Implemented basic notebook browser and fixed numerous bugs.
r4488 <div id="main_app">
Brian Granger
Fixing main toolbar area and cleaning up jquery themes.
r4305
Brian E. Granger
Starting to refactor the notebook layout
r4355 <div id="notebook_panel">
<div id="notebook"></div>
<div id="pager_splitter"></div>
Brian E. Granger
Initial payload handling....
r4356 <div id="pager"></div>
Brian Granger
Fixing main toolbar area and cleaning up jquery themes.
r4305 </div>
Brian Granger
Initial draft of HTML5/JS/CSS3 notebook.
r4292
</div>
Matthias BUSSONNIER
rename show/hide methods to avoid jQuery conflict....
r7202 <div id='tooltip' class='tooltip ui-corner-all' style='display:none'></div>
Matthias Bussonnier
tooltip to mac
r7144
Brian Granger
Initial draft of HTML5/JS/CSS3 notebook.
r4292
Brian Granger
Major refactoring of notebook....
r6193 {% end %}
{% block script %}
Andrew Straw
use Tornado's handler.static_url() in templates
r6002
<script src="{{ static_url("codemirror/lib/codemirror.js") }}" charset="utf-8"></script>
<script src="{{ static_url("codemirror/mode/python/python.js") }}" charset="utf-8"></script>
<script src="{{ static_url("codemirror/mode/htmlmixed/htmlmixed.js") }}" charset="utf-8"></script>
<script src="{{ static_url("codemirror/mode/xml/xml.js") }}" charset="utf-8"></script>
<script src="{{ static_url("codemirror/mode/javascript/javascript.js") }}" charset="utf-8"></script>
<script src="{{ static_url("codemirror/mode/css/css.js") }}" charset="utf-8"></script>
<script src="{{ static_url("codemirror/mode/rst/rst.js") }}" charset="utf-8"></script>
<script src="{{ static_url("codemirror/mode/markdown/markdown.js") }}" charset="utf-8"></script>
<script src="{{ static_url("pagedown/Markdown.Converter.js") }}" charset="utf-8"></script>
<script src="{{ static_url("prettify/prettify.js") }}" charset="utf-8"></script>
<script src="{{ static_url("dateformat/date.format.js") }}" charset="utf-8"></script>
Brian Granger
Major refactoring of saving, notification....
r6047 <script src="{{ static_url("js/events.js") }}" type="text/javascript" charset="utf-8"></script>
Andrew Straw
use Tornado's handler.static_url() in templates
r6002 <script src="{{ static_url("js/utils.js") }}" type="text/javascript" charset="utf-8"></script>
Brian Granger
Major refactoring of notebook....
r6193 <script src="{{ static_url("js/layoutmanager.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/initmathjax.js") }}" type="text/javascript" charset="utf-8"></script>
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 <script src="{{ static_url("js/outputarea.js") }}" type="text/javascript" charset="utf-8"></script>
Andrew Straw
use Tornado's handler.static_url() in templates
r6002 <script src="{{ static_url("js/cell.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/codecell.js") }}" type="text/javascript" charset="utf-8"></script>
Matthias BUSSONNIER
implement the completer in a separate class...
r7131 <script src="{{ static_url("js/completer.js") }}" type="text/javascript" charset="utf-8"></script>
Andrew Straw
use Tornado's handler.static_url() in templates
r6002 <script src="{{ static_url("js/textcell.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/kernel.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/savewidget.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/quickhelp.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/pager.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/menubar.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/toolbar.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/notebook.js") }}" type="text/javascript" charset="utf-8"></script>
Brian Granger
Major refactoring of saving, notification....
r6047 <script src="{{ static_url("js/notificationwidget.js") }}" type="text/javascript" charset="utf-8"></script>
Matthias Bussonnier
tooltip to mac
r7144 <script src="{{ static_url("js/tooltip.js") }}" type="text/javascript" charset="utf-8"></script>
Andrew Straw
use Tornado's handler.static_url() in templates
r6002 <script src="{{ static_url("js/notebookmain.js") }}" type="text/javascript" charset="utf-8"></script>
Brian Granger
Refactoring of text/markdown/rst/html cells.
r4508
Matthias BUSSONNIER
rename context-hint to contexthint
r7196 <script src="{{ static_url("js/contexthint.js") }} charset="utf-8"></script>
Matthias BUSSONNIER
implement the completer in a separate class...
r7131
Brian Granger
Major refactoring of notebook....
r6193 {% end %}