upstream/ipython Commit - r16932:94644d14

Fixed status indicator region

jon -

r16932:94644d14

parent child

IPython/html/static/notebook/less/menubar.less

0 +8 -1

               line-height: 12px;
             }
+            #menubar .navbar-right {
+              // Add some padding to the right aligned items.
+              padding-top: 5px;
+            }
             i.menu-icon {
               // add padding to account for float-right
               padding-top: 4px;
               float: left;
             }
-            // http://www.bootply.com/86684
+            // Make sub menus work in BS3.
+            // Credit: http://www.bootply.com/86684
             .dropdown-submenu{position:relative;}
             .dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;}
             .dropdown-submenu:hover>.dropdown-menu{display:block;}

IPython/html/static/notebook/less/notificationarea.less

0 +13 -2

             #notification_area {
+                .pull-right();
                 z-index: 10;
             }
             }
             #kernel_indicator {
-                // Pull it to the right, outside the container boundary
+                .pull-right();
-                margin-right: -16px;
+                .indicator_area();
+                margin-right: 12px;
+            }
+            #modal_indicator {
+                .pull-right();
+                .indicator_area();
+                margin-right: 5px;
             }
             .edit_mode_icon:before {

IPython/html/templates/notebook.html

0 +196 -196

@@ -49,222 +49,222 b' class="notebook_app"'
49	<div id="menus" class="navbar navbar-default" role="navigation">	49	<div id="menus" class="navbar navbar-default" role="navigation">
50	<div class="container-fluid">	50	<div class="container-fluid">
51	<ul class="nav navbar-nav">	51	<ul class="nav navbar-nav">
52	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">File</a>	52	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">File</a>
53	<ul id="file_menu" class="dropdown-menu">	53	<ul id="file_menu" class="dropdown-menu">
54	<li id="new_notebook"	54	<li id="new_notebook"
55	title="Make a new notebook (Opens a new window)">	55	title="Make a new notebook (Opens a new window)">
56	<a href="#">New</a></li>	56	<a href="#">New</a></li>
57	<li id="open_notebook"	57	<li id="open_notebook"
58	title="Opens a new window with the Dashboard view">	58	title="Opens a new window with the Dashboard view">
59	<a href="#">Open...</a></li>	59	<a href="#">Open...</a></li>
60	<!-- <hr/> -->	60	<!-- <hr/> -->
61	<li class="divider"></li>	61	<li class="divider"></li>
62	<li id="copy_notebook"	62	<li id="copy_notebook"
63	title="Open a copy of this notebook's contents and start a new kernel">	63	title="Open a copy of this notebook's contents and start a new kernel">
64	<a href="#">Make a Copy...</a></li>	64	<a href="#">Make a Copy...</a></li>
65	<li id="rename_notebook"><a href="#">Rename...</a></li>	65	<li id="rename_notebook"><a href="#">Rename...</a></li>
66	<li id="save_checkpoint"><a href="#">Save and Checkpoint</a></li>	66	<li id="save_checkpoint"><a href="#">Save and Checkpoint</a></li>
67	<!-- <hr/> -->	67	<!-- <hr/> -->
68	<li class="divider"></li>	68	<li class="divider"></li>
69	<li id="restore_checkpoint" class="dropdown-submenu"><a href="#">Revert to Checkpoint</a>	69	<li id="restore_checkpoint" class="dropdown-submenu"><a href="#">Revert to Checkpoint</a>
70	<ul class="dropdown-menu">	70	<ul class="dropdown-menu">
71	<li><a href="#"></a></li>	71	<li><a href="#"></a></li>
72	<li><a href="#"></a></li>	72	<li><a href="#"></a></li>
73	<li><a href="#"></a></li>	73	<li><a href="#"></a></li>
74	<li><a href="#"></a></li>	74	<li><a href="#"></a></li>
75	<li><a href="#"></a></li>	75	<li><a href="#"></a></li>
76	</ul>	76	</ul>
77	</li>	77	</li>
78	<li class="divider"></li>	78	<li class="divider"></li>
79	<li id="print_preview"><a href="#">Print Preview</a></li>	79	<li id="print_preview"><a href="#">Print Preview</a></li>
80	<li class="dropdown-submenu"><a href="#">Download as</a>	80	<li class="dropdown-submenu"><a href="#">Download as</a>
81	<ul class="dropdown-menu">	81	<ul class="dropdown-menu">
82	<li id="download_ipynb"><a href="#">IPython Notebook (.ipynb)</a></li>	82	<li id="download_ipynb"><a href="#">IPython Notebook (.ipynb)</a></li>
83	<li id="download_py"><a href="#">Python (.py)</a></li>	83	<li id="download_py"><a href="#">Python (.py)</a></li>
84	<li id="download_html"><a href="#">HTML (.html)</a></li>	84	<li id="download_html"><a href="#">HTML (.html)</a></li>
85	<li id="download_rst"><a href="#">reST (.rst)</a></li>	85	<li id="download_rst"><a href="#">reST (.rst)</a></li>
86	<li id="download_pdf"><a href="#">PDF (.pdf)</a></li>	86	<li id="download_pdf"><a href="#">PDF (.pdf)</a></li>
		87	</ul>
		88	</li>
		89	<li class="divider"></li>
		90	<li id="trust_notebook"
		91	title="Trust the output of this notebook">
		92	<a href="#" >Trust Notebook</a></li>
		93	<li class="divider"></li>
		94	<li id="kill_and_exit"
		95	title="Shutdown this notebook's kernel, and close this window">
		96	<a href="#" >Close and halt</a></li>
87	</ul>	97	</ul>
88	</li>	98	</li>
89	<li class="divider"></li>	99	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Edit</a>
90	<li id="trust_notebook"	100	<ul id="edit_menu" class="dropdown-menu">
91	title="Trust the output of this notebook">	101	<li id="cut_cell"><a href="#">Cut Cell</a></li>
92	<a href="#" >~~Trust Notebook~~</a></li>	102	<li id="copy_cell"><a href="#">Copy Cell</a></li>
93	<li class="divider"></li>	103	<li id="paste_cell_above" class="disabled"><a href="#">Paste Cell Above</a></li>
94	<li id="kill_and_exit"	104	<li id="paste_cell_below" class="disabled"><a href="#">Paste Cell Below</a></li>
95	title="Shutdown this notebook's kernel, and close this window">	105	<li id="paste_cell_replace" class="disabled"><a href="#">Paste Cell & Replace</a></li>
96	<a href="#" >~~Close and halt~~</a></li>	106	<li id="delete_cell"><a href="#">Delete Cell</a></li>
97	</ul>	107	<li id="undelete_cell" class="disabled"><a href="#">Undo Delete Cell</a></li>
98	</li>	108	<li class="divider"></li>
99	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Edit</a>	109	<li id="split_cell"><a href="#">Split Cell</a></li>
100	<ul id="edit_menu" class="dropdown-menu">	110	<li id="merge_cell_above"><a href="#">Merge Cell Above</a></li>
101	<li id="~~cut_cell~~"><a href="#">~~Cut Cell~~</a></li>	111	<li id="merge_cell_below"><a href="#">Merge Cell Below</a></li>
102	<li id="copy_cell"><a href="#">Copy Cell</a></li>	112	<li class="divider"></li>
103	<li id="~~paste_cell_above"~~ ~~class~~=~~"disabled~~"><a href="#">~~Paste Cell Above~~</a></li>	113	<li id="move_cell_up"><a href="#">Move Cell Up</a></li>
104	<li id="~~paste_cell_below"~~ ~~class~~=~~"disabled~~"><a href="#">~~Paste Cell Below~~</a></li>	114	<li id="move_cell_down"><a href="#">Move Cell Down</a></li>
105	<li id="paste_cell_replace" class="disabled"><a href="#">Paste Cell & Replace</a></li>	115	<li class="divider"></li>
106	<li id="~~delete_cell~~"><a href="#">~~Delete Cell~~</a></li>	116	<li id="edit_nb_metadata"><a href="#">Edit Notebook Metadata</a></li>
107	<li id="undelete_cell" class="disabled"><a href="#">Undo Delete Cell</a></li>
108	<li class="divider"></li>
109	<li id="split_cell"><a href="#">Split Cell</a></li>
110	<li id="merge_cell_above"><a href="#">Merge Cell Above</a></li>
111	<li id="merge_cell_below"><a href="#">Merge Cell Below</a></li>
112	<li class="divider"></li>
113	<li id="move_cell_up"><a href="#">Move Cell Up</a></li>
114	<li id="move_cell_down"><a href="#">Move Cell Down</a></li>
115	<li class="divider"></li>
116	<li id="edit_nb_metadata"><a href="#">Edit Notebook Metadata</a></li>
117	</ul>
118	</li>
119	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">View</a>
120	<ul id="view_menu" class="dropdown-menu">
121	<li id="toggle_header"
122	title="Show/Hide the IPython Notebook logo and notebook title (above menu bar)">
123	<a href="#">Toggle Header</a></li>
124	<li id="toggle_toolbar"
125	title="Show/Hide the action icons (below menu bar)">
126	<a href="#">Toggle Toolbar</a></li>
127	</ul>
128	</li>
129	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Insert</a>
130	<ul id="insert_menu" class="dropdown-menu">
131	<li id="insert_cell_above"
132	title="Insert an empty Code cell above the currently active cell">
133	<a href="#">Insert Cell Above</a></li>
134	<li id="insert_cell_below"
135	title="Insert an empty Code cell below the currently active cell">
136	<a href="#">Insert Cell Below</a></li>
137	</ul>
138	</li>
139	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Cell</a>
140	<ul id="cell_menu" class="dropdown-menu">
141	<li id="run_cell" title="Run this cell, and move cursor to the next one">
142	<a href="#">Run</a></li>
143	<li id="run_cell_select_below" title="Run this cell, select below">
144	<a href="#">Run and Select Below</a></li>
145	<li id="run_cell_insert_below" title="Run this cell, insert below">
146	<a href="#">Run and Insert Below</a></li>
147	<li id="run_all_cells" title="Run all cells in the notebook">
148	<a href="#">Run All</a></li>
149	<li id="run_all_cells_above" title="Run all cells above (but not including) this cell">
150	<a href="#">Run All Above</a></li>
151	<li id="run_all_cells_below" title="Run this cell and all cells below it">
152	<a href="#">Run All Below</a></li>
153	<li class="divider"></li>
154	<li id="change_cell_type" class="dropdown-submenu"
155	title="All cells in the notebook have a cell type. By default, new cells are created as 'Code' cells">
156	<a href="#">Cell Type</a>
157	<ul class="dropdown-menu">
158	<li id="to_code"
159	title="Contents will be sent to the kernel for execution, and output will display in the footer of cell">
160	<a href="#">Code</a></li>
161	<li id="to_markdown"
162	title="Contents will be rendered as HTML and serve as explanatory text">
163	<a href="#">Markdown</a></li>
164	<li id="to_raw"
165	title="Contents will pass through nbconvert unmodified">
166	<a href="#">Raw NBConvert</a></li>
167	<li id="to_heading1"><a href="#">Heading 1</a></li>
168	<li id="to_heading2"><a href="#">Heading 2</a></li>
169	<li id="to_heading3"><a href="#">Heading 3</a></li>
170	<li id="to_heading4"><a href="#">Heading 4</a></li>
171	<li id="to_heading5"><a href="#">Heading 5</a></li>
172	<li id="to_heading6"><a href="#">Heading 6</a></li>
173	</ul>	117	</ul>
174	</li>	118	</li>
175	<li class="divider"></li>	119	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">View</a>
176	<li id="~~current_outputs~~" class="dropdown-~~sub~~menu"><a ~~href~~=~~"#"~~>~~Current Output~~</a>	120	<ul id="view_menu" class="dropdown-menu">
177	<ul ~~class~~="~~dropdown-menu"~~>	121	<li id="toggle_header"
178	<li id="toggle_current_output"	122	title="Show/Hide the IPython Notebook logo and notebook title (above menu bar)">
179	title="Hide/Show the output of the current cell">	123	<a href="#">Toggle Header</a></li>
180	<a ~~href~~="#">~~Toggle~~</a>	124	<li id="toggle_toolbar"
181	</li>	125	title="Show/Hide the action icons (below menu bar)">
182	<li id="toggle_current_output_scroll"	126	<a href="#">Toggle Toolbar</a></li>
183	title="Scroll the output of the current cell">
184	<a href="#">Toggle Scrolling</a>
185	</li>
186	<li id="clear_current_output"
187	title="Clear the output of the current cell">
188	<a href="#">Clear</a>
189	</li>
190	</ul>	127	</ul>
191	</li>	128	</li>
192	<li id="all_outputs" class="dropdown-submenu"><a href="#">All Output</a>	129	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Insert</a>
193	<ul class="dropdown-menu">	130	<ul id="insert_menu" class="dropdown-menu">
194	<li id="~~toggle_all_output~~"	131	<li id="insert_cell_above"
195	title="~~Hide/Show the output of all cells~~">	132	title="Insert an empty Code cell above the currently active cell">
196	<a href="#">~~Toggl~~e</a>	133	<a href="#">Insert Cell Above</a></li>
		134	<li id="insert_cell_below"
		135	title="Insert an empty Code cell below the currently active cell">
		136	<a href="#">Insert Cell Below</a></li>
		137	</ul>
		138	</li>
		139	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Cell</a>
		140	<ul id="cell_menu" class="dropdown-menu">
		141	<li id="run_cell" title="Run this cell, and move cursor to the next one">
		142	<a href="#">Run</a></li>
		143	<li id="run_cell_select_below" title="Run this cell, select below">
		144	<a href="#">Run and Select Below</a></li>
		145	<li id="run_cell_insert_below" title="Run this cell, insert below">
		146	<a href="#">Run and Insert Below</a></li>
		147	<li id="run_all_cells" title="Run all cells in the notebook">
		148	<a href="#">Run All</a></li>
		149	<li id="run_all_cells_above" title="Run all cells above (but not including) this cell">
		150	<a href="#">Run All Above</a></li>
		151	<li id="run_all_cells_below" title="Run this cell and all cells below it">
		152	<a href="#">Run All Below</a></li>
		153	<li class="divider"></li>
		154	<li id="change_cell_type" class="dropdown-submenu"
		155	title="All cells in the notebook have a cell type. By default, new cells are created as 'Code' cells">
		156	<a href="#">Cell Type</a>
		157	<ul class="dropdown-menu">
		158	<li id="to_code"
		159	title="Contents will be sent to the kernel for execution, and output will display in the footer of cell">
		160	<a href="#">Code</a></li>
		161	<li id="to_markdown"
		162	title="Contents will be rendered as HTML and serve as explanatory text">
		163	<a href="#">Markdown</a></li>
		164	<li id="to_raw"
		165	title="Contents will pass through nbconvert unmodified">
		166	<a href="#">Raw NBConvert</a></li>
		167	<li id="to_heading1"><a href="#">Heading 1</a></li>
		168	<li id="to_heading2"><a href="#">Heading 2</a></li>
		169	<li id="to_heading3"><a href="#">Heading 3</a></li>
		170	<li id="to_heading4"><a href="#">Heading 4</a></li>
		171	<li id="to_heading5"><a href="#">Heading 5</a></li>
		172	<li id="to_heading6"><a href="#">Heading 6</a></li>
		173	</ul>
197	</li>	174	</li>
198	<li id="~~toggle_all_output_scroll"~~	175	<li class="divider"></li>
199	title="Scroll the output of all cells">	176	<li id="current_outputs" class="dropdown-submenu"><a href="#">Current Output</a>
200	<a href="#">Toggle Scrolling</a>	177	<ul class="dropdown-menu">
		178	<li id="toggle_current_output"
		179	title="Hide/Show the output of the current cell">
		180	<a href="#">Toggle</a>
		181	</li>
		182	<li id="toggle_current_output_scroll"
		183	title="Scroll the output of the current cell">
		184	<a href="#">Toggle Scrolling</a>
		185	</li>
		186	<li id="clear_current_output"
		187	title="Clear the output of the current cell">
		188	<a href="#">Clear</a>
		189	</li>
		190	</ul>
201	</li>	191	</li>
202	<li id="clear_all_output"	192	<li id="all_outputs" class="dropdown-submenu"><a href="#">All Output</a>
203	title="Clear the output of all cells">	193	<ul class="dropdown-menu">
204	<a ~~href~~="#">~~Clear~~</a>	194	<li id="toggle_all_output"
		195	title="Hide/Show the output of all cells">
		196	<a href="#">Toggle</a>
		197	</li>
		198	<li id="toggle_all_output_scroll"
		199	title="Scroll the output of all cells">
		200	<a href="#">Toggle Scrolling</a>
		201	</li>
		202	<li id="clear_all_output"
		203	title="Clear the output of all cells">
		204	<a href="#">Clear</a>
		205	</li>
		206	</ul>
205	</li>	207	</li>
206	</ul>	208	</ul>
207	</li>	209	</li>
208	</ul>	210	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Kernel</a>
209	</li>	211	<ul id="kernel_menu" class="dropdown-menu">
210	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Kernel</a>	212	<li id="int_kernel"
211	<ul id="kernel_menu" class="dropdown-menu">	213	title="Send KeyboardInterrupt (CTRL-C) to the Kernel">
212	<li id="int_kernel"	214	<a href="#">Interrupt</a></li>
213	title="Send KeyboardInterrupt (CTRL-C) to the Kernel">	215	<li id="restart_kernel"
214	<a href="#">Interrupt</a></li>	216	title="Restart the Kernel">
215	<li id="restart_kernel"	217	<a href="#">Restart</a></li>
216	~~title~~=~~"Restart the Kernel"~~>	218	</ul>
217	<a ~~href~~=~~"#"~~>~~Restart~~</a></li>	219	</li>
218	</ul>	220	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Help</a>
219	</li>	221	<ul id="help_menu" class="dropdown-menu">
220	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Help</a>	222	<li id="notebook_tour" title="A quick tour of the notebook user interface"><a href="#">User Interface Tour</a></li>
221	<ul id="help_menu" class="dropdown-menu">	223	<li id="keyboard_shortcuts" title="Opens a tooltip with all keyboard shortcuts"><a href="#">Keyboard Shortcuts</a></li>
222	<li id="notebook_tour" title="A quick tour of the notebook user interface"><a href="#">User Interface Tour</a></li>
223	<li id="keyboard_shortcuts" title="Opens a tooltip with all keyboard shortcuts"><a href="#">Keyboard Shortcuts</a></li>
224	<li class="divider"></li>
225	{% set
226	sections = (
227	(
228	("http://ipython.org/documentation.html","IPython Help",True),
229	("http://nbviewer.ipython.org/github/ipython/ipython/tree/2.x/examples/Index.ipynb", "Notebook Help", True),
230	),(
231	("http://docs.python.org","Python",True),
232	("http://help.github.com/articles/github-flavored-markdown","Markdown",True),
233	("http://docs.scipy.org/doc/numpy/reference/","NumPy",True),
234	("http://docs.scipy.org/doc/scipy/reference/","SciPy",True),
235	("http://matplotlib.org/contents.html","Matplotlib",True),
236	("http://docs.sympy.org/latest/index.html","SymPy",True),
237	("http://pandas.pydata.org/pandas-docs/stable/","pandas", True)
238	)
239	)
240	%}
241
242	{% for helplinks in sections %}
243	{% for link in helplinks %}
244	<li><a href="{{link[0]}}" {{'target="_blank" title="Opens in a new window"' if link[2]}}>
245	{{'<i class="icon-external-link menu-icon pull-right"></i>' if link[2]}}
246	{{link[1]}}
247	</a></li>
248	{% endfor %}
249	{% if not loop.last %}
250	<li class="divider"></li>	224	<li class="divider"></li>
251	~~{% endif %}~~	225	{% set
252	{% endfor %}	226	sections = (
		227	(
		228	("http://ipython.org/documentation.html","IPython Help",True),
		229	("http://nbviewer.ipython.org/github/ipython/ipython/tree/2.x/examples/Index.ipynb", "Notebook Help", True),
		230	),(
		231	("http://docs.python.org","Python",True),
		232	("http://help.github.com/articles/github-flavored-markdown","Markdown",True),
		233	("http://docs.scipy.org/doc/numpy/reference/","NumPy",True),
		234	("http://docs.scipy.org/doc/scipy/reference/","SciPy",True),
		235	("http://matplotlib.org/contents.html","Matplotlib",True),
		236	("http://docs.sympy.org/latest/index.html","SymPy",True),
		237	("http://pandas.pydata.org/pandas-docs/stable/","pandas", True)
		238	)
		239	)
		240	%}
		241
		242	{% for helplinks in sections %}
		243	{% for link in helplinks %}
		244	<li><a href="{{link[0]}}" {{'target="_blank" title="Opens in a new window"' if link[2]}}>
		245	{{'<i class="icon-external-link menu-icon pull-right"></i>' if link[2]}}
		246	{{link[1]}}
		247	</a></li>
		248	{% endfor %}
		249	{% if not loop.last %}
		250	<li class="divider"></li>
		251	{% endif %}
		252	{% endfor %}
		253	</li>
		254	</ul>
253	</li>	255	</li>
254	</ul>	256	</ul>
255	</li>	257	<ul class="nav navbar-nav navbar-right">
256	</ul>	258	<div id="kernel_indicator">
257	</div>
258	</div>
259
260	<!-- float to the right of the menu bar -->
261	<div id="kernel_indicator" class="indicator_area pull-right">
262	<i id="kernel_indicator_icon"></i>	259	<i id="kernel_indicator_icon"></i>
263	</div>	260	</div>
264	<div id="modal_indicator" class="indicator_area pull-right">	261	<div id="modal_indicator">
265	<i id="modal_indicator_icon"></i>	262	<i id="modal_indicator_icon"></i>
266	</div>	263	</div>
267	<div id="notification_area"></div>	264	<div id="notification_area"></div>
		265	</ul>
		266	</div>
		267	</div>
268	</div>	268	</div>
269	<div id="maintoolbar" class="navbar">	269	<div id="maintoolbar" class="navbar">
270	<div class="toolbar-inner navbar-inner navbar-nobg">	270	<div class="toolbar-inner navbar-inner navbar-nobg">

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages