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

crack at making notebook.html use the layout.html template #1336

Merged
merged 0 commits into from Jan 30, 2012

Conversation

hhuuggoo
Copy link

Conflicts:

IPython/frontend/html/notebook/templates/notebook.html

data-project={{project}} data-notebook-id={{notebook_id}}
data-base-project-url={{base_project_url}} data-base-kernel-url={{base_kernel_url}}
>

<div id="header">
Copy link
Member

Choose a reason for hiding this comment

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

I see this whole block deleted here but it doesn't appear anywhere else. Was it redundant/duplicate code?

@hhuuggoo
Copy link
Author

well, since we now extend layout.html, we get that header div from layout.html (i tried to write that html in this txtbox, but it gets escaped away....

@fperez
Copy link
Member

fperez commented Jan 28, 2012

Got it. Thanks for the clarification.

@fperez
Copy link
Member

fperez commented Jan 28, 2012

OK, everything looks good to me, but since this code was initially laid out by @ellisonbg and he's in the middle of working with it, I'd like to give him a chance to have a quick look before merging.

But in testing it seems to work OK, and the code simplification is certainly good. Thanks!

@fperez
Copy link
Member

fperez commented Jan 29, 2012

I can merge this once @ellisonbg gives his final OK.

@ellisonbg
Copy link
Member

Sorry, but this needs to be rebased again...


{% end %}

{% block header %}
{% end %}
</div>

<div id="header_border"></div>
Copy link
Member

Choose a reason for hiding this comment

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

header_border should not be in layout - it is only part of some pages.

@hhuuggoo hhuuggoo merged commit 069f64e into ipython:master Jan 30, 2012
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

3 participants