Show More
@@ -32,7 +32,6 b' define([' | |||
|
32 | 32 | |
|
33 | 33 | KernelSelector.prototype._got_kernelspecs = function(data) { |
|
34 | 34 | this.kernelspecs = data.kernelspecs; |
|
35 | var menu = this.element.find("#kernel_selector"); | |
|
36 | 35 | var change_kernel_submenu = $("#menu-change-kernel-submenu"); |
|
37 | 36 | var keys = Object.keys(data.kernelspecs).sort(function (a, b) { |
|
38 | 37 | // sort by display_name |
@@ -48,12 +47,6 b' define([' | |||
|
48 | 47 | }); |
|
49 | 48 | for (var i = 0; i < keys.length; i++) { |
|
50 | 49 | var ks = this.kernelspecs[keys[i]]; |
|
51 | var ksentry = $("<li>").attr("id", "kernel-" +ks.name).append($('<a>') | |
|
52 | .attr('href', '#') | |
|
53 | .click($.proxy(this.change_kernel, this, ks.name)) | |
|
54 | .text(ks.display_name)); | |
|
55 | menu.append(ksentry); | |
|
56 | ||
|
57 | 50 | var ks_submenu_entry = $("<li>").attr("id", "kernel-submenu-"+ks.name).append($('<a>') |
|
58 | 51 | .attr('href', '#') |
|
59 | 52 | .click($.proxy(this.change_kernel, this, ks.name)) |
@@ -132,7 +125,7 b' define([' | |||
|
132 | 125 | var that = this; |
|
133 | 126 | this.events.on('spec_changed.Kernel', function(event, data) { |
|
134 | 127 | that.current_selection = data.name; |
|
135 |
|
|
|
128 | $("#kernel_indicator").find('.kernel_indicator_name').text(data.display_name); | |
|
136 | 129 | that.element.find("#current_kernel_logo").attr("src", that.notebook.base_url+"kernelspecs/"+data.name+"/logo-64x64.png"); |
|
137 | 130 | }); |
|
138 | 131 | |
@@ -146,7 +139,7 b' define([' | |||
|
146 | 139 | } |
|
147 | 140 | }); |
|
148 | 141 | |
|
149 | var logo_img = this.element.find("#current_kernel_logo") | |
|
142 | var logo_img = this.element.find("#current_kernel_logo"); | |
|
150 | 143 | logo_img.on("load", function() { |
|
151 | 144 | logo_img.show(); |
|
152 | 145 | }); |
@@ -109,7 +109,7 b' require([' | |||
|
109 | 109 | keyboard_manager: keyboard_manager}); |
|
110 | 110 | notification_area.init_notification_widgets(); |
|
111 | 111 | var kernel_selector = new kernelselector.KernelSelector( |
|
112 |
'#kernel_ |
|
|
112 | '#kernel_logo_widget', notebook); | |
|
113 | 113 | |
|
114 | 114 | $('body').append('<div id="fonttest"><pre><span id="test1">x</span>'+ |
|
115 | 115 | '<span id="test2" style="font-weight: bold;">x</span>'+ |
@@ -1,16 +1,9 b'' | |||
|
1 |
#kernel_ |
|
|
1 | #kernel_logo_widget { | |
|
2 | 2 | margin-right: 1em; |
|
3 |
|
|
|
4 | ||
|
5 | & > button { | |
|
6 | .btn-default(); | |
|
7 | ||
|
8 | & > span.caret { | |
|
9 | margin-top:0px; | |
|
10 | } | |
|
11 | } | |
|
3 | .pull-right(); | |
|
12 | 4 | |
|
13 | 5 | & > img#current_kernel_logo { |
|
6 | .navbar-vertical-align(32px); | |
|
14 | 7 | width: 32px; |
|
15 | 8 | height: 32px; |
|
16 | 9 | } |
@@ -15,6 +15,13 b'' | |||
|
15 | 15 | #kernel_indicator { |
|
16 | 16 | .pull-right(); |
|
17 | 17 | .indicator_area(); |
|
18 | width: auto; | |
|
19 | border-left: 1px solid; | |
|
20 | ||
|
21 | .kernel_indicator_name { | |
|
22 | padding-left: 5px; | |
|
23 | padding-right: 5px; | |
|
24 | } | |
|
18 | 25 | } |
|
19 | 26 | |
|
20 | 27 | #modal_indicator { |
@@ -9672,55 +9672,14 b' select[multiple].celltoolbar select {' | |||
|
9672 | 9672 | .completions select option.context { |
|
9673 | 9673 | color: #3071a9; |
|
9674 | 9674 | } |
|
9675 |
#kernel_ |
|
|
9675 | #kernel_logo_widget { | |
|
9676 | 9676 | margin-right: 1em; |
|
9677 | float: right !important; | |
|
9677 | 9678 | float: right; |
|
9678 | 9679 | } |
|
9679 |
#kernel_ |
|
|
9680 | color: #333333; | |
|
9681 | background-color: #ffffff; | |
|
9682 | border-color: #cccccc; | |
|
9683 | } | |
|
9684 | #kernel_selector_widget > button:hover, | |
|
9685 | #kernel_selector_widget > button:focus, | |
|
9686 | #kernel_selector_widget > button:active, | |
|
9687 | #kernel_selector_widget > button.active, | |
|
9688 | .open .dropdown-toggle#kernel_selector_widget > button { | |
|
9689 | color: #333333; | |
|
9690 | background-color: #ebebeb; | |
|
9691 | border-color: #adadad; | |
|
9692 | } | |
|
9693 | #kernel_selector_widget > button:active, | |
|
9694 | #kernel_selector_widget > button.active, | |
|
9695 | .open .dropdown-toggle#kernel_selector_widget > button { | |
|
9696 | background-image: none; | |
|
9697 | } | |
|
9698 | #kernel_selector_widget > button.disabled, | |
|
9699 | #kernel_selector_widget > button[disabled], | |
|
9700 | fieldset[disabled] #kernel_selector_widget > button, | |
|
9701 | #kernel_selector_widget > button.disabled:hover, | |
|
9702 | #kernel_selector_widget > button[disabled]:hover, | |
|
9703 | fieldset[disabled] #kernel_selector_widget > button:hover, | |
|
9704 | #kernel_selector_widget > button.disabled:focus, | |
|
9705 | #kernel_selector_widget > button[disabled]:focus, | |
|
9706 | fieldset[disabled] #kernel_selector_widget > button:focus, | |
|
9707 | #kernel_selector_widget > button.disabled:active, | |
|
9708 | #kernel_selector_widget > button[disabled]:active, | |
|
9709 | fieldset[disabled] #kernel_selector_widget > button:active, | |
|
9710 | #kernel_selector_widget > button.disabled.active, | |
|
9711 | #kernel_selector_widget > button[disabled].active, | |
|
9712 | fieldset[disabled] #kernel_selector_widget > button.active { | |
|
9713 | background-color: #ffffff; | |
|
9714 | border-color: #cccccc; | |
|
9715 | } | |
|
9716 | #kernel_selector_widget > button .badge { | |
|
9717 | color: #ffffff; | |
|
9718 | background-color: #333333; | |
|
9719 | } | |
|
9720 | #kernel_selector_widget > button > span.caret { | |
|
9721 | margin-top: 0px; | |
|
9722 | } | |
|
9723 | #kernel_selector_widget > img#current_kernel_logo { | |
|
9680 | #kernel_logo_widget > img#current_kernel_logo { | |
|
9681 | margin-top: -1px; | |
|
9682 | margin-bottom: -1px; | |
|
9724 | 9683 | width: 32px; |
|
9725 | 9684 | height: 32px; |
|
9726 | 9685 | } |
@@ -9816,6 +9775,12 b' ul#help_menu li a i {' | |||
|
9816 | 9775 | width: 11px; |
|
9817 | 9776 | z-index: 10; |
|
9818 | 9777 | text-align: center; |
|
9778 | width: auto; | |
|
9779 | border-left: 1px solid; | |
|
9780 | } | |
|
9781 | #kernel_indicator .kernel_indicator_name { | |
|
9782 | padding-left: 5px; | |
|
9783 | padding-right: 5px; | |
|
9819 | 9784 | } |
|
9820 | 9785 | #modal_indicator { |
|
9821 | 9786 | float: right !important; |
@@ -42,16 +42,9 b' class="notebook_app"' | |||
|
42 | 42 | <span class="autosave_status"></span> |
|
43 | 43 | </span> |
|
44 | 44 | |
|
45 | <div id="kernel_selector_widget" class="pull-right dropdown"> | |
|
46 | <!-- empty png in 26 bytes below--> | |
|
47 | <img id="current_kernel_logo" src="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D" alt='current kernel logo'> | |
|
48 | <button class="dropdown-toggle btn btn-sm navbar-btn" data-toggle="dropdown" type='button' id="current_kernel_spec"> | |
|
49 | <span class='kernel_name'>Kernel</span> | |
|
50 | <span class="caret"></span> | |
|
51 | </button> | |
|
52 | <ul id="kernel_selector" class="dropdown-menu"> | |
|
53 | </ul> | |
|
54 | </div> | |
|
45 | <span id="kernel_logo_widget"> | |
|
46 | <img id="current_kernel_logo"/> | |
|
47 | </span> | |
|
55 | 48 | |
|
56 | 49 | {% endblock headercontainer %} |
|
57 | 50 | |
@@ -65,6 +58,7 b' class="notebook_app"' | |||
|
65 | 58 | <span class="navbar-text">Menu</span> |
|
66 | 59 | </button> |
|
67 | 60 | <p id="kernel_indicator" class="navbar-text"> |
|
61 | <span class="kernel_indicator_name">Kernel</span> | |
|
68 | 62 | <i id="kernel_indicator_icon"></i> |
|
69 | 63 | </p> |
|
70 | 64 | <p id="modal_indicator" class="navbar-text"> |
General Comments 0
You need to be logged in to leave comments.
Login now