Merge branch 'mrbeam-devel' into devel

src/octoprint/server/__init__.py

@@ -105,6 +105,9 @@ 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 = template_plugins.keys()
+
 	return render_template(
 		"index.jinja2",
 		webcamStream=settings().get(["webcam", "stream"]),
@@ -123,6 +126,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
 	)
 

src/octoprint/templates/index.jinja2

@@ -646,6 +646,14 @@
         {% 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>