From bed2158fb4bb1ff3953418655015bf1301a183dc Mon Sep 17 00:00:00 2001 From: Vitor Henrique Date: Thu, 21 Jan 2021 23:16:37 -0600 Subject: [PATCH] changing folder name --- .../templates/enclosure_settings.jinja2 | 11 ++++++- .../general_info.jinja2 | 12 +++---- .../io_output.jinja2 | 0 .../main_screen.jinja2 | 10 +++--- .../output_action.jinja2 | 0 .../printer_action.jinja2 | 0 .../temperature_sensor.jinja2 | 0 .../templates/input_table.jinja2 | 33 +++++++++++++++++++ .../templates/output_table.jinja2 | 4 +-- 9 files changed, 55 insertions(+), 15 deletions(-) rename octoprint_enclosure/templates/{input_folder => input_editor}/general_info.jinja2 (85%) rename octoprint_enclosure/templates/{input_folder => input_editor}/io_output.jinja2 (100%) rename octoprint_enclosure/templates/{input_folder => input_editor}/main_screen.jinja2 (84%) rename octoprint_enclosure/templates/{input_folder => input_editor}/output_action.jinja2 (100%) rename octoprint_enclosure/templates/{input_folder => input_editor}/printer_action.jinja2 (100%) rename octoprint_enclosure/templates/{input_folder => input_editor}/temperature_sensor.jinja2 (100%) diff --git a/octoprint_enclosure/templates/enclosure_settings.jinja2 b/octoprint_enclosure/templates/enclosure_settings.jinja2 index 7db8ede..f76a0bd 100644 --- a/octoprint_enclosure/templates/enclosure_settings.jinja2 +++ b/octoprint_enclosure/templates/enclosure_settings.jinja2 @@ -2,4 +2,13 @@ {% include "output_table.jinja2" %} -{% include "output_editor/main_screen.jinja2" %} \ No newline at end of file +{% include "output_editor/main_screen.jinja2" %} + +

{{ _('Raspberry Pi Inputs') }}

+ +{% include "input_table.jinja2" %} + +{% include "input_editor/main_screen.jinja2" %} + + + \ No newline at end of file diff --git a/octoprint_enclosure/templates/input_folder/general_info.jinja2 b/octoprint_enclosure/templates/input_editor/general_info.jinja2 similarity index 85% rename from octoprint_enclosure/templates/input_folder/general_info.jinja2 rename to octoprint_enclosure/templates/input_editor/general_info.jinja2 index 031a445..656cf53 100644 --- a/octoprint_enclosure/templates/input_folder/general_info.jinja2 +++ b/octoprint_enclosure/templates/input_editor/general_info.jinja2 @@ -26,21 +26,21 @@
- + Info: GPIO will input status of the pin (HIGH or LOW) to trigger actions on configured outputs or printer events - - + + Info: Temperature Sensors will input temperature and humidity data. - +
- +
@@ -50,7 +50,7 @@ {{ _('Printer') }}
- + diff --git a/octoprint_enclosure/templates/input_folder/io_output.jinja2 b/octoprint_enclosure/templates/input_editor/io_output.jinja2 similarity index 100% rename from octoprint_enclosure/templates/input_folder/io_output.jinja2 rename to octoprint_enclosure/templates/input_editor/io_output.jinja2 diff --git a/octoprint_enclosure/templates/input_folder/main_screen.jinja2 b/octoprint_enclosure/templates/input_editor/main_screen.jinja2 similarity index 84% rename from octoprint_enclosure/templates/input_folder/main_screen.jinja2 rename to octoprint_enclosure/templates/input_editor/main_screen.jinja2 index 0d855b6..b89e373 100644 --- a/octoprint_enclosure/templates/input_folder/main_screen.jinja2 +++ b/octoprint_enclosure/templates/input_editor/main_screen.jinja2 @@ -27,24 +27,24 @@
- {% include "input_folder/general_info.jinja2" %} +
- {% include "input_folder/io_output.jinja2" %} +
- {% include "input_folder/printer_action.jinja2" %} +
- {% include "input_folder/output_action.jinja2" %} +
- {% include "input_folder/temperature_sensor.jinja2" %} +
diff --git a/octoprint_enclosure/templates/input_folder/output_action.jinja2 b/octoprint_enclosure/templates/input_editor/output_action.jinja2 similarity index 100% rename from octoprint_enclosure/templates/input_folder/output_action.jinja2 rename to octoprint_enclosure/templates/input_editor/output_action.jinja2 diff --git a/octoprint_enclosure/templates/input_folder/printer_action.jinja2 b/octoprint_enclosure/templates/input_editor/printer_action.jinja2 similarity index 100% rename from octoprint_enclosure/templates/input_folder/printer_action.jinja2 rename to octoprint_enclosure/templates/input_editor/printer_action.jinja2 diff --git a/octoprint_enclosure/templates/input_folder/temperature_sensor.jinja2 b/octoprint_enclosure/templates/input_editor/temperature_sensor.jinja2 similarity index 100% rename from octoprint_enclosure/templates/input_folder/temperature_sensor.jinja2 rename to octoprint_enclosure/templates/input_editor/temperature_sensor.jinja2 diff --git a/octoprint_enclosure/templates/input_table.jinja2 b/octoprint_enclosure/templates/input_table.jinja2 index e69de29..1def2a4 100644 --- a/octoprint_enclosure/templates/input_table.jinja2 +++ b/octoprint_enclosure/templates/input_table.jinja2 @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
IdLabelTypeGPIO{{ _('Action') }}
N/A +  |  + +
+ +
+ +
\ No newline at end of file diff --git a/octoprint_enclosure/templates/output_table.jinja2 b/octoprint_enclosure/templates/output_table.jinja2 index b80d7f0..631cf50 100644 --- a/octoprint_enclosure/templates/output_table.jinja2 +++ b/octoprint_enclosure/templates/output_table.jinja2 @@ -30,6 +30,4 @@
-
- - \ No newline at end of file +
\ No newline at end of file