Fix #590, #589.

Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email

cps/templates/admin.html

@@ -2,7 +2,6 @@
 {% block body %}
 <div class="discover">
   <h2>{{_('User list')}}</h2>
-    <div id="divLoading"></div>
   <table class="table table-striped" id="table_user">
     <tr>
         <th>{{_('Nickname')}}</th>
@@ -13,7 +12,6 @@
         <th>{{_('Download')}}</th>
         <th>{{_('Upload')}}</th>
         <th>{{_('Edit')}}</th>
-        <th>{{_('Passwd')}}</th>
     </tr>
     {% for user in content %}
       {% if not user.role_anonymous() or config.config_anonbrowse %}
@@ -26,20 +24,18 @@
         <td>{% if user.role_download() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
         <td>{% if user.role_upload() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
         <td>{% if user.role_edit() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-        <td>{% if user.role_passwd() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
       </tr>
       {% endif %}
     {% endfor %}
   </table>
     <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('new_user')}}">{{_('Add new user')}}</a></div>
-  <h2>{{_('SMTP mail settings')}}</h2>
+  <h2>{{_('SMTP e-mail server settings')}}</h2>
   <table class="table table-striped" id="table_email">
     <tr>
         <th>{{_('SMTP hostname')}}</th>
         <th>{{_('SMTP port')}}</th>
         <th>{{_('SSL')}}</th>
         <th>{{_('SMTP login')}}</th>
-        <th>{{_('SMTP password')}}</th>
         <th>{{_('From mail')}}</th>
     </tr>
       <tr>
@@ -47,44 +43,56 @@
         <td>{{email.mail_port}}</td>
         <td>{% if email.mail_use_ssl %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
         <td>{{email.mail_login}}</td>
-        <td>********</td>
         <td>{{email.mail_from}}</td>
-
   </table>
-
     <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('edit_mailsettings')}}">{{_('Change SMTP settings')}}</a></div>
-
+<div id="container">
   <h2>{{_('Configuration')}}</h2>
-  <table class="table table-striped" id="table_configuration">
-    <tr>
-        <th>{{_('Calibre DB dir')}}</th>
-        <th>{{_('Log Level')}}</th>
-        <th>{{_('Port')}}</th>
-        <th>{{_('Books per page')}}</th>
-        <th>{{_('Uploading')}}</th>
-        <th>{{_('Public registration')}}</th>
-        <th>{{_('Anonymous browsing')}}</th>
-        <th>{{_('Remote Login')}}</th>
-    </tr>
-      <tr>
-        <td>{{config.config_calibre_dir}}</td>
-        <td>{{config.get_Log_Level()}}</td>
-        <td>{{config.config_port}}</td>
-        <td>{{config.config_books_per_page}}</td>
-        <td>{% if config.config_uploading %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-        <td>{% if config.config_public_reg %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-        <td>{% if config.config_anonbrowse %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-        <td>{% if config.config_remote_login %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-  </table>
+  <div class="col-xs-12 col-sm-6">
+    <div class="Row">
+        <div class="col-xs-6 col-sm-6">{{_('Calibre DB dir')}}</div>
+        <div class="col-xs-6 col-sm-6">{{config.config_calibre_dir}}</div>
+    </div>
+    <div class="Row">  
+        <div class="col-xs-6 col-sm-6">{{_('Log Level')}}</div>
+        <div class="col-xs-6 col-sm-6">{{config.get_Log_Level()}}</div>
+    </div>
+    <div class="Row">    
+        <div class="col-xs-6 col-sm-6">{{_('Port')}}</div>
+        <div class="col-xs-6 col-sm-6">{{config.config_port}}</div>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-6">
+    <div class="Row">
+        <div class="col-xs-6 col-sm-7">{{_('Books per page')}}</div>
+        <div class="col-xs-6 col-sm-5">{{config.config_books_per_page}}</div>
+    </div>
+    <div class="Row">
+        <div class="col-xs-6 col-sm-7">{{_('Uploading')}}</div>
+        <div class="col-xs-6 col-sm-5">{% if config.config_uploading %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+    </div>
+    <div class="Row">
+        <div class="col-xs-6 col-sm-7">{{_('Public registration')}}</div>
+        <div class="col-xs-6 col-sm-5">{% if config.config_public_reg %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+    </div>
+    <div class="Row">
+        <div class="col-xs-6 col-sm-7">{{_('Remote Login')}}</div>
+        <div class="col-xs-6 col-sm-5">{% if config.config_remote_login %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+    </div>      
+  </div>
+</div>
+    <div class="col-xs-12 col-sm-12">
+        <p></p>
   <div class="btn btn-default"><a href="{{url_for('configuration')}}">{{_('Basic Configuration')}}</a></div>
   <div class="btn btn-default"><a href="{{url_for('view_configuration')}}">{{_('UI Configuration')}}</a></div>
+    </div>
   <h2>{{_('Administration')}}</h2>
     <div>{{_('Current commit timestamp')}}: <span>{{commit}} </span></div>
     <div class="hidden" id="update_info">{{_('Newest commit timestamp')}}: <span></span></div>
     <p></p>
     <div class="btn btn-default" id="restart_database">{{_('Reconnect to Calibre DB')}}</div>
-    <div class="btn btn-default" data-toggle="modal" data-target="#RestartDialog">{{_('Restart Calibre-web')}}</div>
-    <div class="btn btn-default" data-toggle="modal" data-target="#ShutdownDialog">{{_('Stop Calibre-web')}}</div>
+    <div class="btn btn-default" data-toggle="modal" data-target="#RestartDialog">{{_('Restart Calibre-Web')}}</div>
+    <div class="btn btn-default" data-toggle="modal" data-target="#ShutdownDialog">{{_('Stop Calibre-Web')}}</div>
     <div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</div>
     <div class="btn btn-default hidden" id="perform_update" data-toggle="modal" data-target="#UpdateprogressDialog">{{_('Perform Update')}}</div>
 </div>
@@ -95,7 +103,7 @@
     <div class="modal-content">
       <div class="modal-header bg-info"></div>
       <div class="modal-body text-center">
-        <p>{{_('Do you really want to restart Calibre-web?')}}</p>
+        <p>{{_('Do you really want to restart Calibre-Web?')}}</p>
           <div id="spinner" class="spinner"  style="display:none;">
                 <img id="img-spinner" src="/static/css/images/loading-icon.gif"/>
           </div>
@@ -113,7 +121,7 @@
       <div class="modal-header bg-info">
       </div>
       <div class="modal-body text-center">
-        <p>{{_('Do you really want to stop Calibre-web?')}}</p>
+        <p>{{_('Do you really want to stop Calibre-Web?')}}</p>
         <button type="button" class="btn btn-default" id="shutdown" data-dismiss="modal">{{_('Ok')}}</button>
         <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
       </div>