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

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

pull/1/head
Raymond Yee 2012-04-04 15:29:59 +00:00
parent 91f8911337 7c77c748ef
commit 35633bd02f
8 changed files with 105 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/templates/book_panel.html
View File

@ -129,9 +129,11 @@
<div class="listview panelfront side1 booklist-status">
{% ifequal status "ACTIVE" %}
<span class="booklist-status-text" style="width: 190px"><b>${{ work.last_campaign.current_total }}</b> raised of <b>${{ work.last_campaign.target }}</b> goal</span>
{% else %}
<span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text">{{ status }}</span>
{% endifequal %}
{% else %}{% ifequal status "INITIALIZED" %}
<span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text">Coming soon!</span>
{% else %}
<span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text"></span>
{% endifequal %}{% endifequal %}
</div>
<div class="listview panelfront side1 icons">
{% if status == 'No campaign yet' or status == 'INITIALIZED' %}

2
frontend/templates/notification/active_campaign/notice.html
View File

@ -6,7 +6,7 @@
<div class="comments_info">
<div class="comments_graphical">
<span>The rights holder, {{ rightsholder }}, has launched a campaign for <a href="{% url work id %}">{{ campaign.work.title }}</a>!</span>
<div>The rights holder, {{ rightsholder }}, has launched a campaign for <a href="{% url work id %}">{{ campaign.work.title }}</a>!</div>
</div>
<div class="comments_textual">
<div>Congratulations! You wished for a campaign, and here it is. If ungluers like you pledge {{ campaign.target }} by {{ campaign.deadline|date:"M d, Y" }}, {{ campaign.work.title }} will be released under a <a href="http://creativecommons.org">Creative Commons</a> license for all to enjoy.</div>

38
frontend/templates/rh_tools.html
View File

@ -20,10 +20,17 @@ Any questions not covered here? Please email us at <a href="mailto:rights@gluej
<h2>Campaigns You Manage</h2>
<dl>
{% for campaign in request.user.campaigns.all %}
<dt>Work: <a href="{% url work work_id=campaign.work.id %}">{{campaign.work.title }}</a>&nbsp;&nbsp;&nbsp;(work #{{ campaign.work.id }})</dt>
<dd>Campaign: <a href="{% url manage_campaign campaign.id %}">{{ campaign.name }}</a><br />
Status: {{ campaign.status }} <br />
Created: {{ campaign.created }}</dd>
<dt>Work: <a href="{% url work work_id=campaign.work.id %}">{{campaign.work.title }}</a></dt>
<div class="work_campaigns clearfix">
<div class="campaign_info">
<dd>Campaign: {{ campaign.name }}<br />
Campaign status: {{ campaign.status }} <br />
Created: {{ campaign.created }}</dd>
</div>
<div>
<a href="{% url manage_campaign campaign.id %}" class="manage">Manage This Campaign</a>
</div>
</div>
{% endfor %}
</dl>
{% endif %}
@ -36,7 +43,7 @@ Any questions not covered here? Please email us at <a href="mailto:rights@gluej
<br />On Behalf of: {{ claim.rights_holder.rights_holder_name }}
<br />PSA #: {{ claim.rights_holder.id }}
<br />Date of Claim : {{ claim.created }}
<br />Status: {{ claim.status }}
<br />Status of Claim: {{ claim.status }}
{% if claim.can_open_new %}
<h3>Open a campaign for this work</h3>
<form method="POST" action="#">
@ -53,13 +60,20 @@ Any questions not covered here? Please email us at <a href="mailto:rights@gluej
{% else %}{%if claim.campaigns %}
<h3>Campaigns for this work</h3>
{% for campaign in claim.campaigns %}
<p>Name: {{ campaign.name }} {{ campaign.status }} (<a href="{% url manage_campaign campaign.id %}">manage campaign</a>) &nbsp;&nbsp;&nbsp;(campaign #{{ campaign.id }})<br />
Created: {{ campaign.created }}<br />
Manager(s): {% for user in campaign.managers.all %} <a href="{% url supporter user.username %}">{{ user.username }} </a> {% endfor %}</p>
<form method="POST" action="#">{% csrf_token %}
Add/Remove Managers: {{ campaign.edit_managers_form.managers }}{{ campaign.edit_managers_form.managers.errors }}
<input type="submit" name="edit_managers_{{campaign.id}}" value="Save Managers" id="submit">
</form>
<div class="work_campaigns clearfix">
<div class="campaign_info">
Name: Your campaign, "{{ campaign.name }}", is {{ campaign.status }}<br />
Created: {{ campaign.created }}<br />
Manager(s): {% for user in campaign.managers.all %} <a href="{% url supporter user.username %}">{{ user.username }} </a> {% endfor %}
<form method="POST" action="#">{% csrf_token %}
Add/Remove Managers: {{ campaign.edit_managers_form.managers }}{{ campaign.edit_managers_form.managers.errors }}
<input type="submit" name="edit_managers_{{campaign.id}}" value="Save Managers" id="submit">
</form>
</div>
<div>
<a href="{% url manage_campaign campaign.id %}" class="manage">Manage This Campaign</a>
</div>
</div>
{% endfor %}
{% endif %}
{% endif %}

18
frontend/templates/work.html
View File

@ -195,7 +195,7 @@ $j(document).ready(function(){
<h3 class="tabcontent-title">A campaign is running to unglue <i>{{work.title}}</i>!</h3>
<p>The rights holder, {% for claim in work.claim.all %}
{% if claim.status == 'active' %}
{{ claim.rights_holder.rights_holder_name }}
{{ claim.rights_holder.rights_holder_name }}
{% endif %}
{% endfor %}
, has agreed to release <i>{{work.title}}</i> to the world as a Creative Commons licensed ebook ({{ work.last_campaign.license }}) if ungluers can join together to raise ${{ work.last_campaign.target }} by {{ work.last_campaign.deadline }}.
@ -249,22 +249,10 @@ $j(document).ready(function(){
<p>This work has been claimed by {{ rights_holder_name }}. The claim has been registered and approved by Unglue.It staff.</p>
{% else %}
{% if claimstatus == 'disputed' %}
<p>The rights to this work are disputed.</p>
<p>Rights claims are pending.</p>
{% else %}
{% if claimstatus == 'one_pending' %}
<p>This work has been claimed by {{ rights_holder_name }}. The claim is being verified by Unglue.It staff.</p>
{% if request.user.rights_holder.all.count %}
Should you be authorized to run campaigns for this work instead? Select a rights holder:<br /><br />
<form method="GET" action="{% url claim %}">
{% csrf_token %}
{{ claimform.user }}
{{ claimform.work }}
{{ claimform.rights_holder }}
<input type="submit" name="submit" value="Claim">
</form><br />
{% endif %}
<p>This work has been claimed by {{ rights_holder_name }}. The claim is being verified by Unglue.It staff.</p>
{% else %}
{% if request.user.rights_holder.all.count %}
Is this work yours? Claim it: <br /><br />

29
static/css/documentation.css
View File

@ -520,6 +520,35 @@ dd {
padding: 5px;
border: solid 5px #EDF3F4;
}
/* Miscellaneous */
p.pledge_complete {
margin: 7px auto;
}
a.manage {
background: #8dc63f;
color: white;
font-weight: bold;
padding: 0.5em 1em;
cursor: pointer;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
border: 1px solid #d6dde0;
}
a.manage:hover {
text-decoration: none;
}
.work_campaigns {
border: 1px solid #d6dde0;
margin: 10px auto;
}
.work_campaigns div {
float: left;
}
.work_campaigns div.campaign_info {
width: 60%;
margin: 5px;
}

8
static/css/notices.css
View File

@ -150,14 +150,16 @@ input[type="submit"] {
border: solid 3px #d6dde0;
margin: 3px auto;
}
.comments div {
float: left;
}
.comments .comments_book {
padding: 5px;
border: solid 5px #EDF3F4;
float: left;
margin: 5px;
}
.comments .comments_info {
float: left;
max-width: 500px;
}
.comments .comments_info .comments_graphical {
border-bottom: solid 1px #d6dde0;
@ -165,5 +167,5 @@ input[type="submit"] {
padding-bottom: 5px;
}
.comments .comments_info .comments_textual {
margin: auto 5px;
margin: 10px 5px auto;
}

29
static/less/documentation.less
View File

@ -241,6 +241,35 @@ dd {
}
}
/* Miscellaneous */
p.pledge_complete {
margin: 7px auto;
}
a.manage {
background: @call-to-action;
color: white;
font-weight: bold;
padding: 0.5em 1em;
cursor: pointer;
.one-border-radius(5px);
border: 1px solid @blue-grey;
&:hover {
text-decoration: none;
}
}
.work_campaigns {
border: 1px solid @blue-grey;
margin: 10px auto;
div {
float: left;
&.campaign_info {
width: 60%;
margin: 5px;
}
}
}

11
static/less/notices.less
View File

@ -55,16 +55,19 @@ input[type="submit"] {
.comments {
border: solid 3px @blue-grey;
margin: 3px auto;
div {
float: left;
}
.comments_book {
.mediaborder;
float: left;
margin: 5px;
}
.comments_info {
float: left;
max-width: 500px;
.comments_graphical {
border-bottom: solid 1px @blue-grey;
margin: 5px;
@ -72,7 +75,7 @@ input[type="submit"] {
}
.comments_textual {
margin: auto 5px;
margin: 10px 5px auto;
}
}
}