Merge branch 'master' into develop

# Conflicts:
#	cps/web.py

cps/templates/admin.html

@@ -2,6 +2,7 @@
 {% 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>
@@ -76,11 +77,13 @@
   <div class="btn btn-default"><a href="{{url_for('configuration')}}">{{_('Configuration')}}</a></div>
   <h2>{{_('Administration')}}</h2>
       {% if not development %}
-        <p>{{_('Current commit timestamp')}}: {{commit}} </p>
-        <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>
-        <div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</a></div>
-        <a href="{{url_for('update')}}" class="btn btn-default hidden" id="perform_update">{{_('Perform Update')}}</a>
+        <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" 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>
       {% endif %}
 </div>
 <!-- Modal -->
@@ -88,15 +91,17 @@
   <div class="modal-dialog modal-sm">
     <!-- Modal content-->
     <div class="modal-content">
-      <div class="modal-header bg-info">
-      </div>
+      <div class="modal-header bg-info"></div>
       <div class="modal-body text-center">
         <p>{{_('Do you really want to restart Calibre-web?')}}</p>
-        <button type="button" class="btn btn-default" id="restart" data-dismiss="modal">{{_('Ok')}}</button>
+          <div id="spinner" class="spinner"  style="display:none;">
+                <img id="img-spinner" src="/static/css/images/loading-icon.gif"/>
+          </div>
+          <p></p>
+        <button type="button" class="btn btn-default" id="restart" >{{_('Ok')}}</button>
         <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
       </div>
     </div>
-
   </div>
 </div>
 <div id="ShutdownDialog" class="modal fade" role="dialog">
@@ -114,5 +119,23 @@
 
   </div>
 </div>
-
+<div id="UpdateprogressDialog" class="modal fade" role="dialog">
+  <div class="modal-dialog modal-sm">
+    <!-- Modal content-->
+    <div class="modal-content">
+      <div class="modal-header bg-info text-center">
+      <span>{{_('Updating, please do not reload page')}}</span>
+      </div>
+      <div class="modal-body text-center">
+          <div id="spinner2" class="spinner2"  style="display:none;">
+                <img id="img-spinner" src="/static/css/images/loading-icon.gif"/>
+          </div>
+          <p></p>
+         <div id="Updatecontent"></div>
+          <p></p>
+        <button type="button" class="btn btn-default hidden" id="updateFinished" data-dismiss="modal">{{_('Ok')}}</button>
+      </div>
+    </div>
+  </div>
+</div>
 {% endblock %}

cps/templates/detail.html

@@ -50,6 +50,7 @@
 
       {% if entry.identifiers|length > 0 %}
       <div class="identifiers">
+        <p>
         <span class="glyphicon glyphicon-link"></span>
         {% for identifier in entry.identifiers %}
           <a href="{{identifier}}" target="_blank" class="btn btn-xs btn-success" role="button">{{identifier.formatType()}}</a>
@@ -66,10 +67,16 @@
         {% for tag in entry.tags %}
           <a href="{{ url_for('category', id=tag.id) }}" class="btn btn-xs btn-info" role="button">{{tag.name}}</a>
         {%endfor%}
-
       </div>
       </p>
       {% endif %}
+      {% if entry.publishers|length > 0 %}
+      <div class="publishers">
+      <p>
+          <span>{{_('Publisher')}}:{% for publisher in entry.publishers %} {{publisher.name}}{% if not loop.last %},{% endif %}{% endfor %}</span>
+      </p>
+      </div>
+      {% endif %}
       {% if entry.pubdate[:10] != '0101-01-01' %}
         <p>{{_('Publishing date')}}: {{entry.pubdate|formatdate}} </p>
       {% endif %}

cps/templates/layout.html

@@ -65,7 +65,7 @@
         <div class="navbar-collapse collapse">
           {% if g.user.is_authenticated or g.user.is_anonymous() %}
           <ul class="nav navbar-nav ">
-            <li><a href="{{url_for('advanced_search')}}"><span class="glyphicon glyphicon-search"></span> {{_('Advanced Search')}}</a></li>
+            <li><a href="{{url_for('advanced_search')}}"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm"> {{_('Advanced Search')}}</span></a></li>
           </ul>
           {% endif %}
           <ul class="nav navbar-nav navbar-right" id="main-nav">

cps/templates/search_form.html

@@ -10,63 +10,67 @@
       <label for="bookAuthor">{{_('Author')}}</label>
       <input type="text" class="form-control typeahead" name="author_name" id="bookAuthor" value="" autocomplete="off">
     </div>
-    <label for="Tags">{{_('Tags')}}</label>
     <div class="form-group">
+      <label for="Publisher">{{_('Publisher')}}</label>
+      <input type="text" class="form-control" name="publisher" id="publisher" value="">
+    </div>
+    <label for="include_tag">{{_('Tags')}}</label>
+    <div class="form-group" id="test">
       <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
         {% for tag in tags %}
           <label id="tag_{{tag.id}}" class="btn btn-primary tags_click">
-            <input type="checkbox" autocomplete="off" name="include_tag" value="{{tag.id}}">{{tag.name}}</input>
+            <input type="checkbox" autocomplete="off" name="include_tag" id="include_tag" value="{{tag.id}}">{{tag.name}}</input>
           </label>
         {% endfor %}
       </div>
     </div>
-    <label for="Tags">{{_('Exclude Tags')}}</label>
+    <label for="exclude_tag">{{_('Exclude Tags')}}</label>
     <div class="form-group">
       <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
         {% for tag in tags %}
           <label id="tag_{{tag.id}}" class="btn btn-danger tags_click">
-            <input type="checkbox" autocomplete="off" name="exclude_tag" value="{{tag.id}}">{{tag.name}}</input>
+            <input type="checkbox" autocomplete="off" name="exclude_tag" id="exclude_tag" value="{{tag.id}}">{{tag.name}}</input>
           </label>
         {% endfor %}
       </div>
     </div>
-    <label for="Series">{{_('Series')}}</label>
+    <label for="include_serie">{{_('Series')}}</label>
     <div class="form-group">
       <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
         {% for serie in series %}
           <label id="serie_{{serie.id}}" class="btn btn-primary serie_click">
-            <input type="checkbox" autocomplete="off" name="include_serie" value="{{serie.id}}">{{serie.name}}</input>
+            <input type="checkbox" autocomplete="off" name="include_serie" id="include_serie" value="{{serie.id}}">{{serie.name}}</input>
           </label>
         {% endfor %}
       </div>
     </div>
-    <label for="Series">{{_('Exclude Series')}}</label>
+    <label for="exclude_serie">{{_('Exclude Series')}}</label>
     <div class="form-group">
       <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
         {% for serie in series %}
           <label id="serie_{{serie.id}}" class="btn btn-danger serie_click">
-            <input type="checkbox" autocomplete="off" name="exclude_serie" value="{{serie.id}}">{{serie.name}}</input>
+            <input type="checkbox" autocomplete="off" name="exclude_serie" id="exclude_serie" value="{{serie.id}}">{{serie.name}}</input>
           </label>
         {% endfor %}
       </div>
     </div>
    {% if languages %}
-      <label for="Languages">{{_('Languages')}}</label>
+      <label for="include_language">{{_('Languages')}}</label>
       <div class="form-group">
         <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
           {% for language in languages %}
             <label id="language_{{language.id}}" class="btn btn-primary serie_click">
-              <input type="checkbox" autocomplete="off" name="include_language" value="{{language.id}}">{{language.name}}</input>
+              <input type="checkbox" autocomplete="off" name="include_language" id="include_language" value="{{language.id}}">{{language.name}}</input>
             </label>
           {% endfor %}
         </div>
       </div>
-      <label for="Languages">{{_('Exclude Languages')}}</label>
+      <label for="exclude_language">{{_('Exclude Languages')}}</label>
       <div class="form-group">
         <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
           {% for language in languages %}
             <label id="language_{{language.id}}" class="btn btn-danger language_click">
-              <input type="checkbox" autocomplete="off" name="exclude_language" value="{{language.id}}">{{language.name}}</input>
+              <input type="checkbox" autocomplete="off" name="exclude_language" id="exclude_language" value="{{language.id}}">{{language.name}}</input>
             </label>
           {% endfor %}
         </div>