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

Merge pull request #213 from Gluejar/b2u_errata 

errata- kindle config, b2u campaign mechanics, display text
pull/1/head
Raymond Yee 2013-09-27 07:33:59 -07:00
parent 48ab7cb7e8 c74723cf02
commit 4ee69bf0e5
16 changed files with 25 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/models.py
View File

@ -476,7 +476,11 @@ class Campaign(models.Model):
return self.dollar_per_day
if self.cc_date_initial is None:
return None
time_to_cc = self.cc_date_initial - datetime.today()
start_datetime= self.activated if self.activated else datetime.today()
time_to_cc = self.cc_date_initial - start_datetime
self.dollar_per_day = float(self.target)/float(time_to_cc.days)
self.save()
return self.dollar_per_day
@ -520,8 +524,9 @@ class Campaign(models.Model):
self.status= 'ACTIVE'
self.left = self.target
self.activated = datetime.today()
self.save()
action = CampaignAction( campaign = self, type='activated', comment = self.get_type_display())
ungluers = self.work.wished_by()
notification.queue(ungluers, "wishlist_active", {'campaign':self}, True)
return self

4
frontend/templates/campaign_list.html
View File

@ -28,9 +28,9 @@ location.hash = "#2";
<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">{{ facet|capfirst }} Campaigns</span></div>
</div>
<div class="user-block2">With your help we're raising money to buy the rights to give these {% if pub_lang %}{{pub_lang|ez_lang_name}} language {% endif %}books to the world.
<div class="user-block2">With your help we're raising money to give these {% if pub_lang %}{{pub_lang|ez_lang_name}} language {% endif %}books to the world.
</div>
<div class="user-block3">
</div>

2
frontend/templates/comments.html
View File

@ -23,7 +23,7 @@
<div id="user-block1">
<div id="block-intro-text"><span class="special-user-name">Latest Comments</span></div>
</div>
<div class="user-block2"><span class="user-short-info">With your help we're raising money to buy the rights to give these books to the world.</span>
<div class="user-block2"><span class="user-short-info">With your help we're raising money to give these books to the world.</span>
</div>
<div class="user-block3">
</div>

4
frontend/templates/kindle_config.html
View File

@ -60,9 +60,9 @@
document.getElementById('id_kindle_email').focus()
</script>
</div>
https://www.amazon.com/gp/digital/fiona/manage#manageDevices
<div>
<p>Don't know the email address for your device or reading app? <a href="http://www.amazon.com/myk#manageDevices">Find it here</a>, under Manage Your Devices.</p>
<p>Don't know the email address for your device or reading app? <a href="https://www.amazon.com/myk#manageDevices">Find it here</a>. (If you're not logged in to Amazon, you need to click "Manage Your Devices" in the "Your Kindle Account" section on the lower left side of the page.)</p>
<p>Once we have your Kindle email, you'll be able to send unglued ebooks to your Kindle device or app with one click from any Unglue.it download page.</p>
</div>

2
frontend/templates/work_list.html
View File

@ -31,7 +31,7 @@
</div>
<div class="user-block2">
{% block userblock2 %}
<span class="user-short-info">With your help we're raising money to buy the rights to give these {% if pub_lang %}{{pub_lang|ez_lang_name}} language {% endif %}books to the world.</span>
<span class="user-short-info">With your help we're raising money to give these {% if pub_lang %}{{pub_lang|ez_lang_name}} language {% endif %}books to the world.</span>
{% endblock %}
</div>
<div class="user-block3">

2
static/css/campaign2.css
View File

File diff suppressed because one or more lines are too long

2
static/css/download.css
View File

File diff suppressed because one or more lines are too long

2
static/css/lists.css
View File

@ -1 +1 @@
.header-text{height:36px;line-height:36px;display:block;text-decoration:none;font-weight:bold;letter-spacing:-0.05em}.panelborders{border-width:1px 0;border-style:solid none;border-color:#fff}.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:0;margin:5px 0}.errors{-moz-border-radius:16px;-webkit-border-radius:16px;border-radius:16px;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:0}.user-block2{width:48%;font-size:14px;padding-right:2%}#js-leftcol li.active_lang a{font-weight:bold}.show_langs:hover{text-decoration:underline}#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}
.header-text{height:36px;line-height:36px;display:block;text-decoration:none;font-weight:bold;letter-spacing:-0.05em}.panelborders{border-width:1px 0;border-style:solid none;border-color:#fff}.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:0;margin:5px 0}.errors{-moz-border-radius:16px;-webkit-border-radius:16px;border-radius:16px;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:0}.user-block2{width:48%;font-size:18px;padding-right:2%}#js-leftcol li.active_lang a{font-weight:bold}.show_langs:hover{text-decoration:underline}#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}

2
static/css/manage_campaign.css
View File

File diff suppressed because one or more lines are too long

197
static/css/searchandbrowse2.css
View File

@ -1,196 +1 @@
/* 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;
font-size: 13px;
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;
}
.google_signup_div {
padding: 14px 0;
}
.google_signup_div div {
height: 24px;
line-height: 24px;
float: left;
padding-left: 5px;
}
.google_signup_div img {
float: left;
height: 24px;
width: 24px;
}
.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;
}
#js-maincontainer-bot-block {
clear: both;
overflow: visible;
margin-top: 55px;
}
#js-maincontainer-bot-block #js-search {
-moz-border-radius: 64px;
-webkit-border-radius: 64px;
border-radius: 64px;
background-color: #8dc63f;
width: 652px;
height: 80px;
overflow: hidden;
clear: both;
color: #fff;
}
#js-maincontainer-bot-block #js-search label {
line-height: 80px;
font-size: 18px;
float: left;
padding: 0;
width: auto;
padding: 0 15px 0 30px;
}
#js-maincontainer-bot-block #js-search form {
float: left;
width: 210px;
background: url("/static/images/landingpage/search-box-two.png") 0 0 no-repeat;
height: 36px;
display: block;
overflow: hidden;
margin-top: 22px;
}
#js-slideshow {
padding: 0 30px;
position: relative;
}
#js-slideshow a.prev {
text-indent: -10000px;
font-size: 0;
width: 15px;
height: 22px;
display: block;
position: absolute;
top: 45%;
background: url("/static/images/landingpage/arrow-left.png") 0 0 no-repeat;
left: 0;
}
#js-slideshow a.next {
text-indent: -10000px;
font-size: 0;
width: 15px;
height: 22px;
display: block;
position: absolute;
top: 45%;
background: url("/static/images/landingpage/arrow-right.png") 0 0 no-repeat;
right: 0;
}
.spacer {
float: left;
margin: 0 4px;
}
#js-search input.inputbox {
border: none;
color: #66942e;
height: 26px;
line-height: 26px;
font-size: 13px;
float: left;
padding: 0;
margin: 5px 0 5px 20px;
width: 149px;
outline: none;
}
#js-search input.greenbutton {
background: url("/static/images/landingpage/search-button-two.png") 0 0 no-repeat;
width: 40px;
height: 40px;
padding: 0;
margin: 0;
border: none;
display: block;
float: right;
text-indent: -10000px;
font-size: 0;
}
#js-slide .jsmodule > h3 {
background: url("/static/images/landingpage/bg-slide.png") bottom center no-repeat;
padding-bottom: 7px;
padding-left: 35px;
}
#js-slide .jsmodule > h3 span {
background: #8ac3d7;
color: #fff;
padding: 10px 20px;
-moz-border-radius: 10px 10px 0 0;
-webkit-border-radius: 10px 10px 0 0;
border-radius: 10px 10px 0 0;
font-size: 18px;
overflow: hidden;
display: inline-block;
font-weight: normal;
}
.header-text{height:36px;line-height:36px;display:block;text-decoration:none;font-weight:bold;letter-spacing:-0.05em}.panelborders{border-width:1px 0;border-style:solid none;border-color:#fff}.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:0;margin:5px 0}.errors{-moz-border-radius:16px;-webkit-border-radius:16px;border-radius:16px;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:0}#js-maincontainer-bot-block{clear:both;overflow:visible;margin-top:55px}#js-maincontainer-bot-block #js-search{-moz-border-radius:64px;-webkit-border-radius:64px;border-radius:64px;background-color:#8dc63f;width:652px;height:80px;overflow:hidden;clear:both;color:#fff}#js-maincontainer-bot-block #js-search label{line-height:80px;font-size:19px;float:left;padding:0;width:auto;padding:0 15px 0 30px}#js-maincontainer-bot-block #js-search form{float:left;width:210px;background:url("/static/images/landingpage/search-box-two.png") 0 0 no-repeat;height:36px;display:block;overflow:hidden;margin-top:22px}#js-slideshow{padding:0 30px;position:relative}#js-slideshow a.prev{text-indent:-10000px;font-size:0;width:15px;height:22px;display:block;position:absolute;top:45%;background:url("/static/images/landingpage/arrow-left.png") 0 0 no-repeat;left:0}#js-slideshow a.next{text-indent:-10000px;font-size:0;width:15px;height:22px;display:block;position:absolute;top:45%;background:url("/static/images/landingpage/arrow-right.png") 0 0 no-repeat;right:0}.spacer{float:left;margin:0 4px}#js-search input.inputbox{border:0;color:#66942e;height:26px;line-height:26px;font-size:13px;float:left;padding:0;margin:5px 0 5px 20px;width:149px;outline:0}#js-search input.greenbutton{background:url("/static/images/landingpage/search-button-two.png") 0 0 no-repeat;width:40px;height:40px;padding:0;margin:0;border:0;display:block;float:right;text-indent:-10000px;font-size:0}#js-slide .jsmodule>h3{background:url("/static/images/landingpage/bg-slide.png") bottom center no-repeat;padding-bottom:7px;padding-left:35px}#js-slide .jsmodule>h3 span{background:#8ac3d7;color:#fff;padding:10px 20px;-moz-border-radius:10px 10px 0 0;-webkit-border-radius:10px 10px 0 0;border-radius:10px 10px 0 0;font-size:19px;overflow:hidden;display:inline-block;font-weight:normal}

2
static/css/sitewide4.css
View File

File diff suppressed because one or more lines are too long

2
static/less/book_detail.less
View File

@ -1,3 +1,5 @@
@import "variables.less";
/* needed for campaign, pledge, and manage_campaign */
.book-detail {

2
static/less/documentation2.less
View File

@ -1,6 +1,6 @@
// Styles basedocumentation.html and its descendants.
@import "variables.less";
@import "learnmore.less";
@import "learnmore2.less";
body {
line-height: @font-size-default*1.5;

2
static/less/lists.less
View File

@ -2,7 +2,7 @@
.user-block2 {
width: 48%;
font-size: 14px;
font-size: 18px;
padding-right: 2%;
}
#js-leftcol li.active_lang a {

2
static/less/searchandbrowse2.less
View File

@ -46,7 +46,7 @@
}
a.next {
.clickyarrows(rt);
.clickyarrows();
background:url("@{image-base}landingpage/arrow-right.png") 0 0 no-repeat;
right: 0;
}

1
static/less/social_share.less
View File

@ -1,3 +1,4 @@
@import "variables.less";
.shareclass(@sharewhere) {
background:url("@{image-base}icons/@{sharewhere}.png") 10px center no-repeat;
cursor: pointer;