From a24beb25a35b705dcbe58d4abb2e397233e75ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 21 Nov 2016 17:43:04 +0100 Subject: [PATCH] _snippets => snippets - because babel ignores folders starting with _ --- .../corewizard_printerprofile_wizard.jinja2 | 8 ++++---- .../corewizard_servercommands_wizard.jinja2 | 6 +++--- .../templates/corewizard_webcam_wizard.jinja2 | 6 +++--- .../plugins/cura/templates/cura_settings.jinja2 | 8 ++++---- .../plugins/cura/templates/cura_wizard.jinja2 | 4 ++-- .../settings/cura/engineLog.jinja2 | 0 .../settings/cura/enginePath.jinja2 | 0 .../settings/cura/profileImporter.jinja2 | 0 .../settings/cura/profiles.jinja2 | 0 .../plugins/softwareupdate/checkoutFolder.jinja2 | 0 .../plugins/softwareupdate/releaseChannel.jinja2 | 0 .../plugins/softwareupdate/versionTracking.jinja2 | 0 .../templates/softwareupdate_settings.jinja2 | 6 +++--- .../templates/softwareupdate_wizard.jinja2 | 4 ++-- src/octoprint/templates/dialogs/files.jinja2 | 2 +- .../dialogs/settings/printerprofiles.jinja2 | 4 ++-- .../templates/dialogs/settings/server.jinja2 | 6 +++--- .../templates/dialogs/settings/webcam.jinja2 | 14 +++++++------- .../settings/printerprofiles/profileEditor.jinja2 | 8 ++++---- .../printerprofiles/profileEditorAxes.jinja2 | 0 .../profileEditorBuildvolume.jinja2 | 0 .../printerprofiles/profileEditorExtruder.jinja2 | 0 .../printerprofiles/profileEditorGeneral.jinja2 | 0 .../settings/printerprofiles/profiles.jinja2 | 0 .../server/serverCommandServerRestart.jinja2 | 0 .../server/serverCommandSystemRestart.jinja2 | 0 .../server/serverCommandSystemShutdown.jinja2 | 0 .../settings/webcam/ffmpegBitrate.jinja2 | 0 .../settings/webcam/ffmpegPath.jinja2 | 0 .../settings/webcam/ffmpegThreads.jinja2 | 0 .../settings/webcam/watermark.jinja2 | 0 .../settings/webcam/webcamOrientation.jinja2 | 0 .../settings/webcam/webcamSnapshotUrl.jinja2 | 0 .../settings/webcam/webcamStreamUrl.jinja2 | 0 34 files changed, 38 insertions(+), 38 deletions(-) rename src/octoprint/plugins/cura/templates/{_snippets => snippets}/settings/cura/engineLog.jinja2 (100%) rename src/octoprint/plugins/cura/templates/{_snippets => snippets}/settings/cura/enginePath.jinja2 (100%) rename src/octoprint/plugins/cura/templates/{_snippets => snippets}/settings/cura/profileImporter.jinja2 (100%) rename src/octoprint/plugins/cura/templates/{_snippets => snippets}/settings/cura/profiles.jinja2 (100%) rename src/octoprint/plugins/softwareupdate/templates/{_snippets => snippets}/plugins/softwareupdate/checkoutFolder.jinja2 (100%) rename src/octoprint/plugins/softwareupdate/templates/{_snippets => snippets}/plugins/softwareupdate/releaseChannel.jinja2 (100%) rename src/octoprint/plugins/softwareupdate/templates/{_snippets => snippets}/plugins/softwareupdate/versionTracking.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/printerprofiles/profileEditor.jinja2 (83%) rename src/octoprint/templates/{_snippets => snippets}/settings/printerprofiles/profileEditorAxes.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/printerprofiles/profileEditorBuildvolume.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/printerprofiles/profileEditorExtruder.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/printerprofiles/profileEditorGeneral.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/printerprofiles/profiles.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/server/serverCommandServerRestart.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/server/serverCommandSystemRestart.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/server/serverCommandSystemShutdown.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/webcam/ffmpegBitrate.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/webcam/ffmpegPath.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/webcam/ffmpegThreads.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/webcam/watermark.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/webcam/webcamOrientation.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/webcam/webcamSnapshotUrl.jinja2 (100%) rename src/octoprint/templates/{_snippets => snippets}/settings/webcam/webcamStreamUrl.jinja2 (100%) diff --git a/src/octoprint/plugins/corewizard/templates/corewizard_printerprofile_wizard.jinja2 b/src/octoprint/plugins/corewizard/templates/corewizard_printerprofile_wizard.jinja2 index 2b82ad35..b787defa 100644 --- a/src/octoprint/plugins/corewizard/templates/corewizard_printerprofile_wizard.jinja2 +++ b/src/octoprint/plugins/corewizard/templates/corewizard_printerprofile_wizard.jinja2 @@ -13,19 +13,19 @@ to OctoPrint, you can also configure additional printer profiles under Settings
- {% include '_snippets/settings/printerprofiles/profileEditorGeneral.jinja2' %} + {% include 'snippets/settings/printerprofiles/profileEditorGeneral.jinja2' %}
- {% include '_snippets/settings/printerprofiles/profileEditorBuildvolume.jinja2' %} + {% include 'snippets/settings/printerprofiles/profileEditorBuildvolume.jinja2' %}
- {% include '_snippets/settings/printerprofiles/profileEditorAxes.jinja2' %} + {% include 'snippets/settings/printerprofiles/profileEditorAxes.jinja2' %}
- {% include '_snippets/settings/printerprofiles/profileEditorExtruder.jinja2' %} + {% include 'snippets/settings/printerprofiles/profileEditorExtruder.jinja2' %}
diff --git a/src/octoprint/plugins/corewizard/templates/corewizard_servercommands_wizard.jinja2 b/src/octoprint/plugins/corewizard/templates/corewizard_servercommands_wizard.jinja2 index 509070d7..18233a46 100644 --- a/src/octoprint/plugins/corewizard/templates/corewizard_servercommands_wizard.jinja2 +++ b/src/octoprint/plugins/corewizard/templates/corewizard_servercommands_wizard.jinja2 @@ -8,12 +8,12 @@

{{ _('OctoPrint related commands') }}

- {% include "_snippets/settings/server/serverCommandServerRestart.jinja2" %} + {% include "snippets/settings/server/serverCommandServerRestart.jinja2" %}

{{ _('System related commands') }}

- {% include "_snippets/settings/server/serverCommandSystemRestart.jinja2" %} - {% include "_snippets/settings/server/serverCommandSystemShutdown.jinja2" %} + {% include "snippets/settings/server/serverCommandSystemRestart.jinja2" %} + {% include "snippets/settings/server/serverCommandSystemShutdown.jinja2" %}
diff --git a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 index aa5a8cf7..b1fc6f3a 100644 --- a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 +++ b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 @@ -26,8 +26,8 @@

{% endtrans %}
- {% include "_snippets/settings/webcam/webcamStreamUrl.jinja2" %} - {% include "_snippets/settings/webcam/webcamSnapshotUrl.jinja2" %} + {% include "snippets/settings/webcam/webcamStreamUrl.jinja2" %} + {% include "snippets/settings/webcam/webcamSnapshotUrl.jinja2" %}

{{ _('Timelapse Recordings') }}

@@ -38,5 +38,5 @@

{% endtrans %}
- {% include "_snippets/settings/webcam/ffmpegPath.jinja2" %} + {% include "snippets/settings/webcam/ffmpegPath.jinja2" %}
diff --git a/src/octoprint/plugins/cura/templates/cura_settings.jinja2 b/src/octoprint/plugins/cura/templates/cura_settings.jinja2 index 2bba70fd..d5726f2d 100644 --- a/src/octoprint/plugins/cura/templates/cura_settings.jinja2 +++ b/src/octoprint/plugins/cura/templates/cura_settings.jinja2 @@ -8,13 +8,13 @@ {% endtrans %}

- {% include "_snippets/settings/cura/enginePath.jinja2" %} - {% include "_snippets/settings/cura/engineLog.jinja2" %} + {% include "snippets/settings/cura/enginePath.jinja2" %} + {% include "snippets/settings/cura/engineLog.jinja2" %}

{{ _('Profiles') }}

-{% include "_snippets/settings/cura/profiles.jinja2" %} +{% include "snippets/settings/cura/profiles.jinja2" %} @@ -22,4 +22,4 @@ {% trans %}For more information on configuration and usage please see the Plugin's homepage.{% endtrans %} -{% include "_snippets/settings/cura/profileImporter.jinja2" %} +{% include "snippets/settings/cura/profileImporter.jinja2" %} diff --git a/src/octoprint/plugins/cura/templates/cura_wizard.jinja2 b/src/octoprint/plugins/cura/templates/cura_wizard.jinja2 index 6bae2e18..bf72dc64 100644 --- a/src/octoprint/plugins/cura/templates/cura_wizard.jinja2 +++ b/src/octoprint/plugins/cura/templates/cura_wizard.jinja2 @@ -7,7 +7,7 @@
- {% include "_snippets/settings/cura/enginePath.jinja2" %} + {% include "snippets/settings/cura/enginePath.jinja2" %}
@@ -18,7 +18,7 @@ yet. You should do this now.{% endtrans %}

- {% include "_snippets/settings/cura/profiles.jinja2" %} + {% include "snippets/settings/cura/profiles.jinja2" %}
diff --git a/src/octoprint/plugins/cura/templates/_snippets/settings/cura/engineLog.jinja2 b/src/octoprint/plugins/cura/templates/snippets/settings/cura/engineLog.jinja2 similarity index 100% rename from src/octoprint/plugins/cura/templates/_snippets/settings/cura/engineLog.jinja2 rename to src/octoprint/plugins/cura/templates/snippets/settings/cura/engineLog.jinja2 diff --git a/src/octoprint/plugins/cura/templates/_snippets/settings/cura/enginePath.jinja2 b/src/octoprint/plugins/cura/templates/snippets/settings/cura/enginePath.jinja2 similarity index 100% rename from src/octoprint/plugins/cura/templates/_snippets/settings/cura/enginePath.jinja2 rename to src/octoprint/plugins/cura/templates/snippets/settings/cura/enginePath.jinja2 diff --git a/src/octoprint/plugins/cura/templates/_snippets/settings/cura/profileImporter.jinja2 b/src/octoprint/plugins/cura/templates/snippets/settings/cura/profileImporter.jinja2 similarity index 100% rename from src/octoprint/plugins/cura/templates/_snippets/settings/cura/profileImporter.jinja2 rename to src/octoprint/plugins/cura/templates/snippets/settings/cura/profileImporter.jinja2 diff --git a/src/octoprint/plugins/cura/templates/_snippets/settings/cura/profiles.jinja2 b/src/octoprint/plugins/cura/templates/snippets/settings/cura/profiles.jinja2 similarity index 100% rename from src/octoprint/plugins/cura/templates/_snippets/settings/cura/profiles.jinja2 rename to src/octoprint/plugins/cura/templates/snippets/settings/cura/profiles.jinja2 diff --git a/src/octoprint/plugins/softwareupdate/templates/_snippets/plugins/softwareupdate/checkoutFolder.jinja2 b/src/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/checkoutFolder.jinja2 similarity index 100% rename from src/octoprint/plugins/softwareupdate/templates/_snippets/plugins/softwareupdate/checkoutFolder.jinja2 rename to src/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/checkoutFolder.jinja2 diff --git a/src/octoprint/plugins/softwareupdate/templates/_snippets/plugins/softwareupdate/releaseChannel.jinja2 b/src/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/releaseChannel.jinja2 similarity index 100% rename from src/octoprint/plugins/softwareupdate/templates/_snippets/plugins/softwareupdate/releaseChannel.jinja2 rename to src/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/releaseChannel.jinja2 diff --git a/src/octoprint/plugins/softwareupdate/templates/_snippets/plugins/softwareupdate/versionTracking.jinja2 b/src/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/versionTracking.jinja2 similarity index 100% rename from src/octoprint/plugins/softwareupdate/templates/_snippets/plugins/softwareupdate/versionTracking.jinja2 rename to src/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/versionTracking.jinja2 diff --git a/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 b/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 index 31f8b94a..656f2316 100644 --- a/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 +++ b/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 @@ -74,9 +74,9 @@