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.

Sign up for GitHub

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

toc2: update for html export + notebook menus set to the left #803

Merged
merged 2 commits into from
Nov 28, 2016
Merged

toc2: update for html export + notebook menus set to the left #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
959eb71
html export: restore hover highlightof sections in toc
jfbercher Nov 27, 2016
d25148d
toc2: move title/menu to the left as an option
jfbercher Nov 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions src/jupyter_contrib_nbextensions/nbextensions/toc2/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
/*extracted from https://gist.github.com/magican/5574556*/


/*#toc-level0 li > a:hover { display: block; background-color: #DAA520}*/
/*background color for links when you mouse over it
This style is used on export, but can be overwritted in the livenotebook
by selecting a color in the nbextension-configurator*/
#toc-level0 li > a:hover { display: block; background-color: #DAA520}

#toc-level0 a {color: #333333; text-decoration: none;}
#navigate_menu li a:hover {background-color: #f1f1f1}

/*#Navigate_menu {
list-style-type: none;
max-width: 500px;
min-width: 100px;
width: 250px;
overflow: auto;
}

#navigate_menu {
overflow: hidden;
}

#Navigate_menu {
list-style-type: none;
overflow: auto;
/* Move menus and tooolbar to the left, following @Kevin-McIsaac suggestion
div#menubar-container, div#header-container {
width: auto;
padding-left: 20px;
}*/

#navigate_menu {
Expand Down Expand Up @@ -164,7 +157,10 @@
color: black;
}

/*.toc-item-highlight-select {background-color: Gold}
/*
These colors are now specified in js, after reading the extension's config stored in system
and updated using the nbextension-configurator
.toc-item-highlight-select {background-color: Gold}
.toc-item-highlight-execute {background-color: red}
.toc-item-highlight-execute.toc-item-highlight-select {background-color: Gold} */

Expand Down
21 changes: 17 additions & 4 deletions src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ define(["require", "jquery", "base/js/namespace", 'services/config',
"toc_section_display": "block",
'sideBar':true,
'navigate_menu':true,
'moveMenuLeft': true,
'colors': {'hover_highlight': '#DAA520',
'selected_highlight': '#FFD700',
'running_highlight': '#FF0000'}
Expand Down Expand Up @@ -60,12 +61,19 @@ define(["require", "jquery", "base/js/namespace", 'services/config',
cfg = IPython.notebook.metadata.toc = $.extend(true, cfg,
IPython.notebook.metadata.toc);
// excepted colors that are taken globally (if defined)
cfg.colors = IPython.notebook.metadata.toc.colors = $.extend(true, {}, initial_cfg.colors);
cfg.colors = IPython.notebook.metadata.toc.colors = $.extend(true, {}, initial_cfg.colors);
try
{cfg.colors = IPython.notebook.metadata.toc.colors = $.extend(true, cfg.colors, config.data.toc2.colors); }
catch(e) {}
// and moveMenuLeft taken globally (if it exists, otherwise default)
cfg.moveMenuLeft = IPython.notebook.metadata.toc.moveMenuLeft = initial_cfg.moveMenuLeft;
if (config.data.toc2) {
if (typeof config.data.toc2.moveMenuLeft !== "undefined") {
cfg.moveMenuLeft = IPython.notebook.metadata.toc.moveMenuLeft = config.data.toc2.moveMenuLeft;
}
}
// create highlights style section in document
create_highlights_css()
create_additional_css()
// call callbacks
callback && callback();
st.config_loaded = true;
Expand Down Expand Up @@ -112,12 +120,17 @@ define(["require", "jquery", "base/js/namespace", 'services/config',
};


function create_highlights_css() {
function create_additional_css() {
var sheet = document.createElement('style')
sheet.innerHTML = "#toc-level0 li > a:hover { display: block; background-color: " + cfg.colors.hover_highlight + " }\n" +
".toc-item-highlight-select {background-color: " + cfg.colors.selected_highlight + "}\n" +
".toc-item-highlight-execute {background-color: " + cfg.colors.running_highlight + "}\n" +
".toc-item-highlight-execute.toc-item-highlight-select {background-color: " + cfg.colors.selected_highlight + "}"
".toc-item-highlight-execute.toc-item-highlight-select {background-color: " + cfg.colors.selected_highlight + "}"
if (cfg.moveMenuLeft){
sheet.innerHTML += "div#menubar-container, div#header-container {\n"+
"width: auto;\n"+
"padding-left: 20px; }"
}
document.body.appendChild(sheet);
}

Expand Down
4 changes: 4 additions & 0 deletions src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ Parameters:
description: Display Table of Contents as a navigation menu
input_type: checkbox
default: true
- name: toc2.moveMenuLeft
description: Move notebook's title and menu on the left instead of being centered -- This provides a better look when the toc/sidebar is present
input_type: checkbox
default: true
- name: toc2.colors.hover_highlight
input_type: color
description: Hover color in toc
Expand Down