Small enhancements

config/themes/yunohost-docs.yaml

@@ -1,11 +1,17 @@
+streams:
+  schemes:
+    theme:
+      type: ReadOnlyStream
+      prefixes:
+        '': [user/themes/yunohost-docs, user/themes/learn4]
 enabled: true
 production-mode: false
 grid-size: grid-xl
 github:
   note: false
   link: true
-  tree: https://github.com/yunohost/doc/blob/grav/
+  tree: 'https://github.com/yunohost/doc/blob/grav/'
-  commits: https://github.com/yunohost/doc/commits/grav/
+  commits: 'https://github.com/yunohost/doc/commits/grav/'
 spectre:
   exp: false
   icons: false

pages/01.administrate/01.selfhosting/01.whatisyunohost/whatsyunohost.md

@@ -52,6 +52,6 @@ You can host your friends, your family and your company safely and with ease, bu
 Black and white YunoHost PNG logo by ToZz (400 × 400 px):
 
 [![](image://ynh_logo_black_300dpi.png?resize=220)](image://ynh_logo_black_300dpi.png)
-[![](image://ynh_logo_white_300dpi.png?resize=220)](image://ynh_logo_white_300dpi.png)
+[![](image://ynh_logo_white_300dpi.png?resize=220&id=whitelogo)](image://ynh_logo_white_300dpi.png)
 
 Licence: CC-BY-SA 4.0

pages/01.administrate/01.selfhosting/02.tryyunohost/try.md

@@ -11,13 +11,14 @@ routes:
 
 [center]
 [columns]
-[<i class="fa fa-user"></i> User interface](https://demo.yunohost.org/?target=_blank&classes=btn,btn-lg,btn-success)  
+[[fa=user /] User interface](https://demo.yunohost.org/?target=_blank&classes=btn,btn-lg,btn-success)  
 Username: demo  
 Password: demo
 
-[<i class="fa fa-user"></i> Administration interface](https://demo.yunohost.org/yunohost/admin?target=_blank&classes=btn,btn-lg,btn-primary)  
+[[fa=cog /] Administration interface](https://demo.yunohost.org/yunohost/admin/?target=_blank&classes=btn,btn-lg,btn-primary)  
-Password: demo</p>
+Password: demo
+
 [/columns]
 [/center]
 
-!!! **Demo server gracefully provided by [Gitoyen](https://www.gitoyen.net?target=_blank)**
+!!!! **Demo server gracefully provided by [Gitoyen](https://www.gitoyen.net?target=_blank) [fa=heart /]**

pages/01.administrate/01.selfhosting/03.howtohostyourself/howtohostyourself.md

@@ -14,7 +14,7 @@ You can host yourself at home (on a small computer), or on a remote server. Each
 You can host yourself at home with an ARM board or a re-purposed regular computer, connected to your home router/box. 
 
 - **Pros**  : you will have physical control of the machine and only need to buy the hardware;
-- **Cons**  : you will have to [manually configure your internet box](/administrate/postinstall/ispbox) and [might be limited by your ISP](/administrate/advance/isp).
+- **Cons**  : you will have to [manually configure your internet box](/isp_box_config) and [might be limited by your ISP](/isp).
 
 ### At home, behind a VPN
 

themes/learn2-git-sync/CHANGELOG.md

@@ -1,8 +1,26 @@
+# v1.6.2
+## 01/26/2021
+
+1. [](#improved)
+    * Updated theme blueprints for Grav 1.7
+
+# v1.6.1
+## 01/15/2021
+
+1. [](#new)
+    * GoogleSlides shortcode updated to handle double `_` characters in URL (thanks @GeorgesPapas)
+
+# v1.6.0
+## 01/05/2021
+
+1. [](#new)
+    * Initial NextGen Editor support for GoogleSlides, H5P and PDF shortcodes
+
 # v1.5.9
 ## 05/19/2020
 
 1. [](#improved)
-    * Updated inherited theme file paths for multisite compatibility (thanks to @tituspijean for the PR!)
+    * Updated inherited theme file paths for multisite compatibility (thanks to @tituspijean for the PR and @mahagr for the debugging!)
 
 # v1.5.8
 ## 12/05/2019

themes/learn2-git-sync/blueprints.yaml

@@ -1,5 +1,7 @@
 name: Learn2 Git Sync
-version: 1.5.9
+type: theme
+slug: learn2-git-sync
+version: 1.6.2
 description: "A customized version of the Learn2 theme for use with the Learn2 with Git Sync skeleton package. Includes selectable visual styles."
 icon: git
 author:

themes/learn2-git-sync/learn2-git-sync.php

@@ -17,11 +17,29 @@ class Learn2GitSync extends Learn2
         return [
             'onTwigInitialized' => ['onTwigInitialized', 0],
             'onThemeInitialized' => ['onThemeInitialized', 0],
+            'onShortcodeHandlers' => ['onShortcodeHandlers', 0],
             'onTwigSiteVariables' => ['onTwigSiteVariables', 0],
-            'onTNTSearchIndex' => ['onTNTSearchIndex', 0]
+            'onTNTSearchIndex' => ['onTNTSearchIndex', 0],
+            'registerNextGenEditorPlugin' => ['registerNextGenEditorPluginShortcodes', 0]
         ];
     }
 
+    public function onShortcodeHandlers()
+    {
+        $this->grav['shortcode']->registerAllShortcodes('user://themes/learn2-git-sync/shortcodes');
+    }
+
+    public function registerNextGenEditorPluginShortcodes($event) {
+        $plugins = $event['plugins'];
+
+        $plugins['js'][] = 'user://themes/learn2-git-sync/nextgen-editor/shortcodes/googleslides.js';
+        $plugins['js'][] = 'user://themes/learn2-git-sync/nextgen-editor/shortcodes/h5p.js';
+        $plugins['js'][] = 'user://themes/learn2-git-sync/nextgen-editor/shortcodes/pdf.js';
+
+        $event['plugins']  = $plugins;
+        return $event;
+    }
+
     public function onTwigSiteVariables()
     {
         if ($this->isAdmin() && ($this->grav['config']->get('plugins.shortcode-core.enabled'))) {

themes/learn2-git-sync/templates/partials/search.html.twig

@@ -8,6 +8,6 @@
 {% endif %}
 {% if config.plugins.tntsearch.enabled %}
   <div class="adv-search">
-    <i class="fa fa-sliders"></i> <a href="{{ base_url_absolute }}/search">{{ 'THEME_LEARN2_ADVANCED_SEARCH'|t }}</a>
+    <i class="fa fa-sliders"></i> <a href="{{ base_url_absolute }}/tntsearch">{{ 'THEME_LEARN2_ADVANCED_SEARCH'|t }}</a>
   </div>
 {% endif %}

themes/learn2/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.8.1
+## 01/15/2021
+
+1. [](#improved)
+    * Fixed autoescaping in preparation for Grav 1.7
+
 # v1.8.0
 ## 03/21/2019
 

themes/learn2/blueprints.yaml

@@ -1,5 +1,7 @@
 name: Learn2
-version: 1.8.0
+slug: learn2
+type: theme
+version: 1.8.1
 description: "Learn2 is a new modern documentation theme for Grav"
 icon: book
 author:

themes/learn2/templates/chapter.html.twig

@@ -3,7 +3,7 @@
 {% block content %}
 	<div id="chapter">
     	<div id="body-inner">
-			{{ page.content }}
+			{{ page.content|raw }}
 		</div>
     </div>
 {% endblock %}

themes/learn2/templates/error.html.twig

@@ -8,7 +8,7 @@
     	<div id="body-inner">
     		<h1>{{ 'PLUGIN_ERROR.ERROR'|t }} {{ header.http_response_code }}</h1>
 
-            {{ page.content }}
+            {{ page.content|raw }}
 
 		</div>
     </div>

themes/learn2/templates/partials/page.html.twig

@@ -1,6 +1,6 @@
 <div id="body-inner">
     <h1>{{ page.title }}</h1>
     <p>
-    	{{ page.content }}
+    	{{ page.content|raw }}
     </p>
 </div>

themes/learn2/templates/partials/sidebar.html.twig

@@ -62,7 +62,7 @@
                     class="fa fa-fw fa-history"></i> {{ 'THEME_LEARN2_CLEAR_HISTORY'|t }}</a><br/>
 
         <section id="footer">
-            <p>{{ 'THEME_LEARN2_BUILT_WITH_GRAV'|t }}</p>
+            <p>{{ 'THEME_LEARN2_BUILT_WITH_GRAV'|t|raw }}</p>
         </section>
     </div>
 </div>

themes/learn2/templates/search.html.twig

@@ -1,7 +1,7 @@
 {% embed 'partials/base.html.twig' with { github_link_position: false } %}
 
     {% block content %}
-        {{ page.content }}
+        {{ page.content|raw }}
 
         {% include 'partials/tntsearch.html.twig' with { in_page: true, placeholder: "Search the Grav documentation..." }%}
     {% endblock %}

themes/yunohost-docs/css/custom.css

@@ -64,3 +64,8 @@ h1, h2, h3, h4, h5, h6 {
     font-weight: 700;
     font-style: normal;
 }
+
+img#whitelogo {
+    background-color: gray;
+    padding: 10px;
+}