[vispy] 05/10: fix for real the build
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Sat Aug 30 17:17:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository vispy.
commit 310081edc087f45c9d6856a021977ac790352be2
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Thu Feb 20 15:07:45 2014 +0100
fix for real the build
---
.../0002-use-the-latest-scikit-image-theme.patch | 79 +++++++++++++++++++---
1 file changed, 71 insertions(+), 8 deletions(-)
diff --git a/debian/patches/0002-use-the-latest-scikit-image-theme.patch b/debian/patches/0002-use-the-latest-scikit-image-theme.patch
index 7faac1a..2c4b9e9 100644
--- a/debian/patches/0002-use-the-latest-scikit-image-theme.patch
+++ b/debian/patches/0002-use-the-latest-scikit-image-theme.patch
@@ -1,13 +1,13 @@
From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Thu, 20 Feb 2014 14:56:21 +0100
+Date: Thu, 20 Feb 2014 15:06:50 +0100
Subject: use the latest scikit-image theme
---
- doc/themes/scikit-image/layout.html | 12 ++++++------
- doc/themes/scikit-image/search.html | 2 +-
- doc/themes/scikit-image/static/css/custom.css | 21 ++++++++++++++-------
- doc/themes/scikit-image/static/js/docversions.js | 21 ---------------------
- 4 files changed, 21 insertions(+), 35 deletions(-)
+ doc/themes/scikit-image/layout.html | 12 ++++----
+ doc/themes/scikit-image/search.html | 37 ++++++++++++++++--------
+ doc/themes/scikit-image/static/css/custom.css | 21 +++++++++-----
+ doc/themes/scikit-image/static/js/docversions.js | 21 --------------
+ 4 files changed, 45 insertions(+), 46 deletions(-)
delete mode 100644 doc/themes/scikit-image/static/js/docversions.js
diff --git a/doc/themes/scikit-image/layout.html b/doc/themes/scikit-image/layout.html
@@ -58,10 +58,73 @@ index 1c6163a..58424f2 100644
</div>
</body>
diff --git a/doc/themes/scikit-image/search.html b/doc/themes/scikit-image/search.html
-index 3a723ef..61520e6 100644
+index 3a723ef..3697b60 100644
--- a/doc/themes/scikit-image/search.html
+++ b/doc/themes/scikit-image/search.html
-@@ -43,4 +43,4 @@
+@@ -4,20 +4,25 @@
+
+ Template for the search page.
+
+- :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
++ :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+ :license: BSD, see LICENSE for details.
+ #}
+-{% extends "layout.html" %}
++{%- extends "layout.html" %}
+ {% set title = _('Search') %}
+ {% set script_files = script_files + ['_static/searchtools.js'] %}
+-{% set script_files = script_files + ['searchindex.js'] %}
++{% block extrahead %}
++ <script type="text/javascript">
++ jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
++ </script>
++ {# this is used when loading the search index using $.ajax fails,
++ such as on Chrome for documents on localhost #}
++ <script type="text/javascript" id="searchindexloader"></script>
++ {{ super() }}
++{% endblock %}
+ {% block body %}
+ <h1 id="search-documentation">{{ _('Search') }}</h1>
+ <div id="fallback" class="admonition warning">
+- <script type="text/javascript">
+- $('#fallback').hide();
+- $("input.search").focus();
+- </script>
++ <script type="text/javascript">$('#fallback').hide();</script>
+ <p>
+ {% trans %}Please activate JavaScript to enable the search
+ functionality.{% endtrans %}
+@@ -25,22 +30,30 @@
+ </div>
+ <p>
+ {% trans %}From here you can search these documents. Enter your search
+- words into the box in the navigation bar and press "Enter". Note that the
+- search function will automatically search for all of the words. Pages
++ words into the box below and click "search". Note that the search
++ function will automatically search for all of the words. Pages
+ containing fewer words won't appear in the result list.{% endtrans %}
+ </p>
++ <form action="" method="get">
++ <input type="text" name="q" value="" />
++ <input type="submit" value="{{ _('search') }}" />
++ <span id="search-progress" style="padding-left: 10px"></span>
++ </form>
+ {% if search_performed %}
++ <h2>{{ _('Search Results') }}</h2>
+ {% if not search_results %}
+- <p>{{ _('Your search did not match any results.') }}</p>
++ <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
+ {% endif %}
+ {% endif %}
+ <div id="search-results">
+ {% if search_results %}
+ <ul>
+ {% for href, caption, context in search_results %}
+- <li class="well"><a href="{{ pathto(item.href) }}">{{ caption }}</a></li>
++ <li><a href="{{ pathto(item.href) }}">{{ caption }}</a>
++ <div class="context">{{ context|e }}</div>
++ </li>
+ {% endfor %}
</ul>
{% endif %}
</div>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vispy.git
More information about the debian-science-commits
mailing list