final incorporation of all stray CSS changes

pull/1/head
Andromeda Yelton 2013-01-02 15:55:10 -05:00
commit 8d321d46dc
16 changed files with 246 additions and 93 deletions

View File

@ -0,0 +1,25 @@
"""
one-time command to ensure transaction.ack_name for OLA returns something sensible
see https://github.com/Gluejar/regluit/pull/97#discussion_r2436193
"""
from django.core.management.base import BaseCommand
from regluit.core.models import Campaign
from regluit.payment.models import Transaction
class Command(BaseCommand):
help = "make sure transaction.ack_name returns something sensible for OLA transactions"
def handle(self, **options):
ola_campaign = Campaign.objects.filter(work__id=81834)
assert ola_campaign.count() == 1
ola_campaign = ola_campaign[0]
ola_transactions = Transaction.objects.filter(campaign=ola_campaign)
for t in ola_transactions:
if t.anonymous:
t.ack_name = ''
else:
if not t.ack_name:
t.ack_name = t.user.username
t.dedication = ''
t.save()

View File

@ -781,7 +781,15 @@ class Work(models.Model):
def __unicode__(self):
return self.title
@property
def has_unglued_edition(self):
"""
allows us to distinguish successful campaigns with ebooks still in progress from successful campaigns with ebooks available
"""
if self.ebooks().filter(edition__unglued=True):
return True
return False
class Author(models.Model):
created = models.DateTimeField(auto_now_add=True)

View File

@ -22,9 +22,9 @@
<p><b>On:</b> {{ deadline|date:"M d, Y" }}</p>
<p><b>Raised:</b> {{ work.last_campaign.current_total|floatformat:0|intcomma }}</p>
{% if first_ebook %}
<a href="{% url download workid %}" class="hijax"><div class="read_itbutton"><span>Read it Now</span></div></a>
<a href="{% url download workid %}" class="hijax"><span class="read_itbutton"><span>Read it Now</span></span></a>
{% else %}
<div class="read_itbutton"><span>Coming Soon</span></div>
<span class="read_itbutton"><span>Coming Soon</span></span>
{% endif %}
{% else %}{% if status == 'ACTIVE' %}
@ -32,7 +32,7 @@
<p><b>${{ work.last_campaign.current_total|floatformat:0|intcomma }}</b> raised</p>
<p><b>${{ work.last_campaign.target|floatformat:0|intcomma }}</b> needed</p>
<p>by {{ deadline|naturalday:"M d, Y" }}</p>
<a href="{% url pledge work_id=workid %}"><div class="read_itbutton pledge"><span>Pledge</span></div></a>
<a href="{% url pledge work_id=workid %}"><span class="read_itbutton pledge"><span>Pledge</span></span></a>
{% else %}{% if status == 'INITIALIZED' %}
<p>Campaign coming soon!</p>
@ -50,7 +50,7 @@
{% else %}
{% if first_ebook %}
<b>AVAILABLE!</b>
<a href="{{ work.ebooks.0.url }}"><div class="read_itbutton"><span>Read it Now</span></div></a>
<a href="{{ work.ebooks.0.url }}"><span class="read_itbutton"><span>Read it Now</span></span></a>
{% else %}
<p>No campaign yet.</p><br /><p>But if lots of ungluers wishlist this book, maybe there will be!</p>
{% endif %}
@ -151,7 +151,7 @@
<div class="listview panelfront side1 booklist-status">
{% ifequal status "ACTIVE" %}
<span class="booklist-status-text" style="width: 190px"><b>${{ work.last_campaign.current_total|floatformat:0|intcomma }}</b>/<b>${{ work.last_campaign.target|floatformat:0|intcomma }}</b></span>
<span class="booklist-status-text"><b>${{ work.last_campaign.current_total|floatformat:0|intcomma }}</b>/<b>${{ work.last_campaign.target|floatformat:0|intcomma }}</b></span>
{% else %}{% ifequal status "INITIALIZED" %}
<span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text">Coming soon!</span>
{% else %}{% ifequal status "SUCCESSFUL" %}

View File

@ -6,6 +6,7 @@
.ackbox {
float: left;
min-width: 33%;
margin-right: 7px;
}
h2 {
@ -14,19 +15,6 @@
padding: 20px 0 10px 0 !important;
}
dt {
margin-left: auto;
padding-left: 7px;
margin-bottom: 0;
}
dd {
margin-left: 7px;
border-left: solid 2px #EDF3F4;
padding-left: 5px;
padding-top: 7px;
}
p {
text-indent: 0;
}

View File

@ -215,10 +215,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="#"><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>
<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 %}<br />({{ wishers }}){% endif %}</a></li>
<li class="tabs4 {% if activetab == '4' %}active{% endif %}"><a href="#">Rights</a></li>
</ul>
</div>

View File

@ -145,6 +145,12 @@ div.book-list.listview div.create-account span {
text-transform: none;
padding-left: 20px;
}
div.book-list.listview div.add-wishlist span.booklist_pledge,
div.book-list.listview div.remove-wishlist span.booklist_pledge,
div.book-list.listview div.on-wishlist span.booklist_pledge,
div.book-list.listview div.create-account span.booklist_pledge {
padding-left: 18px;
}
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;
@ -160,8 +166,7 @@ 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 {
width: 110px;
margin-right: 7px;
margin-right: 85px;
float: left;
}
div.add-wishlist,
@ -176,6 +181,9 @@ div.remove-wishlist {
display: block;
padding-right: 5px;
}
.booklist-status.listview .read_itbutton {
margin-top: 4px;
}
div.unglue-this a {
text-transform: uppercase;
color: #3d4e53;
@ -304,6 +312,9 @@ ul.navigation li.active a {
.listview.icons .booklist-status-label {
display: none;
}
.listview.icons .boolist-ebook img {
margin-top: 6px;
}
div#content-block-content {
padding-bottom: 100px;
}

View File

@ -77,7 +77,6 @@
}
/* Local variables */
.greenpanelstuff {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
width: 120px;
line-height: 16px;
@ -97,6 +96,7 @@
.readit {
width: 118px;
height: 35px;
line-height: 35px;
padding: 0px 0px;
background: #FFF;
margin: 0px;
@ -130,7 +130,6 @@
}
/* styling of front side elements */
.panelview.book-list {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
width: 120px;
line-height: 16px;
@ -156,7 +155,6 @@
display: none;
}
.panelview.book-name div {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
line-height: 16px;
max-height: 32px;
@ -236,7 +234,6 @@ div.panelview.side2 {
position: relative;
}
.greenpanel2 {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
width: 120px;
line-height: 16px;
@ -263,6 +260,7 @@ div.panelview.side2 {
.read_itbutton {
width: 118px;
height: 35px;
line-height: 35px;
padding: 0px 0px;
background: #FFF;
margin: 0px;
@ -270,12 +268,21 @@ div.panelview.side2 {
-webkit-border-radius: 4px;
border-radius: 4px;
border: 1px solid #81bb38;
display: block;
}
.read_itbutton span {
line-height: 40px;
<<<<<<< HEAD
<<<<<<< HEAD
height: 35px;
=======
>>>>>>> 73266f0... line up icons better and more clearly indicate status of books with successful campaigns
=======
height: 35px;
>>>>>>> 4a307a1... addressing CSS comments and also fixing some invalid html
line-height: 35px;
font-size: 11px;
background-repeat: no-repeat;
background-position: 10px center;
background-position: 10px auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -296,10 +303,11 @@ div.panelview.side2 {
background-position: 90% center;
}
.read_itbutton.pledge span {
height: 35px;
line-height: 35px;
font-size: 11px;
background-repeat: no-repeat;
background-position: 10px center;
background-position: 10px auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -317,6 +325,7 @@ div.panelview.side2 {
.read_itbutton_fail {
width: 118px;
height: 35px;
line-height: 35px;
padding: 0px 0px;
background: #FFF;
margin: 0px;
@ -326,10 +335,11 @@ div.panelview.side2 {
border: 1px solid #81bb38;
}
.read_itbutton_fail span {
line-height: 40px;
height: 35px;
line-height: 35px;
font-size: 11px;
background-repeat: no-repeat;
background-position: 10px center;
background-position: 10px auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -348,6 +358,7 @@ div.panelview.side2 {
.Unglue_itbutton {
width: 118px;
height: 35px;
line-height: 35px;
padding: 0px 0px;
background: #FFF;
margin: 0px;
@ -358,10 +369,11 @@ div.panelview.side2 {
}
.Unglue_itbutton a {
background-image: url("/static/images/book-panel/unglue_icon.png");
height: 40px;
line-height: 40px;
font-size: 11px;
background-repeat: no-repeat;
background-position: 10px center;
background-position: 10px auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -390,10 +402,11 @@ div.panelview.side2 {
.moreinfo.create-account a,
.moreinfo.add-wishlist span,
.moreinfo.create-account span {
height: 30px;
line-height: 30px;
font-size: 11px;
background-repeat: no-repeat;
background-position: left center;
background-position: left auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -422,10 +435,11 @@ div.panelview.side2 {
}
.moreinfo.remove-wishlist a,
.moreinfo.remove-wishlist span {
height: 30px;
line-height: 30px;
font-size: 11px;
background-repeat: no-repeat;
background-position: left center;
background-position: left auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -452,10 +466,11 @@ div.panelview.side2 {
}
.moreinfo.on-wishlist a,
.moreinfo.on-wishlist span {
height: 30px;
line-height: 30px;
font-size: 11px;
background-repeat: no-repeat;
background-position: left center;
background-position: left auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -505,10 +520,11 @@ div.panelview.side2 {
}
.moreinfo a,
.moreinfo span {
height: 30px;
line-height: 30px;
font-size: 11px;
background-repeat: no-repeat;
background-position: left center;
background-position: left auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;

View File

@ -122,7 +122,7 @@ ul.tabs li.tabs4 {
padding-right: 0px;
}
ul.tabs li a {
height: 46px;
height: 41px;
line-height: 18px;
display: block;
text-align: center;
@ -133,6 +133,7 @@ ul.tabs li a {
border-radius: 7px 7px 0 0;
background: #d6dde0;
color: #3d4e53;
padding-top: 5px;
}
ul.tabs li a:hover {
text-decoration: none;

View File

@ -313,25 +313,17 @@ body {
font-weight: bold;
}
.doc ul {
list-style: none;
list-style-type: disc;
padding: 0;
margin: 0;
}
.doc ul li {
margin-bottom: 7px;
-moz-border-radius: 14px;
-webkit-border-radius: 14px;
border-radius: 14px;
-moz-border-radius: 14px;
-webkit-border-radius: 14px;
border-radius: 14px;
padding: 10px;
background: #edf3f4;
}
.doc ul.errorlist li {
background: none;
margin-bottom: 0;
}
.doc ul li {
margin-left: 7px;
}
.doc ul.terms {
list-style: inherit;
list-style-position: inside;
@ -359,15 +351,12 @@ body {
font-style: italic;
}
dt {
margin: 7px 0px 7px -7px;
-moz-border-radius: 14px;
-webkit-border-radius: 14px;
border-radius: 14px;
-moz-border-radius: 14px;
-webkit-border-radius: 14px;
border-radius: 14px;
padding: 10px 0px 10px 7px;
background: #edf3f4;
font-style: italic;
font-size: 15px;
margin-bottom: 7px;
border-top: solid #edf3f4 2px;
border-bottom: solid #edf3f4 2px;
padding: 7px 0;
}
dt.nomargin {
margin: 7px 0px;
@ -376,7 +365,7 @@ dt.nomargin a {
margin-left: 7px;
}
dd {
margin: 0;
margin: 0 0 0 7px;
padding-bottom: 7px;
}
dd.margin {

View File

@ -1,3 +1,80 @@
/* variables and mixins used in multiple less files go here */
.header-text {
height: 36px;
line-height: 36px;
display: block;
text-decoration: none;
font-weight: bold;
letter-spacing: -0.05em;
}
.panelborders {
border-width: 1px 0px;
border-style: solid none;
border-color: #FFFFFF;
}
.roundedspan {
border: 1px solid #d4d4d4;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
border-radius: 7px;
padding: 1px;
color: #fff;
margin: 0 8px 0 0;
display: inline-block;
}
.roundedspan > span {
padding: 7px 7px;
min-width: 15px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
text-align: center;
display: inline-block;
}
.roundedspan > span .hovertext {
display: none;
}
.roundedspan > span:hover .hovertext {
display: inline;
}
.mediaborder {
padding: 5px;
border: solid 5px #EDF3F4;
}
.actionbuttons {
width: auto;
height: 36px;
line-height: 36px;
background: #8dc63f;
-moz-border-radius: 32px;
-webkit-border-radius: 32px;
border-radius: 32px;
color: white;
cursor: pointer;
font-size: 13px;
font-weight: bold;
padding: 0 15px;
border: none;
margin: 5px 0;
}
.errors {
-moz-border-radius: 16px 16px 0 0;
-webkit-border-radius: 16px 16px 0 0;
border-radius: 16px 16px 0 0;
border: solid #e35351 3px;
clear: both;
width: 90%;
height: auto;
line-height: 16px;
padding: 7px 0;
font-weight: bold;
font-size: 13px;
text-align: center;
}
.errors li {
list-style: none;
border: none;
}
.user-block2 {
width: 48%;
font-size: 14px;
@ -12,3 +89,24 @@
#lang_list {
display: none;
}
<<<<<<< HEAD
#tabs-1,
#tabs-2,
#tabs-3 {
margin-left: 0;
}
ul.tabs li a {
height: 41px;
line-height: 18px;
padding-top: 5px;
}
ul.tabs li.active a,
ul.tabs li:hover a {
background-color: #8dc63f !important;
color: white !important;
}
<<<<<<< HEAD
=======
>>>>>>> parent of b001aef... separating unglued and PD works on ready-to-read page
=======
>>>>>>> 4a307a1... addressing CSS comments and also fixing some invalid html

View File

@ -122,7 +122,7 @@ ul.tabs li.tabs4 {
padding-right: 0px;
}
ul.tabs li a {
height: 46px;
height: 41px;
line-height: 18px;
display: block;
text-align: center;
@ -133,6 +133,7 @@ ul.tabs li a {
border-radius: 7px 7px 0 0;
background: #d6dde0;
color: #3d4e53;
padding-top: 5px;
}
ul.tabs li a:hover {
text-decoration: none;

View File

@ -73,6 +73,10 @@ div.book-list.listview{
padding-left:20px;
}
span.booklist_pledge {
padding-left: 18px;
}
}
&.add-wishlist span, &.create-account span {
@ -92,8 +96,8 @@ div.book-list.listview{
}
&.booklist-status {
width: 110px;
margin-right:7px;
//width: 110px;
margin-right:85px;
float: left;
}
}
@ -113,6 +117,10 @@ div.add-wishlist, div.remove-wishlist {
display:block;
padding-right:5px;
}
.read_itbutton {
margin-top: 4px;
}
}
div.unglue-this {
@ -255,6 +263,10 @@ ul.navigation li a:hover, ul.navigation li.active a {
.booklist-status-label, {
display: none;
}
.boolist-ebook img {
margin-top: 6px;
}
}
div#content-block-content {

View File

@ -2,17 +2,16 @@
/* Local variables */
.greenpanelstuff {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
width: 120px;
line-height:16px;
}
.greenpanelactionitems(@pos, @lineheight) {
line-height:@lineheight;
.height(@lineheight);
font-size:11px;
background-repeat: no-repeat;
background-position: @pos center;
background-position: @pos auto;
font-weight:bold;
text-decoration:none;
text-transform: uppercase;
@ -34,7 +33,7 @@
.readit {
width:118px;
height:35px;
.height(35px);
padding:0px 0px;
background:#FFF;
margin:0px;
@ -123,7 +122,6 @@
}
.panelview.book-name div {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
line-height:16px;
max-height:32px;
@ -221,8 +219,9 @@ div.panelview.side2 {
/* White-background action buttons; vary by state of campaign */
.read_itbutton {
.readit;
display: block;
span {
.readit_inner(30px, 40px);
.readit_inner(30px, 35px);
background: url("@{image-base}book-panel/book_icon.png") no-repeat 10% center;
&:hover { .panelhoverlink; }
@ -246,7 +245,7 @@ div.panelview.side2 {
.readit;
span {
.readit_inner(15px, 40px);
.readit_inner(15px, 35px);
background: none;
}
}

View File

@ -46,7 +46,7 @@ ul.tabs {
}
a {
height: 46px;
height: 41px;
line-height: 18px;
display:block;
text-align:center;
@ -55,6 +55,7 @@ ul.tabs {
.border-radius(7px, 7px, 0, 0);
background:@blue-grey;
color:@text-blue;
padding-top: 5px;
&:hover {
text-decoration: none;

View File

@ -100,22 +100,19 @@ body {
}
.doc ul {
list-style: none;
list-style-type: disc;
padding:0;
margin:0;
li {
margin-bottom:7px;
.one-border-radius(14px);
padding:10px;
background:@pale-blue;
}
&.errorlist li {
background: none;
margin-bottom: 0;
}
li {
margin-left: 7px;
}
&.terms {
list-style: inherit;
list-style-position: inside;
@ -137,21 +134,16 @@ body {
}
dt {
margin:7px 0px 7px -7px;
.one-border-radius(14px);
padding:10px 0px 10px 7px;
background:@pale-blue;
&.nomargin {
margin:7px 0px;
a {
margin-left: 7px;
}
}
font-style: italic;
font-size: @font-size-larger;
margin-bottom: 7px;
border-top: solid @pale-blue 2px;
border-bottom: solid @pale-blue 2px;
padding: 7px 0;
}
dd {
margin: 0;
margin: 0 0 0 7px;
padding-bottom: 7px;
&.margin {

View File

@ -1,3 +1,5 @@
@import "variables.less";
.user-block2 {
width: 48%;
font-size: 14px;
@ -11,4 +13,14 @@
}
#lang_list {
display: none;
}
#tabs-1, #tabs-2, #tabs-3 {
margin-left: 0;
}
ul.tabs li a {
height: 41px;
line-height: 18px;
padding-top: 5px;
}