##// END OF EJS Templates
Merge PR #7616 at f6260bd: notebook running indicator in dashboard...
Thomas Kluyver -
r20259:a41eba58 merge
parent child Browse files
Show More
@@ -8668,6 +8668,7 ul.breadcrumb span {
8668 }
8668 }
8669 .list_header {
8669 .list_header {
8670 font-weight: bold;
8670 font-weight: bold;
8671 background-color: #eeeeee;
8671 }
8672 }
8672 .list_container {
8673 .list_container {
8673 margin-top: 4px;
8674 margin-top: 4px;
@@ -8690,6 +8691,9 ul.breadcrumb span {
8690 .list_item a {
8691 .list_item a {
8691 text-decoration: none;
8692 text-decoration: none;
8692 }
8693 }
8694 .list_item:hover {
8695 background-color: #fafafa;
8696 }
8693 .action_col {
8697 .action_col {
8694 text-align: right;
8698 text-align: right;
8695 }
8699 }
@@ -8797,6 +8801,23 input.engine_num_input {
8797 .notebook_icon:before.pull-right {
8801 .notebook_icon:before.pull-right {
8798 margin-left: .3em;
8802 margin-left: .3em;
8799 }
8803 }
8804 .running_notebook_icon:before {
8805 display: inline-block;
8806 font: normal normal normal 14px/1 FontAwesome;
8807 font-size: inherit;
8808 text-rendering: auto;
8809 -webkit-font-smoothing: antialiased;
8810 -moz-osx-font-smoothing: grayscale;
8811 transform: translate(0, 0);
8812 content: "\f02d";
8813 color: #5cb85c;
8814 }
8815 .running_notebook_icon:before.pull-left {
8816 margin-right: .3em;
8817 }
8818 .running_notebook_icon:before.pull-right {
8819 margin-left: .3em;
8820 }
8800 .file_icon:before {
8821 .file_icon:before {
8801 display: inline-block;
8822 display: inline-block;
8802 font: normal normal normal 14px/1 FontAwesome;
8823 font: normal normal normal 14px/1 FontAwesome;
@@ -422,11 +422,16 define([
422 NotebookList.prototype.add_link = function (model, item) {
422 NotebookList.prototype.add_link = function (model, item) {
423 var path = model.path,
423 var path = model.path,
424 name = model.name;
424 name = model.name;
425 var running = (model.type == 'notebook' && this.sessions[path] !== undefined);
426
425 item.data('name', name);
427 item.data('name', name);
426 item.data('path', path);
428 item.data('path', path);
427 item.data('type', model.type);
429 item.data('type', model.type);
428 item.find(".item_name").text(name);
430 item.find(".item_name").text(name);
429 var icon = NotebookList.icons[model.type];
431 var icon = NotebookList.icons[model.type];
432 if (running) {
433 icon = 'running_' + icon;
434 }
430 var uri_prefix = NotebookList.uri_prefixes[model.type];
435 var uri_prefix = NotebookList.uri_prefixes[model.type];
431 item.find(".item_icon").addClass(icon).addClass('icon-fixed-width');
436 item.find(".item_icon").addClass(icon).addClass('icon-fixed-width');
432 var link = item.find("a.item_link")
437 var link = item.find("a.item_link")
@@ -438,7 +443,6 define([
438 )
443 )
439 );
444 );
440
445
441 var running = (model.type == 'notebook' && this.sessions[path] !== undefined);
442 item.find(".item_buttons .running-indicator").css('visibility', running ? '' : 'hidden');
446 item.find(".item_buttons .running-indicator").css('visibility', running ? '' : 'hidden');
443
447
444 // directory nav doesn't open new tabs
448 // directory nav doesn't open new tabs
@@ -12,6 +12,7
12 @btn_small_height: 24px;
12 @btn_small_height: 24px;
13 @btn_mini_height: 22px;
13 @btn_mini_height: 22px;
14 @dark_dashboard_color: @breadcrumb-color;
14 @dark_dashboard_color: @breadcrumb-color;
15 @list_stripe_color: lighten(@page-backdrop-color,3%);
15
16
16 ul#tabs {
17 ul#tabs {
17 margin-bottom: @dashboard_tb_pad;
18 margin-bottom: @dashboard_tb_pad;
@@ -55,6 +56,7 ul.breadcrumb {
55
56
56 .list_header {
57 .list_header {
57 font-weight: bold;
58 font-weight: bold;
59 background-color: @page-backdrop-color
58 }
60 }
59
61
60 .list_container {
62 .list_container {
@@ -80,6 +82,9 ul.breadcrumb {
80 background-color: @table-border-color;
82 background-color: @table-border-color;
81 };
83 };
82 a {text-decoration: none;}
84 a {text-decoration: none;}
85 &:hover {
86 background-color: darken(white,2%);
87 }
83 }
88 }
84
89
85 .action_col {
90 .action_col {
@@ -168,6 +173,12 input.engine_num_input {
168 .icon(@fa-var-book)
173 .icon(@fa-var-book)
169 }
174 }
170
175
176 .running_notebook_icon:before {
177 .icon(@fa-var-book);
178 color: @brand-success
179 }
180
181
171 .file_icon:before {
182 .file_icon:before {
172 .icon(@fa-var-file-o)
183 .icon(@fa-var-file-o)
173 }
184 }
General Comments 0
You need to be logged in to leave comments. Login now