[Python-modules-commits] [cloud-sptheme] 06/10: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Tue Dec 13 12:22:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository cloud-sptheme.
commit 05a9a4b76c37835b612b2a8a7ba2b0e16324dc78
Merge: 7e42721 b8da379
Author: Sandro Tosi <morph at debian.org>
Date: Tue Dec 13 07:11:49 2016 -0500
merge patched into master
CHANGES | 111 +-
MANIFEST.in | 1 +
PKG-INFO | 5 +-
cloud_sptheme.egg-info/PKG-INFO | 5 +-
cloud_sptheme.egg-info/SOURCES.txt | 30 +-
cloud_sptheme.egg-info/entry_points.txt | 3 +
cloud_sptheme.egg-info/requires.txt | 2 +-
cloud_sptheme/__init__.py | 31 +-
cloud_sptheme/ext/__init__.pyc | Bin 0 -> 413 bytes
cloud_sptheme/ext/autoattribute_search_bases.py | 62 +
cloud_sptheme/ext/autoattribute_search_bases.pyc | Bin 0 -> 1964 bytes
cloud_sptheme/ext/autodoc_sections.py | 420 +++-
cloud_sptheme/ext/autodoc_sections.pyc | Bin 0 -> 7433 bytes
cloud_sptheme/ext/docfield_markup.py | 67 +
cloud_sptheme/ext/docfield_markup.pyc | Bin 0 -> 1841 bytes
cloud_sptheme/ext/escaped_samp_literals.py | 27 +-
cloud_sptheme/ext/escaped_samp_literals.pyc | Bin 0 -> 2898 bytes
cloud_sptheme/ext/index_styling.py | 11 +-
cloud_sptheme/ext/index_styling.pyc | Bin 0 -> 2632 bytes
cloud_sptheme/ext/issue_tracker.py | 11 +-
cloud_sptheme/ext/issue_tracker.pyc | Bin 0 -> 3341 bytes
cloud_sptheme/ext/page_only.py | 191 ++
cloud_sptheme/ext/perpage.py | 5 +
cloud_sptheme/ext/relbar_toc.py | 21 +-
cloud_sptheme/ext/relbar_toc.pyc | Bin 0 -> 1407 bytes
cloud_sptheme/ext/role_index.py | 119 +
cloud_sptheme/ext/table_styling.py | 10 +-
cloud_sptheme/ext/table_styling.pyc | Bin 0 -> 7991 bytes
cloud_sptheme/themes/cloud/globaltoc.html | 2 +-
cloud_sptheme/themes/cloud/layout.html | 29 +-
cloud_sptheme/themes/cloud/localtoc.html | 2 +-
cloud_sptheme/themes/cloud/quicklinks.html | 2 +-
cloud_sptheme/themes/cloud/relations.html | 8 +-
cloud_sptheme/themes/cloud/static/cloud.css_t | 2482 ++++++++++++++------
cloud_sptheme/themes/cloud/static/cloud.js_t | 1408 ++++++++---
cloud_sptheme/themes/cloud/static/icon-caution.png | Bin 0 -> 1100 bytes
cloud_sptheme/themes/cloud/static/icon-danger.png | Bin 0 -> 1272 bytes
cloud_sptheme/themes/cloud/static/jquery.cookie.js | 154 +-
cloud_sptheme/themes/cloud/theme.conf | 137 +-
cloud_sptheme/themes/greencloud/theme.conf | 5 +-
cloud_sptheme/themes/magenta_cloud/theme.conf | 15 +
cloud_sptheme/themes/redcloud/static/overlay.jpg | Bin 7973 -> 0 bytes
cloud_sptheme/themes/redcloud/static/overlay.xcf | Bin 990868 -> 0 bytes
.../themes/redcloud/static/redcloud.css_t | 24 -
cloud_sptheme/themes/redcloud/theme.conf | 20 +-
cloud_sptheme/themes/solarcloud/theme.conf | 73 +
cloud_sptheme/utils.py | 81 +
debian/.git-dpm | 6 +-
debian/patches/0001-move-themes-to-usr-share.patch | 20 +-
.../0002-add-missing-table_styling.css.patch | 38 +-
.../patches/0003-Remove-cookies-and-tracking.patch | 66 +-
.../0004-make_helper.py-python3-conversion.patch | 104 -
debian/patches/series | 1 -
docs/_static/logo-128.png | Bin 11941 -> 0 bytes
docs/_static/logo-64.png | Bin 5481 -> 0 bytes
docs/_static/longline.txt | 4 +
docs/cloud_theme.rst | 52 +-
docs/cloud_theme_test.rst | 93 +-
docs/conf.py | 5 +-
docs/contents.rst | 4 +
docs/index.rst | 18 +
docs/install.rst | 6 +-
...loud_sptheme.ext.autoattribute_search_bases.rst | 16 +
docs/lib/cloud_sptheme.ext.autodoc_sections.rst | 36 +-
docs/lib/cloud_sptheme.ext.docfield_markup.rst | 16 +
docs/lib/cloud_sptheme.ext.index_styling.rst | 2 +-
docs/lib/cloud_sptheme.ext.issue_tracker.rst | 2 +-
docs/lib/cloud_sptheme.ext.page_only.rst | 2 +
docs/lib/cloud_sptheme.ext.role_index.rst | 1 +
docs/lib/cloud_sptheme.ext.table_styling.rst | 4 +-
setup.cfg | 6 +-
setup.py | 33 +-
72 files changed, 4530 insertions(+), 1579 deletions(-)
diff --cc debian/.git-dpm
index 131e9ef,0000000..ece85f1
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 3485e0b44183699c4fbe1b841ab520eee76c6607
- 3485e0b44183699c4fbe1b841ab520eee76c6607
- 02822f01d6004949fab59934076bac613c59b9c3
++b8da379d62adc562991aa7837ddaf646c218b146
++b8da379d62adc562991aa7837ddaf646c218b146
++8d2f240f4fd198977cd9c73a2b34804bada9bccb
+8d2f240f4fd198977cd9c73a2b34804bada9bccb
+cloud-sptheme_1.8.0.orig.tar.gz
+ba105473cf10eb94ba72b41929c804b1a91adbea
+116992
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-move-themes-to-usr-share.patch
index f4ecd79,0000000..cabf2e6
mode 100644,000000..100644
--- a/debian/patches/0001-move-themes-to-usr-share.patch
+++ b/debian/patches/0001-move-themes-to-usr-share.patch
@@@ -1,52 -1,0 +1,52 @@@
- From a61aab59b20506323ef9898e0b9b698e05bd06a9 Mon Sep 17 00:00:00 2001
++From 4ef050a1e59e1d41901a3c178fcb4134d080f3bd Mon Sep 17 00:00:00 2001
+From: Nicolas Dandrimont <olasd at debian.org>
+Date: Thu, 8 Oct 2015 08:41:07 -0700
+Subject: Move themes to /usr/share
+
+Forwarded: not-needed
+
+Patch-Name: 0001-move-themes-to-usr-share.patch
+---
+ cloud_sptheme/__init__.py | 2 +-
+ docs/conf.py | 2 +-
+ setup.py | 1 -
+ 3 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/cloud_sptheme/__init__.py b/cloud_sptheme/__init__.py
- index ff9acc1..558e7e7 100644
++index d62ce10..b117d70 100644
+--- a/cloud_sptheme/__init__.py
++++ b/cloud_sptheme/__init__.py
+@@ -60,7 +60,7 @@ def get_theme_dir():
-
- .. seealso:: The :ref:`Cloud Sphinx Theme <cloud-theme-usage>` for a usage example.
++ As of Sphinx 1.2, this is passed to Sphinx via a ``setup.py`` entry point,
++ and no longer needs to be included in your documentation's ``conf.py``.
+ """
+- return os.path.join(_root_dir, "themes")
++ return "/usr/share/sphinx/themes"
+
+ def get_version(release):
+ """Derive short version string from longer 'release' string.
+diff --git a/docs/conf.py b/docs/conf.py
- index b6ef193..d0e1432 100644
++index 2f6a524..ac78edd 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -140,7 +140,7 @@ if csp.is_cloud_theme(html_theme):
++@@ -141,7 +141,7 @@ if csp.is_cloud_theme(html_theme):
+ )
+
+ # Add any paths that contain custom themes here, relative to this directory.
+-html_theme_path = [csp.get_theme_dir()]
++html_theme_path = [os.path.join(os.path.abspath(os.pardir), "cloud_sptheme", "themes")]
+
+ # The name for this set of Sphinx documents. If None, it defaults to
+ # "<project> v<release> documentation".
+diff --git a/setup.py b/setup.py
- index c32ac7c..597f6bc 100644
++index 5e81390..04bb298 100644
+--- a/setup.py
++++ b/setup.py
- @@ -24,7 +24,6 @@ from cloud_sptheme import __version__ as VERSION
++@@ -40,7 +40,6 @@ if os.environ.get("CLOUD_SETUP_TAG_RELEASE", "y").lower() in "yes y true t 1".sp
+ setup(
+ #package info
+ packages = find_packages(),
- - package_data = { "cloud_sptheme": ["themes/*/*.*", "themes/*/static/*.*"] },
++- package_data = { "cloud_sptheme": ["themes/*/*.*", "themes/*/static/*.*", "ext/*.css"] },
+ zip_safe=False,
+
- install_requires=[ "sphinx>=1.1"],
++ install_requires=["sphinx>=1.4"],
diff --cc debian/patches/0002-add-missing-table_styling.css.patch
index 1e01d7b,0000000..5a09f1d
mode 100644,000000..100644
--- a/debian/patches/0002-add-missing-table_styling.css.patch
+++ b/debian/patches/0002-add-missing-table_styling.css.patch
@@@ -1,54 -1,0 +1,28 @@@
- From 0a92b27d8e8140e1ac4abc0a5205d95ad003ad86 Mon Sep 17 00:00:00 2001
++From 1b49267b01693eb6d790102bfc5e0f5844ebd428 Mon Sep 17 00:00:00 2001
+From: Nicolas Dandrimont <olasd at debian.org>
+Date: Thu, 8 Oct 2015 08:41:08 -0700
+Subject: Add missing table_styling.css
+
+Forwarded: https://bitbucket.org/ecollins/cloud_sptheme/pull-request/2/install-the-table_stylingcss-file
+
+Patch-Name: 0002-add-missing-table_styling.css.patch
+---
- cloud_sptheme/ext/table_styling.css | 18 ++++++++++++++++++
- setup.py | 5 +++++
- 2 files changed, 23 insertions(+)
- create mode 100644 cloud_sptheme/ext/table_styling.css
++ setup.py | 5 +++++
++ 1 file changed, 5 insertions(+)
+
- diff --git a/cloud_sptheme/ext/table_styling.css b/cloud_sptheme/ext/table_styling.css
- new file mode 100644
- index 0000000..c1a7edf
- --- /dev/null
- +++ b/cloud_sptheme/ext/table_styling.css
- @@ -0,0 +1,18 @@
- +/* css fragment used by cloud_sptheme.ext.table_styling
- + * for themes which don't derive from base cloud theme
- + */
- +table.docutils .left-align { text-align: left; }
- +table.docutils .center-align { text-align: center; }
- +table.docutils .right-align { text-align: right; }
- +table.docutils .justify-align { text-align: justify; }
- +table.docutils .nowrap { white-space: nowrap; }
- +
- +table.docutils .no-left-divider { border-left-width: 0; }
- +table.docutils .single-left-divider { border-left-width: 2px; border-left-style: solid; }
- +table.docutils .double-left-divider { border-left-width: 6px; border-left-style: double; }
- +
- +table.docutils .no-right-divider,
- +table.docutils .single-right-divider,
- +table.docutils .double-right-divider { border-right-width: 0; }
- +table.docutils .single-right-divider:last-child { border-right-width: 2px; border-right-style: solid; }
- +table.docutils .double-right-divider:last-child { border-right-width: 6px; border-right-style: double; }
+diff --git a/setup.py b/setup.py
- index 597f6bc..080d9f6 100644
++index 04bb298..e15612f 100644
+--- a/setup.py
++++ b/setup.py
- @@ -24,6 +24,11 @@ from cloud_sptheme import __version__ as VERSION
++@@ -40,6 +40,11 @@ if os.environ.get("CLOUD_SETUP_TAG_RELEASE", "y").lower() in "yes y true t 1".sp
+ setup(
+ #package info
+ packages = find_packages(),
++ package_data = {
++ "cloud_sptheme": [
++ "ext/*.css",
++ ]
++ },
+ zip_safe=False,
+
- install_requires=[ "sphinx>=1.1"],
++ install_requires=["sphinx>=1.4"],
diff --cc debian/patches/0003-Remove-cookies-and-tracking.patch
index 0e3ef2b,0000000..9ae552b
mode 100644,000000..100644
--- a/debian/patches/0003-Remove-cookies-and-tracking.patch
+++ b/debian/patches/0003-Remove-cookies-and-tracking.patch
@@@ -1,98 -1,0 +1,100 @@@
- From 31b25f9d495097c467911d8f79f748e35bed009a Mon Sep 17 00:00:00 2001
++From b8da379d62adc562991aa7837ddaf646c218b146 Mon Sep 17 00:00:00 2001
+From: Nicolas Dandrimont <olasd at debian.org>
+Date: Thu, 8 Oct 2015 08:41:10 -0700
+Subject: Remove cookies and tracking
+
+Forwarded: not-needed
+
+Patch-Name: 0003-Remove-cookies-and-tracking.patch
+---
+ cloud_sptheme/themes/cloud/layout.html | 32 +---------------------------
+ cloud_sptheme/themes/cloud/static/cloud.js_t | 6 ------
+ 2 files changed, 1 insertion(+), 37 deletions(-)
+
+diff --git a/cloud_sptheme/themes/cloud/layout.html b/cloud_sptheme/themes/cloud/layout.html
- index 1084769..8a817f9 100644
++index 017fce6..7cf2936 100644
+--- a/cloud_sptheme/themes/cloud/layout.html
++++ b/cloud_sptheme/themes/cloud/layout.html
- @@ -20,8 +20,7 @@
++@@ -19,8 +19,7 @@
+ {% set reldelim2 = reldim2 is not defined and ' ' or reldelim2 %}
+
+ {# add script file to instrument collapsable sections and other features #}
+-{% set script_files = script_files + ['_static/jquery.cookie.js',
+- '_static/cloud.js'] %}
++{% set script_files = script_files + ['_static/cloud.js'] %}
+
+ {# add font stylesheets #}
+ {% set css_files = css_files + [theme_fontcssurl] %}
- @@ -58,38 +57,9 @@
++@@ -57,23 +56,6 @@
+ {% block extrahead -%}
+ {{ super() }}
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+- {%- if theme_googleanalytics_id -%}
+-<script type="text/javascript">
+-var ga_enabled = !$.cookie('disable-ga');
+-if(ga_enabled){
+- var _gaq = _gaq || [];
+- _gaq.push(['_setAccount', '{{ theme_googleanalytics_id }}']);
+- _gaq.push(['_setCookiePath', '{{ theme_googleanalytics_path }}']);
+- _gaq.push(['_setDetectFlash', false]);
+- _gaq.push(['_trackPageview']);
+- (function() {
+- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+- })();
+-}
+-</script>
+- {%- endif %}
+ {%- endblock %}
+
++ {% block body -%}
++@@ -106,17 +88,5 @@ if(ga_enabled){
++
+ {% block footer -%}
+ {{ super() }}
+- {%- if theme_googleanalytics_id -%}
+-<script type="text/javascript">
+- if(ga_enabled){
+- document.write("<div class=\"footer\">This page uses <a href=\"http://analytics.google.com\">Google Analytics</a> to collect statistics. ");
+- document.write("Click <button title=\"set cookie to disable analytics for this site\" class=\"link\" onclick=\"$.cookie('disable-ga', 'true', {expires: 3650, path: '{{ theme_googleanalytics_path }}'}); window.location.reload(); return false; \">here</button> to disable analytics for this site.");
+- document.write("</div>");
+- }else{
+- document.write("<div class=\"footer\">Google Analytics has been disabled. ");
+- document.write("Click <button title=\"set cookie to re-enable analytics for this site\" class=\"link\" onclick=\"$.cookie('disable-ga', null, {path: '{{ theme_googleanalytics_path }}'}); window.location.reload(); return false; \">here</button> to re-enable analytics for this site.");
+- };
+-</script>
+- {%- endif %}
+ <!-- cloud_sptheme 1.4 -->
+ {%- endblock %}
+diff --git a/cloud_sptheme/themes/cloud/static/cloud.js_t b/cloud_sptheme/themes/cloud/static/cloud.js_t
- index e9aa0b8..199aacd 100644
++index 5aca993..0357cb1 100644
+--- a/cloud_sptheme/themes/cloud/static/cloud.js_t
++++ b/cloud_sptheme/themes/cloud/static/cloud.js_t
- @@ -144,15 +144,11 @@ $(document).ready(function (){
-
- var show_btn = $('#sidebar-show', holder);
- var hide_btn = $('#sidebar-hide', holder);
- - /* FIXME: when url_root is a relative path, this sets cookie in wrong spot.
- - need to detect relative roots, and combine with document.location.path */
- - var copts = { expires: 7, path: DOCUMENTATION_OPTIONS.url_root };
-
- show_btn.click(function (){
- doc.removeClass("collapsed-sidebar");
- hide_btn.show();
- show_btn.hide();
- - $.cookie("sidebar", "expanded", copts);
- $(window).trigger("cloud-sidebar-toggled", false);
- });
-
- @@ -160,11 +156,9 @@ $(document).ready(function (){
- doc.addClass("collapsed-sidebar");
- show_btn.show();
- hide_btn.hide();
- - $.cookie("sidebar", "collapsed", copts);
- $(window).trigger("cloud-sidebar-toggled", true);
- });
++@@ -322,10 +322,6 @@
++ var $doc = $('div.document'),
++ $hide = $('button#sidebar-hide'),
++ $show = $('button#sidebar-show'),
++- copts = {
++- // expires: 7,
++- path: abspath(DOCUMENTATION_OPTIONS.URL_ROOT || "")
++- };
+
- - var state = $.cookie("sidebar");
- {% if theme_defaultcollapsed | tobool %}
- if(!state)
- state = "collapsed";
++ // set sidebar state for current media size
++ var lastSmall = false,
++@@ -345,7 +341,6 @@
++ } else {
++ largeState = visible;
++ if(!visible) { smallState = false; }
++- $.cookie("sidebar", visible ? "expanded" : "collapsed", copts);
++ }
++ $window.trigger("cloud-sidebar-toggled", visible);
++ }
++@@ -363,7 +358,6 @@
++ if(smallScreen){
++ setState(false);
++ } else {
++- var value = $.cookie("sidebar");
++ {% if theme_defaultcollapsed | tobool %}
++ if (!value) value = "collapsed";
++ {% endif %}
diff --cc debian/patches/series
index f3fa6b4,0000000..4594ac4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,3 @@@
+0001-move-themes-to-usr-share.patch
+0002-add-missing-table_styling.css.patch
+0003-Remove-cookies-and-tracking.patch
- 0004-make_helper.py-python3-conversion.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cloud-sptheme.git
More information about the Python-modules-commits
mailing list