Merge branch 'master' of github.com:Gluejar/regluit into payment
Raymond Yee
commit
759eed1da8
|
|
@ -133,6 +133,8 @@ class TestBookLoader(TestCase):
|
|||
w = edition.work
|
||||
self.assertEqual(w.first_epub().url, "http://books.google.com/books/download/The_Latin_language.epub?id=U3FXAAAAYAAJ&ie=ISO-8859-1&output=epub&source=gbs_api")
|
||||
self.assertEqual(w.first_pdf().url, "http://books.google.com/books/download/The_Latin_language.pdf?id=U3FXAAAAYAAJ&ie=ISO-8859-1&output=pdf&sig=ACfU3U2yLt3nmTncB8ozxOWUc4iHKUznCA&source=gbs_api")
|
||||
self.assertEqual(w.first_epub_url(), "http://books.google.com/books/download/The_Latin_language.epub?id=U3FXAAAAYAAJ&ie=ISO-8859-1&output=epub&source=gbs_api")
|
||||
self.assertEqual(w.first_pdf_url(), "http://books.google.com/books/download/The_Latin_language.pdf?id=U3FXAAAAYAAJ&ie=ISO-8859-1&output=pdf&sig=ACfU3U2yLt3nmTncB8ozxOWUc4iHKUznCA&source=gbs_api")
|
||||
|
||||
def test_add_no_ebook(self):
|
||||
# this edition lacks an ebook, but we should still be able to load it
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
<div class="Unglue_itbutton"><a href="#">Unglue it!</a> </div>
|
||||
{% endif %}
|
||||
{% ifequal supporter request.user %}
|
||||
<div class="moreinfo remove-wishlist"><a id="{{ work.id }}">Remove</a></div>
|
||||
<div class="moreinfo remove-wishlist"><div><a id="{{ work.id }}">Remove</a></div></div>
|
||||
{% else %}{% if work in shared_works %}
|
||||
<div class="moreinfo on-wishlist">
|
||||
<a href="#">On Your Wishlist!</a>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,14 @@
|
|||
{% empty %}
|
||||
<h1>Manage the campaign</h1>
|
||||
{% endfor %}
|
||||
{% for problem in problems %}
|
||||
Please fix the following before launching your campaign:
|
||||
<br /><br />
|
||||
<ul class="errorlist">
|
||||
<li>{{ problem }}</li>
|
||||
</ul>
|
||||
{% empty %}
|
||||
{% endfor %}
|
||||
<h2>The work</h2>
|
||||
<div class="book-detail-info">
|
||||
<h2 class="book-name">Title: <a href="{% url work campaign.work.id %}">{{ campaign.work.title }}</a></h2>
|
||||
|
|
@ -25,14 +33,15 @@
|
|||
<h3>Description of the offering</h2>
|
||||
<form action="#" method="POST">
|
||||
{% csrf_token %}
|
||||
<p>This should include:</p>
|
||||
<p>This will be displayed in the Campaign tab for your work. It's your main pitch to supporters. It should include:</p>
|
||||
<ul>
|
||||
<li>A synopsis of the work.</li>
|
||||
<li>Hyperlinks for the author(s), publisher making the offer, or for the work itself.</li>
|
||||
<li>Anything especially appealing about the work or author: awards, embedded video (460px max), etc.</li>
|
||||
</ul>
|
||||
{{ form.description }}{{ form.description.errors }}
|
||||
<h3>Offer details</h2>
|
||||
<p>This should include:</p>
|
||||
<p>This will be displayed on the Details tab for your work. It gives additional information for the highly curious. It should include:</p>
|
||||
<ul>
|
||||
<li>Details about the edition being offered.</li>
|
||||
<li>Hyperlinks for the author(s), publisher making the offer, or for the work itself.</li>
|
||||
|
|
@ -52,10 +61,6 @@ The ending date can't be more than six months away- that's a practical limit for
|
|||
{{ form.paypal_receiver }}{{ form.paypal_receiver.errors }}
|
||||
<p> To save your work, or to launch the campaign, click a button below.</p>
|
||||
|
||||
|
||||
{% for problem in problems %}
|
||||
<p>{{ problem }}</p>
|
||||
{% endfor %}
|
||||
<input type="submit" name="save" value="Save Campaign" />
|
||||
<input type="submit" name="launch" value="Launch Campaign" />
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -49,7 +49,8 @@
|
|||
{% else %}{%if claim.campaigns %}
|
||||
<h3>Campaigns for this work</h3>
|
||||
{% for campaign in claim.campaigns %}
|
||||
<p>Name: {{ campaign.name }} {{ campaign.status }} <br />Created: {{ campaign.created }}<br />
|
||||
<p>Name: {{ campaign.name }} {{ campaign.status }} (<a href="{% url manage_campaign campaign.id %}">manage campaign</a>)<br />
|
||||
Created: {{ campaign.created }}<br />
|
||||
Manager(s): {% for user in campaign.managers.all %} <a href="{% url supporter user.username %}">{{ user.username }} </a> {% endfor %}</p>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<link type="text/css" rel="stylesheet" href="/static/css/book_panel.css" />
|
||||
|
||||
<script type="text/javascript" src="/static/js/wishlist.js"></script>
|
||||
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script>
|
||||
<script type="text/javascript" src="/static/js/jquery-1.6.3.min.js"></script>
|
||||
<script type="text/javascript" src="/static/js/jquery-ui-1.8.16.custom.min.js"></script>
|
||||
|
||||
<script type="text/javascript" src="/static/js/greenpanel.js"></script>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
{% block extra_head %}
|
||||
<link type="text/css" rel="stylesheet" href="/static/css/campaign.css" />
|
||||
|
||||
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script>
|
||||
<script type="text/javascript" src="/static/js/jquery-1.6.3.min.js"></script>
|
||||
<script type="text/javascript" src="/static/js/jquery-ui-1.8.16.custom.min.js"></script>
|
||||
<script type="text/javascript" src="/static/js/tabs4.js"></script>
|
||||
|
||||
|
|
@ -20,14 +20,13 @@ $(document).ready(function(){
|
|||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% with work.last_campaign_status as status %}
|
||||
{% with work.last_campaign_status as status %}
|
||||
<div id="main-container">
|
||||
<div class="js-main">
|
||||
<div id="js-leftcol">
|
||||
<div class="jsmodule rounded">
|
||||
<div class="jsmod-content"> {{ work.last_campaign.id }} {{ work.campaigns.0.id }}
|
||||
<div class="jsmod-content">
|
||||
{% if work.last_campaign %}
|
||||
{{ work.last_campaign_status}}
|
||||
{% if status == 'ACTIVE' %}
|
||||
Campaign in Progress: <br />${{ work.last_campaign.current_total }}/${{ work.last_campaign.target }}
|
||||
{% else %}{% if status == 'SUCCESSFUL' %}
|
||||
|
|
@ -74,7 +73,7 @@ $(document).ready(function(){
|
|||
</div>
|
||||
</div>
|
||||
{% if status == 'ACTIVE' %}
|
||||
<div class="pledged-info"><div class="pledged-group">{% if work.last_campaign.supporters.count == 1 %}{{ work.last_campaign.supporters.count }} 1 Ungluer has{% else %} {{ work.last_campaign.supporters.count }} Ungluers have {% endif %}pledged ${{ work.last_campaign.current_total }}</div><div class="status"><img src="/static/images/images/icon-book-37by25-{{ work.percent_unglued }}.png" /></div></div>
|
||||
<div class="pledged-info"><div class="pledged-group">{% if work.last_campaign.supporters.count == 1 %}{{ work.last_campaign.supporters.count }} 1 Ungluer has{% else %} {{ work.last_campaign.supporters.count }} Ungluers have {% endif %}pledged ${{ work.last_campaign.current_total }}<br />toward a ${{ work.last_campaign.target }} goal </div><div class="status"><img src="/static/images/images/icon-book-37by25-{{ work.percent_unglued }}.png" /></div></div>
|
||||
<div class="btn_support"><form action="{% url pledge work_id=work.id %}" method="get"><input type="submit" value="Support"/></form></div>
|
||||
{% else %}
|
||||
<div class="pledged-info"><div class="pledged-group">
|
||||
|
|
|
|||
|
|
@ -158,11 +158,12 @@ div.panelview.side2 > div {
|
|||
padding: 10px;
|
||||
height: 295px;
|
||||
background-color: #8dc63f;
|
||||
color: #ffffff;
|
||||
color: #fff;
|
||||
position: absolute;
|
||||
top: -5px;
|
||||
left: -10px;
|
||||
}
|
||||
/* Campaign status text at top of hover state */
|
||||
.unglued_white {
|
||||
font-size: 12px;
|
||||
margin: 0px auto;
|
||||
|
|
@ -170,6 +171,7 @@ div.panelview.side2 > div {
|
|||
padding: 10px 0px;
|
||||
height: 48px;
|
||||
}
|
||||
/* White-background action buttons; vary by state of campaign */
|
||||
.read_itbutton {
|
||||
width: 118px;
|
||||
height: 35px;
|
||||
|
|
@ -222,12 +224,43 @@ div.panelview.side2 > div {
|
|||
.read_itbutton_fail span:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
.Unglue_itbutton {
|
||||
width: 118px;
|
||||
height: 35px;
|
||||
padding: 0px 0px;
|
||||
background: #FFFFFF;
|
||||
margin: 0px;
|
||||
-moz-border-radius: 4px 4px 4px 4px;
|
||||
-webkit-border-radius: 4px 4px 4px 4px;
|
||||
border-radius: 4px 4px 4px 4px;
|
||||
border: 1px solid #81bb38;
|
||||
}
|
||||
.Unglue_itbutton a {
|
||||
background-image: url("/static/images/book-panel/unglue_icon.png");
|
||||
line-height: 40px;
|
||||
font-size: 11px;
|
||||
background-repeat: no-repeat;
|
||||
background-position: 10px center;
|
||||
font-weight: bold;
|
||||
text-decoration: none;
|
||||
text-transform: uppercase;
|
||||
padding: 0px 0px 0px 25px;
|
||||
color: #73a334;
|
||||
}
|
||||
.Unglue_itbutton a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
.add_towish {
|
||||
width: 130px;
|
||||
width: 120px;
|
||||
height: 30px;
|
||||
padding: 0px;
|
||||
margin: 15px 0 15px 0;
|
||||
vertical-align: baseline;
|
||||
border-top-width: 1px;
|
||||
border-bottom-width: 1px;
|
||||
border-top-style: solid;
|
||||
border-bottom-style: solid;
|
||||
border-top-color: #FFFFFF;
|
||||
border-bottom-color: #FFFFFF;
|
||||
background-image: url("/static/images/book-panel/add_wish_icon.png");
|
||||
}
|
||||
.add_towish a {
|
||||
|
|
@ -238,19 +271,14 @@ div.panelview.side2 > div {
|
|||
font-weight: bold;
|
||||
text-decoration: none;
|
||||
text-transform: uppercase;
|
||||
padding: 8px 5px 8px 21px;
|
||||
color: #FFFFFF;
|
||||
border-top-width: 1px;
|
||||
border-bottom-width: 1px;
|
||||
border-top-style: solid;
|
||||
border-bottom-style: solid;
|
||||
border-top-color: #FFFFFF;
|
||||
border-bottom-color: #FFFFFF;
|
||||
padding: 0 5px 0 21px;
|
||||
color: #FFF;
|
||||
}
|
||||
.add_towish a:hover {
|
||||
text-decoration: none;
|
||||
color: #3d4e53;
|
||||
}
|
||||
/* title, author */
|
||||
.white_text {
|
||||
width: 130px;
|
||||
height: 40px;
|
||||
|
|
@ -266,16 +294,23 @@ div.panelview.side2 > div {
|
|||
color: #3d4e53;
|
||||
}
|
||||
.white_text p {
|
||||
/* necessary to ensure title/author don't overflow onto icons */
|
||||
|
||||
line-height: 16px;
|
||||
max-height: 32px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.moreinfo {
|
||||
width: 130px;
|
||||
width: 120px;
|
||||
height: 30px;
|
||||
padding: 0px;
|
||||
margin: 15px 0 0px 0;
|
||||
vertical-align: baseline;
|
||||
margin: 15px 0 0 0;
|
||||
border-top-width: 1px;
|
||||
border-bottom-width: 1px;
|
||||
border-top-style: solid;
|
||||
border-bottom-style: solid;
|
||||
border-top-color: #FFFFFF;
|
||||
border-bottom-color: #FFFFFF;
|
||||
background-image: url("/static/images/book-panel/more_icon.png") no-repeat 10% center;
|
||||
}
|
||||
.moreinfo a {
|
||||
|
|
@ -286,48 +321,19 @@ div.panelview.side2 > div {
|
|||
font-weight: bold;
|
||||
text-decoration: none;
|
||||
text-transform: uppercase;
|
||||
padding: 8px 42px 8px 21px;
|
||||
color: #FFFFFF;
|
||||
border-top-width: 1px;
|
||||
border-bottom-width: 1px;
|
||||
border-top-style: solid;
|
||||
border-bottom-style: solid;
|
||||
border-top-color: #FFFFFF;
|
||||
border-bottom-color: #FFFFFF;
|
||||
padding: 0 0 0 21px;
|
||||
color: #FFF;
|
||||
}
|
||||
.moreinfo a:hover {
|
||||
text-decoration: none;
|
||||
color: #3d4e53;
|
||||
}
|
||||
.moreinfo > div {
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
padding-bottom: 8px;
|
||||
}
|
||||
/* styling of hover state when book has not been unglued, and a bunch of stuff I haven't figured out yet */
|
||||
.Unglue_itbutton {
|
||||
width: 110px;
|
||||
height: 40px;
|
||||
padding: 0px 9px;
|
||||
background: #FFFFFF;
|
||||
margin: 0px 15px 0px -5px;
|
||||
-moz-border-radius: 4px 4px 4px 4px;
|
||||
-webkit-border-radius: 4px 4px 4px 4px;
|
||||
border-radius: 4px 4px 4px 4px;
|
||||
border: 1px solid #d4dcdd;
|
||||
}
|
||||
.Unglue_itbutton a {
|
||||
line-height: 40px;
|
||||
font-size: 11px;
|
||||
background-repeat: no-repeat;
|
||||
background-position: 2px center;
|
||||
font-weight: bold;
|
||||
text-decoration: none;
|
||||
text-transform: uppercase;
|
||||
background-image: url("/static/images/book-panel/unglue_icon.png");
|
||||
padding: 5px 0px 0px 20px;
|
||||
color: #3d4e53;
|
||||
text-align: right;
|
||||
font-family: "LucidaGrandeBold";
|
||||
}
|
||||
.Unglue_itbutton a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
.add_towish2 {
|
||||
width: 130px;
|
||||
height: 30px;
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@
|
|||
}
|
||||
.book-detail-info .status {
|
||||
float: right;
|
||||
padding-top: 4px;
|
||||
margin-top: 11px;
|
||||
}
|
||||
.book-detail-info .btn_support a {
|
||||
background: url("/static/images/btn_bg.png") 0 0 no-repeat;
|
||||
|
|
|
|||
|
|
@ -129,3 +129,6 @@ dd {
|
|||
.doc ol li {
|
||||
margin-bottom: 7px;
|
||||
}
|
||||
.errorlist li {
|
||||
border: solid #8dc63f 4px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
background:#FFFFFF;
|
||||
margin:0px;
|
||||
.border-radius(4px, 4px, 4px, 4px);
|
||||
border: 1px solid #81bb38;
|
||||
border: 1px solid #81bb38;
|
||||
}
|
||||
|
||||
.readit_inner (@padding) {
|
||||
|
|
@ -53,17 +53,16 @@
|
|||
}
|
||||
|
||||
.banners (@right, @bottom) {
|
||||
width:130px;
|
||||
width:120px;
|
||||
height:30px;
|
||||
padding:0px;
|
||||
margin:15px 0 @bottom 0;
|
||||
vertical-align: baseline;
|
||||
.greenpanelactionborders;
|
||||
|
||||
a {
|
||||
.greenpanelactionitems(left);
|
||||
padding:8px @right 8px 21px;
|
||||
color:#FFFFFF;
|
||||
.greenpanelactionborders;
|
||||
padding:0 @right 0 21px;
|
||||
color:#FFF;
|
||||
|
||||
&:hover { .panelhoverlink;}
|
||||
}
|
||||
|
|
@ -200,11 +199,13 @@ div.panelview.side2 > div {
|
|||
padding: 10px;
|
||||
height: 295px;
|
||||
background-color: @green;
|
||||
color: #ffffff;
|
||||
color: #fff;
|
||||
position:absolute;
|
||||
top:-5px;
|
||||
left:-10px;
|
||||
}
|
||||
|
||||
/* Campaign status text at top of hover state */
|
||||
.unglued_white {
|
||||
font-size: 12px;
|
||||
margin: 0px auto;
|
||||
|
|
@ -213,6 +214,7 @@ div.panelview.side2 > div {
|
|||
height:48px;
|
||||
}
|
||||
|
||||
/* White-background action buttons; vary by state of campaign */
|
||||
.read_itbutton {
|
||||
.readit;
|
||||
a {
|
||||
|
|
@ -230,6 +232,14 @@ div.panelview.side2 > div {
|
|||
}
|
||||
}
|
||||
|
||||
.Unglue_itbutton{
|
||||
.readit;
|
||||
|
||||
a {
|
||||
background-image: url("@{image-base}book-panel/unglue_icon.png");
|
||||
.readit_inner(25px);
|
||||
}
|
||||
}
|
||||
|
||||
.add_towish {
|
||||
.banners(5px, 15px);
|
||||
|
|
@ -237,6 +247,7 @@ div.panelview.side2 > div {
|
|||
|
||||
}
|
||||
|
||||
/* title, author */
|
||||
.white_text {
|
||||
width:130px;
|
||||
height:40px;
|
||||
|
|
@ -251,6 +262,7 @@ div.panelview.side2 > div {
|
|||
}
|
||||
|
||||
p {
|
||||
/* necessary to ensure title/author don't overflow onto icons */
|
||||
line-height:16px;
|
||||
max-height:32px;
|
||||
overflow: hidden;
|
||||
|
|
@ -258,33 +270,18 @@ div.panelview.side2 > div {
|
|||
}
|
||||
|
||||
.moreinfo {
|
||||
.banners(42px, 0px);
|
||||
.banners(0, 0);
|
||||
background-image: url("@{image-base}book-panel/more_icon.png") no-repeat 10% center;
|
||||
|
||||
> div {
|
||||
.height(30px);
|
||||
padding-bottom:8px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* styling of hover state when book has not been unglued, and a bunch of stuff I haven't figured out yet */
|
||||
|
||||
.Unglue_itbutton{
|
||||
width:110px;
|
||||
height:40px;
|
||||
padding:0px 9px;
|
||||
background:#FFFFFF;
|
||||
margin:0px 15px 0px -5px;
|
||||
.border-radius(4px, 4px, 4px, 4px);
|
||||
border: 1px solid #d4dcdd;
|
||||
}
|
||||
.Unglue_itbutton a{
|
||||
.greenpanelactionitems(2px);
|
||||
background-image: url("@{image-base}book-panel/unglue_icon.png");
|
||||
padding:5px 0px 0px 20px;
|
||||
color:@text-blue;
|
||||
text-align:right;
|
||||
font-family: "LucidaGrandeBold";
|
||||
}
|
||||
.Unglue_itbutton a:hover{
|
||||
text-decoration:none;
|
||||
}
|
||||
|
||||
.add_towish2{
|
||||
width:130px;
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@
|
|||
|
||||
.status {
|
||||
float: right;
|
||||
padding-top: 4px;
|
||||
margin-top: 11px;
|
||||
}
|
||||
|
||||
.btn_support a {
|
||||
|
|
|
|||
|
|
@ -129,4 +129,8 @@ dd {
|
|||
|
||||
.doc ol li {
|
||||
margin-bottom: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
.errorlist li {
|
||||
border: solid @green 4px;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue