Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge

pull/1/head
Raymond Yee 2012-05-24 08:43:33 -07:00
commit 2f9d899030
19 changed files with 578 additions and 455 deletions

View File

@ -418,6 +418,24 @@ class CampaignTests(TestCase):
c5.activate().withdraw('testing')
self.assertEqual(c5.status, 'WITHDRAWN')
# testing percent-of-goal
w2 = Work()
w2.save()
c6 = Campaign(target=D('1000.00'),deadline=now() + timedelta(days=1),work=w2)
c6.save()
cl = Claim(rights_holder = rh, work = w2, user = u, status = 'active')
cl.save()
c6.activate()
t = Transaction()
t.amount = D('234.00')
t.type = PAYMENT_TYPE_AUTHORIZATION
t.status = 'ACTIVE'
t.approved = True
t.campaign = c6
t.user = user
t.save()
print w2.percent_of_goal()
self.assertEqual(w2.percent_of_goal(), 23)
class WishlistTest(TestCase):

View File

@ -16,21 +16,21 @@
{% if first_ebook %}
<b>AVAILABLE!</b>
</div>
<div class="read_itbutton">{% if first_ebook %}<a href="{{ work.ebooks.0.url }}">{% endif %}Read it Now</a></div>
<a href="{{ work.ebooks.0.url }}"><div class="read_itbutton"><span>Read it Now</span></div></a>
{% else %}{% if status == 'SUCCESSFUL' %}
<b>UNGLUED!</b>
<p><b>On:</b> {{ deadline|date:"M d, Y" }}</p>
<p><b>Raised:</b> {{ work.last_campaign.current_total|intcomma }}</p>
</div>
<div class="read_itbutton">{% if first_ebook %}<a href="{{ work.ebooks.0.url }}">{% endif %}Read it Now</a></div>
{% if first_ebook %}<a href="{{ work.ebooks.0.url }}"><div class="read_itbutton"><span>Read it Now</span></div></a>{% else %}<div class="read_itbutton"><span>Coming Soon</span></div>{% endif %}
{% else %}{% if status == 'ACTIVE' %}
<b>UNGLUE IT!</b>
<p><b>${{ work.last_campaign.current_total|intcomma }}</b> raised</p><p><b>${{ work.last_campaign.target|intcomma }}</b> needed</p>
<p>by {{ deadline|date:"M d, Y" }}</p>
</div>
<div class="read_itbutton pledge"><a href="/pledge/{{work.id}}">Support</a></div>
<a href="/pledge/{{work.id}}"><div class="read_itbutton pledge"><span>Support</span></div></a>
{% else %}{% if status == 'INITIALIZED' %}
<p>Campaign coming soon!</p>

View File

@ -15,6 +15,7 @@
{% endif %}
{% if not is_preview %}
<a href="{% url campaign_list 'ending' %}"><span>Active Campaigns</span></a></li>
<li><a href="{% url comment %}"><span>Latest Comments</span></a></li>
<li><a href="{% url work_list 'popular' %}"><span>Most Wished</span></a></li>
{% else %}
<a href="{% url work_list 'popular' %}"><span>Most Wishes</span></a></li>

View File

@ -1,4 +1,4 @@
We thought you might like to know, there are new comments for a book on your wishlist.
We thought you might like to know there's a new comment for a book on your wishlist.
{{ comment.user.username }} has commented on {{ comment.content_object.title }}:

View File

@ -7,7 +7,7 @@
<a href="{% url work id %}?tab=2"><img src="{{ comment.content_object.cover_image_small }}" alt="cover image for {{ comment.content_object.title }}" /></a>
</div>
<div class="comments_graphical">
<span><a href="{% url supporter supporter_username=user %}">{{ comment.user.username }}</a> has made a comment on <a href="{% url work id %}?tab=2">{{ comment.content_object.title }}</a></span>
<a href="{% url supporter supporter_username=user %}">{{ comment.user.username }}</a> has made a comment on <a href="{% url work id %}?tab=2">{{ comment.content_object.title }}</a>
</div>
</div>

View File

@ -92,8 +92,11 @@
{% endfor %}
</ul>
<input type="submit" {% if faqmenu == 'modify' %}value="Modify Pledge"{% else %}value="Pledge Now"{% endif %} id="pledgesubmit" />
<input type="submit" id="fakepledgesubmit" disabled="disabled" />
<input name="pledge" type="submit" {% if faqmenu == 'modify' %}value="Modify Pledge"{% else %}value="Pledge Now"{% endif %} id="pledgesubmit" />
<input name="decoy" type="submit" id="fakepledgesubmit" disabled="disabled" />
{% comment %}
When the pledge amount and premium are in an inconsistent state, the real button is disabled and (via css) hidden; instead we display this fake button with a helpful message. It's a button so we can reuse all the existing CSS for buttons, so that it looks like the real button has just changed in appearance. It's hidden and the other one un-disabled and un-hidden when the pledge & premium return to a correct state. People without javascript enabled will miss out on the front-end corrections but form validation will catch it.
{% endcomment %}
</form>
</div>
</div>

View File

@ -137,6 +137,10 @@ Creative Commons offers a variety of other licenses, many of them with even less
<a id="blogs"></a><h2>Blog Coverage (Highlights)</h2>
<div class="pressarticles">
<div>
<a href="http://blog.schoollibraryjournal.com/neverendingsearch/2012/05/23/unglue-it-crowdfunding-ebooks/">Unglue.it: crowdfunding ebooks</a><br />
Neverendingsearch (School Library Journal) - May 23, 2012<br />
</div>
<div>
<a href="http://boingboing.net/2012/05/18/raising-money-to-free-classic.html">Raising money to free classic volume on Africa's oral literature</a><br />
Boing Boing - May 18, 2012<br />

View File

@ -219,10 +219,10 @@ $j(document).ready(function(){
{% get_comment_count for work as comment_count %}
<div class="content-block-heading" id="tabs">
<ul class="tabs">
<li class="tabs1 {% if activetab == '1' %}active{% endif %}"><a href="#">{% if status == 'ACTIVE' %}Campaign{% else %}Description{% endif %}</a></li>
<li class="tabs2 {% if activetab == '2' %}active{% endif %}"><a href="#">Comments {% if comment_count > 0 %}({{ comment_count }}){% endif %}</a></li>
<li class="tabs3 {% if activetab == '3' %}active{% endif %}" id="supporters"><a href="#">Ungluers {% if wishers > 0 %}({{ wishers }}){% endif %}</a></li>
<li class="tabs4 {% if activetab == '4' %}active{% endif %}"><a href="#">Rights</a></li>
<li class="tabs1 {% if activetab == '1' %}active{% endif %}"><a href="#"><div>{% if status == 'ACTIVE' %}Campaign{% else %}Description{% endif %}</div></a></li>
<li class="tabs2 {% if activetab == '2' %}active{% endif %}"><a href="#"><div>Comments {% if comment_count > 0 %}({{ comment_count }}){% endif %}</div></a></li>
<li class="tabs3 {% if activetab == '3' %}active{% endif %}" id="supporters"><a href="#"><div>Ungluers {% if wishers > 0 %}<br />({{ wishers }}){% endif %}</div></a></li>
<li class="tabs4 {% if activetab == '4' %}active{% endif %}"><a href="#"><div>Rights</div></a></li>
</ul>
</div>
@ -397,7 +397,7 @@ $j(document).ready(function(){
{% if premium.limit == 0 or premium.limit > premium.premium_count %}
<li class="{% if forloop.first %}first{% else %}{% if forloop.last %}last{% endif %}{% endif %}">
<a href="{% url pledge_modify work_id %}?premium_id={{premium.id}}">
<span class="menu-item-price">${{ premium.amount|intcomma }}</span>
<span class="menu-item-price">${{ premium.amount|intcomma }}</span>{% if pledged.0.premium == premium %}<div class="you_pledged">Pledged!</div>{% endif %}
<span class="menu-item-desc">{{ premium.description }}</span>
{% ifnotequal premium.limit 0 %}<br /> Only {{ premium.premium_remaining }} remaining! {% endifnotequal %}
</a></li>

View File

@ -160,13 +160,15 @@ div.book-list.listview div.create-account span {
text-transform: none;
padding-left: 20px;
}
div.book-list.listview div.add-wishlist span, div.book-list.listview div.create-account span {
div.book-list.listview div.add-wishlist span,
div.book-list.listview div.create-account span {
background: url("/static/images/booklist/add-wishlist.png") left center no-repeat;
}
div.book-list.listview div.remove-wishlist span {
background: url("/static/images/booklist/remove-wishlist-blue.png") left center no-repeat;
}
div.book-list.listview div.on-wishlist > span, div.book-list.listview div > span.on-wishlist {
div.book-list.listview div.on-wishlist > span,
div.book-list.listview div > span.on-wishlist {
background: url("/static/images/checkmark_small.png") left center no-repeat;
}
div.book-list.listview div.booklist-status {
@ -174,7 +176,8 @@ div.book-list.listview div.booklist-status {
margin-right: 7px;
float: left;
}
div.add-wishlist, div.remove-wishlist {
div.add-wishlist,
div.remove-wishlist {
cursor: pointer;
}
.booklist-status.listview span.booklist-status-label {
@ -263,7 +266,8 @@ ul.navigation li.arrow-r a {
display: block;
text-indent: -10000px;
}
ul.navigation li a:hover, ul.navigation li.active a {
ul.navigation li a:hover,
ul.navigation li.active a {
color: #8ac3d7;
text-decoration: underline;
}
@ -315,7 +319,8 @@ ul.navigation li a:hover, ul.navigation li.active a {
div#content-block-content {
padding-bottom: 100px;
}
.listview.panelback, .listview.panelback div {
.listview.panelback,
.listview.panelback div {
display: none;
}
.listview.boolist-ebook a {

View File

@ -254,7 +254,7 @@ div.panelview.side2 {
border-radius: 4px;
border: 1px solid #81bb38;
}
.read_itbutton a {
.read_itbutton span {
line-height: 40px;
font-size: 11px;
background-repeat: no-repeat;
@ -266,10 +266,10 @@ div.panelview.side2 {
color: #73a334;
background: url("/static/images/book-panel/book_icon.png") no-repeat 10% center;
}
.read_itbutton a:hover {
.read_itbutton span:hover {
text-decoration: none;
}
.read_itbutton a:hover {
.read_itbutton span:hover {
text-decoration: none;
color: #3d4e53;
}
@ -278,7 +278,7 @@ div.panelview.side2 {
background-repeat: no-repeat;
background-position: 90% center;
}
.read_itbutton.pledge a {
.read_itbutton.pledge span {
line-height: 35px;
font-size: 11px;
background-repeat: no-repeat;
@ -290,10 +290,10 @@ div.panelview.side2 {
color: #73a334;
background: none;
}
.read_itbutton.pledge a:hover {
.read_itbutton.pledge span:hover {
text-decoration: none;
}
.read_itbutton.pledge a:hover {
.read_itbutton.pledge span:hover {
text-decoration: none;
color: #3d4e53;
}
@ -349,7 +349,8 @@ div.panelview.side2 {
.Unglue_itbutton a:hover {
text-decoration: none;
}
.moreinfo.add-wishlist, .moreinfo.create-account {
.moreinfo.add-wishlist,
.moreinfo.create-account {
width: 120px;
height: 30px;
padding: 0px;
@ -397,7 +398,8 @@ div.panelview.side2 {
border-bottom-color: #FFFFFF;
background: url("/static/images/booklist/remove-wishlist-white.png") no-repeat left center;
}
.moreinfo.remove-wishlist a, .moreinfo.remove-wishlist span {
.moreinfo.remove-wishlist a,
.moreinfo.remove-wishlist span {
line-height: 30px;
font-size: 11px;
background-repeat: no-repeat;
@ -408,7 +410,8 @@ div.panelview.side2 {
padding: 0 5px 0 21px;
color: #FFF;
}
.moreinfo.remove-wishlist a:hover, .moreinfo.remove-wishlist span:hover {
.moreinfo.remove-wishlist a:hover,
.moreinfo.remove-wishlist span:hover {
text-decoration: none;
color: #3d4e53;
}
@ -425,7 +428,8 @@ div.panelview.side2 {
border-bottom-color: #FFFFFF;
background: url("/static/images/checkmark_small-white.png") no-repeat left center;
}
.moreinfo.on-wishlist a, .moreinfo.on-wishlist span {
.moreinfo.on-wishlist a,
.moreinfo.on-wishlist span {
line-height: 30px;
font-size: 11px;
background-repeat: no-repeat;
@ -436,7 +440,8 @@ div.panelview.side2 {
padding: 0 5px 0 21px;
color: #FFF;
}
.moreinfo.on-wishlist a:hover, .moreinfo.on-wishlist span:hover {
.moreinfo.on-wishlist a:hover,
.moreinfo.on-wishlist span:hover {
text-decoration: none;
color: #3d4e53;
}
@ -476,7 +481,8 @@ div.panelview.side2 {
background: url("/static/images/book-panel/more_icon.png") no-repeat left center;
cursor: pointer;
}
.moreinfo a, .moreinfo span {
.moreinfo a,
.moreinfo span {
line-height: 30px;
font-size: 11px;
background-repeat: no-repeat;
@ -487,7 +493,8 @@ div.panelview.side2 {
padding: 0 0 0 21px;
color: #FFF;
}
.moreinfo a:hover, .moreinfo span:hover {
.moreinfo a:hover,
.moreinfo span:hover {
text-decoration: none;
color: #3d4e53;
}

View File

@ -126,7 +126,7 @@ ul.tabs {
ul.tabs li {
float: left;
height: 46px;
line-height: 46px;
line-height: 20px;
padding-right: 2px;
width: 116px;
background: none;
@ -138,7 +138,7 @@ ul.tabs li.tabs4 {
}
ul.tabs li a {
height: 46px;
line-height: 46px;
line-height: 18px;
display: block;
text-align: center;
padding: 0 10px;
@ -152,7 +152,11 @@ ul.tabs li a {
ul.tabs li a:hover {
text-decoration: none;
}
ul.tabs li a:hover, ul.tabs li.active a {
ul.tabs li a div {
padding-top: 8px;
}
ul.tabs li a:hover,
ul.tabs li.active a {
background: #6994a3;
color: #fff;
}
@ -178,7 +182,9 @@ ul.tabs li a:hover, ul.tabs li.active a {
width: 309px;
}
.book-detail-info h2.book-name, .book-detail-info h3.book-author, .book-detail-info h3.book-year {
.book-detail-info h2.book-name,
.book-detail-info h3.book-author,
.book-detail-info h3.book-year {
padding: 0;
margin: 0;
line-height: normal;
@ -189,7 +195,8 @@ ul.tabs li a:hover, ul.tabs li.active a {
font-weight: bold;
color: #3d4e53;
}
.book-detail-info h3.book-author, .book-detail-info h3.book-year {
.book-detail-info h3.book-author,
.book-detail-info h3.book-year {
font-size: 12px;
font-weight: normal;
color: #6994a3;
@ -215,19 +222,13 @@ ul.tabs li a:hover, ul.tabs li.active a {
float: right;
}
.book-detail-info > div.layout div.btn_support input {
background: url("/static/images/btn_bg.png") 0 0 no-repeat;
width: 104px;
height: 41px;
display: block;
color: #fff;
font-weight: bold;
text-align: center;
border: none;
padding: 0;
cursor: pointer;
font-size: 17px;
}
.book-detail-info > div.layout div.btn_support.modify input {
background: url("/static/images/btn_bg_grey.png") 0 0 no-repeat;
background: #d6dde0;
font-size: 13px;
border: double white;
line-height: 17px;
}
.book-detail-info .btn_wishlist span {
text-align: right;
@ -263,16 +264,20 @@ ul.tabs li a:hover, ul.tabs li.active a {
height: 25px;
margin-top: -12px;
}
/* Common elements of share links -- just swap in the background image */
/* Page layout */
#js-page-wrap {
overflow: hidden;
}
#main-container {
margin-top: 20px;
}
#js-leftcol .jsmodule, .pledge.jsmodule {
#js-leftcol .jsmodule,
.pledge.jsmodule {
margin-bottom: 10px;
}
#js-leftcol .jsmodule.rounded .jsmod-content, .pledge.jsmodule.rounded .jsmod-content {
#js-leftcol .jsmodule.rounded .jsmod-content,
.pledge.jsmodule.rounded .jsmod-content {
-moz-border-radius: 20px;
-webkit-border-radius: 20px;
border-radius: 20px;
@ -283,73 +288,73 @@ ul.tabs li a:hover, ul.tabs li.active a {
border: none;
margin: 0;
line-height: 16px;
/* Bubble in upper left looks different depending on campaign status */
}
#js-leftcol .jsmodule.rounded .jsmod-content.ACTIVE, .pledge.jsmodule.rounded .jsmod-content.ACTIVE {
#js-leftcol .jsmodule.rounded .jsmod-content.ACTIVE,
.pledge.jsmodule.rounded .jsmod-content.ACTIVE {
background: #8dc63f;
color: white;
font-size: 18px;
font-weight: normal;
line-height: 20px;
}
#js-leftcol .jsmodule.rounded .jsmod-content.No.campaign.yet, .pledge.jsmodule.rounded .jsmod-content.No.campaign.yet {
#js-leftcol .jsmodule.rounded .jsmod-content.No.campaign.yet,
.pledge.jsmodule.rounded .jsmod-content.No.campaign.yet {
background: #e18551;
color: white;
}
#js-leftcol .jsmodule.rounded .jsmod-content span, .pledge.jsmodule.rounded .jsmod-content span {
#js-leftcol .jsmodule.rounded .jsmod-content span,
.pledge.jsmodule.rounded .jsmod-content span {
display: inline-block;
vertical-align: middle;
}
#js-leftcol .jsmodule.rounded .jsmod-content span.spacer, .pledge.jsmodule.rounded .jsmod-content span.spacer {
#js-leftcol .jsmodule.rounded .jsmod-content span.spacer,
.pledge.jsmodule.rounded .jsmod-content span.spacer {
visibility: none;
}
#js-leftcol .jsmodule.rounded .jsmod-content span.findtheungluers, .pledge.jsmodule.rounded .jsmod-content span.findtheungluers {
#js-leftcol .jsmodule.rounded .jsmod-content span.findtheungluers,
.pledge.jsmodule.rounded .jsmod-content span.findtheungluers {
cursor: pointer;
}
.jsmodule.pledge {
float: left;
margin-left: 10px;
}
#js-rightcol, #pledge-rightcol {
float: right;
width: 235px;
margin-bottom: 20px;
#js-slide .jsmodule {
width: 660px !important;
}
#js-rightcol h3.jsmod-title, #pledge-rightcol h3.jsmod-title {
background: #a7c1ca;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
padding: 10px;
height: auto;
font-style: normal;
a {
color: #3d4e53;
font-size: 12px;
}
#js-search {
margin: 0 15px 0 15px !important;
}
.alert > .errorlist {
list-style-type: none;
font-size: 14px;
margin: 0 0 10px 0;
color: white;
border: none;
text-align: left;
font-weight: normal;
font-size: 12px;
}
#js-rightcol h3.jsmod-title span, #pledge-rightcol h3.jsmod-title span {
padding: 0;
color: #fff;
font-style: normal;
height: 22px;
line-height: 22px;
.alert > .errorlist > li {
margin-bottom: 14px;
}
#js-rightcol .jsmodule, #pledge-rightcol .jsmodule {
margin-bottom: 10px;
}
#pledge-rightcol {
.alert > .errorlist .errorlist {
margin-top: 7px;
}
.js-rightcol-pad {
border: 1px solid #d6dde0;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
padding: 10px;
.alert > .errorlist .errorlist li {
width: auto;
height: auto;
padding-left: 32px;
padding-right: 32px;
font-size: 12px;
}
/* Center elements */
#js-maincol {
float: left;
/* If we want to nuke the explore column, width should be 705ish */
width: 470px;
margin: 0 10px;
}
@ -362,6 +367,50 @@ ul.tabs li a:hover, ul.tabs li.active a {
width: 450px;
padding-right: 15px;
}
.status {
font-size: 17px;
color: #8dc63f;
}
/* Center - add/remove actions in book detail area */
.add-wishlist,
.add-wishlist-workpage,
.remove-wishlist-workpage,
.remove-wishlist,
.on-wishlist,
.create-account {
float: right;
cursor: pointer;
}
.add-wishlist span,
.add-wishlist-workpage span,
.remove-wishlist-workpage span,
.remove-wishlist span,
.on-wishlist span,
.create-account span {
font-weight: normal;
color: #3d4e53;
text-transform: none;
padding-left: 20px;
}
.add-wishlist span.on-wishlist,
.add-wishlist-workpage span.on-wishlist,
.remove-wishlist-workpage span.on-wishlist,
.remove-wishlist span.on-wishlist,
.on-wishlist span.on-wishlist,
.create-account span.on-wishlist {
background: url("/static/images/checkmark_small.png") left center no-repeat;
cursor: default;
}
.add-wishlist span,
.add-wishlist-workpage span,
.create-account span {
background: url("/static/images/booklist/add-wishlist.png") left center no-repeat;
}
.remove-wishlist-workpage span,
.remove-wishlist span {
background: url("/static/images/booklist/remove-wishlist-blue.png") left center no-repeat;
}
/* Center - tabs and content below them */
div#content-block-content {
padding-left: 5px;
}
@ -382,6 +431,117 @@ div#content-block-content #tabs-1 img {
.tabs-content form {
margin-left: -5px;
}
.work_supporter {
height: auto;
min-height: 50px;
margin-top: 5px;
vertical-align: middle;
margin-left: -5px;
}
.work_supporter_avatar {
float: left;
margin-right: 5px;
}
.work_supporter_avatar img {
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
}
.work_supporter_name {
height: 50px;
line-height: 50px;
float: left;
}
.work_supporter_nocomment {
height: 50px;
margin-top: 5px;
vertical-align: middle;
margin-left: -5px;
}
.editions {
clear: both;
}
.editions div {
float: left;
padding-bottom: 5px;
}
.editions .image {
width: 60px;
overflow: hidden;
}
.editions .metadata {
display: block;
overflow: hidden;
margin-left: 5px;
}
.editions a:hover {
text-decoration: underline;
}
.show_more_edition,
.show_more_ebooks {
cursor: pointer;
}
.show_more_edition {
text-align: right;
}
.show_more_edition:hover {
text-decoration: underline;
}
.more_edition {
display: none;
clear: both;
padding-bottom: 10px;
padding-left: 60px;
}
.more_ebooks {
display: none;
}
.show_more_ebooks:hover {
text-decoration: underline;
}
/* Right column */
#js-rightcol,
#pledge-rightcol {
float: right;
width: 235px;
margin-bottom: 20px;
}
#js-rightcol h3.jsmod-title,
#pledge-rightcol h3.jsmod-title {
background: #a7c1ca;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
padding: 10px;
height: auto;
font-style: normal;
font-size: 14px;
margin: 0 0 10px 0;
color: white;
}
#js-rightcol h3.jsmod-title span,
#pledge-rightcol h3.jsmod-title span {
padding: 0;
color: #fff;
font-style: normal;
height: 22px;
line-height: 22px;
}
#js-rightcol .jsmodule,
#pledge-rightcol .jsmodule {
margin-bottom: 10px;
}
#pledge-rightcol {
margin-top: 7px;
}
.js-rightcol-pad {
border: 1px solid #d6dde0;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
padding: 10px;
}
/* Right column - sharing */
ul.social a:hover {
text-decoration: none;
}
@ -454,6 +614,7 @@ ul.social li.embed:hover span {
border-radius: 10px;
padding: 10px;
}
/* Right column - support tiers */
ul.support li {
border-bottom: 1px solid #d6dde0;
padding: 10px 5px 10px 10px;
@ -465,6 +626,12 @@ ul.support li span {
}
ul.support li span.menu-item-price {
font-size: 18px;
float: left;
margin-bottom: 3px;
}
ul.support li span.menu-item-desc {
float: none;
clear: both;
}
ul.support li:hover {
color: #fff;
@ -474,147 +641,16 @@ ul.support li:hover a {
color: #fff;
text-decoration: none;
}
.work_supporter_nocomment {
height: 50px;
margin-top: 5px;
vertical-align: middle;
margin-left: -5px;
}
.work_supporter_avatar {
.you_pledged {
float: left;
}
.work_supporter_name {
height: 50px;
line-height: 50px;
float: left;
}
.add-wishlist,
.add-wishlist-workpage,
.remove-wishlist-workpage,
.remove-wishlist,
.on-wishlist,
.create-account {
float: right;
cursor: pointer;
}
.add-wishlist span,
.add-wishlist-workpage span,
.remove-wishlist-workpage span,
.remove-wishlist span,
.on-wishlist span,
.create-account span {
line-height: 21px;
font-weight: normal;
color: #3d4e53;
text-transform: none;
padding-left: 20px;
}
.add-wishlist span.on-wishlist,
.add-wishlist-workpage span.on-wishlist,
.remove-wishlist-workpage span.on-wishlist,
.remove-wishlist span.on-wishlist,
.on-wishlist span.on-wishlist,
.create-account span.on-wishlist {
background: url("/static/images/checkmark_small.png") left center no-repeat;
cursor: default;
}
.add-wishlist span, .add-wishlist-workpage span, .create-account span {
background: url("/static/images/booklist/add-wishlist.png") left center no-repeat;
}
.remove-wishlist-workpage span, .remove-wishlist span {
background: url("/static/images/booklist/remove-wishlist-blue.png") left center no-repeat;
}
.editions {
clear: both;
}
.editions div {
float: left;
padding-bottom: 5px;
}
.editions .image {
width: 60px;
overflow: hidden;
}
.editions .metadata {
display: block;
overflow: hidden;
margin-left: 5px;
}
.editions a:hover {
text-decoration: underline;
}
.show_more_edition, .show_more_ebooks {
cursor: pointer;
}
.thank-you {
font-size: 18px;
font-weight: bold;
margin: 20px auto;
}
.work_supporter {
height: auto;
min-height: 50px;
margin-top: 5px;
vertical-align: middle;
margin-left: -5px;
}
.work_supporter_avatar {
margin-right: 5px;
}
.work_supporter_avatar img {
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
}
.more_edition {
display: none;
clear: both;
padding-bottom: 10px;
padding-left: 60px;
}
.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;
border: none;
text-align: left;
font-weight: normal;
font-size: 12px;
}
.alert > .errorlist > li {
margin-bottom: 14px;
}
.alert > .errorlist .errorlist {
margin-top: 7px;
}
.alert > .errorlist .errorlist li {
width: auto;
height: auto;
padding-left: 32px;
padding-right: 32px;
font-size: 12px;
}
#js-slide .jsmodule {
width: 660px !important;
}
a {
color: #3d4e53;
font-size: 12px;
}
#js-search {
margin: 0 15px 0 15px !important;
}
.status {
font-size: 17px;
color: #8dc63f;
}

View File

@ -126,7 +126,7 @@ ul.tabs {
ul.tabs li {
float: left;
height: 46px;
line-height: 46px;
line-height: 20px;
padding-right: 2px;
width: 116px;
background: none;
@ -138,7 +138,7 @@ ul.tabs li.tabs4 {
}
ul.tabs li a {
height: 46px;
line-height: 46px;
line-height: 18px;
display: block;
text-align: center;
padding: 0 10px;
@ -152,7 +152,11 @@ ul.tabs li a {
ul.tabs li a:hover {
text-decoration: none;
}
ul.tabs li a:hover, ul.tabs li.active a {
ul.tabs li a div {
padding-top: 8px;
}
ul.tabs li a:hover,
ul.tabs li.active a {
background: #6994a3;
color: #fff;
}
@ -178,7 +182,9 @@ ul.tabs li a:hover, ul.tabs li.active a {
width: 309px;
}
.book-detail-info h2.book-name, .book-detail-info h3.book-author, .book-detail-info h3.book-year {
.book-detail-info h2.book-name,
.book-detail-info h3.book-author,
.book-detail-info h3.book-year {
padding: 0;
margin: 0;
line-height: normal;
@ -189,7 +195,8 @@ ul.tabs li a:hover, ul.tabs li.active a {
font-weight: bold;
color: #3d4e53;
}
.book-detail-info h3.book-author, .book-detail-info h3.book-year {
.book-detail-info h3.book-author,
.book-detail-info h3.book-year {
font-size: 12px;
font-weight: normal;
color: #6994a3;
@ -215,19 +222,13 @@ ul.tabs li a:hover, ul.tabs li.active a {
float: right;
}
.book-detail-info > div.layout div.btn_support input {
background: url("/static/images/btn_bg.png") 0 0 no-repeat;
width: 104px;
height: 41px;
display: block;
color: #fff;
font-weight: bold;
text-align: center;
border: none;
padding: 0;
cursor: pointer;
font-size: 17px;
}
.book-detail-info > div.layout div.btn_support.modify input {
background: url("/static/images/btn_bg_grey.png") 0 0 no-repeat;
background: #d6dde0;
font-size: 13px;
border: double white;
line-height: 17px;
}
.book-detail-info .btn_wishlist span {
text-align: right;

View File

@ -90,7 +90,8 @@
list-style: none;
border: none;
}
#content-block .jsmod-content, .book-detail {
#content-block .jsmod-content,
.book-detail {
float: left;
width: auto;
}
@ -116,7 +117,8 @@ form.pledgeform {
line-height: 30px;
font-size: 16px;
}
ul.support li, ul.support li:hover {
ul.support li,
ul.support li:hover {
background-image: none;
}
p {
@ -152,3 +154,6 @@ p {
font-size: 17px;
display: none;
}
span.menu-item-price {
float: none !important;
}

View File

@ -106,7 +106,8 @@
#user-block-hide .block {
float: left;
}
#user-block-hide .block1, #user-block-hide .block3 {
#user-block-hide .block1,
#user-block-hide .block3 {
width: 25%;
}
#user-block-hide .block2 {
@ -128,7 +129,8 @@
float: none;
width: auto;
}
#user-block-hide input#librarything_input, #user-block-hide input#goodreads_input {
#user-block-hide input#librarything_input,
#user-block-hide input#goodreads_input {
width: auto;
cursor: pointer;
background: #edf3f4;
@ -160,14 +162,17 @@
float: left;
width: 25%;
}
.user-block3, .user-block4 {
.user-block3,
.user-block4 {
float: left;
width: 25%;
}
.user-block3.recommended, .user-block4.recommended {
.user-block3.recommended,
.user-block4.recommended {
margin-top: auto;
}
.user-block3.recommended img, .user-block4.recommended img {
.user-block3.recommended img,
.user-block4.recommended img {
margin-right: 7px;
}
.user-block3 {
@ -201,13 +206,16 @@ span.special-user-name {
font-weight: bold;
height: 50px;
}
span.user-name, span.user-date, span.user-short-info {
span.user-name,
span.user-date,
span.user-short-info {
display: block;
}
.user-block2 .user-short-info {
padding-right: 10px;
}
span.user-name, span.user-name a {
span.user-name,
span.user-name a {
font-size: 12px;
color: #3d4e53;
}
@ -280,7 +288,8 @@ input.profile-save {
display: inline-block;
vertical-align: middle;
}
#loadgr div, #loadgr input {
#loadgr div,
#loadgr input {
margin: auto 10px auto 36px;
}
#loadgr #goodreads_shelves {
@ -292,7 +301,8 @@ input.profile-save {
min-height: 32px;
padding-top: 4px;
}
#loadlt div, #loadlt input {
#loadlt div,
#loadlt input {
margin: auto 10px auto 36px;
}
.weareonthat {
@ -344,7 +354,9 @@ span.my-setting.active {
#tabs ul.book-list-view {
margin-bottom: 0 !important;
}
#tabs-1, #tabs-2, #tabs-3 {
#tabs-1,
#tabs-2,
#tabs-3 {
margin-left: 10px;
}
ul.tabs {
@ -359,7 +371,9 @@ ul.tabs li {
line-height: 46px;
margin-right: 2px;
}
ul.tabs li.tabs1, ul.tabs li.tabs2, ul.tabs li.tabs3 {
ul.tabs li.tabs1,
ul.tabs li.tabs2,
ul.tabs li.tabs3 {
width: 112px;
}
ul.tabs li a {
@ -375,15 +389,18 @@ ul.tabs li a {
background: #6994a3;
color: #fff;
}
ul.tabs li.tabs1 a:hover, ul.tabs li.tabs1.active a {
ul.tabs li.tabs1 a:hover,
ul.tabs li.tabs1.active a {
background: #8dc63f;
color: #ffffff;
}
ul.tabs li.tabs2 a:hover, ul.tabs li.tabs2.active a {
ul.tabs li.tabs2 a:hover,
ul.tabs li.tabs2.active a {
background: #eabc7c;
color: #fff;
}
ul.tabs li.tabs3 a:hover, ul.tabs li.tabs3.active a {
ul.tabs li.tabs3 a:hover,
ul.tabs li.tabs3.active a {
background: #d6dde0;
color: #3d4e53;
}

View File

@ -64,20 +64,14 @@
float: right;
input {
background:url("@{image-base}btn_bg.png") 0 0 no-repeat;
width:104px;
height:41px;
display:block;
color:#fff;
font-weight:bold;
text-align:center;
border:none;
padding:0;
cursor:pointer;
font-size: 17px;
}
&.modify input {
background:url("@{image-base}btn_bg_grey.png") 0 0 no-repeat;
background:@blue-grey;
font-size: 13px;
border: double white;
line-height: 17px;
}
}
}

View File

@ -209,7 +209,7 @@ div.panelview.side2 {
/* White-background action buttons; vary by state of campaign */
.read_itbutton {
.readit;
a {
span {
.readit_inner(30px, 40px);
background: url("@{image-base}book-panel/book_icon.png") no-repeat 10% center;
@ -217,7 +217,7 @@ div.panelview.side2 {
}
&.pledge {
a {
span {
.readit_inner(25px, 35px);
background: none;

View File

@ -2,6 +2,7 @@
@import "campaign_tabs.less";
@import "book_detail.less";
/* Common elements of share links -- just swap in the background image */
.shareclass(@sharewhere) {
background:url("@{image-base}icons/@{sharewhere}.png") 10px center no-repeat;
cursor: pointer;
@ -19,6 +20,7 @@
}
}
/* Page layout */
#js-page-wrap {
overflow:hidden;
}
@ -40,6 +42,7 @@
margin:0;
line-height: 16px;
/* Bubble in upper left looks different depending on campaign status */
&.ACTIVE {
background: @green;
color: white;
@ -74,6 +77,199 @@
margin-left: 10px;
}
#js-slide .jsmodule {
width: 660px !important;
}
a {
color:#3d4e53;
font-size:12px;
}
#js-search {
margin: 0 15px 0 15px !important;
}
.alert > .errorlist {
list-style-type: none;
font-size: 14px;
border: none;
text-align: left;
font-weight: normal;
font-size: 12px;
> li {
margin-bottom: 14px;
}
.errorlist {
margin-top: 7px;
li {
width: auto;
height: auto;
padding-left: 32px;
padding-right: 32px;
font-size: 12px;
}
}
}
/* Center elements */
#js-maincol {
float:left;
width:470px;
margin:0 10px;
div#content-block {
background: none;
padding:0;
}
}
#pledge-maincol {
float: left;
width: 450px;
padding-right: 15px;
}
.status {
font-size: 17px;
color: @green;
}
/* Center - add/remove actions in book detail area */
.add-wishlist, .add-wishlist-workpage, &.remove-wishlist-workpage, .remove-wishlist, &.on-wishlist, &.create-account {
float: right;
cursor: pointer;
span {
font-weight:normal;
color:@text-blue;
text-transform: none;
padding-left:20px;
&.on-wishlist {
background:url("@{image-base}checkmark_small.png") left center no-repeat;
cursor: default;
}
}
}
.add-wishlist span, .add-wishlist-workpage span, .create-account span {
background:url("@{image-base}booklist/add-wishlist.png") left center no-repeat;
}
.remove-wishlist-workpage span, .remove-wishlist span {
background:url("@{image-base}booklist/remove-wishlist-blue.png") left center no-repeat;
}
/* Center - tabs and content below them */
div#content-block-content {
padding-left: 5px;
a {
color: @medium-blue;
}
#tabs-1 img {
.mediaborder;
}
}
.tabs-content {
padding-right: 5px;
iframe {
.mediaborder;
}
form {
margin-left: -5px;
}
}
.work_supporter {
height: auto;
min-height: 50px;
margin-top: 5px;
vertical-align: middle;
margin-left:-5px;
}
.work_supporter_avatar {
float: left;
margin-right: 5px;
img {
.one-border-radius(5px);
}
}
.work_supporter_name {
.height(50px);
float: left;
}
.work_supporter_nocomment {
height: 50px;
margin-top: 5px;
vertical-align: middle;
margin-left:-5px;
}
.editions {
clear: both;
div {
float:left;
padding-bottom: 5px;
}
.image {
width: 60px;
overflow: hidden;
}
.metadata {
display:block;
overflow: hidden;
margin-left: 5px;
}
a:hover {
text-decoration: underline;
}
}
.show_more_edition,
.show_more_ebooks {
cursor: pointer;
}
.show_more_edition {
text-align: right;
&:hover {
text-decoration: underline;
}
}
.more_edition {
display:none;
clear: both;
padding-bottom: 10px;
padding-left: 60px;
}
.more_ebooks {
display:none;
}
.show_more_ebooks:hover {
text-decoration: underline;
}
/* Right column */
#js-rightcol, #pledge-rightcol {
float:right;
width:235px;
@ -112,48 +308,7 @@
padding:10px;
}
#js-maincol {
float:left;
/* If we want to nuke the explore column, width should be 705ish */
width:470px;
margin:0 10px;
div#content-block {
background: none;
padding:0;
}
}
#pledge-maincol {
float: left;
width: 450px;
padding-right: 15px;
}
div#content-block-content {
padding-left: 5px;
a {
color: @medium-blue;
}
#tabs-1 img {
.mediaborder;
}
}
.tabs-content {
padding-right: 5px;
iframe {
.mediaborder;
}
form {
margin-left: -5px;
}
}
/* Right column - sharing */
ul.social {
a:hover {
text-decoration: none;
@ -191,6 +346,7 @@ ul.social {
padding:10px;
}
/* Right column - support tiers */
ul.support li {
border-bottom:1px solid @blue-grey;
padding:10px 5px 10px 10px;
@ -202,6 +358,13 @@ ul.support li {
&.menu-item-price {
font-size:18px;
float: left;
margin-bottom: 3px;
}
&.menu-item-desc {
float: none;
clear: both;
}
}
@ -215,74 +378,13 @@ ul.support li {
}
}
.work_supporter_nocomment {
height: 50px;
margin-top: 5px;
vertical-align: middle;
margin-left:-5px;
}
.work_supporter_avatar {
.you_pledged {
float: left;
}
.work_supporter_name {
.height(50px);
float: left;
}
.add-wishlist, .add-wishlist-workpage, &.remove-wishlist-workpage, .remove-wishlist, &.on-wishlist, &.create-account {
float: right;
cursor: pointer;
span {
line-height: 21px;
font-weight:normal;
color:@text-blue;
text-transform: none;
padding-left:20px;
&.on-wishlist {
background:url("@{image-base}checkmark_small.png") left center no-repeat;
cursor: default;
}
}
}
.add-wishlist span, .add-wishlist-workpage span, .create-account span {
background:url("@{image-base}booklist/add-wishlist.png") left center no-repeat;
}
.remove-wishlist-workpage span, .remove-wishlist span {
background:url("@{image-base}booklist/remove-wishlist-blue.png") left center no-repeat;
}
.editions {
clear: both;
div {
float:left;
padding-bottom: 5px;
}
.image {
width: 60px;
overflow: hidden;
}
.metadata {
display:block;
overflow: hidden;
margin-left: 5px;
}
a:hover {
text-decoration: underline;
}
}
.show_more_edition,
.show_more_ebooks {
cursor: pointer;
}
.thank-you {
@ -290,83 +392,3 @@ ul.support li {
font-weight: bold;
margin: 20px auto;
}
.work_supporter {
height: auto;
min-height: 50px;
margin-top: 5px;
vertical-align: middle;
margin-left:-5px;
}
.work_supporter_avatar {
margin-right: 5px;
img {
.one-border-radius(5px);
}
}
.more_edition {
display:none;
clear: both;
padding-bottom: 10px;
padding-left: 60px;
}
.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;
border: none;
text-align: left;
font-weight: normal;
font-size: 12px;
> li {
margin-bottom: 14px;
}
.errorlist {
margin-top: 7px;
li {
width: auto;
height: auto;
padding-left: 32px;
padding-right: 32px;
font-size: 12px;
}
}
}
#js-slide .jsmodule {
width: 660px !important;
}
a {
color:#3d4e53;
font-size:12px;
}
#js-search {
margin: 0 15px 0 15px !important;
}
.status {
font-size: 17px;
color: @green;
}

View File

@ -33,7 +33,8 @@ ul.tabs {
li {
float: left;
.height(46px);
height: 46px;
line-height: 20px;
padding-right:2px;
width: 116px;
background: none;
@ -45,7 +46,8 @@ ul.tabs {
}
a {
.height(46px);
height: 46px;
line-height: 18px;
display:block;
text-align:center;
padding:0 10px;
@ -57,6 +59,10 @@ ul.tabs {
&:hover {
text-decoration: none;
}
div {
padding-top: 8px;
}
}
a:hover, &.active a {

View File

@ -73,3 +73,7 @@ p {
font-size: 17px;
display: none;
}
span.menu-item-price {
float: none !important;
}