Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master

cps/static/js/edit_books.js

@@ -2,11 +2,11 @@
  * Created by SpeedProg on 05.04.2015.
  */
 
-    /*
+/*
-    Takes a prefix, query typeahead callback, Bloodhound typeahead adapter
+Takes a prefix, query typeahead callback, Bloodhound typeahead adapter
  and returns the completions it gets from the bloodhound engine prefixed.
  */
-    function prefixed_source(prefix, query, cb, bh_adapter) {
+function prefixed_source(prefix, query, cb, bh_adapter) {
     bh_adapter(query, function(retArray){
         var matches = [];
         for (var i = 0; i < retArray.length; i++) {
@@ -15,20 +15,25 @@
         }
         cb(matches);
     });
-    }
+}
+function get_path(){
+    var jsFileLocation = $('script[src*=edit_books]').attr('src');  // the js file path
+    jsFileLocation = jsFileLocation.replace('/static/js/edit_books.js', '');   // the js folder path
+    return jsFileLocation;
+}
 
-   var authors = new Bloodhound({
+var authors = new Bloodhound({
     name: 'authors',
     datumTokenizer: function(datum) {
         return [datum.name];
     },
     queryTokenizer: Bloodhound.tokenizers.whitespace,
     remote: {
-            url: '/get_authors_json?q=%QUERY'
+        url: get_path()+'/get_authors_json?q=%QUERY'
     }
-    });
+});
 
-    function authors_source(query, cb) {
+function authors_source(query, cb) {
     var bh_adapter = authors.ttAdapter();
 
     var tokens = query.split("&");
@@ -42,11 +47,11 @@
     }
 
     prefixed_source(prefix, current_author, cb, bh_adapter);
-  }
+}
 
 
 
-    var promise = authors.initialize();
+var promise = authors.initialize();
     promise.done(function(){
     $("#bookAuthor").typeahead(
             {
@@ -57,9 +62,9 @@
                 source: authors_source
             }
     )
-    });
+});
 
-    var series = new Bloodhound({
+var series = new Bloodhound({
     name: 'series',
     datumTokenizer: function(datum) {
         return [datum.name];
@@ -68,14 +73,14 @@
         return [query];
     },
     remote: {
-            url: '/get_series_json?q=',
+        url: get_path()+'/get_series_json?q=',
         replace: function(url, query) {
             url_query = url+encodeURIComponent(query);
             return url_query;
         }
     }
-    });
+});
-    var promise = series.initialize();
+var promise = series.initialize();
     promise.done(function(){
     $("#series").typeahead(
             {
@@ -86,9 +91,9 @@
                 source: series.ttAdapter()
             }
     )
-    });
+});
 
-    var tags = new Bloodhound({
+var tags = new Bloodhound({
     name: 'tags',
     datumTokenizer: function(datum) {
         return [datum.name];
@@ -99,11 +104,11 @@
         return tokens
     },
     remote: {
-            url: '/get_tags_json?q=%QUERY'
+        url: get_path()+'/get_tags_json?q=%QUERY'
     }
-    });
+});
 
-    function tag_source(query, cb) {
+function tag_source(query, cb) {
     var bh_adapter = tags.ttAdapter();
 
     var tokens = query.split(",");
@@ -117,9 +122,9 @@
     }
 
     prefixed_source(prefix, current_tag, cb, bh_adapter);
-    }
+}
 
-    var promise = tags.initialize();
+var promise = tags.initialize();
     promise.done(function(){
     $("#tags").typeahead(
             {
@@ -130,9 +135,9 @@
                 source: tag_source
             }
     )
-    });
+});
 
-    var languages = new Bloodhound({
+var languages = new Bloodhound({
     name: 'languages',
     datumTokenizer: function(datum) {
         return [datum.name];
@@ -141,15 +146,15 @@
         return [query];
     },
     remote: {
-            url: '/get_languages_json?q=',
+        url: get_path()+'/get_languages_json?q=',
         replace: function(url, query) {
             url_query = url+encodeURIComponent(query);
             return url_query;
         }
     }
-    });
+});
 
-    function language_source(query, cb) {
+function language_source(query, cb) {
     var bh_adapter = languages.ttAdapter();
 
     var tokens = query.split(",");
@@ -163,9 +168,9 @@
     }
 
     prefixed_source(prefix, current_language, cb, bh_adapter);
-    }
+}
 
-    var promise = languages.initialize();
+var promise = languages.initialize();
     promise.done(function(){
     $("#languages").typeahead(
             {
@@ -176,4 +181,20 @@
                 source: language_source
             }
     )
+});
+
+$('form').on('change input typeahead:selected', function(data){
+    form = $('form').serialize();
+    $.getJSON( get_path()+"/get_matching_tags", form, function( data ) {
+      $('.tags_click').each(function() {
+        if ($.inArray(parseInt($(this).children('input').first().val(), 10), data.tags) == -1 ) {
+          if (!($(this).hasClass('active'))) {
+            $(this).addClass('disabled');
+          }
+        }
+        else {
+          $(this).removeClass('disabled');
+        }
       });
+    });
+});

cps/static/js/main.js

@@ -25,6 +25,39 @@ $(function() {
         $this.text('Please wait...');
         $this.addClass('disabled');
     });
+    $("#restart").click(function() {
+        $.ajax({
+            dataType: 'json',
+            url: window.location.pathname+"/../../shutdown",
+            data: {"parameter":0},
+            success: function(data) {
+                return alert(data.text);}
+        });
+    });
+    $("#shutdown").click(function() {
+        $.ajax({
+            dataType: 'json',
+            url: window.location.pathname+"/../../shutdown",
+            data: {"parameter":1},
+            success: function(data) {
+                return alert(data.text);}
+        });
+    });
+    $("#check_for_update").click(function() {
+        var button_text = $("#check_for_update").html();
+        $("#check_for_update").html('Checking...');
+        $.ajax({
+            dataType: 'json',
+            url: window.location.pathname+"/../../get_update_status",
+            success: function(data) {
+            if (data.status == true) {
+                $("#check_for_update").addClass('hidden');
+                $("#perform_update").removeClass('hidden');
+            }else{
+                $("#check_for_update").html(button_text);
+            };}
+        });
+    });
 
 });
 

cps/templates/admin.html

@@ -115,40 +115,3 @@
 </div>
 
 {% endblock %}
-{% block js %}
-<script type="text/javascript">
-    $("#restart").click(function() {
-        $.ajax({
-            dataType: 'json',
-            url: "{{url_for('shutdown')}}",
-            data: {"parameter":0},
-            //data: data,
-            success: function(data) {
-                return alert(data.text);}
-        });
-    });
-    $("#shutdown").click(function() {
-        $.ajax({
-            dataType: 'json',
-            url: "{{url_for('shutdown')}}",
-            data: {"parameter":1},
-            success: function(data) {
-                return alert(data.text);}
-        });
-    });
-    $("#check_for_update").click(function() {
-        $("#check_for_update").html('Checking...');
-        $.ajax({
-            dataType: 'json',
-            url: "{{url_for('get_update_status')}}",
-            success: function(data) {
-            if (data.status == true) {
-                $("#check_for_update").addClass('hidden');
-                $("#perform_update").removeClass('hidden');
-            }else{
-                $("#check_for_update").html('{{_('Check for update')}}');
-            };}
-        });
-    });
-</script>
-{% endblock %}

cps/templates/book_edit.html

@@ -4,7 +4,7 @@
 <div class="col-sm-3 col-lg-3 col-xs-12">
   <div class="cover">
     {% if book.has_cover %}
-      <img src="{{ url_for('get_cover', cover_path=book.path) }}" />
+      <img src="{{ url_for('get_cover', cover_path=book.path.replace('\\','/')) }}" />
     {% else %}
       <img src="{{ url_for('static', filename='generic_cover.jpg') }}" />
     {% endif %}

cps/templates/search_form.html

@@ -40,7 +40,7 @@
         {% endfor %}
       </div>
     </div>
-    <label for="Tags">{{_('Exclude Series')}}</label>
+    <label for="Series">{{_('Exclude Series')}}</label>
     <div class="form-group">
       <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
         {% for serie in series %}
@@ -81,21 +81,6 @@
 <script src="{{ url_for('static', filename='js/typeahead.bundle.js') }}"></script>
 <script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
 <script>
-  $('form')}}.on('change input typeahead:selected', function() {
-    form = $('form')}}.serialize();
-    $.getJSON( "{{ url_for('get_matching_tags') }}", form, function( data ) {
-      $('.tags_click').each(function() {
-        if ($.inArray(parseInt($(this).children('input').first().val(), 10), data.tags) == -1 ) {
-          if (!($(this).hasClass('active'))) {
-            $(this).addClass('disabled');
-          }
-        }
-        else {
-          $(this).removeClass('disabled');
-        }
-      });
-    });
-  });
 </script>
 {% endblock %}
 {% block header %}

cps/web.py

@@ -421,6 +421,7 @@ def before_request():
     g.user = current_user
     g.allow_registration = config.config_public_reg
     g.allow_upload = config.config_uploading
+    g.public_shelfes = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1).all()
     if not config.db_configured and request.endpoint not in ('basic_configuration', 'login') and '/static/' not in request.path:
         return redirect(url_for('basic_configuration'))