Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
fa3426aa08
|
@ -224,14 +224,13 @@ $( '.publishers span:nth-child(3)' ).text(function() {
|
|||
return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, "");
|
||||
});
|
||||
|
||||
published = $( '.book-meta p:contains("Publishing date")' )
|
||||
published = $( '.publishing-date p' )
|
||||
.text().split(': ');
|
||||
$( '.book-meta p:contains("Publishing date")' )
|
||||
.before( '<div class="published-date"></div>' );
|
||||
$( '.book-meta p:contains("Publishing date")' ).remove();
|
||||
$( '.publishing-date p' ).remove();
|
||||
$.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 p span' ).remove();
|
||||
$.each(languages, function(i, val) {
|
||||
|
@ -400,7 +399,7 @@ if ( $( 'body.shelf' ).length > 0 ) {
|
|||
}
|
||||
|
||||
// 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
|
||||
$( '#main-nav' )
|
||||
|
|
|
@ -144,7 +144,9 @@
|
|||
{% endif %}
|
||||
|
||||
{% if entry.pubdate[:10] != '0101-01-01' %}
|
||||
<div class="publishing-date">
|
||||
<p>{{_('Publishing date')}}: {{entry.pubdate|formatdate}} </p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if cc|length > 0 %}
|
||||
|
||||
|
|
|
@ -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>
|
||||
{%endif%}
|
||||
{% 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 %}
|
||||
<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 %}
|
||||
<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 %}
|
||||
<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 %}
|
||||
|
|
Loading…
Reference in New Issue
Block a user