From 98a46e8caac651ab7dfd0afe470a32e101d3feb2 Mon Sep 17 00:00:00 2001
From: Philipp Engel <philipp@filzip.com>
Date: Tue, 11 Nov 2014 14:09:35 -0800
Subject: [PATCH 1/2] including plugins' main template (='name of the
 plugin'.jinja2, e.g. cura.jinja2) to index.jinja2

---
 src/octoprint/server/__init__.py     | 7 +++++++
 src/octoprint/templates/index.jinja2 | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index 754a682c..85eed1d2 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -105,6 +105,12 @@ def index():
 	for name, implementation in asset_plugins.items():
 		asset_plugin_urls[name] = implementation.get_assets()
 
+	template_plugins = pluginManager.get_implementations(octoprint.plugin.TemplatePlugin)
+	template_plugin_names = list()
+	for name in template_plugins.items():
+		template_plugin_names.append(name[0])
+
+
 	return render_template(
 		"index.jinja2",
 		webcamStream=settings().get(["webcam", "stream"]),
@@ -123,6 +129,7 @@ def index():
 		gcodeThreshold=settings().get(["gcodeViewer", "sizeThreshold"]),
 		uiApiKey=UI_API_KEY,
 		settingsPlugins=settings_plugin_template_vars,
+		templatePlugins=template_plugin_names,
 		assetPlugins=asset_plugin_urls
 	)
 
diff --git a/src/octoprint/templates/index.jinja2 b/src/octoprint/templates/index.jinja2
index fe4eb2e9..e7942fee 100644
--- a/src/octoprint/templates/index.jinja2
+++ b/src/octoprint/templates/index.jinja2
@@ -646,6 +646,15 @@
         {% include 'settings.jinja2' %}
         {% include 'dialogs.jinja2' %}
 
+        <!-- Plugin template files -->
+        {%  if templatePlugins %}
+            {% for plugin_name in templatePlugins %}
+                {% include plugin_name+".jinja2" ignore missing %}
+            {% endfor %}
+        {% endif %}
+        <!-- End plugin template files -->
+
+
         <script type="text/javascript" src="{{ url_for('static', filename='js/lib/jquery/jquery.min.js') }}"></script>
         <script type="text/javascript" src="{{ url_for('static', filename='js/lib/modernizr.custom.js') }}"></script>
         <script type="text/javascript" src="{{ url_for('static', filename='js/lib/underscore-min.js') }}"></script>

From 71bb760ce59c4dca3d53f5fd74eb12340faeb0d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 12 Nov 2014 11:22:55 +0100
Subject: [PATCH 2/2] Small optimization

---
 src/octoprint/server/__init__.py     | 5 +----
 src/octoprint/templates/index.jinja2 | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index 85eed1d2..d0d0a8e7 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -106,10 +106,7 @@ def index():
 		asset_plugin_urls[name] = implementation.get_assets()
 
 	template_plugins = pluginManager.get_implementations(octoprint.plugin.TemplatePlugin)
-	template_plugin_names = list()
-	for name in template_plugins.items():
-		template_plugin_names.append(name[0])
-
+	template_plugin_names = template_plugins.keys()
 
 	return render_template(
 		"index.jinja2",
diff --git a/src/octoprint/templates/index.jinja2 b/src/octoprint/templates/index.jinja2
index e7942fee..e1aed158 100644
--- a/src/octoprint/templates/index.jinja2
+++ b/src/octoprint/templates/index.jinja2
@@ -654,7 +654,6 @@
         {% endif %}
         <!-- End plugin template files -->
 
-
         <script type="text/javascript" src="{{ url_for('static', filename='js/lib/jquery/jquery.min.js') }}"></script>
         <script type="text/javascript" src="{{ url_for('static', filename='js/lib/modernizr.custom.js') }}"></script>
         <script type="text/javascript" src="{{ url_for('static', filename='js/lib/underscore-min.js') }}"></script>