From 8aede1dfe4c574addd4a2a0c6c7dd4e34aa7b164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 13 Jan 2015 11:31:45 +0100 Subject: [PATCH] Moved settings components into individual template files as well --- src/octoprint/templates/settings.jinja2 | 729 +----------------- .../templates/settings/accesscontrol.jinja2 | 167 ++++ src/octoprint/templates/settings/api.jinja2 | 30 + .../templates/settings/appearance.jinja2 | 17 + .../templates/settings/features.jinja2 | 67 ++ .../templates/settings/folders.jinja2 | 34 + src/octoprint/templates/settings/logs.jinja2 | 48 ++ .../templates/settings/printerprofiles.jinja2 | 174 +++++ .../settings/serialconnection.jinja2 | 75 ++ .../templates/settings/temperatures.jinja2 | 31 + .../templates/settings/terminalfilters.jinja2 | 26 + .../templates/settings/webcam.jinja2 | 47 ++ 12 files changed, 727 insertions(+), 718 deletions(-) create mode 100644 src/octoprint/templates/settings/accesscontrol.jinja2 create mode 100644 src/octoprint/templates/settings/api.jinja2 create mode 100644 src/octoprint/templates/settings/appearance.jinja2 create mode 100644 src/octoprint/templates/settings/features.jinja2 create mode 100644 src/octoprint/templates/settings/folders.jinja2 create mode 100644 src/octoprint/templates/settings/logs.jinja2 create mode 100644 src/octoprint/templates/settings/printerprofiles.jinja2 create mode 100644 src/octoprint/templates/settings/serialconnection.jinja2 create mode 100644 src/octoprint/templates/settings/temperatures.jinja2 create mode 100644 src/octoprint/templates/settings/terminalfilters.jinja2 create mode 100644 src/octoprint/templates/settings/webcam.jinja2 diff --git a/src/octoprint/templates/settings.jinja2 b/src/octoprint/templates/settings.jinja2 index 7c2771f2..8388e4c1 100644 --- a/src/octoprint/templates/settings.jinja2 +++ b/src/octoprint/templates/settings.jinja2 @@ -31,730 +31,23 @@
-
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
- -
-
- - s -
-
-
-
- -
-
- - s -
-
-
-
- -
-
- - s -
-
-
-
- -
-
- - s -
-
-
-
- -
-
- - s -
-
-
-
-
- -
-
-
-
-
-

{{ _('Printer Profiles') }}

- - - - - - - - - - - - - - - -
{{ _('Name') }}{{ _('Model') }}{{ _('Action') }}
-  |  |  -
- - - - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
-
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
-

{{ _('Extruder') }}

-

{{ _('Bed') }}

-
-
-
-
- -
-
- - °C -
-
- - °C -
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-

{{ _('Name') }}

-

{{ _('RegExp') }} ?

-
-
-
-
- -
-
- -
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
-
- -
-
-
-
- -
-
-
- -
- -
-
-
- -
-
-
-
-
-
- - {% if enableAccessControl %} -
- - - - - - - - - - - - - - - - - -
{{ _('Name') }}{{ _('Active') }}{{ _('Admin') }}{{ _('Action') }}

{{ _('API Key') }}: 		-  |  |  -
- - - - - - - - - - - - -
- {% endif %} + {% include 'settings/serialconnection.jinja2' %} + {% include 'settings/printerprofiles.jinja2' %} + {% include 'settings/temperatures.jinja2' %} + {% include 'settings/terminalfilters.jinja2' %} + {% include 'settings/features.jinja2' %} + {% include 'settings/webcam.jinja2' %} + {% include 'settings/accesscontrol.jinja2' %} + {% include 'settings/api.jinja2' %} + {% include 'settings/folders.jinja2' %} + {% include 'settings/appearance.jinja2' %} + {% include 'settings/logs.jinja2' %} {% for plugin_name, vars in settingsPlugins.items() %}
{% include plugin_name+"_settings_dialog.jinja2" ignore missing %}
{% endfor %} - -
-
-

{{ _('Logs') }}

- -
- - {{ _('Sort by') }}: {{ _('Name') }} ({{ _('ascending') }}) | {{ _('Modification date') }} ({{ _('descending') }}) | {{ _('Size') }} ({{ _('descending') }}) - -
- - - - - - - - - - - - - - - - - -
{{ _('Name') }}{{ _('Size') }}{{ _('Date') }}{{ _('Action') }}
-  |  -
- -
-
diff --git a/src/octoprint/templates/settings/accesscontrol.jinja2 b/src/octoprint/templates/settings/accesscontrol.jinja2 new file mode 100644 index 00000000..f08c974b --- /dev/null +++ b/src/octoprint/templates/settings/accesscontrol.jinja2 @@ -0,0 +1,167 @@ +{% if enableAccessControl %} +
+ + + + + + + + + + + + + + + + + +
{{ _('Name') }}{{ _('Active') }}{{ _('Admin') }}{{ _('Action') }}

{{ _('API Key') }}: 		+  |  |  +
+ + + + + + + + + + + + +
+{% endif %} diff --git a/src/octoprint/templates/settings/api.jinja2 b/src/octoprint/templates/settings/api.jinja2 new file mode 100644 index 00000000..f763e6ff --- /dev/null +++ b/src/octoprint/templates/settings/api.jinja2 @@ -0,0 +1,30 @@ +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+
diff --git a/src/octoprint/templates/settings/appearance.jinja2 b/src/octoprint/templates/settings/appearance.jinja2 new file mode 100644 index 00000000..bc6c8838 --- /dev/null +++ b/src/octoprint/templates/settings/appearance.jinja2 @@ -0,0 +1,17 @@ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
diff --git a/src/octoprint/templates/settings/features.jinja2 b/src/octoprint/templates/settings/features.jinja2 new file mode 100644 index 00000000..52527734 --- /dev/null +++ b/src/octoprint/templates/settings/features.jinja2 @@ -0,0 +1,67 @@ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
diff --git a/src/octoprint/templates/settings/folders.jinja2 b/src/octoprint/templates/settings/folders.jinja2 new file mode 100644 index 00000000..28f8fac8 --- /dev/null +++ b/src/octoprint/templates/settings/folders.jinja2 @@ -0,0 +1,34 @@ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
diff --git a/src/octoprint/templates/settings/logs.jinja2 b/src/octoprint/templates/settings/logs.jinja2 new file mode 100644 index 00000000..da80c20a --- /dev/null +++ b/src/octoprint/templates/settings/logs.jinja2 @@ -0,0 +1,48 @@ +
+
+

{{ _('Logs') }}

+ +
+ + {{ _('Sort by') }}: {{ _('Name') }} ({{ _('ascending') }}) | {{ _('Modification date') }} ({{ _('descending') }}) | {{ _('Size') }} ({{ _('descending') }}) + +
+ + + + + + + + + + + + + + + + + +
{{ _('Name') }}{{ _('Size') }}{{ _('Date') }}{{ _('Action') }}
+  |  +
+ +
+
diff --git a/src/octoprint/templates/settings/printerprofiles.jinja2 b/src/octoprint/templates/settings/printerprofiles.jinja2 new file mode 100644 index 00000000..beb23dc9 --- /dev/null +++ b/src/octoprint/templates/settings/printerprofiles.jinja2 @@ -0,0 +1,174 @@ +
+

{{ _('Printer Profiles') }}

+ + + + + + + + + + + + + + + +
{{ _('Name') }}{{ _('Model') }}{{ _('Action') }}
+  |  |  +
+ + + + +
diff --git a/src/octoprint/templates/settings/serialconnection.jinja2 b/src/octoprint/templates/settings/serialconnection.jinja2 new file mode 100644 index 00000000..cd6b18c4 --- /dev/null +++ b/src/octoprint/templates/settings/serialconnection.jinja2 @@ -0,0 +1,75 @@ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+
+ + s +
+
+
+
+ +
+
+ + s +
+
+
+
+ +
+
+ + s +
+
+
+
+ +
+
+ + s +
+
+
+
+ +
+
+ + s +
+
+
+
+
+ +
+
+
+
diff --git a/src/octoprint/templates/settings/temperatures.jinja2 b/src/octoprint/templates/settings/temperatures.jinja2 new file mode 100644 index 00000000..599eea50 --- /dev/null +++ b/src/octoprint/templates/settings/temperatures.jinja2 @@ -0,0 +1,31 @@ +
+
+
+

{{ _('Extruder') }}

+

{{ _('Bed') }}

+
+
+
+
+ +
+
+ + °C +
+
+ + °C +
+
+ +
+
+
+
+
+ +
+
+
+
diff --git a/src/octoprint/templates/settings/terminalfilters.jinja2 b/src/octoprint/templates/settings/terminalfilters.jinja2 new file mode 100644 index 00000000..1ba21175 --- /dev/null +++ b/src/octoprint/templates/settings/terminalfilters.jinja2 @@ -0,0 +1,26 @@ +
+
+
+

{{ _('Name') }}

+

{{ _('RegExp') }} ?

+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ +
+
+
+
diff --git a/src/octoprint/templates/settings/webcam.jinja2 b/src/octoprint/templates/settings/webcam.jinja2 new file mode 100644 index 00000000..3294493a --- /dev/null +++ b/src/octoprint/templates/settings/webcam.jinja2 @@ -0,0 +1,47 @@ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+