update all list pages to have two-line tab content

pull/1/head
Andromeda Yelton 2013-01-02 15:35:42 -05:00
parent 53a62c3764
commit cc4f748e36
6 changed files with 40 additions and 60 deletions

View File

@ -59,7 +59,7 @@ location.hash = "#2";
<div id="content-block">
<div class="content-block-heading ungluing" id="tabs">
<ul class="tabs">
<li class="tabs2 active"><a href="#">Active</a></li>
<li class="tabs2 active"><a href="#">Active<br />({{ campaign_list.count }})</a></li>
</ul>
<ul class="book-list-view">
@ -75,13 +75,10 @@ location.hash = "#2";
</a>
</li>
</ul>
<div class="badges listspage">
<span class="rounded"><span class="orange" title="We're ungluing {{ campaign_list.count }} {% if campaign_list.count == 1 %}book{% else %}books{% endif %}."><span class="hovertext">We're ungluing&nbsp;</span>{{ campaign_list.count }}</span></span>
</div>
</div>
<div id="content-block-content">
{% ifequal campaign_list.count 0 %}
There aren't any {{pub_lang|ez_lang_name}} ungluing campaigns active yet. If you're a rights holder, you can <a href="/faq/rightsholders">start one</a>.
There aren't any {{ pub_lang|ez_lang_name }} ungluing campaigns active yet. If you're a rights holder, you can <a href="/faq/rightsholders">start one</a>.
{% else %}
{% lazy_paginate 20 campaign_list using "campaign_list" %}

View File

@ -19,7 +19,7 @@
<li><a href="{% url work_list 'popular' %}"><span>Most Wished</span></a></li>
<li><a href="{% url work_list 'new' %}"><span>Newly Wished</span></a></li>
<li><a href="{% url work_list 'recommended' %}"><span>Noteworthy</span></a></li>
<li class="last"><a href="{% url unglued_list 'recent' %}"><span>Ready to Read</span></a></li>
<li class="last"><a href="{% url unglued_list '' %}"><span>Ready to Read</span></a></li>
</ul>
</li>
{% if show_langs %}

View File

@ -2,6 +2,7 @@
{% load endless %}
{% load lang_utils %}
{% with request.user.wishlist.works.all as wishlist %}
{% with work_list.count as works_count %}
{% block title %} Ready-to-Read Works {% if pub_lang %} in {{pub_lang|ez_lang_name}}{% endif %}{% endblock %}
{% block extra_css %}
@ -28,9 +29,9 @@
<div class="js-topnews3">
<div class="user-block">
<div id="user-block1">
<div id="block-intro-text"><span class="special-user-name">{{ facet|capfirst }}</span></div>
<div id="block-intro-text"><span class="special-user-name">{% if facet %}{{ facet|capfirst }}{% else %}Ready to Read{% endif %}</span></div>
</div>
<div class="user-block2"><span class="user-short-info">These {% if pub_lang %}{{pub_lang|ez_lang_name}} language {% endif %}ebooks are ready to read- either they're in the public domain, or they've been 'unglued' by ungluers like you.</span>
<div class="user-block2"><span class="user-short-info">These {% if pub_lang %}{{ pub_lang|ez_lang_name }} language {% endif %}ebooks are ready to read - either they're in the public domain, or they've been unglued by people like you.</span>
</div>
<div class="user-block3">
</div>
@ -57,29 +58,25 @@
<div id="content-block">
<div class="content-block-heading unglued" id="tabs">
<ul class="tabs">
<li class="tabs1"><a href="#">Unglued</a></li>
<li class="tabs1"><a href="#">All<br />{{ works_count }}</a></li>
</ul>
<ul class="book-list-view">
<li>View As:</li>
<li class="view-list">
<a href="#" id="toggle-list">
<img src="/static/images/booklist/view-list.png" alt="view list" title="view list" height="21" width="24" />
</a>
</li>
<li class="view-list">
<a href="#" id="toggle-panel">
<img src="/static/images/booklist/view-icon.png" alt="view icon" title="view icon" height="22" width="22" />
</a>
</li>
</ul>
<div class="badges listspage">
<span class="rounded"><span class="blue tabs1" title="Enjoy {{ counts.unglued }} unglued {% if counts.unglued == 1 %}book{% else %}books{% endif %}."><span class="hovertext">Enjoy&nbsp;</span>{{ counts.unglued }}</span></span>
</div>
<ul class="book-list-view">
<li>View As:</li>
<li class="view-list">
<a href="#" id="toggle-list">
<img src="/static/images/booklist/view-list.png" alt="view list" title="view list" height="21" width="24" />
</a>
</li>
<li class="view-list">
<a href="#" id="toggle-panel">
<img src="/static/images/booklist/view-icon.png" alt="view icon" title="view icon" height="22" width="22" />
</a>
</li>
</ul>
</div>
<div id="content-block-content">
{% ifequal work_list.count 0 %}
There aren't any {{pub_lang|ez_lang_name}} works in this list. Why don't you add some?
{% ifequal works_count 0 %}
There aren't any {{ pub_lang|ez_lang_name }} works in this list. Why don't you add some?
{% else %}
{% lazy_paginate 20 work_list using "work_list" %}
{% for work in work_list %}
@ -106,3 +103,4 @@
</div>
{% endblock %}
{% endwith %}
{% endwith %}

View File

@ -71,36 +71,30 @@
<div id="content-block">
<div class="content-block-heading wantto" id="tabs">
<ul class="tabs">
<li class="tabs1"><a href="#">Unglued</a></li>
<li class="tabs2"><a href="#">Active</a></li>
<li class="tabs3"><a href="#">Unglue It!</a></li>
<li class="tabs1"><a href="#">Unglued<br />({{ counts.unglued }})</a></li>
<li class="tabs2"><a href="#">Active<br />({{ counts.unglueing }})</a></li>
<li class="tabs3"><a href="#">Unglue It!<br />({{ counts.wished }})</a></li>
</ul>
<ul class="book-list-view">
<li>View As:</li>
<li class="view-list">
<a href="#" id="toggle-list">
<img src="/static/images/booklist/view-list.png" alt="view list" title="view list" height="21" width="24" />
</a>
</li>
<li class="view-list">
<a href="#" id="toggle-panel">
<img src="/static/images/booklist/view-icon.png" alt="view icon" title="view icon" height="22" width="22" />
</a>
</li>
</ul>
<div class="badges listspage">
<span class="rounded"><span class="blue tabs1" title="Enjoy {{ counts.unglued }} unglued {% if counts.unglued == 1 %}book{% else %}books{% endif %}."><span class="hovertext">Enjoy&nbsp;</span>{{ counts.unglued }}</span></span>
<span class="rounded"><span class="orange tabs2" title="We're ungluing {{ counts.unglueing }} {% if counts.unglueing == 1 %}book{% else %}books{% endif %}."><span class="hovertext">Ungluing&nbsp;</span>{{ counts.unglueing }}</span></span>
<span class="rounded"><span class="grey tabs3" title="We're wishing for {{ counts.wished }} {% if counts.wished == 1 %}book{% else %}books{% endif %}."><span class="hovertext">Wishing for&nbsp;</span>{{ counts.wished }}</span></span>
</div>
<ul class="book-list-view">
<li>View As:</li>
<li class="view-list">
<a href="#" id="toggle-list">
<img src="/static/images/booklist/view-list.png" alt="view list" title="view list" height="21" width="24" />
</a>
</li>
<li class="view-list">
<a href="#" id="toggle-panel">
<img src="/static/images/booklist/view-icon.png" alt="view icon" title="view icon" height="22" width="22" />
</a>
</li>
</ul>
</div>
<div id="content-block-content">
{% ifequal work_list.count 0 %}
{% if facet == 'recommended' %}
Check back soon to see what we're recommending.
{% else %}
There aren't any {{pub_lang|ez_lang_name}} works in this list yet. Why not add your favorite books to your wishlist, so we can feature them here?
There aren't any {{ pub_lang|ez_lang_name }} works in this list yet. Why not add your favorite books to your wishlist, so we can feature them here?
{% endif %}
{% else %}
{% comment %}

View File

@ -327,10 +327,6 @@ span.my-setting {
span.my-setting.active {
background: #d6dde0 url("/static/images/header/collspane.png") 90% center no-repeat;
}
.badges.listspage {
float: left;
margin-left: 12px;
}
#tabs {
clear: both;
float: left;

View File

@ -264,11 +264,6 @@ span.my-setting.active {
background:@blue-grey url("@{image-base}header/collspane.png") 90% center no-repeat;
}
.badges.listspage {
float: left;
margin-left: 12px;
}
#tabs {
clear: both;
float: left;