Convert sharing pages to templates

modules/installed/sharing/sharing.py

@@ -26,14 +26,9 @@ class Sharing(PagePlugin):
     @cherrypy.expose
     @require()
     def files(self):
-        return util.render_template(title="File Server", main='',
+        return util.render_template(template='sharing',
-                                    sidebar_right=_("""
+                                    title=_('File Server'))
-<strong>Freedom NAS</strong><p> The %s can make your spare hard drives accessible to your
-local network, thus acting as a NAS server.  We currently support
-sharing files via NFS and SMB. 
 
-TODO: this is not true.  We currently support no sharing.</p>
-""" % cfg.box_name))
 
 #TODO: move PrinterSharing to another file, as it should be an optional module (most people don't care about printer sharing)
 class PrinterSharing(PagePlugin):
@@ -45,13 +40,5 @@ class PrinterSharing(PagePlugin):
     @cherrypy.expose
     @require()
     def index(self):
-        main = """
+        return util.render_template(template='sharing_printer',
-<p>TODO: Setup and install SAMBA</p>
+                                    title=_('Printer Sharing'))
-<p>TODO: Setup and install CUPS</p>
-"""
-        return util.render_template(title="Printer Sharing", main=main,
-                                    sidebar_right="""
-<strong>Share Your Printer</strong><p> The %s can share your printer via Samba and CUPS.</p>
-""" % cfg.box_name)
-
- 

modules/installed/sharing/templates/sharing.html

@@ -0,0 +1,15 @@
+{% extends "login_nav.html" %}
+
+{% block sidebar_right_block %}
+
+<div class="well sidebar-nav">
+  <h3>Freedom NAS</h3>
+
+  <p> The {{ cfg.box_name }} can make your spare hard drives
+  accessible to your local network, thus acting as a NAS server.  We
+  currently support sharing files via NFS and SMB.</p>
+
+  <p>TODO: this is not true.  We currently support no sharing.</p>
+</div>
+
+{% endblock %}

modules/installed/sharing/templates/sharing_printer.html

@@ -0,0 +1,19 @@
+{% extends "login_nav.html" %}
+
+{% block main_block %}
+
+<p>TODO: Setup and install SAMBA</p>
+<p>TODO: Setup and install CUPS</p>
+
+{% endblock %}
+
+{% block sidebar_right_block %}
+
+<div class="well sidebar-nav">
+  <h3>Share Your Printer</h3>
+
+  <p> The {{ cfg.box_name }} can share your printer via Samba and
+  CUPS.</p>
+</div>
+
+{% endblock %}