Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dashboard "Running" Tab #5215

Merged
merged 13 commits into from Feb 28, 2014
Merged

Dashboard "Running" Tab #5215

merged 13 commits into from Feb 28, 2014

Conversation

ivanov
Copy link
Member

@ivanov ivanov commented Feb 24, 2014

this is following the discussion from #5140

I still need to refactor it a bit, but it mostly works now

Refactoring

  • use one session_list, instead of having kernel_list and notebook_list load the sessions separately.
  • on session load, fire-off an IPython event which the kernel_list and notebook_list would listen for

@ivanov
Copy link
Member Author

ivanov commented Feb 24, 2014

Requisite screenshots:
2014-02-24-142146_784x259_scrot
2014-02-24-140902_791x195_scrot

@takluyver
Copy link
Member

The wording when the list is empty ('actively running kernels') seems odd - I'd drop 'actively'.

@damianavila
Copy link
Member

Looks good... a nice addition would be an open book as the icon, but font-awesome only have a close one...

@damianavila
Copy link
Member

Ah...the reload button seems a little higher than the shutdown buttons... I think it will fit better if it has the same height...

before this, kernel_list and notebook_list each fetched and held onto
their own copy of the sessions.
@ivanov
Copy link
Member Author

ivanov commented Feb 26, 2014

Ok, this is finished. I've factored out the sessions_list so that sessions are fetched only once but used by both the Notebooks and the Running tabs.

@minrk
Copy link
Member

minrk commented Feb 26, 2014

Very nice. Only one note:

The header says

Currently running IPython notebooks

but the empty message says:

There are no running kernels

Presumably we should pick either 'notebooks' or 'kernels'. I don't have a strong preference for which, but it seems like we try to avoid using the term 'kernels' with novice users, in which case 'notebooks' is probably best.

@ivanov
Copy link
Member Author

ivanov commented Feb 26, 2014

@damianavila the reload button is the same as for Clusters and Notebooks, so any CSS shenanigans needed to fix the slight inconsistencies are out-of-scope for this PR ;)

@minrk yeah, that sounds right, fixed.

@damianavila
Copy link
Member

@ivanov ok... no problem... we can deal with the css later 😉

@fperez
Copy link
Member

fperez commented Feb 27, 2014

The code looks superficially good to me, but my JS expertise is so limited that this shouldn't be considered a proper review.

User experience and functionality-wise, this looks great. I think it does just enough for what we need in 2.0, and we can leave a bigger refactoring, with multi-notebook selection/actions and other such niceties for a later refactoring.

If the JS code passes review, big +1 from me to merge. Many, many thanks @ivanov for pushing this, great work. It will be super useful.

};

NotebookList.prototype.style = function () {
$('#notebook_toolbar').addClass('list_toolbar');
$('#' + this.element_name + '_toolbar').addClass('list_toolbar');
$('#drag_info').addClass('toolbar_info');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is only applying the toolbar_info class to the version in the notebook list. In the kernel list, that class should be applied to #running_list_info. This is causing the info text of the kernel list to be too high.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, thanks for that tip, Brian, I've renamed drag_info to notebook_list_infoand now apply the toolbar_info class to both notebook_list_info and running_list_info

@ellisonbg
Copy link
Member

OK I have looked at this and tested it interactively. Overall it looks great. There are a few minor inline changes I found though. Once they are done, ready for merge.

@fperez
Copy link
Member

fperez commented Feb 28, 2014

Thanks @ellisonbg! @ivanov, I think with this much review, once you get those fixes in, you can go ahead and apply the merge.

success : $.proxy(that.sessions_loaded, this)
};
var url = utils.url_join_encode(this.base_url, 'api/sessions');
$.ajax(url,settings);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

space after comma...

@damianavila
Copy link
Member

Only some aesthetic comments... 😉

in the dashboard, I've renamed drag_info to notebook_list_info, so
applying style to notebook_list_info and running_list_info can be done
in one place.
@ivanov
Copy link
Member Author

ivanov commented Feb 28, 2014

alright, Travis is happy, and so am I. Thanks for the feedback on this one, everyone, merging!

ivanov added a commit that referenced this pull request Feb 28, 2014
@ivanov ivanov merged commit 44a94be into ipython:master Feb 28, 2014
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants