From b8982309132fb7ea96fe20fc286acc6f28dddfff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Dietrich?= <astro@joergdietrich.com>
Date: Fri, 7 Feb 2014 23:08:23 +0100
Subject: [PATCH 1/8] Make python code collapsible:

- Remove unused code: https://github.com/getpelican/pelican-plugins/issues/140
- Add javascript and CSS to header to toggle code areas
- load jinja2 template from file
---
 liquid_tags/notebook.py | 60 +++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/liquid_tags/notebook.py b/liquid_tags/notebook.py
index 8b45d5d..2dce5e4 100644
--- a/liquid_tags/notebook.py
+++ b/liquid_tags/notebook.py
@@ -112,6 +112,14 @@ pre.ipynb {
 }
 
 img.anim_icon{padding:0; border:0; vertical-align:middle; -webkit-box-shadow:none; -box-shadow:none}
+
+div.collapseheader {
+    width=100%;
+    background-color:#d3d3d3;
+    padding: 2px;
+    cursor: pointer;
+    font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
+}
 </style>
 
 <script src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" type="text/javascript"></script>
@@ -134,6 +142,23 @@ init_mathjax = function() {
 }
 init_mathjax();
 </script>
+<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
+
+<script type="text/javascript">
+jQuery(document).ready(function($) {
+    $("div.collapseheader").click(function () {
+    $header = $(this).children("span").first();
+    $codearea = $(this).children(".input_area");
+    console.log($(this).children());
+    $codearea.slideToggle(500, function () {
+        $header.text(function () {
+            return $codearea.is(":visible") ? "Collapse Code" : "Expand Code";
+        });
+    });
+});
+});
+</script>
+
 """
 
 CSS_WRAPPER = """
@@ -171,36 +196,6 @@ class SubCell(Transformer):
         return nbc, resources
 
 
-#----------------------------------------------------------------------
-# Customize the html template:
-#  This changes the <pre> tags in basic_html.tpl to <pre class="ipynb"
-pelican_loader = DictLoader({'pelicanhtml.tpl':
-"""
-{%- extends 'basichtml.tpl' -%}
-
-{% block stream_stdout -%}
-<div class="box-flex1 output_subarea output_stream output_stdout">
-<pre class="ipynb">{{output.text |ansi2html}}</pre>
-</div>
-{%- endblock stream_stdout %}
-
-{% block stream_stderr -%}
-<div class="box-flex1 output_subarea output_stream output_stderr">
-<pre class="ipynb">{{output.text |ansi2html}}</pre>
-</div>
-{%- endblock stream_stderr %}
-
-{% block pyerr -%}
-<div class="box-flex1 output_subarea output_pyerr">
-<pre class="ipynb">{{super()}}</pre>
-</div>
-{%- endblock pyerr %}
-
-{%- block data_text %}
-<pre class="ipynb">{{output.text | ansi2html}}</pre>
-{%- endblock -%}
-"""})
-
 
 #----------------------------------------------------------------------
 # Custom highlighter:
@@ -254,10 +249,9 @@ def notebook(preprocessor, tag, markup):
                     {'enabled':True, 'start':start, 'end':end}})
 
     exporter = HTMLExporter(config=c,
-                            template_file='basic',
+                            template_file='pelicanhtml',
                             filters={'highlight2html': custom_highlighter},
-                            transformers=[SubCell],
-                            extra_loaders=[pelican_loader])
+                            transformers=[SubCell])
 
     # read and parse the notebook
     with open(nb_path) as f:

From 1876bf4438e17bd7879dd6795e70752ab53a2603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Dietrich?= <astro@joergdietrich.com>
Date: Fri, 7 Feb 2014 23:10:34 +0100
Subject: [PATCH 2/8] add jinja2 template file to have collapsible python code

---
 liquid_tags/pelicanhtml.tpl | 44 +++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 liquid_tags/pelicanhtml.tpl

diff --git a/liquid_tags/pelicanhtml.tpl b/liquid_tags/pelicanhtml.tpl
new file mode 100644
index 0000000..dbba638
--- /dev/null
+++ b/liquid_tags/pelicanhtml.tpl
@@ -0,0 +1,44 @@
+{%- extends 'html_basic.tpl' -%}
+
+{% block stream_stdout -%}
+<div class="box-flex1 output_subarea output_stream output_stdout">
+<pre class="ipynb">{{output.text |ansi2html}}</pre>
+</div>
+{%- endblock stream_stdout %}
+
+{% block stream_stderr -%}
+<div class="box-flex1 output_subarea output_stream output_stderr">
+<pre class="ipynb">{{output.text |ansi2html}}</pre>
+</div>
+{%- endblock stream_stderr %}
+
+{% block pyerr -%}
+<div class="box-flex1 output_subarea output_pyerr">
+<pre class="ipynb">{{super()}}</pre>
+</div>
+{%- endblock pyerr %}
+
+{%- block data_text %}
+<pre class="ipynb">{{output.text | ansi2html}}</pre>
+{%- endblock -%}
+
+{% block input %}
+{% if "#<!-- collapse=True -->" in cell.input %}
+<div class="collapseheader box-flex1"><span style="font-weight: bold;">Expand Code</span>
+<div class="input_area box-flex1" style="display:none">
+{{ cell.input.replace("#<!-- collapse=True -->\n", "") | highlight2html }}
+</div>
+</div>
+{% elif "#<!-- collapse=False -->" in cell.input %}
+<div class="collapseheader box-flex1"><span style="font-weight: bold;">Collapse Code</span>
+<div class="input_area box-flex1">
+{{ cell.input.replace("#<!-- collapse=False -->\n", "") | highlight2html }}
+</div>
+</div>
+{% else %}
+<div class="input_area box-flex1">
+{{ cell.input.replace("#<!-- collapse=True -->\n", "") | highlight2html }}
+</div>
+{% endif %}
+{%- endblock input %}
+

From e1fd114a0eb93e0d04b2a01a1684146982948887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Dietrich?= <astro@joergdietrich.com>
Date: Sat, 8 Feb 2014 10:34:53 +0100
Subject: [PATCH 3/8] remove unnessecary replace from template, require white
 space after hash

---
 liquid_tags/pelicanhtml.tpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/liquid_tags/pelicanhtml.tpl b/liquid_tags/pelicanhtml.tpl
index dbba638..b32a52b 100644
--- a/liquid_tags/pelicanhtml.tpl
+++ b/liquid_tags/pelicanhtml.tpl
@@ -23,21 +23,21 @@
 {%- endblock -%}
 
 {% block input %}
-{% if "#<!-- collapse=True -->" in cell.input %}
+{% if "# <!-- collapse=True -->" in cell.input %}
 <div class="collapseheader box-flex1"><span style="font-weight: bold;">Expand Code</span>
 <div class="input_area box-flex1" style="display:none">
-{{ cell.input.replace("#<!-- collapse=True -->\n", "") | highlight2html }}
+{{ cell.input.replace("# <!-- collapse=True -->\n", "") | highlight2html }}
 </div>
 </div>
-{% elif "#<!-- collapse=False -->" in cell.input %}
+{% elif "# <!-- collapse=False -->" in cell.input %}
 <div class="collapseheader box-flex1"><span style="font-weight: bold;">Collapse Code</span>
 <div class="input_area box-flex1">
-{{ cell.input.replace("#<!-- collapse=False -->\n", "") | highlight2html }}
+{{ cell.input.replace("# <!-- collapse=False -->\n", "") | highlight2html }}
 </div>
 </div>
 {% else %}
 <div class="input_area box-flex1">
-{{ cell.input.replace("#<!-- collapse=True -->\n", "") | highlight2html }}
+{{ cell.input | highlight2html }}
 </div>
 {% endif %}
 {%- endblock input %}

From 5d0a5d2ec53e1be3c2b16961883cb5a192b6a678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Dietrich?= <astro@joergdietrich.com>
Date: Sat, 8 Feb 2014 10:47:18 +0100
Subject: [PATCH 4/8] get jquery via https from google's cdn

---
 liquid_tags/notebook.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/liquid_tags/notebook.py b/liquid_tags/notebook.py
index 2dce5e4..8a1acbb 100644
--- a/liquid_tags/notebook.py
+++ b/liquid_tags/notebook.py
@@ -142,7 +142,7 @@ init_mathjax = function() {
 }
 init_mathjax();
 </script>
-<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 
 <script type="text/javascript">
 jQuery(document).ready(function($) {

From 8d6a4a9d796729878dea92e302346006e1b4cd5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Dietrich?= <astro@joergdietrich.com>
Date: Tue, 11 Feb 2014 22:15:37 +0100
Subject: [PATCH 5/8] Maintain backward compatibility by not requiring that
 pelicanhtml is copied to the blog home

---
 liquid_tags/notebook.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/liquid_tags/notebook.py b/liquid_tags/notebook.py
index 8a1acbb..f155e71 100644
--- a/liquid_tags/notebook.py
+++ b/liquid_tags/notebook.py
@@ -248,8 +248,12 @@ def notebook(preprocessor, tag, markup):
                 'SubCell':
                     {'enabled':True, 'start':start, 'end':end}})
 
+    if os.path.exists('pelicanhtml.tpl'):
+        template_file = 'pelicanhtml'
+    else:
+        template_file = 'basic'
     exporter = HTMLExporter(config=c,
-                            template_file='pelicanhtml',
+                            template_file=template_file,
                             filters={'highlight2html': custom_highlighter},
                             transformers=[SubCell])
 

From b412bb1c5676c19b23a0ce406a9ea7569dd86790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Dietrich?= <astro@joergdietrich.com>
Date: Tue, 11 Feb 2014 22:31:30 +0100
Subject: [PATCH 6/8] Explain new collapsible code cells feature in Readme.md

---
 liquid_tags/Readme.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/liquid_tags/Readme.md b/liquid_tags/Readme.md
index e1591f1..0ddfe37 100644
--- a/liquid_tags/Readme.md
+++ b/liquid_tags/Readme.md
@@ -98,4 +98,15 @@ are a few extra steps required for this plugin:
 
   this will insert the proper css formatting into your document.
 
+### Collapsible Code in IPython Notebooks
+
+The plugin also enables collapsible code input boxes. For this to work
+you first need to copy the file ``pelicanhtml.tpl`` to the top level
+of your Pelican blog. Notebook input cells containing the comment line
+``# <!-- collapse=True -->`` will be collapsed when the html page is
+loaded and can be expanded by clicking on them. Cells containing the
+comment line ``# <!-- collapse=False -->`` will be open on load but
+can be collapsed by clicking on their header. Cells without collapse
+comments are rendered as standard code input cells.
+
 [1] http://ipython.org/

From 5d1b77a2382f1cf246f9edb92ad6c5bbd12baf0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Dietrich?= <astro@joergdietrich.com>
Date: Tue, 6 May 2014 10:51:34 +0200
Subject: [PATCH 7/8] work with IPython 1.x and 2.0

---
 liquid_tags/notebook.py                       | 12 ++---
 .../{pelicanhtml.tpl => pelicanhtml_1.tpl}    |  6 +--
 liquid_tags/pelicanhtml_2.tpl                 | 44 +++++++++++++++++++
 3 files changed, 54 insertions(+), 8 deletions(-)
 rename liquid_tags/{pelicanhtml.tpl => pelicanhtml_1.tpl} (90%)
 create mode 100644 liquid_tags/pelicanhtml_2.tpl

diff --git a/liquid_tags/notebook.py b/liquid_tags/notebook.py
index 54b4aa2..1208f1e 100644
--- a/liquid_tags/notebook.py
+++ b/liquid_tags/notebook.py
@@ -269,11 +269,14 @@ def notebook(preprocessor, tag, markup):
                 'SubCell':
                     {'enabled':True, 'start':start, 'end':end}})
 
-    if os.path.exists('pelicanhtml.tpl'):
-        template_file = 'pelicanhtml'
+    template_file = 'basic'
+    if LooseVersion(IPython.__version__) >= '2.0':
+        if os.path.exists('pelicanhtml_2.tpl'):
+            template_file = 'pelicanhtml_2'
     else:
-        template_file = 'basic'
-    
+        if os.path.exists('pelicanhtml_1.tpl'):
+            template_file = 'pelicanhtml_1'
+
     if LooseVersion(IPython.__version__) >= '2.0':
         subcell_kwarg = dict(preprocessors=[SubCell])
     else:
@@ -282,7 +285,6 @@ def notebook(preprocessor, tag, markup):
     exporter = HTMLExporter(config=c,
                             template_file=template_file,
                             filters={'highlight2html': custom_highlighter},
-                            extra_loaders=[pelican_loader],
                             **subcell_kwarg)
 
     # read and parse the notebook
diff --git a/liquid_tags/pelicanhtml.tpl b/liquid_tags/pelicanhtml_1.tpl
similarity index 90%
rename from liquid_tags/pelicanhtml.tpl
rename to liquid_tags/pelicanhtml_1.tpl
index b32a52b..e0094f3 100644
--- a/liquid_tags/pelicanhtml.tpl
+++ b/liquid_tags/pelicanhtml_1.tpl
@@ -26,18 +26,18 @@
 {% if "# <!-- collapse=True -->" in cell.input %}
 <div class="collapseheader box-flex1"><span style="font-weight: bold;">Expand Code</span>
 <div class="input_area box-flex1" style="display:none">
-{{ cell.input.replace("# <!-- collapse=True -->\n", "") | highlight2html }}
+{{ cell.input.replace("# <!-- collapse=True -->\n", "") | highlight2html(metadata=cell.metadata) }}
 </div>
 </div>
 {% elif "# <!-- collapse=False -->" in cell.input %}
 <div class="collapseheader box-flex1"><span style="font-weight: bold;">Collapse Code</span>
 <div class="input_area box-flex1">
-{{ cell.input.replace("# <!-- collapse=False -->\n", "") | highlight2html }}
+{{ cell.input.replace("# <!-- collapse=False -->\n", "") | highlight2html(metadata=cell.metadata) }}
 </div>
 </div>
 {% else %}
 <div class="input_area box-flex1">
-{{ cell.input | highlight2html }}
+{{ cell.input | highlight2html(metadata=cell.metadata) }}
 </div>
 {% endif %}
 {%- endblock input %}
diff --git a/liquid_tags/pelicanhtml_2.tpl b/liquid_tags/pelicanhtml_2.tpl
new file mode 100644
index 0000000..937c383
--- /dev/null
+++ b/liquid_tags/pelicanhtml_2.tpl
@@ -0,0 +1,44 @@
+{%- extends 'basic.tpl' -%}
+
+{% block stream_stdout -%}
+<div class="box-flex1 output_subarea output_stream output_stdout">
+<pre class="ipynb">{{output.text |ansi2html}}</pre>
+</div>
+{%- endblock stream_stdout %}
+
+{% block stream_stderr -%}
+<div class="box-flex1 output_subarea output_stream output_stderr">
+<pre class="ipynb">{{output.text |ansi2html}}</pre>
+</div>
+{%- endblock stream_stderr %}
+
+{% block pyerr -%}
+<div class="box-flex1 output_subarea output_pyerr">
+<pre class="ipynb">{{super()}}</pre>
+</div>
+{%- endblock pyerr %}
+
+{%- block data_text %}
+<pre class="ipynb">{{output.text | ansi2html}}</pre>
+{%- endblock -%}
+
+{% block input %}
+{% if "# <!-- collapse=True -->" in cell.input %}
+<div class="collapseheader box-flex1"><span style="font-weight: bold;">Expand Code</span>
+<div class="input_area box-flex1" style="display:none">
+{{ cell.input.replace("# <!-- collapse=True -->\n", "") | highlight2html(metadata=cell.metadata) }}
+</div>
+</div>
+{% elif "# <!-- collapse=False -->" in cell.input %}
+<div class="collapseheader box-flex1"><span style="font-weight: bold;">Collapse Code</span>
+<div class="input_area box-flex1">
+{{ cell.input.replace("# <!-- collapse=False -->\n", "") | highlight2html(metadata=cell.metadata) }}
+</div>
+</div>
+{% else %}
+<div class="input_area box-flex1">
+{{ cell.input | highlight2html(metadata=cell.metadata) }}
+</div>
+{% endif %}
+{%- endblock input %}
+

From 620d176f30b9c2c94d83ec29c9d0d3f59f704b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Dietrich?= <astro@joergdietrich.com>
Date: Tue, 6 May 2014 11:04:17 +0200
Subject: [PATCH 8/8] Update Readme to specify which template is needed for
 which IPython version

---
 liquid_tags/Readme.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/liquid_tags/Readme.md b/liquid_tags/Readme.md
index f2c83bf..8ddca8e 100644
--- a/liquid_tags/Readme.md
+++ b/liquid_tags/Readme.md
@@ -110,9 +110,10 @@ are a few extra steps required for this plugin:
 ### Collapsible Code in IPython Notebooks
 
 The plugin also enables collapsible code input boxes. For this to work
-you first need to copy the file ``pelicanhtml.tpl`` to the top level
-of your Pelican blog. Notebook input cells containing the comment line
-``# <!-- collapse=True -->`` will be collapsed when the html page is
+you first need to copy the file ``pelicanhtml_1.tpl`` (for IPython
+1.x) ``pelicanhtml_2.tpl`` (for IPython 2.x) to the top level of your
+Pelican blog. Notebook input cells containing the comment line ``#
+<!-- collapse=True -->`` will be collapsed when the html page is
 loaded and can be expanded by clicking on them. Cells containing the
 comment line ``# <!-- collapse=False -->`` will be open on load but
 can be collapsed by clicking on their header. Cells without collapse