Merge branch 'master' of https://github.com/getnikola/plugins

getnikola · Jul 9, 2017 · e2ecea3 · e2ecea3
2 parents d6ee980 + b9b999b
commit e2ecea3
Show file tree

Hide file tree

Showing 40 changed files with 317 additions and 93 deletions.
diff --git a/site/conf.py b/site/conf.py
@@ -29,21 +29,25 @@
 
 # Package index configuration
 PKGINDEX_DIRS = {
-    'v7': ('v7', 'plugin.tmpl')
+    'v7': ('v7', 'plugin.tmpl'),
+    'v8': ('v8', 'plugin.tmpl')
 }
+
 PKGINDEX_HANDLERS = {
-    'v7': ['dirname_as_title', 'parse_plugin_file']
+    'v7': ['dirname_as_title', 'parse_plugin_file', 'add_dummy_multiver'],
+    'v8': ['dirname_as_title', 'parse_plugin_file', 'add_dummy_multiver']
 }
 PKGINDEX_CONFIG = {
     'extension': '.plugin',
-    'versions_supported': [7],
+    'versions_supported': [7, 8],
     'json_filename': 'plugins.json',
 }
 
 plugins_submenu = (
     ('/', 'Plugins Home'),
     ('/categories/', 'Categories'),
     ('/v7/', 'Version 7'),
+    ('/v8/', 'Version 8'),
 )
 
 # Output folder -- change if using locally
@@ -1211,7 +1215,7 @@
 
 # If you hate "Filenames with Capital Letters and Spaces.md", you should
 # set this to true.
-UNSLUGIFY_TITLES = True
+FILE_METADATA_UNSLUGIFY_TITLES = True
 
 # Additional metadata that is added to a post when creating a new_post
 # ADDITIONAL_METADATA = {}

diff --git a/site/continuous-import.plugin b/site/continuous-import.plugin
diff --git a/site/pages/categories/Command.rst b/site/pages/categories/Command.rst
@@ -4,7 +4,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: Command
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/categories/Compiler.rst b/site/pages/categories/Compiler.rst
@@ -4,7 +4,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: Compiler
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/categories/CompilerExtension.rst b/site/pages/categories/CompilerExtension.rst
@@ -4,7 +4,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: CompilerExtension
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/categories/ConfigPlugin.rst b/site/pages/categories/ConfigPlugin.rst
@@ -4,7 +4,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: ConfigPlugin
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/categories/LateTask.rst b/site/pages/categories/LateTask.rst
@@ -4,7 +4,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: LateTask
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/categories/PostScanner.rst b/site/pages/categories/PostScanner.rst
@@ -4,7 +4,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: PostScanner
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/categories/ShortcodePlugin.rst b/site/pages/categories/ShortcodePlugin.rst
@@ -4,7 +4,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: ShortcodePlugin
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/categories/SignalHandler.rst b/site/pages/categories/SignalHandler.rst
@@ -4,7 +4,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: SignalHandler
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/categories/Task.rst b/site/pages/categories/Task.rst
@@ -4,7 +4,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: Task
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/categories/TaskMultiplier.rst b/site/pages/categories/TaskMultiplier.rst
@@ -4,7 +4,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: TaskMultiplier
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/categories/TemplateSystem.rst b/site/pages/categories/TemplateSystem.rst
@@ -4,7 +4,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: TemplateSystem
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/categories/gen.py b/site/pages/categories/gen.py
@@ -9,7 +9,7 @@
 .. category: category_page
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :categories: {0}
    :post_type: pages
    :template: plugin_list.tmpl

diff --git a/site/pages/index.rst b/site/pages/index.rst
@@ -31,7 +31,7 @@ All available plugins
 =====================
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :tags: plugin
    :post_type: pages
    :template: plugin_list.tmpl

diff --git a/site/pages/sidemenu.rst b/site/pages/sidemenu.rst
@@ -6,7 +6,7 @@
 .. url_type: full_path
 
 .. post-list::
-   :sort: slug
+   :sort: slug_sortable
    :tags: plugin
    :post_type: pages
    :template: sidemenu_list.tmpl
diff --git a/site/pages/v7.rst b/site/pages/v7.rst
@@ -4,7 +4,7 @@
 .. category: version_page
 
 .. post-list::
-   :sort: slug
-   :tags: plugin, v7
+   :sort: slug_sortable
+   :tags: v7
    :post_type: pages
    :template: plugin_list.tmpl
diff --git a/site/pages/v8.rst b/site/pages/v8.rst
@@ -0,0 +1,10 @@
+.. title: Version 8
+.. slug: v8
+.. date: 1970-01-01 00:00:00 UTC
+.. category: version_page
+
+.. post-list::
+   :sort: slug_sortable
+   :tags: v8
+   :post_type: pages
+   :template: plugin_list.tmpl
diff --git a/site/templates/plugin.tmpl b/site/templates/plugin.tmpl
@@ -20,9 +20,9 @@
         ${post.meta('author')}
         % endif
         <p class="minverline">Supports Nikola v${post.meta('minver')}
-        % if post.meta('maxver'):
+        % if post.meta('maxver') and post.meta('maxver') != post.meta('minver'):
         through ${post.meta('maxver')}
-        % else:
+        % elif not post.meta('maxver'):
         or newer
         % endif
         </p>
@@ -64,5 +64,5 @@
 </article>
 </div>
 <div class="col-md-3 hidden-xs hidden-sm" id="sidemenu-container"></div>
-<script>var pkgindex_item_name = "${post.meta('slug')}";</script>
+<script>var pkgindex_item_name = "${post.meta('slug_versioned')}";</script>
 </%block>
diff --git a/site/templates/plugin_list.tmpl b/site/templates/plugin_list.tmpl
@@ -6,8 +6,12 @@
     <ul class="post-list">
         % for post in posts:
             <li class="post-list-item">
+            % if post.meta('multiver'):
+            <a href="${post.permalink(lang)}"><span class="text-muted">v${post.meta('dirver')}/</span>${post.title(lang)|h}</a> — ${post.meta('description')}
+            % else:
             <a href="${post.permalink(lang)}">${post.title(lang)|h}</a> — ${post.meta('description')}
             </li>
+            % endif
         % endfor
     </ul>
     %endif

diff --git a/site/templates/sidemenu_list.tmpl b/site/templates/sidemenu_list.tmpl
@@ -3,7 +3,11 @@
 %if posts:
 <div class="list-group">
 % for post in posts:
-<a class="list-group-item sidemenu-item" data-name="${post.meta('slug')}" href="${post.permalink(lang)}">${post.title(lang)|h}</a>
+% if post.meta('multiver'):
+<a class="list-group-item sidemenu-item" data-name="${post.meta('slug_versioned')}" href="${post.permalink(lang)}"><span class="text-muted">v${post.meta('dirver')}/</span>${post.title(lang)|h}</a>
+% else:
+<a class="list-group-item sidemenu-item" data-name="${post.meta('slug_versioned')}" href="${post.permalink(lang)}">${post.title(lang)|h}</a>
+% endif
 % endfor
 </div>
 %endif

diff --git a/site/v8 b/site/v8
@@ -0,0 +1 @@
+../v8
diff --git a/v7/helloworld/helloworld.plugin b/v7/helloworld/helloworld.plugin
@@ -4,8 +4,6 @@ Module = helloworld
 Tests = test_helloworld
 
 [Nikola]
-MinVersion = 6.0.0
-MaxVersion = 7.0.0
 PluginCategory = Task
 
 [Documentation]

diff --git a/v7/ical/README.md b/v7/ical/README.md
@@ -9,13 +9,13 @@ external file, or embedded in your document.
 Example with external file:
 
 ```
-{{% calendar file=my_event.ical %}}
+{{% raw %}}{{% calendar file=my_event.ical %}}{{% /raw %}}
 ```
 
 Example with embedded calendar:
 
 ```
-{{% calendar %}}
+{{% raw %}}{{% calendar %}}
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//hacksw/handcal//NONSGML v1.0//EN
@@ -28,7 +28,7 @@ DTEND:19970715T035959Z
 SUMMARY:Bastille Day Party
 END:VEVENT
 END:VCALENDAR
-{{% /calendar %}}
+{{% /calendar %}}{{% /raw %}}
 
 ```
 
@@ -37,5 +37,5 @@ a different template, just use the ``template`` argument (it will be loaded from
 or from ``templates/``:
 
 ```
-{{% calendar file=my_event.ical template=my_fancy_template.tmpl %}}
+{{% raw %}}{{% calendar file=my_event.ical template=my_fancy_template.tmpl %}}{{% /raw %}}
 ```
diff --git a/v7/notebook_shortcode/README.md b/v7/notebook_shortcode/README.md
@@ -4,7 +4,7 @@ adapting an existing notebook into a post with additional markup.
 Usage:
 
 ```
-{{% notebook path/to/notebook.ipynb %}}
+{{% raw %}}{{% notebook path/to/notebook.ipynb %}}{{% /raw %}}
 ```
 
 Note: `ipynb` must be enabled and configured (COMPILERS, POSTS/PAGES) for CSS to appear properly. If you are using math

diff --git a/v7/orgmode/README.md b/v7/orgmode/README.md
@@ -30,3 +30,17 @@ You can add any customization variables that you wish to add, to modify the
 output generated by org-mode to `conf.el` inside the plugin directory.  This
 lets you have custom configuration, that doesn't get wiped out each time the
 plugin is updated.
+
+## Teasers
+
+You may use teasers by enabling `INDEX_TEASERS = True` in conf.py, and
+use `{{{TEASER_END}}}` to generate `<!-- TEASER_END -->` in org posts.
+
+## Image URLs
+
+The image url in ox-html is a little fuzzy. For example, `[[/images/test.jpg]]` will be
+generated as `<img src="file:///images/test.jpg" alt="test.jpg">`
+because the path is considered as an absolute file path.
+
+In order to correctly generate image urls, you may write `[[img-url:/images/test.jpg]]`,
+and then it should be generated as `<img src="/images/test.jpg" alt="test.jpg">`.