# HG changeset patch
# User Mitesh Patel <qed777@gmail.com>
# Date 1244625622 25200
# Node ID 83ba39bd183c20dd4edf7f6de4ec5ccfebdf3b81
# Parent  6c7354ace3b6e0bf4c33ddb730531bd23a9fb92c
jsMath, favicon, logo for live, static, offline docs.  Different approach.

diff --git a/doc/common/conf.py b/doc/common/conf.py
--- a/doc/common/conf.py
+++ b/doc/common/conf.py
@@ -17,7 +17,7 @@
     extensions.append('sphinx.ext.jsmath')
 else:
     extensions.append('sphinx.ext.pngmath')
-jsmath_path = '/javascript_local/jsMath/easy/load.js'
+jsmath_path = '/javascript_local/jsmath/easy/load.js'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = [SAGE_DOC + '/common/templates', 'templates']
@@ -101,7 +101,7 @@
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = 'sageicon.png'
+html_favicon = 'favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/doc/common/static/favicon.ico b/doc/common/static/favicon.ico
new file mode 120000
--- /dev/null
+++ b/doc/common/static/favicon.ico
@@ -0,0 +1,1 @@
+../../../../../data/extcode/notebook/images/favicon.ico
\ No newline at end of file
diff --git a/doc/common/static/jsmath b/doc/common/static/jsmath
new file mode 120000
--- /dev/null
+++ b/doc/common/static/jsmath
@@ -0,0 +1,1 @@
+../../../../../local/notebook/javascript/jsmath/
\ No newline at end of file
diff --git a/doc/common/static/sageicon.png b/doc/common/static/sageicon.png
new file mode 120000
--- /dev/null
+++ b/doc/common/static/sageicon.png
@@ -0,0 +1,1 @@
+../../../../../data/extcode/notebook/images/sageicon.png
\ No newline at end of file
diff --git a/doc/common/static/sagelogo.png b/doc/common/static/sagelogo.png
new file mode 120000
--- /dev/null
+++ b/doc/common/static/sagelogo.png
@@ -0,0 +1,1 @@
+../../../../../data/extcode/notebook/images/sagelogo.png
\ No newline at end of file
diff --git a/doc/common/templates/layout.html b/doc/common/templates/layout.html
--- a/doc/common/templates/layout.html
+++ b/doc/common/templates/layout.html
@@ -1,6 +1,11 @@
 {% extends "!layout.html" %}
 
 {% block rootrellink %}
-    <img src="_static/sage_logo.png" title="Sage Logo">
+    <img src="{{ pathto('_static/sagelogo.png', 1) }}" style="vertical-align: middle" title="Sage Logo">
     {{ super() }}
 {% endblock %}
+
+{% block extrahead %}
+    <script type="text/javascript" src="{{ pathto('_static/jsmath/easy/load.js', 1) }}"></script>
+    <link rel="icon" href="{{ pathto('_static/sageicon.png', 1) }}" type="image/x-icon" />
+{% endblock %}