changes for #77

Code cosmetics
#75:
- More debug infos for kindlegen and sending e-mail.
- Button for sending test e-mail.
- timeout of 5min for sending e-mail

cps/templates/email_edit.html

@@ -27,7 +27,8 @@
       <label for="mail_from">{{_('From e-mail')}}</label>
       <input type="text" class="form-control" name="mail_from" id="mail_from" value="{{content.mail_from}}">
     </div>
-    <button type="submit" class="btn btn-default">{{_('Submit')}}</button>
+    <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save settings')}}</button>
+    <button type="submit" name="test" value="test" class="btn btn-default">{{_('Save settings and send Test E-Mail')}}</button>
     <a href="{{ url_for('user_list') }}" class="btn btn-default">{{_('Back')}}</a>
   </form>
 

cps/templates/stats.html

@@ -1,7 +1,45 @@
 {% extends "layout.html" %}
 {% block body %}
-<div class="discover">
-  <h2>{{bookcounter}} {{_('Books in this Library')}}</h2>
-  <h2>{{authorcounter}} {{_('Authors in this Library')}}</h2>
-</div>
+  <h3>{{_('Linked libraries')}}</h3>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>{{_('Program library')}}</th>
+      <th>{{_('Installed Version')}}</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <th>Python</th>
+      <td>{{Versions['PythonVersion']}}</td>
+    </tr>
+    <tr>
+      <th>Kindlegen</th>
+      <td>{{Versions['KindlegenVersion']}}</td>
+    </tr>
+    <tr>
+      <th>ImageMagick</th>
+      <td>{{Versions['ImageVersion']}}</td>
+    </tr>
+    <tr>
+      <th>PyPDF2</th>
+      <td>{{Versions['PyPdfVersion']}}</td>
+    </tr>
+  </tbody>
+</table>
+
+  <h3>{{_('Calibre library statistics')}}</h3>
+<table class="table">
+  <tbody>
+    <tr>
+      <th>{{bookcounter}}</th>
+      <td>{{_('Books in this Library')}}</td>
+    </tr>
+    <tr>
+      <th>{{authorcounter}}</th>
+      <td>{{_('Authors in this Library')}}</td>
+    </tr>
+  </tbody>
+</table>
 {% endblock %}

cps/templates/user_edit.html

@@ -40,7 +40,6 @@
             {% endfor %}
         </select>
     </div>
-    {% if g.user and g.user.role_admin() and not profile %}
     <div class="form-group">
         <input type="checkbox" name="show_random" {% if content.random_books %}checked{% endif %}>
         <label for="show_random">{{_('Show random books')}}</label>
@@ -62,6 +61,8 @@
         <label for="show_category">{{_('Show category selection')}}</label>
     </div>
 
+    {% if g.user and g.user.role_admin() and not profile %}
+
     <div class="form-group">
       <input type="checkbox" name="admin_role" id="admin_role" {% if content.role_admin() %}checked{% endif %}>
       <label for="admin_role">{{_('Admin user')}}</label>