Finalize graphical setup for calibre-web

cps/templates/admin.html

@@ -75,7 +75,7 @@
   </table>
   <div class="btn btn-default"><a href="{{url_for('configuration')}}">{{_('Configuration')}}</a></div>
   <h2>{{_('Administration')}}</h2>
-      {% if not config.DEVELOPMENT %}
+      {% if not development %}
         <div class="btn btn-default" data-toggle="modal" data-target="#RestartDialog">{{_('Restart Calibre-web')}}</a></div>
         <div class="btn btn-default" data-toggle="modal" data-target="#ShutdownDialog">{{_('Stop Calibre-web')}}</a></div>
       {% endif %}

cps/templates/config_edit.html

@@ -9,7 +9,7 @@
     </div>
     <div class="form-group">
       <label for="config_port">{{_('Server Port')}}</label>
-      <input type="text" class="form-control" name="config_port" id="config_port" value="{% if content.config_port != None %}{{ content.config_port }}{% endif %}" autocomplete="off" required>
+      <input type="number" min="1" max="65535" class="form-control" name="config_port" id="config_port" value="{% if content.config_port != None %}{{ content.config_port }}{% endif %}" autocomplete="off" required>
     </div>
     <div class="form-group">
       <label for="config_calibre_web_title">{{_('Title')}}</label>
@@ -17,11 +17,11 @@
     </div>    
     <div class="form-group">
       <label for="config_books_per_page">{{_('Books per page')}}</label>
-      <input type="text" class="form-control" name="config_books_per_page" id="config_books_per_page" value="{% if content.config_books_per_page != None %}{{ content.config_books_per_page }}{% endif %}" autocomplete="off">
+      <input type="number" min="1" max="200" class="form-control" name="config_books_per_page" id="config_books_per_page" value="{% if content.config_books_per_page != None %}{{ content.config_books_per_page }}{% endif %}" autocomplete="off">
     </div>
     <div class="form-group">
       <label for="config_random_books">{{_('No. of random books to show')}}</label>
-      <input type="text" class="form-control" name="config_random_books" id="config_random_books" value="{% if content.config_random_books != None %}{{ content.config_random_books }}{% endif %}" autocomplete="off">
+      <input type="number" min="1" max="30" class="form-control" name="config_random_books" id="config_random_books" value="{% if content.config_random_books != None %}{{ content.config_random_books }}{% endif %}" autocomplete="off">
     </div>
     
     <div class="form-group">
@@ -31,10 +31,10 @@
     <div class="form-group">
     <label for="config_log_level">{{_('Log Level')}}</label>
         <select name="config_log_level" id="config_log_level" class="form-control">
-                <option value="DEBUG" {% if content.config_log_level == 'DEBUG' %}selected{% endif %}>DEBUG</option>
-                <option value="INFO" {% if content.config_log_level == 'INFO' or content.config_log_level == None %}selected{% endif %}>INFO</option>
-                <option value="WARNING" {% if content.config_log_level == 'WARNING' %}selected{% endif %}>WARNING</option>
-                <option value="ERROR" {% if content.config_log_level == 'ERROR' %}selected{% endif %}>ERROR</option>
+                <option value="10" {% if content.config_log_level == 10 %}selected{% endif %}>DEBUG</option>
+                <option value="20" {% if content.config_log_level == 20 or content.config_log_level == None %}selected{% endif %}>INFO</option>
+                <option value="30" {% if content.config_log_level == 30 %}selected{% endif %}>WARNING</option>
+                <option value="40" {% if content.config_log_level == 40 %}selected{% endif %}>ERROR</option>
         </select>
     </div>
     <div class="form-group">
@@ -48,8 +48,14 @@
     <div class="form-group">
         <input type="checkbox" id="config_public_reg" name="config_public_reg" {% if content.config_public_reg %}checked{% endif %}>
         <label for="config_public_reg">{{_('Enable public registration')}}</label>
-    </div>    
+    </div>
     <button type="submit" class="btn btn-default">{{_('Submit')}}</button>
+    {% if not origin %}
+      <a href="{{ url_for('admin') }}" class="btn btn-default">{{_('Back')}}</a>
+    {% endif %}
+    {% if success %}
+      <a href="{{ url_for('login') }}" class="btn btn-default">{{_('Login')}}</a>
+    {% endif %}
   </form>
 </div>
 {% endblock %}

cps/templates/index.html

@@ -1,6 +1,6 @@
 {% extends "layout.html" %}
 {% block body %}
-{% if g.user.show_random_books() %}
+{% if g.user.show_detail_random() %}
 <div class="discover">
   <h2>{{_('Discover (Random Books)')}}</h2>
   <div class="row">

cps/templates/stats.html

@@ -12,19 +12,19 @@
   <tbody>
     <tr>
       <th>Python</th>
-      <td>{{Versions['PythonVersion']}}</td>
+      <td>{{versions['PythonVersion']}}</td>
     </tr>
     <tr>
       <th>Kindlegen</th>
-      <td>{{Versions['KindlegenVersion']}}</td>
+      <td>{{versions['KindlegenVersion']}}</td>
     </tr>
     <tr>
       <th>ImageMagick</th>
-      <td>{{Versions['ImageVersion']}}</td>
+      <td>{{versions['ImageVersion']}}</td>
     </tr>
     <tr>
       <th>PyPDF2</th>
-      <td>{{Versions['PyPdfVersion']}}</td>
+      <td>{{versions['PyPdfVersion']}}</td>
     </tr>
   </tbody>
 </table>

cps/templates/user_edit.html

@@ -41,25 +41,33 @@
         </select>
     </div>
     <div class="form-group">
-        <input type="checkbox" name="show_random" id="show_random" {% if content.random_books %}checked{% endif %}>
+        <input type="checkbox" name="show_random" id="show_random" {% if content.show_random_books() %}checked{% endif %}>
         <label for="show_random">{{_('Show random books')}}</label>
     </div>
     <div class="form-group">
-        <input type="checkbox" name="show_hot" id="show_hot" {% if content.hot_books %}checked{% endif %}>
+        <input type="checkbox" name="show_hot" id="show_hot" {% if content.show_hot_books() %}checked{% endif %}>
         <label for="show_hot">{{_('Show hot books')}}</label>
     </div>
     <div class="form-group">
-        <input type="checkbox" name="show_language" id="show_language" {% if content.language_books %}checked{% endif %}>
+        <input type="checkbox" name="show_language" id="show_language" {% if content.show_language() %}checked{% endif %}>
         <label for="show_language">{{_('Show language selection')}}</label>
     </div>
     <div class="form-group">
-        <input type="checkbox" name="show_series" id="show_series" {% if content.series_books %}checked{% endif %}>
+        <input type="checkbox" name="show_series" id="show_series" {% if content.show_series() %}checked{% endif %}>
         <label for="show_series">{{_('Show series selection')}}</label>
     </div>
     <div class="form-group">
-        <input type="checkbox" name="show_category" id="show_category" {% if content.category_books %}checked{% endif %}>
+        <input type="checkbox" name="show_category" id="show_category" {% if content.show_category() %}checked{% endif %}>
         <label for="show_category">{{_('Show category selection')}}</label>
     </div>
+    <div class="form-group">
+        <input type="checkbox" name="show_author" id="show_author" {% if content.show_author() %}checked{% endif %}>
+        <label for="show_author">{{_('Show author selection')}}</label>
+    </div>
+    <div class="form-group">
+        <input type="checkbox" name="show_detail_random" id="show_detail_random" {% if content.show_detail_random() %}checked{% endif %}>
+        <label for="show_detail_random">{{_('Show random books in detail view')}}</label>
+    </div>
 
     {% if g.user and g.user.role_admin() and not profile %}
     {% if not content.role_anonymous() %}