upstream/ipython Commit - r19477:da58c6f3

emit valid html:...

Bussonnier Matthias -

r19477:da58c6f3

parent child

IPython/html/templates/page.html

0 +2 -2

             <!DOCTYPE HTML>
             <html>
             <head>
                 <meta charset="utf-8">
                 <title>{% block title %}IPython Notebook{% endblock %}</title>
                 {% block favicon %}<link rel="shortcut icon" type="image/x-icon" href="{{static_url("base/images/favicon.ico") }}">{% endblock %}
-                <meta http-equiv="X-UA-Compatible" content="chrome=1">
+                <meta http-equiv="X-UA-Compatible" content="IE=edge" />
                 <link rel="stylesheet" href="{{static_url("components/jquery-ui/themes/smoothness/jquery-ui.min.css") }}" type="text/css" />
                 <meta name="viewport" content="width=device-width, initial-scale=1.0">
                 {% block stylesheet %}
                 <link rel="stylesheet" href="{{ static_url("style/style.min.css") }}" type="text/css"/>
                 {% endblock %}
                 <link rel="stylesheet" href="{{ static_url("custom/custom.css") }}" type="text/css" />
                 <script src="{{static_url("components/es6-promise/promise.min.js")}}" type="text/javascript" charset="utf-8"></script>
                 <script src="{{static_url("components/requirejs/require.js") }}" type="text/javascript" charset="utf-8"></script>
                 <script>
                   require.config({
                       {% if version_hash %}
                       urlArgs: "v={{version_hash}}",
                       {% endif %}
                       baseUrl: '{{static_url("", include_version=False)}}',
                       paths: {
                         nbextensions : '{{ base_url }}nbextensions',
                         underscore : 'components/underscore/underscore-min',
                         backbone : 'components/backbone/backbone-min',
                         jquery: 'components/jquery/jquery.min',
                         bootstrap: 'components/bootstrap/js/bootstrap.min',
                         bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min',
                         jqueryui: 'components/jquery-ui/ui/minified/jquery-ui.min',
                         moment: 'components/moment/moment',
                         codemirror: 'components/codemirror',
                         termjs: 'components/term.js/src/term',
                       },
                       shim: {
                         underscore: {
                           exports: '_'
                         },
                         backbone: {
                           deps: ["underscore", "jquery"],
                           exports: "Backbone"
                         },
                         bootstrap: {
                           deps: ["jquery"],
                           exports: "bootstrap"
                         },
                         bootstraptour: {
                           deps: ["bootstrap"],
                           exports: "Tour"
                         },
                         jqueryui: {
                           deps: ["jquery"],
                           exports: "$"
                         }
                       }
                   });
                   require.config({
                       map: {
                           '*':{
                             'contents': '{{ contents_js_source }}',
                           }
                       }
                   });
                 </script>
                 {% block meta %}
                 {% endblock %}
             </head>
             <body {% block params %}{% endblock %}>
             <noscript>
                 <div id='noscript'>
                   IPython Notebook requires JavaScript.<br>
                   Please enable it to proceed.
               </div>
             </noscript>
             <div id="header" class="navbar navbar-fixed-top">
               <div id="header-container" class="container">
-              <div id="ipython_notebook" class="nav navbar-brand pull-left"><a href="{{base_url}}tree" alt='dashboard'>{% block logo %}<img src='{{static_url("base/images/logo.png") }}' alt='Jupyter Notebook'/>{% endblock %}</a></div>
+              <div id="ipython_notebook" class="nav navbar-brand pull-left"><a href="{{base_url}}tree" title='dashboard'>{% block logo %}<img src='{{static_url("base/images/logo.png") }}' alt='Jupyter Notebook'/>{% endblock %}</a></div>
               {% block login_widget %}
                 <span id="login_widget">
                   {% if logged_in %}
                     <button id="logout" class="btn btn-sm navbar-btn">Logout</button>
                   {% elif login_available and not logged_in %}
                     <button id="login" class="btn btn-sm navbar-btn">Login</button>
                   {% endif %}
                 </span>
               {% endblock %}
               {% block headercontainer %}
               {% endblock %}
               </div>
               <div class="header-bar"></div>
               {% block header %}
               {% endblock %}
             </div>
             <div id="header-spacer"></div>
             <div id="site">
             {% block site %}
             {% endblock %}
             </div>
             {% block script %}
             {% endblock %}
             </body>
             </html>

IPython/html/templates/tree.html

0 +5 -4

             {% extends "page.html" %}
             {% block title %}{{page_title}}{% endblock %}
             {% block stylesheet %}
             {{super()}}
             <link rel="stylesheet" href="{{ static_url("tree/css/override.css") }}" type="text/css" />
             {% endblock %}
             {% block params %}
             data-base-url="{{base_url}}"
             data-notebook-path="{{notebook_path}}"
             data-terminals-available="{{terminals_available}}"
             {% endblock %}
             {% block site %}
             <div id="ipython-main-app" class="container">
             <div id="tab_content" class="tabbable">
                 <ul id="tabs" class="nav nav-tabs">
                     <li class="active"><a href="#notebooks" data-toggle="tab">Notebooks</a></li>
                     <li><a href="#running" data-toggle="tab">Running</a></li>
                   {% if terminals_available %}
                     <li><a href="#terminals" data-toggle="tab">Terminals</a></li>
                   {% endif %}
                     <li><a href="#clusters" data-toggle="tab">Clusters</a></li>
                 </ul>
                 <div class="tab-content">
                 <div id="notebooks" class="tab-pane active">
                     <div id="notebook_toolbar" class="row">
                         <div class="col-sm-12 no-padding">
                             <form id='alternate_upload'  class='alternate_upload'>
                                 <span id="notebook_list_info">
                                     To import a notebook, drag the file onto the listing below or
                                     <span class="input-overlay">
                                       <input type="file" name="datafile" class="fileinput" multiple='multiple'>
                                       click here.
                                     </span>
                                 </span>
                             </form>
-                          <span id="notebook_buttons" class="pull-right">
+                          <div id="notebook_buttons" class="pull-right">
                             <div id="new-notebook-buttons" class="btn-group">
                               <button id="new_notebook" class="btn btn-default btn-xs">
                                 New Notebook
                               </button>
                               <button class="dropdown-toggle btn btn-default btn-xs" data-toggle="dropdown">
                                 <span id="current-kernel">Loading...</span>
                                 <span class="caret"></span>
                               </button>
                               <ul id="new-notebook-menu" class="dropdown-menu"></ul>
                             </div>
                             <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
-                          </span>
+                          </div>
                         </div>
                     </div>
                     <div id="notebook_list">
                       <div id="notebook_list_header" class="row list_header">
                           <div id="project_name">
                             <ul class="breadcrumb">
                                 <li><a href="{{breadcrumbs[0][0]}}"><i class="fa fa-home"></i></a></li>
                                 {% for crumb in breadcrumbs[1:] %}
                                     <li><a href="{{crumb[0]}}">{{crumb[1]}}</a></li>
                                 {% endfor %}
                             </ul>
                           </div>
                       </div>
                     </div>
                 </div>
                 <div id="running" class="tab-pane">
                     <div id="running_toolbar" class="row">
                         <div class="col-sm-8 no-padding">
                             <span id="running_list_info">Currently running IPython notebooks</span>
                         </div>
                         <div class="col-sm-4 no-padding tree-buttons">
                             <span id="running_buttons" class="pull-right">
                                 <button id="refresh_running_list" title="Refresh running list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
                             </span>
                         </div>
                     </div>
                     <div id="running_list">
                         <div id="running_list_header" class="row list_header">
                             <div> There are no notebooks running. </div>
                         </div>
                     </div>
                 </div>
               {% if terminals_available %}
                 <div id="terminals" class="tab-pane">
                     <div id="terminal_toolbar" class="row">
                         <div class="col-xs-8 no-padding">
                             <span id="terminal_list_info">Currently running terminals</span>
                         </div>
                         <div class="col-xs-4 no-padding tree-buttons">
                             <span id="terminal_buttons" class="pull-right">
                                 <button id="new_terminal" title="New terminal" class="btn btn-default btn-xs">New Terminal</button>
                                 <button id="refresh_terminal_list" title="Refresh terminal list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
                             </span>
                         </div>
                     </div>
                     <div id="terminal_list">
                         <div id="terminal_list_header" class="row list_header">
                             <div> There are no terminals running. </div>
                         </div>
                     </div>
                 </div>
               {% endif %}
                 <div id="clusters" class="tab-pane">
                     <div id="cluster_toolbar" class="row">
                         <div class="col-xs-8 no-padding">
                             <span id="cluster_list_info">IPython parallel computing clusters</span>
                         </div>
                         <div class="col-xs-4 no-padding tree-buttons">
                             <span id="cluster_buttons" class="pull-right">
                                 <button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
                             </span>
                         </div>
                     </div>
                     <div id="cluster_list">
                         <div id="cluster_list_header" class="row list_header">
                             <div class="profile_col col-xs-4">profile</div>
                             <div class="status_col col-xs-3">status</div>
                             <div class="engines_col col-xs-3" title="Enter the number of engines to start or empty for default"># of engines</div>
                             <div class="action_col col-xs-2">action</div>
                         </div>
                     </div>
                 </div>
-            </div>
+                </div>
+            </div><!-- tab_content -->
-            </div>
+            </div><!-- ipython-main-app  -->
             {% endblock %}
             {% block script %}
                 {{super()}}
             <script src="{{ static_url("tree/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
             {% endblock %}

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