Commit d3f8153b authored by Ozzie Isaacs's avatar Ozzie Isaacs

Merge branch 'master' into development

parents 5d8d7968 99ecf227
blank_issues_enabled: false
...@@ -403,6 +403,39 @@ $("div.comments").readmore({ ...@@ -403,6 +403,39 @@ $("div.comments").readmore({
// End of Global Work // // End of Global Work //
/////////////////////////////// ///////////////////////////////
// Advanced Search Results
if($("body.advsearch").length > 0) {
$("#loader + .container-fluid")
.prepend("<div class='blur-wrapper'></div>");
$("#add-to-shelves").insertBefore(".blur-wrapper");
$('div[aria-label="Add to shelves"]').click(function () {
$("#add-to-shelves").toggle();
});
$('#add-to-shelf').height("40px");
function dropdownToggle() {
topPos = $("#add-to-shelf").offset().top-20;
if ($('div[aria-label="Add to shelves"]').length > 0) {
position = $('div[aria-label="Add to shelves"]').offset().left
if (position + $("#add-to-shelves").width() > $(window).width()) {
positionOff = position + $("#add-to-shelves").width() - $(window).width();
adsPosition = position - positionOff - 5
$("#add-to-shelves").attr("style", "left: " + adsPosition + "px !important; right: auto; top: " + topPos + "px");
} else {
$("#add-to-shelves").attr("style", "left: " + position + "px !important; right: auto; top: " + topPos + "px");
}
}
}
dropdownToggle();
$(window).on("resize", function () {
dropdownToggle();
});
}
// Author Page Background Blur // Author Page Background Blur
if ($("body.author").length > 0) { if ($("body.author").length > 0) {
cover = $(".author-bio img").attr("src"); cover = $(".author-bio img").attr("src");
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<div class="row"> <div class="row">
<div class="form-group col-sm-6" id="tag"> <div class="form-group col-sm-6" id="tag">
<div><label for="include_tag">{{_('Tags')}}</label></div> <div><label for="include_tag">{{_('Tags')}}</label></div>
<select class="selectpicker" name="include_tag" id="include_tag" data-live-search="true" data-style="btn-primary" multiple> <select class="selectpicker" name="include_tag" id="include_tag" data-live-search="true" data-style="btn-primary" data-dropup-auto="false" multiple>
{% for tag in tags %} {% for tag in tags %}
<option class="tags_click" value="{{tag.id}}">{{tag.name}}</option> <option class="tags_click" value="{{tag.id}}">{{tag.name}}</option>
{% endfor %} {% endfor %}
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<div><label for="exclude_tag">{{_('Exclude Tags')}}</label></div> <div><label for="exclude_tag">{{_('Exclude Tags')}}</label></div>
<select class="selectpicker" name="exclude_tag" id="exclude_tag" data-live-search="true" data-style="btn-danger" multiple> <select class="selectpicker" name="exclude_tag" id="exclude_tag" data-live-search="true" data-style="btn-danger" data-dropup-auto="false" multiple>
{% for tag in tags %} {% for tag in tags %}
<option class="tags_click" value="{{tag.id}}">{{tag.name}}</option> <option class="tags_click" value="{{tag.id}}">{{tag.name}}</option>
{% endfor %} {% endfor %}
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<div class="row"> <div class="row">
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<div><label for="include_serie">{{_('Series')}}</label></div> <div><label for="include_serie">{{_('Series')}}</label></div>
<select class="selectpicker" name="include_serie" id="include_serie" data-live-search="true" data-style="btn-primary" multiple> <select class="selectpicker" name="include_serie" id="include_serie" data-live-search="true" data-style="btn-primary" data-dropup-auto="false" data-actions-box="true" multiple>
{% for serie in series %} {% for serie in series %}
<option value="{{serie.id}}">{{serie.name}}</option> <option value="{{serie.id}}">{{serie.name}}</option>
{% endfor %} {% endfor %}
...@@ -68,18 +68,37 @@ ...@@ -68,18 +68,37 @@
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<div><label for="exclude_serie">{{_('Exclude Series')}}</label></div> <div><label for="exclude_serie">{{_('Exclude Series')}}</label></div>
<select class="selectpicker" name="exclude_serie" id="exclude_serie" data-live-search="true" data-style="btn-danger" multiple> <select class="selectpicker" name="exclude_serie" id="exclude_serie" data-live-search="true" data-style="btn-danger" data-dropup-auto="false" data-actions-box="true" multiple>
{% for serie in series %} {% for serie in series %}
<option value="{{serie.id}}">{{serie.name}}</option> <option value="{{serie.id}}">{{serie.name}}</option>
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
</div> </div>
<div class="row">
<div class="form-group col-sm-6">
<div><label for="include_shelf">{{_('Shelves')}}</label></div>
<select class="selectpicker" name="include_shelf" id="include_shelf" data-live-search="true" data-style="btn-primary" data-dropup-auto="false" data-actions-box="true" multiple>
{% for shelf in shelves %}
<option value="{{shelf.id}}">{{shelf.name}}</option>
{% endfor %}
</select>
</div>
<div class="form-group col-sm-6">
<div><label for="exclude_shelf">{{_('Exclude Shelves')}}</label></div>
<select class="selectpicker" name="exclude_shelf" id="exclude_shelf" data-live-search="true" data-style="btn-danger" data-dropup-auto="false" data-actions-box="true" multiple>
{% for shelf in shelves %}
<option value="{{shelf.id}}">{{shelf.name}}</option>
{% endfor %}
</select>
</div>
</div>
{% if languages %} {% if languages %}
<div class="row"> <div class="row">
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<div><label for="include_language">{{_('Languages')}}</label></div> <div><label for="include_language">{{_('Languages')}}</label></div>
<select class="selectpicker" name="include_language" id="include_language" data-live-search="true" data-style="btn-primary" multiple> <select class="selectpicker" name="include_language" id="include_language" data-live-search="true" data-style="btn-primary" data-dropup-auto="false" data-actions-box="true" multiple>
{% for language in languages %} {% for language in languages %}
<option value="{{language.id}}">{{language.name}}</option> <option value="{{language.id}}">{{language.name}}</option>
{% endfor %} {% endfor %}
...@@ -87,7 +106,7 @@ ...@@ -87,7 +106,7 @@
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<div><label for="exclude_language">{{_('Exclude Languages')}}</label></div> <div><label for="exclude_language">{{_('Exclude Languages')}}</label></div>
<select class="selectpicker" name="exclude_language" id="exclude_language" data-live-search="true" data-style="btn-danger" multiple> <select class="selectpicker" name="exclude_language" id="exclude_language" data-live-search="true" data-style="btn-danger" data-dropup-auto="false" data-actions-box="true" multiple>
{% for language in languages %} {% for language in languages %}
<option value="{{language.id}}">{{language.name}}</option> <option value="{{language.id}}">{{language.name}}</option>
{% endfor %} {% endfor %}
...@@ -98,7 +117,7 @@ ...@@ -98,7 +117,7 @@
<div class="row"> <div class="row">
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<div><label for="include_extension">{{_('Extensions')}}</label></div> <div><label for="include_extension">{{_('Extensions')}}</label></div>
<select class="selectpicker" name="include_extension" id="include_extension" data-live-search="true" data-style="btn-primary" multiple> <select class="selectpicker" name="include_extension" id="include_extension" data-live-search="true" data-style="btn-primary" data-dropup-auto="false" data-actions-box="true" multiple>
{% for extension in extensions %} {% for extension in extensions %}
<option value="{{extension.format}}">{{extension.format}}</option> <option value="{{extension.format}}">{{extension.format}}</option>
{% endfor %} {% endfor %}
...@@ -106,7 +125,7 @@ ...@@ -106,7 +125,7 @@
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<div><label for="exclude_extension">{{_('Exclude Extensions')}}</label></div> <div><label for="exclude_extension">{{_('Exclude Extensions')}}</label></div>
<select class="selectpicker" name="exclude_extension" id="exclude_extension" data-live-search="true" data-style="btn-danger" multiple> <select class="selectpicker" name="exclude_extension" id="exclude_extension" data-live-search="true" data-style="btn-danger" data-dropup-auto="false" data-actions-box="true" multiple>
{% for extension in extensions %} {% for extension in extensions %}
<option value="{{extension.format}}">{{extension.format}}</option> <option value="{{extension.format}}">{{extension.format}}</option>
{% endfor %} {% endfor %}
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment