upstream/ipython Commit - r19478:ac67a84b

just indent everythin twice

Bussonnier Matthias -

r19478:ac67a84b

parent child

IPython/html/templates/notebook.html

0 +5 -4

             {% block stylesheet %}
             {% if mathjax_url %}
-            <script type="text/javascript" src="{{mathjax_url}}?config=TeX-AMS_HTML-full&delayStartupUntil=configured" charset="utf-8"></script>
+            <script type="text/javascript" src="{{mathjax_url}}?config=TeX-AMS_HTML-full%26delayStartupUntil=configured" charset="utf-8"></script>
             {% endif %}
             <script type="text/javascript">
             // MathJax disabled, set as null to distingish from *missing* MathJax,
                 <span class="autosave_status"></span>
             </span>
-            <span id="kernel_selector_widget" class="pull-right dropdown">
+            <div id="kernel_selector_widget" class="pull-right dropdown">
-              <img id="current_kernel_logo"/>
+              <!-- empty png in 26 bytes below-->
+              <img id="current_kernel_logo" src="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D" alt='current kernel logo'>
               <button class="dropdown-toggle btn btn-sm navbar-btn" data-toggle="dropdown" type='button' id="current_kernel_spec">
                 <span class='kernel_name'>Kernel</span>
                 <span class="caret"></span>
               </button>
               <ul id="kernel_selector" class="dropdown-menu">
               </ul>
-            </span>
+            </div>
             {% endblock headercontainer %}

IPython/html/templates/tree.html

0 +68 -83

@@ -19,132 +19,117 b' data-terminals-available="{{terminals_available}}"'
19		19
20	{% block site %}	20	{% block site %}
21		21
22	<div id="ipython-main-app" class="container">	22	<div id="ipython-main-app" class="container">
23		23	<div id="tab_content" class="tabbable">
24	<div id="tab_content" class="tabbable">	24	<ul id="tabs" class="nav nav-tabs">
25	<ul id="tabs" class="nav nav-tabs">
26	<li class="active"><a href="#notebooks" data-toggle="tab">Notebooks</a></li>	25	<li class="active"><a href="#notebooks" data-toggle="tab">Notebooks</a></li>
27	<li><a href="#running" data-toggle="tab">Running</a></li>	26	<li><a href="#running" data-toggle="tab">Running</a></li>
28	{% if terminals_available %}	27	{% if terminals_available %}
29	<li><a href="#terminals" data-toggle="tab">Terminals</a></li>	28	<li><a href="#terminals" data-toggle="tab">Terminals</a></li>
30	{% endif %}	29	{% endif %}
31	<li><a href="#clusters" data-toggle="tab">Clusters</a></li>	30	<li><a href="#clusters" data-toggle="tab">Clusters</a></li>
32	</ul>	31	</ul>
33		32	<div class="tab-content">
34	<div class="tab-~~content~~">	33	<div id="notebooks" class="tab-pane active">
35	<div id="notebooks" class="~~tab-pane active~~">	34	<div id="notebook_toolbar" class="row">
36	<div id="notebook_toolbar" class="row">
37	<div class="col-sm-12 no-padding">	35	<div class="col-sm-12 no-padding">
38	<form id='alternate_upload' class='alternate_upload'>	36	<form id='alternate_upload' class='alternate_upload'>
39	<span id="notebook_list_info">	37	<span id="notebook_list_info">
40	To import a notebook, drag the file onto the listing below or	38	To import a notebook, drag the file onto the listing below or
41	<span class="input-overlay">	39	<span class="input-overlay">
42	<input type="file" name="datafile" class="fileinput" multiple='multiple'>	40	<input type="file" name="datafile" class="fileinput" multiple='multiple'>
43	click here.	41	click here.
44	</span>	42	</span>
45	</span>	43	</span>
46	</form>	44	</form>
47	<div id="notebook_buttons" class="pull-right">	45	<div id="notebook_buttons" class="pull-right">
48	<div id="new-notebook-buttons" class="btn-group">	46	<div id="new-notebook-buttons" class="btn-group">
49	<button id="new_notebook" class="btn btn-default btn-xs">	47	<button id="new_notebook" class="btn btn-default btn-xs">
50	New Notebook	48	New Notebook
51	</button>	49	</button>
52	<button class="dropdown-toggle btn btn-default btn-xs" data-toggle="dropdown">	50	<button class="dropdown-toggle btn btn-default btn-xs" data-toggle="dropdown">
53	<span id="current-kernel">Loading...</span>	51	<span id="current-kernel">Loading...</span>
54	<span class="caret"></span>	52	<span class="caret"></span>
55	</button>	53	</button>
56	<ul id="new-notebook-menu" class="dropdown-menu"></ul>	54	<ul id="new-notebook-menu" class="dropdown-menu"></ul>
57	</div>	55	</div>
58
59
60	<button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>	56	<button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
61	</div>	57	</div>
62	</div>	58	</div>
63	</div>	59	</div>
64		60	<div id="notebook_list">
65	<div id="notebook_list">	61	<div id="notebook_list_header" class="row list_header">
66	<div id="notebook_list_header" class="row list_header">
67	<div id="project_name">	62	<div id="project_name">
68	<ul class="breadcrumb">	63	<ul class="breadcrumb">
69	<li><a href="{{breadcrumbs[0][0]}}"><i class="fa fa-home"></i></a></li>	64	<li><a href="{{breadcrumbs[0][0]}}"><i class="fa fa-home"></i></a></li>
70	{% for crumb in breadcrumbs[1:] %}	65	{% for crumb in breadcrumbs[1:] %}
71	<li><a href="{{crumb[0]}}">{{crumb[1]}}</a></li>	66	<li><a href="{{crumb[0]}}">{{crumb[1]}}</a></li>
72	{% endfor %}	67	{% endfor %}
73	</ul>	68	</ul>
74	</div>	69	</div>
		70	</div>
75	</div>	71	</div>
76	</div>	72	</div>
77	</div>	73	<div id="running" class="tab-pane">
78		74	<div id="running_toolbar" class="row">
79	<div id="running" class="tab-pane">
80
81	<div id="running_toolbar" class="row">
82	<div class="col-sm-8 no-padding">	75	<div class="col-sm-8 no-padding">
83	<span id="running_list_info">Currently running IPython notebooks</span>	76	<span id="running_list_info">Currently running IPython notebooks</span>
84	</div>	77	</div>
85	<div class="col-sm-4 no-padding tree-buttons">	78	<div class="col-sm-4 no-padding tree-buttons">
86	<span id="running_buttons" class="pull-right">	79	<span id="running_buttons" class="pull-right">
87	<button id="refresh_running_list" title="Refresh running list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>	80	<button id="refresh_running_list" title="Refresh running list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
88	</span>	81	</span>
89	</div>	82	</div>
		83	</div>
		84	<div id="running_list">
		85	<div id="running_list_header" class="row list_header">
		86	<div> There are no notebooks running. </div>
		87	</div>
		88	</div>
90	</div>	89	</div>
91		90	{% if terminals_available %}
92	<div id="~~running_list~~">	91	<div id="terminals" class="tab-pane">
93	<div id="~~running_list_heade~~r" class="row ~~list_header~~">	92	<div id="terminal_toolbar" class="row">
94	<div> There are no notebooks running. </div>
95	</div>
96	</div>
97	</div>
98
99	{% if terminals_available %}
100	<div id="terminals" class="tab-pane">
101
102	<div id="terminal_toolbar" class="row">
103	<div class="col-xs-8 no-padding">	93	<div class="col-xs-8 no-padding">
104	<span id="terminal_list_info">Currently running terminals</span>	94	<span id="terminal_list_info">Currently running terminals</span>
105	</div>	95	</div>
106	<div class="col-xs-4 no-padding tree-buttons">	96	<div class="col-xs-4 no-padding tree-buttons">
107	<span id="terminal_buttons" class="pull-right">	97	<span id="terminal_buttons" class="pull-right">
108	<button id="new_terminal" title="New terminal" class="btn btn-default btn-xs">New Terminal</button>	98	<button id="new_terminal" title="New terminal" class="btn btn-default btn-xs">New Terminal</button>
109	<button id="refresh_terminal_list" title="Refresh terminal list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>	99	<button id="refresh_terminal_list" title="Refresh terminal list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
110	</span>	100	</span>
111	</div>	101	</div>
112	</div>	102	</div>
113		103	<div id="terminal_list">
114	<div id="terminal_list">
115	<div id="terminal_list_header" class="row list_header">	104	<div id="terminal_list_header" class="row list_header">
116	<div> There are no terminals running. </div>	105	<div> There are no terminals running. </div>
117	</div>	106	</div>
		107	</div>
118	</div>	108	</div>
119	</div>	109	{% endif %}
120	{% endif %}	110	<div id="clusters" class="tab-pane">
121		111	<div id="cluster_toolbar" class="row">
122	<div id="clusters" class="tab-pane">
123
124	<div id="cluster_toolbar" class="row">
125	<div class="col-xs-8 no-padding">	112	<div class="col-xs-8 no-padding">
126	<span id="cluster_list_info">IPython parallel computing clusters</span>	113	<span id="cluster_list_info">IPython parallel computing clusters</span>
127	</div>	114	</div>
128	<div class="col-xs-4 no-padding tree-buttons">	115	<div class="col-xs-4 no-padding tree-buttons">
129	<span id="cluster_buttons" class="pull-right">	116	<span id="cluster_buttons" class="pull-right">
130	<button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>	117	<button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
131	</span>	118	</span>
132	</div>	119	</div>
133	</div>	120	</div>
134		121	<div id="cluster_list">
135	<div id="cluster_list">
136	<div id="cluster_list_header" class="row list_header">	122	<div id="cluster_list_header" class="row list_header">
137	<div class="profile_col col-xs-4">profile</div>	123	<div class="profile_col col-xs-4">profile</div>
138	<div class="status_col col-xs-3">status</div>	124	<div class="status_col col-xs-3">status</div>
139	<div class="engines_col col-xs-3" title="Enter the number of engines to start or empty for default"># of engines</div>	125	<div class="engines_col col-xs-3" title="Enter the number of engines to start or empty for default"># of engines</div>
140	<div class="action_col col-xs-2">action</div>	126	<div class="action_col col-xs-2">action</div>
141	</div>	127	</div>
		128	</div>
142	</div>	129	</div>
143	</div>	130	</div><!-- class:tab-content -->
144	</div>	131	</div><!-- id:tab_content -->
145	</div><!-- ~~tab_content -->~~	132	</div><!-- ipython-main-app -->
146
147	</div><!-- ipython-main-app -->
148		133
149	{% endblock %}	134	{% endblock %}
150		135

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