diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2014-06-13 22:22:01 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2014-06-13 22:22:01 -0300 |
| commit | d566f55c2da609d0fc9280fbc299b8c0b1cae6b1 (patch) | |
| tree | eabf325a33c6d2f663ede8ff77acc9e417d9f07a | |
| parent | 3dddbd8cc879402c2047919bccd20e6697082657 (diff) | |
Update patches
| -rw-r--r-- | debian/patches/0001-Add-an-install_bs3-command.patch | 16 | ||||
| -rw-r--r-- | debian/patches/0002-Remove-jquery-version-of-bundles.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 8 insertions, 27 deletions
diff --git a/debian/patches/0001-Add-an-install_bs3-command.patch b/debian/patches/0001-Add-an-install_bs3-command.patch index ed13a43..e768a79 100644 --- a/debian/patches/0001-Add-an-install_bs3-command.patch +++ b/debian/patches/0001-Add-an-install_bs3-command.patch @@ -21,28 +21,28 @@ diff --git a/nikola/conf.py.in b/nikola/conf.py.in index b398ac3..69ed0e8 100644 --- a/nikola/conf.py.in +++ b/nikola/conf.py.in -@@ -311,6 +311,8 @@ COMPILERS = ${COMPILERS} - # the main (the newest) index page (index.html) +@@ -65,6 +65,8 @@ # (the same way you would do with a (translatable) setting.) + NAVIGATION_LINKS = ${NAVIGATION_LINKS} # Name of the theme to use. +# WARNING: With this Nikola package, the bootstrap3 theme must be installed +# separately. In order to do this, use: nikola install_bs3 THEME = ${THEME} - # Color scheme to be used for code blocks. If your theme provides + ############################################## diff --git a/nikola/plugins/command/init.py b/nikola/plugins/command/init.py index d7eeed7..29eebcf 100644 --- a/nikola/plugins/command/init.py +++ b/nikola/plugins/command/init.py -@@ -47,7 +47,7 @@ SAMPLE_CONF = { - 'BLOG_EMAIL': "joe@demo.site", - 'BLOG_DESCRIPTION': "This is a demo site for Nikola.", - 'DEFAULT_LANG': "en", +@@ -57,7 +57,7 @@ SAMPLE_CONF = { + # Example for another language: + # "es": "./es", + }""", - 'THEME': 'bootstrap3', + 'THEME': 'bootstrap', + 'TIMEZONE': 'UTC', 'COMMENT_SYSTEM': 'disqus', 'COMMENT_SYSTEM_ID': 'nikolademo', - 'TRANSLATIONS_PATTERN': DEFAULT_TRANSLATIONS_PATTERN, diff --git a/nikola/plugins/command/install_bs3.plugin b/nikola/plugins/command/install_bs3.plugin new file mode 100644 index 0000000..77730cc diff --git a/debian/patches/0002-Remove-jquery-version-of-bundles.patch b/debian/patches/0002-Remove-jquery-version-of-bundles.patch deleted file mode 100644 index d018df9..0000000 --- a/debian/patches/0002-Remove-jquery-version-of-bundles.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Agustin Henze <tin@sluc.org.ar> -Date: Thu, 21 Nov 2013 08:33:15 -0300 -Subject: Remove jquery version of bundles - ---- - nikola/data/themes/bootstrap/bundles | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nikola/data/themes/bootstrap/bundles b/nikola/data/themes/bootstrap/bundles -index 14124a3..089b036 100644 ---- a/nikola/data/themes/bootstrap/bundles -+++ b/nikola/data/themes/bootstrap/bundles -@@ -1,4 +1,4 @@ - assets/css/all-nocdn.css=bootstrap.css,bootstrap-responsive.css,rst.css,code.css,colorbox.css,theme.css,custom.css - assets/css/all.css=rst.css,code.css,colorbox.css,theme.css,custom.css --assets/js/all-nocdn.js=jquery-1.10.2.min.js,bootstrap.min.js,jquery.colorbox-min.js -+assets/js/all-nocdn.js=jquery.min.js,bootstrap.min.js,jquery.colorbox-min.js - assets/js/all.js=jquery.colorbox-min.js diff --git a/debian/patches/series b/debian/patches/series index d07eb8b..13c69a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-Add-an-install_bs3-command.patch -0002-Remove-jquery-version-of-bundles.patch |