Imported Upstream version 7.6.4

4 files changed, 9 insertions, 12 deletions

diff --git a/scripts/INTERNAL USE ONLY b/scripts/INTERNAL USE ONLY
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/scripts/INTERNAL USE ONLY
diff --git a/scripts/getwheelhouse.sh b/scripts/getwheelhouse.sh
index 753fc2b..911ffbd 100755
--- a/scripts/getwheelhouse.sh
+++ b/scripts/getwheelhouse.sh
@@ -3,7 +3,5 @@ for i in $@; do
     wget https://github.com/getnikola/wheelhouse/archive/v$i'.zip'
     unzip 'v'$i'.zip'
     pip install --use-wheel --no-index --find-links=wheelhouse-$i lxml Pillow ipython
-    # Install Markdown for Python 2.6.
-    pip install --use-wheel --no-index --find-links=wheelhouse-$i Markdown || true
     rm -rf wheelhouse-$i 'v'$i'.zip'
 done
diff --git a/scripts/jinjify.py b/scripts/jinjify.py
index 30f8029..abd18e9 100755
--- a/scripts/jinjify.py
+++ b/scripts/jinjify.py
@@ -18,7 +18,8 @@ dumb_replacements = [
     ["og: http://ogp.me/ns# \\", "og: http://ogp.me/ns#"],
     ["article: http://ogp.me/ns/article# \\", "article: http://ogp.me/ns/article#"],
     ["fb: http://ogp.me/ns/fb# \\", "fb: http://ogp.me/ns/fb#"],
-    ['dir="rtl" \\', 'dir="rtl"']
+    ['dir="rtl" \\', 'dir="rtl"'],
+    ['sorted(translations)', 'translations|sort'],
 ]
 
 dumber_replacements = [
@@ -70,8 +71,7 @@ def jinjify(in_theme, out_theme):
     child = os.path.basename(out_theme.rstrip('/'))
     mappings = {
         'base-jinja': 'base',
-        'bootstrap-jinja': 'base-jinja',
-        'bootstrap3-jinja': 'bootstrap-jinja',
+        'bootstrap3-jinja': 'base-jinja',
     }
 
     if child in mappings:
@@ -84,7 +84,7 @@ def jinjify(in_theme, out_theme):
         outf.write(u"jinja\n")
 
     # Copy assets in bootstrap/bootstrap3
-    if child in ('bootstrap-jinja', 'bootstrap3-jinja'):
+    if child == 'bootstrap3-jinja':
         shutil.rmtree(os.path.join(out_theme, "assets"))
         shutil.copytree(
             os.path.join(in_theme, "assets"), os.path.join(out_theme, "assets"),
@@ -220,7 +220,6 @@ if __name__ == "__main__":
         print('Performing standard conversions:')
         for m, j in (
             ('nikola/data/themes/base', 'nikola/data/themes/base-jinja'),
-            ('nikola/data/themes/bootstrap', 'nikola/data/themes/bootstrap-jinja'),
             ('nikola/data/themes/bootstrap3', 'nikola/data/themes/bootstrap3-jinja')
         ):
             print('    {0} -> {1}'.format(m, j))
diff --git a/scripts/update-bower.sh b/scripts/update-bower.sh
index d077434..fbf69a0 100755
--- a/scripts/update-bower.sh
+++ b/scripts/update-bower.sh
@@ -27,29 +27,29 @@ git add moment-with-locales.min.js
 popd
 
 # Link jQuery to bootstrap theme
-pushd nikola/data/themes/bootstrap/assets/js
+pushd nikola/data/themes/bootstrap3/assets/js
 ln -sf ../../../../../../bower_components/jquery/dist/* .
 git add .
 popd
 
 
 # Link colorbox into bootstrap theme
-pushd nikola/data/themes/bootstrap/assets/js
+pushd nikola/data/themes/bootstrap3/assets/js
 ln -sf ../../../../../../bower_components/jquery-colorbox/jquery.colorbox.js .
 git add jquery.colorbox.js
 popd
 
-pushd nikola/data/themes/bootstrap/assets/js/colorbox-i18n
+pushd nikola/data/themes/bootstrap3/assets/js/colorbox-i18n
 ln -sf ../../../../../../../bower_components/jquery-colorbox/i18n/* .
 git add .
 popd
 
-pushd nikola/data/themes/bootstrap/assets/css/
+pushd nikola/data/themes/bootstrap3/assets/css/
 ln -sf ../../../../../../bower_components/jquery-colorbox/example3/colorbox.css .
 git add colorbox.css
 popd
 
-pushd nikola/data/themes/bootstrap/assets/css/images/
+pushd nikola/data/themes/bootstrap3/assets/css/images/
 ln -sf ../../../../../../../bower_components/jquery-colorbox/example3/images/* .
 git add .
 popd