NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ozzieisaacs 2019-01-08 07:10:36 +01:00
commit fa3426aa08
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cps/static/js/caliBlur.js
View File

@ -224,14 +224,13 @@ $( '.publishers span:nth-child(3)' ).text(function() {
return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, ""); return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, "");
}); });
published = $( '.book-meta p:contains("Publishing date")' ) published = $( '.publishing-date p' )
.text().split(': '); .text().split(': ');
$( '.book-meta p:contains("Publishing date")' ) $( '.publishing-date p' ).remove();
.before( '<div class="published-date"></div>' );
$( '.book-meta p:contains("Publishing date")' ).remove();
$.each(published, function(i, val) { $.each(published, function(i, val) {
$( '.published-date' ).append( '<span>' + published[i] + '</span>' ); $( '.publishing-date' ).append( '<span>' + published[i] + '</span>' );
}); });
languages = $( '.languages p span' ).text().split( ': ' ); languages = $( '.languages p span' ).text().split( ': ' );
$( '.languages p span' ).remove(); $( '.languages p span' ).remove();
$.each(languages, function(i, val) { $.each(languages, function(i, val) {
@ -400,7 +399,7 @@ if ( $( 'body.shelf' ).length > 0 ) {
} }
// Move create shelf // Move create shelf
$( '#nav_createshelf' ).prependTo( 'li:contains("Your Shelves")' ); $( '#nav_createshelf' ).prependTo( '.your-shelves' );
// Create drop-down for profile and move elements to it // Create drop-down for profile and move elements to it
$( '#main-nav' ) $( '#main-nav' )

2
cps/templates/detail.html
View File

@ -144,7 +144,9 @@
{% endif %} {% endif %}
{% if entry.pubdate[:10] != '0101-01-01' %} {% if entry.pubdate[:10] != '0101-01-01' %}
<div class="publishing-date">
<p>{{_('Publishing date')}}: {{entry.pubdate|formatdate}} </p> <p>{{_('Publishing date')}}: {{entry.pubdate|formatdate}} </p>
</div>
{% endif %} {% endif %}
{% if cc|length > 0 %} {% if cc|length > 0 %}

4
cps/templates/layout.html
View File

@ -166,11 +166,11 @@
<li id="nav_lang" {% if page == 'language' %}class="active"{% endif %}><a href="{{url_for('language_overview')}}"><span class="glyphicon glyphicon-flag"></span>{{_('Languages')}} </a></li> <li id="nav_lang" {% if page == 'language' %}class="active"{% endif %}><a href="{{url_for('language_overview')}}"><span class="glyphicon glyphicon-flag"></span>{{_('Languages')}} </a></li>
{%endif%} {%endif%}
{% if g.user.is_authenticated or g.user.is_anonymous %} {% if g.user.is_authenticated or g.user.is_anonymous %}
<li class="nav-head hidden-xs">{{_('Public Shelves')}}</li> <li class="nav-head hidden-xs public-shelves">{{_('Public Shelves')}}</li>
{% for shelf in g.public_shelfes %} {% for shelf in g.public_shelfes %}
<li><a href="{{url_for('show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list public_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li> <li><a href="{{url_for('show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list public_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li>
{% endfor %} {% endfor %}
<li class="nav-head hidden-xs">{{_('Your Shelves')}}</li> <li class="nav-head hidden-xs your-shelves">{{_('Your Shelves')}}</li>
{% for shelf in g.user.shelf %} {% for shelf in g.user.shelf %}
<li><a href="{{url_for('show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list private_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li> <li><a href="{{url_for('show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list private_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li>
{% endfor %} {% endfor %}