From a41eba58e1d14ece153e3d127e666e36c17dc9e9 2015-01-30 17:36:40 From: Thomas Kluyver Date: 2015-01-30 17:36:40 Subject: [PATCH] Merge PR #7616 at f6260bd: notebook running indicator in dashboard Closes gh-7616 --- diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 47b14e1..aa24069 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8668,6 +8668,7 @@ ul.breadcrumb span { } .list_header { font-weight: bold; + background-color: #eeeeee; } .list_container { margin-top: 4px; @@ -8690,6 +8691,9 @@ ul.breadcrumb span { .list_item a { text-decoration: none; } +.list_item:hover { + background-color: #fafafa; +} .action_col { text-align: right; } @@ -8797,6 +8801,23 @@ input.engine_num_input { .notebook_icon:before.pull-right { margin-left: .3em; } +.running_notebook_icon:before { + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + transform: translate(0, 0); + content: "\f02d"; + color: #5cb85c; +} +.running_notebook_icon:before.pull-left { + margin-right: .3em; +} +.running_notebook_icon:before.pull-right { + margin-left: .3em; +} .file_icon:before { display: inline-block; font: normal normal normal 14px/1 FontAwesome; diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js index dbbd555..aa05f44 100644 --- a/IPython/html/static/tree/js/notebooklist.js +++ b/IPython/html/static/tree/js/notebooklist.js @@ -422,11 +422,16 @@ define([ NotebookList.prototype.add_link = function (model, item) { var path = model.path, name = model.name; + var running = (model.type == 'notebook' && this.sessions[path] !== undefined); + item.data('name', name); item.data('path', path); item.data('type', model.type); item.find(".item_name").text(name); var icon = NotebookList.icons[model.type]; + if (running) { + icon = 'running_' + icon; + } var uri_prefix = NotebookList.uri_prefixes[model.type]; item.find(".item_icon").addClass(icon).addClass('icon-fixed-width'); var link = item.find("a.item_link") @@ -438,7 +443,6 @@ define([ ) ); - var running = (model.type == 'notebook' && this.sessions[path] !== undefined); item.find(".item_buttons .running-indicator").css('visibility', running ? '' : 'hidden'); // directory nav doesn't open new tabs diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index 4e2d700..1a657ec 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -12,6 +12,7 @@ @btn_small_height: 24px; @btn_mini_height: 22px; @dark_dashboard_color: @breadcrumb-color; +@list_stripe_color: lighten(@page-backdrop-color,3%); ul#tabs { margin-bottom: @dashboard_tb_pad; @@ -55,6 +56,7 @@ ul.breadcrumb { .list_header { font-weight: bold; + background-color: @page-backdrop-color } .list_container { @@ -80,6 +82,9 @@ ul.breadcrumb { background-color: @table-border-color; }; a {text-decoration: none;} + &:hover { + background-color: darken(white,2%); + } } .action_col { @@ -168,6 +173,12 @@ input.engine_num_input { .icon(@fa-var-book) } +.running_notebook_icon:before { + .icon(@fa-var-book); + color: @brand-success +} + + .file_icon:before { .icon(@fa-var-file-o) }