diff --git a/blueprints.yaml b/blueprints.yaml index f2aadcf..ee7945f 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -15,47 +15,70 @@ license: MIT form: validation: loose fields: - top_level_version: - type: toggle - label: Top Level Version - highlight: 1 - default: 0 - options: - 1: Enabled - 0: Disabled - validate: - type: bool - home_url: - type: text - label: Home URL - placeholder: http://getgrav.org - validate: - type: text - - google_analytics_code: - type: text - label: Google Analytics Code - placeholder: UA-XXXXXXXX-X - validate: - type: text - - github.position: - type: select - size: medium - classes: fancy - label: GitHub Position - options: - top: Top - bottom: Bottom - off: Off - - github.tree: - type: text - label: GitHub Tree - default: https://github.com/getgrav/grav-skeleton-rtfm-site/blob/develop/ - - github.commits: - type: text - label: GitHub Commits - default: https://github.com/getgrav/grav-skeleton-rtfm-site/commits/develop/ + tabs: + type: tabs + active: 1 + class: subtle + fields: + tab_configuration: + type: tab + title: THEME_LEARN2._TAB_GLOBAL + fields: + home_url: + type: text + label: THEME_LEARN2._HOME_URL + placeholder: http://getgrav.org + validate: + type: text + google_analytics_code: + type: text + label: THEME_LEARN2._GOOGLE_ANALYTICS + placeholder: UA-XXXXXXXX-X + validate: + type: text + tab_view: + type: tab + title: THEME_LEARN2._TAB_VIEW + fields: + top_level_version: + type: toggle + label: THEME_LEARN2._TOPLEVEL_VERSION + highlight: 1 + default: 0 + options: + 1: THEME_LEARN2._ENABLED + 0: THEME_LEARN2._DISABLED + validate: + type: bool + grav.signature: + type: toggle + label: THEME_LEARN2._GRAV_SIGN + highlight: 1 + default: 0 + options: + 1: THEME_LEARN2._ENABLED + 0: THEME_LEARN2._DISABLED + validate: + type: bool + tab_github: + type: tab + title: THEME_LEARN2._TAB_GITHUB + fields: + github.position: + type: select + size: medium + classes: fancy + label: THEME_LEARN2._GITHUB_POSITION + options: + top: THEME_LEARN2._TOP + bottom: THEME_LEARN2._BOTTOM + off: THEME_LEARN2._OFF + github.tree: + type: text + label: THEME_LEARN2._GITHUB_TREE + default: https://github.com/getgrav/grav-skeleton-rtfm-site/blob/develop/ + github.commits: + type: text + label: THEME_LEARN2._GITHUB_COMMITS + default: https://github.com/getgrav/grav-skeleton-rtfm-site/commits/develop/ diff --git a/languages.yaml b/languages.yaml deleted file mode 100644 index 755af59..0000000 --- a/languages.yaml +++ /dev/null @@ -1,48 +0,0 @@ -en: - THEME_LEARN2_GITHUB_EDIT_THIS_PAGE: edit this page - THEME_LEARN2_GITHUB_NOTE: Found errors? Think you can improve this documentation? - THEME_LEARN2_CLEAR_HISTORY: Clear History - THEME_LEARN2_BUILT_WITH_GRAV: Built with Grav - The Modern Flat File CMS - THEME_LEARN2_SEARCH_DOCUMENTATION: Search Documentation -cn: - THEME_LEARN2_GITHUB_EDIT_THIS_PAGE: 编辑此页 - THEME_LEARN2_GITHUB_NOTE: 发现错误？请帮忙改进，谢谢！ - THEME_LEARN2_CLEAR_HISTORY: 清除历史 - THEME_LEARN2_BUILT_WITH_GRAV: Built with Grav - The Modern Flat File CMS - THEME_LEARN2_SEARCH_DOCUMENTATION: 搜索文档 -cs: - THEME_LEARN2_GITHUB_EDIT_THIS_PAGE: Upravte tuto stránku - THEME_LEARN2_GITHUB_NOTE: Našli jste chybu? Myslíte, že můžete vylepšit tuto dokumentaci? - THEME_LEARN2_CLEAR_HISTORY: Smazat historii - THEME_LEARN2_BUILT_WITH_GRAV: Postaveno na Grav - Moderní správce obsahu pomocí souborů prostých textů - THEME_LEARN2_SEARCH_DOCUMENTATION: Vyhledat v dokumentaci -de: - THEME_LEARN2_GITHUB_EDIT_THIS_PAGE: diese Seite bearbeiten - THEME_LEARN2_GITHUB_NOTE: Fehler gefunden? Möchten Sie diese Seite verbessern? - THEME_LEARN2_CLEAR_HISTORY: Verlauf löschen - THEME_LEARN2_BUILT_WITH_GRAV: Seite erstellt mit Grav - The Modern Flat File CMS - THEME_LEARN2_SEARCH_DOCUMENTATION: Dokumentation durchsuchen -es: - THEME_LEARN2_GITHUB_EDIT_THIS_PAGE: editar esta página - THEME_LEARN2_GITHUB_NOTE: ¿Encontraste errores? ¿Crees que puedes mejorar esta documentación? - THEME_LEARN2_CLEAR_HISTORY: Limpiar historial - THEME_LEARN2_BUILT_WITH_GRAV: Hecho con Grav - El CMS moderno de archivos planos - THEME_LEARN2_SEARCH_DOCUMENTATION: Buscar en la documentación -fr: - THEME_LEARN2_GITHUB_EDIT_THIS_PAGE: modifier cette page - THEME_LEARN2_GITHUB_NOTE: Vous avez découvert des erreurs ? Vous pensez pouvoir améliorer cette documentation ? - THEME_LEARN2_CLEAR_HISTORY: Effacer l'historique - THEME_LEARN2_BUILT_WITH_GRAV: Créé avec Grav - Le CMS moderne sans base de données - THEME_LEARN2_SEARCH_DOCUMENTATION: Rechercher dans la documentation -it: - THEME_LEARN2_GITHUB_EDIT_THIS_PAGE: modifica pagina - THEME_LEARN2_GITHUB_NOTE: Hai trovato degli errori? Pensi di poter migliorare questa documentazione? - THEME_LEARN2_CLEAR_HISTORY: Cancella Cronologia - THEME_LEARN2_BUILT_WITH_GRAV: Built with Grav - The Modern Flat File CMS - THEME_LEARN2_SEARCH_DOCUMENTATION: Cerca nella Documentatione -ru: - THEME_LEARN2_GITHUB_EDIT_THIS_PAGE: редактировать эту страницу - THEME_LEARN2_GITHUB_NOTE: Нашли ошибки? Думаете, что можете улучшить документацию? - THEME_LEARN2_CLEAR_HISTORY: Очистить историю - THEME_LEARN2_BUILT_WITH_GRAV: Сделано на Grav — современной файловой CMS - THEME_LEARN2_SEARCH_DOCUMENTATION: Поиск по документации diff --git a/languages/en.yaml b/languages/en.yaml new file mode 100644 index 0000000..e3b35f0 --- /dev/null +++ b/languages/en.yaml @@ -0,0 +1,24 @@ +THEME_LEARN2: + _YES: yes + _NO: no + _ENABLED: enabled + _DISABLED: disabled + _TAB_GLOBAL: Global + _TAB_VIEW: View + _TAB_GITHUB: GitHub + _TOP: Top + _BOTTOM: Bottom + _ON: On + _OFF: Off + _HOME_URL: Home URL + _GOOGLE_ANALYTICS: Google Analytics Code API + _TOPLEVEL_VERSION: Top Level Version + _GRAV_SIGN: GRAV sign in sidebar + _GITHUB_POSITION: GitHub position + _GITHUB_TREE: GitHub tree URL + _GITHUB_COMMITS: GitHub commits URL + GITHUB_EDIT_THIS_PAGE: edit this page + GITHUB_NOTE: Found errors? Think you can improve this documentation? + CLEAR_HISTORY: Clear History + BUILT_WITH_GRAV: Built with Grav - The Modern Flat File CMS + SEARCH_DOCUMENTATION: Search Documentation diff --git a/languages/fr.yaml b/languages/fr.yaml new file mode 100644 index 0000000..2568301 --- /dev/null +++ b/languages/fr.yaml @@ -0,0 +1,24 @@ +THEME_LEARN2: + _YES: oui + _NO: non + _ENABLED: activé + _DISABLED: désactivé + _TAB_GLOBAL: Général + _TAB_VIEW: Affichage + _TAB_GITHUB: GitHub + _TOP: Haut + _BOTTOM: Bas + _ON: Actif + _OFF: Inactif + _HOME_URL: URL du site + _GOOGLE_ANALYTICS: Code API Google Analytics + _TOPLEVEL_VERSION: Version en haut du menu + _GRAV_SIGN: Signature GRAV dans le menu + _GITHUB_POSITION: Position du lien GitHub + _GITHUB_TREE: URL de la branche + _GITHUB_COMMITS: URL des commits + GITHUB_EDIT_THIS_PAGE: modifier cette page + GITHUB_NOTE: Vous avez découvert des erreurs ? Vous pensez pouvoir améliorer cette documentation ? + CLEAR_HISTORY: Effacer l'historique + BUILT_WITH_GRAV: Créé avec Grav - Le CMS moderne sans base de données + SEARCH_DOCUMENTATION: Rechercher dans la documentation diff --git a/templates/partials/github_link.html.twig b/templates/partials/github_link.html.twig index f39c4ab..ab01985 100644 --- a/templates/partials/github_link.html.twig +++ b/templates/partials/github_link.html.twig @@ -1 +1,4 @@ - {{ 'THEME_LEARN2_GITHUB_EDIT_THIS_PAGE'|t }} + + + {{ 'THEME_LEARN2.GITHUB_EDIT_THIS_PAGE'|t }} + diff --git a/templates/partials/github_note.html.twig b/templates/partials/github_note.html.twig index 8198220..51a4a4f 100644 --- a/templates/partials/github_note.html.twig +++ b/templates/partials/github_note.html.twig @@ -1,7 +1,15 @@ -
-

- {{ 'THEME_LEARN2_GITHUB_NOTE'|t }} +

+
+
+
+
+

+ {{ 'THEME_LEARN2.GITHUB_NOTE'|t }} - {% include 'partials/github_link.html.twig' %} -

-
+ {% include 'partials/github_link.html.twig' %} +

+
+
+
+
+
diff --git a/templates/partials/search.html.twig b/templates/partials/search.html.twig index f48565c..2b02eb1 100644 --- a/templates/partials/search.html.twig +++ b/templates/partials/search.html.twig @@ -1,6 +1,9 @@
- - - + + + + +
diff --git a/templates/partials/sidebar.html.twig b/templates/partials/sidebar.html.twig index 3f1ff80..f9ab713 100644 --- a/templates/partials/sidebar.html.twig +++ b/templates/partials/sidebar.html.twig @@ -1,64 +1,78 @@ {% macro loop(page, parent_loop) %} - {% if parent_loop|length > 0 %} - {% set data_level = parent_loop %} - {% else %} - {% set data_level = 0 %} - {% endif %} - {% for p in page.children.visible %} - {% set parent_page = p.activeChild ? ' parent' : '' %} - {% set current_page = p.active ? ' active' : '' %} -
  • - - - {% if data_level == 0 %}{{ loop.index }}. {% endif %}{{ p.menu }} - - {% if p.children.count > 0 %} - - {% endif %} -
    • - {% endfor %} -{% endmacro %} + {% if parent_loop|length > 0 %} + {% set data_level = parent_loop %} + {% else %} + {% set data_level = 0 %} + {% endif %} -{% macro version(p) %} + {% for p in page.children.visible %} {% set parent_page = p.activeChild ? ' parent' : '' %} {% set current_page = p.active ? ' active' : '' %} -
    - {% if p.activeChild or p.active %} - - {% else %} - - {% endif %} - {{ p.menu }} -
    + +
  • + + + + {% if data_level == 0 %}{{ loop.index }}. {% endif %} + {{ p.menu }} + + + {% if p.children.count > 0 %} + + {% endif %} +
    • + {% endfor %} +{% endmacro %} + +{% macro version(p) %} + {% set parent_page = p.activeChild ? ' parent' : '' %} + {% set current_page = p.active ? ' active' : '' %} + +
    + {% if p.activeChild or p.active %} + + {% else %} + + {% endif %} + + {{ p.menu }} + +
    {% endmacro %}
    -
    - {% if theme_config.top_level_version %} - {% for slug, ver in pages.children %} - {{ _self.version(ver) }} - - {% endfor %} - {% else %} - - {% endif %} -
    +
    + {% if theme_config.top_level_version %} + {% for slug, ver in pages.children %} + {{ _self.version(ver) }} +
      + {{ _self.loop(ver, '') }} +
    + {% endfor %} + {% else %} +
      + {% if theme_config.root_page %} + {{ _self.loop(page.find(theme_config.root_page), '') }} + {% else %} + {{ _self.loop(pages, '') }} + {% endif %} +
    + {% endif %} +
    - {{ 'THEME_LEARN2_CLEAR_HISTORY'|t }}
    + + {{ 'THEME_LEARN2.CLEAR_HISTORY'|t }} + +
    - -
    + +