EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

css changes per Stefan, part 1

pull/1/head
Andromeda Yelton 2012-05-01 09:56:19 -04:00
parent 8999afb7f1
commit ce36f6771d
12 changed files with 102 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/templates/book_panel.html
View File

@ -53,6 +53,17 @@
{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}
</div>
{% comment %}link to work page{% endcomment %}
<div class="moreinfo">
<a href="{% if work.id %}{% url work work.id %}{% else %}{% url googlebooks googlebooks_id %}{% endif %}" target="_top">More Info</a>
</div>
{% comment %}bibliographic data{% endcomment %}
<div class="white_text">
<p><a href="{% if work.id %}{% url work work.id %}{% else %}{% url googlebooks googlebooks_id %}{% endif %}">{{ work.title }}</a></p>
<p>{{ author }}</p>
</div>
{% comment %}status of book vis-a-vis user's wishlist{% endcomment %}
{% if works and activetab %}
<div class="moreinfo add-wishlist">
@ -82,17 +93,6 @@
</div>
{% endif %}{% endif %}{% endifequal %}{% endif %}{% endif %}
{% comment %}bibliographic data{% endcomment %}
<div class="white_text">
<p><a href="{% if work.id %}{% url work work.id %}{% else %}{% url googlebooks googlebooks_id %}{% endif %}">{{ work.title }}</a></p>
<p>{{ author }}</p>
</div>
{% comment %}link to work page{% endcomment %}
<div class="moreinfo">
<a href="{% if work.id %}{% url work work.id %}{% else %}{% url googlebooks googlebooks_id %}{% endif %}" target="_top">More Info</a>
</div>
</div>
</div>
<div class="listview panelfront side1 book-thumb">

4
frontend/templates/notification/wishlist_unglued_book_released/full.txt
View File

@ -20,7 +20,7 @@ URL: {{ ebook.url }}
{% if work.ebooks.0.rights == 'PD-US' %}
A public domain ebook belongs to all of us. You can do anything you like with it.
{% else %}
The Creative Commons licensing terms for allow you to redistribute the files under the specified license terms. There's no DRM.
The Creative Commons licensing terms for {{ work.title }} allow you to redistribute the files under the specified license terms. There's no DRM. For full details, see http://creativecommons.org/licenses/.
{% endif %}
{% if work.last_campaign_status == 'SUCCESSFUL' %}
@ -33,4 +33,4 @@ Thanks,
Your Tireless Unglue.it Staff
Give ebooks to the world; give income to authors and publishers. Unglue.it
Give ebooks to the world; give income to authors and publishers. Unglue.it

30
frontend/templates/pledge.html
View File

@ -10,16 +10,29 @@
{% endblock %}
{% block doccontent %}
<div style="height:10px";></div>
<div style="height:15px";></div>
<div class="book-detail">
<div class="book-detail-img">
<div id="book-detail-img">
<a href="#"><img src="{{ work.cover_image_thumbnail }}" alt="{{ work.title }}" title="{{ work.title }}" width="131" height="192" /></a>
</div>
<div class="book-detail-info">
<h2 class="book-name">{{ work.title }}</h2>
<h3 class="book-author">{{ work.author }}</h3>
<h3 class="book-year">{{ work.publication_date }}</h3>
<div class="layout">
<h2 class="book-name">{{ work.title }}</h2>
<div>
<div class="pubinfo">
<h3 class="book-author">{{ work.author }}</h3>
<h3 class="book-year">{{ pubdate }}</h3>
</div>
</div>
</div>
<div class="jsmodule rounded pledge">
<div class="jsmod-content">
${{ work.last_campaign.target }} needed by<br />
{{ work.last_campaign.deadline }}
</div>
</div>
<div class="pledged-info">
<div class="pledged-group">
@ -32,13 +45,6 @@
</div>
</div>
<div class="jsmodule rounded pledge">
<div class="jsmod-content">
${{ work.last_campaign.target }} needed by<br />
{{ work.last_campaign.deadline }}
</div>
</div>
<div class="jsmodule rounded">
<div class="jsmod-content">

20
frontend/templates/supporter.html
View File

@ -255,19 +255,20 @@ there's no tab for seeing ALL my books, only the filters! huh.
<div id="js-maincol-fr">
<div class="js-maincol-inner">
<div id="content-block">
{% if not works %}
{% comment %}
if we're in empty-wishlist, slideshow mode, suppress tab area
{% endcomment %}
<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="#">Wishlisted</a></li>
</ul>
{% if not works %}
{% comment %}
don't let people toggle views if we're doing the slideshow -- it'll look weird
{% endcomment %}
<ul class="book-list-view">
<li>View As:</li>
<li class="view-list">
@ -281,14 +282,15 @@ there's no tab for seeing ALL my books, only the filters! huh.
</a>
</li>
</ul>
{% endif %}
</div>
{% endif %}
<div id="content-block-content">
{% ifequal wishlist.works.all.count 0 %}
{% ifequal request.user supporter %}
<div class="empty-wishlist">
<div>You haven't wishlisted anything yet. Can we help?<br /><br /></div>
<div><h2 style="padding-left:35px;">Add a book to your wishlist to get started.</h2><br /><br /></div>
<div id="js-slide">
<div class="js-main">

4
frontend/templates/work.html
View File

@ -114,7 +114,7 @@ $j(document).ready(function(){
<div class="btn_support"><form action="{% url pledge work_id=work.id %}" method="get"><input type="submit" value="Support" /></form></div>
{% endif %}
{% endif %}
</div>
</div>
</div>
{% if work.first_ebook %}
<div class="get-book">
@ -139,7 +139,7 @@ $j(document).ready(function(){
{% endfor %}
</span>
</div>
{% endif %}
{% endif %}
<div class="find-book">
<label>Find it:</label>
<div class="find-link">

8
frontend/views.py
View File

@ -422,8 +422,14 @@ class PledgeView(FormView):
form = form_class(data)
else:
form = form_class()
try:
pubdate = work.publication_date[:4]
except IndexError:
pubdate = 'unknown'
context.update({'work':work,'campaign':campaign, 'premiums':premiums, 'form':form, 'premium_id':premium_id, 'faqmenu': 'pledge'})
context.update({'work':work,'campaign':campaign, 'premiums':premiums, 'form':form, 'premium_id':premium_id, 'faqmenu': 'pledge', 'pubdate':pubdate})
return context
def form_valid(self, form):

22
static/css/campaign.css
View File

@ -196,6 +196,7 @@
.book-detail-info > div.layout div.pubinfo {
float: left;
width: auto;
padding-bottom: 7px;
}
.book-detail-info > div.layout div.btn_support {
float: right;
@ -262,8 +263,7 @@
#tabs-1,
#tabs-2,
#tabs-3,
#tabs-4,
.more_ebooks {
#tabs-4 {
display: none;
}
#tabs-1.active,
@ -368,6 +368,9 @@ ul.tabs li a:hover, ul.tabs li.active a {
div#content-block-content {
padding-left: 5px;
}
div#content-block-content a {
color: #6994a3;
}
.tabs-content {
padding-right: 5px;
}
@ -538,7 +541,7 @@ ul.support li:hover a {
.editions a:hover {
text-decoration: underline;
}
.show_more_edition,.show_more_ebooks{
.show_more_edition, .show_more_ebooks {
cursor: pointer;
}
.thank-you {
@ -567,13 +570,18 @@ ul.support li:hover a {
padding-bottom: 10px;
padding-left: 60px;
}
.show_more_edition:hover,
.show_more_ebooks:hover {
.show_more_edition:hover {
text-decoration: underline;
}
.show_more_edition {
text-align: right;
}
.more_ebooks {
display: none;
}
.show_more_ebooks:hover {
text-decoration: underline;
}
.alert > .errorlist {
list-style-type: none;
font-size: 14px;
@ -598,3 +606,7 @@ ul.support li:hover a {
#js-slide .jsmodule {
width: 660px !important;
}
a {
color: #3d4e53;
font-size: 12px;
}

13
static/css/pledge.css
View File

@ -100,13 +100,12 @@
cursor: pointer;
}
.pledge_amount {
margin: auto auto 10px 10px;
padding: 10px;
font-size: 17px;
background: #edf3f4;
}
form.pledgeform {
margin-top: 10px;
padding-top: 10px;
border-top: solid 2px #d6dde0;
width: 470px;
}
#id_preapproval_amount {
width: 50%;
@ -119,3 +118,9 @@ ul.support li, ul.support li:hover {
p {
margin: 7px auto;
}
.jsmodule.pledge {
margin: auto;
}
.jsmodule.pledge .jsmod-content {
float: right !important;
}

6
static/css/sitewide.css
View File

@ -175,9 +175,9 @@ body {
bottom: 0;
width: 160px;
height: 32px;
-moz-border-radius: 32px;
-webkit-border-radius: 32px;
border-radius: 32px;
-moz-border-radius: 10px 10px 0 0;
-webkit-border-radius: 10px 10px 0 0;
border-radius: 10px 10px 0 0;
background: #8dc63f;
margin-bottom: 0;
text-align: center;

10
static/less/campaign.less
View File

@ -139,6 +139,7 @@
div.pubinfo {
float: left;
width: auto;
padding-bottom: 7px;
}
div.btn_support {
@ -328,6 +329,10 @@ ul.tabs {
div#content-block-content {
padding-left: 5px;
a {
color: @medium-blue;
}
}
.tabs-content {
@ -544,3 +549,8 @@ ul.support li {
#js-slide .jsmodule {
width: 660px !important;
}
a {
color:#3d4e53;
font-size:12px;
}

15
static/less/pledge.less
View File

@ -13,14 +13,13 @@
}
.pledge_amount {
margin: auto auto 10px 10px;
padding: 10px;
font-size: 17px;
background: @pale-blue;
}
form.pledgeform {
margin-top: 10px;
padding-top: 10px;
border-top: solid 2px @blue-grey;
width: 470px;
}
#id_preapproval_amount {
@ -35,4 +34,12 @@ ul.support li, ul.support li:hover {
p {
margin: 7px auto;
}
.jsmodule.pledge {
margin: auto;
.jsmod-content {
float: right !important;
}
}

2
static/less/sitewide.less
View File

@ -85,7 +85,7 @@ body{
bottom:0;
width:160px;
height:32px;
.one-border-radius(32px);
.border-radius(10px, 10px, 0, 0);
background: @call-to-action;
margin-bottom: 0;
text-align: center;