Merge branch 'templates' into stable3

frontend.py

@@ -272,9 +272,6 @@ logger.addHandler(fh)
 application = bottle.default_app()
 bottle.install(SessionPlugin('/'))
 
-for bot in listdir('bots'):
-    bottle.TEMPLATE_PATH.insert(0, path.join('bots', bot, 'settings.tpl'))
-
 if __name__ == '__main__':
     bottle.run(host="0.0.0.0", port=config["web"]["port"])
 else:

template/settings.tpl

@@ -8,14 +8,13 @@
 % end
 
 <%
-
 # import all the settings templates from bots/*/settings.tpl
 import os
 bots = os.listdir('bots')
 
 for bot in bots:
-    include('/home/b3yond/git/ticketfrei/bots/' + bot + '/settings.tpl', csrf=csrf, city=city)
-
+    include('bots/' + bot + '/settings.tpl', csrf=csrf, city=city)
+end
 %>
 
 <div>
@@ -43,24 +42,6 @@ for bot in bots:
     </form>
 </div>
 
-<div>
-    <h2>Edit your mail subscription page</h2>
-    <p>
-        There is also a page where users can subscribe to mail notifications:
-        <a href="/city/mail/{{city}}" target="_blank">Ticketfrei {{city}}</a>.
-        You can change what your users will read there, and adjust it to your
-        needs.
-    </p>
-    <p>
-        So this is the default text we suggest:
-    </p>
-    <form action="/settings/mail_md" method="post">
-        <textarea id="mail_md" rows="20" cols="70" name="mail_md" wrap="physical">{{mail_md}}</textarea>
-        <input name='csrf' value='{{csrf}}' type='hidden' />
-        <input name='confirm' value='Save' type='submit'/>
-    </form>
-</div>
-
 <div>
     <h2>Edit your trigger patterns</h2>
     <p>