Author: gregoryjnewman
Date: Tue Oct 14 08:40:04 2008
New Revision: 1044
Modified:
trunk/projects/complete_project/templates/swaps/accepted.html
trunk/projects/complete_project/templates/swaps/dead.html
trunk/projects/complete_project/templates/swaps/edit_offer.html
trunk/projects/complete_project/templates/swaps/new_offer.html
trunk/projects/complete_project/templates/swaps/offer.html
trunk/projects/complete_project/templates/swaps/offers.html
trunk/projects/complete_project/templates/swaps/propose_swap.html
trunk/projects/complete_project/templates/swaps/proposed_to_you.html
trunk/projects/complete_project/templates/swaps/swap.html
trunk/projects/complete_project/templates/swaps/your_offers.html
Log:
applying bhaugen's patch to swaps
Modified: trunk/projects/complete_project/templates/swaps/accepted.html
==============================================================================
--- trunk/projects/complete_project/templates/swaps/accepted.html
(original)
+++ trunk/projects/complete_project/templates/swaps/accepted.html Tue Oct
14 08:40:04 2008
@@ -13,8 +13,6 @@
{% block head_title %}{% blocktrans %}Your accepted Swaps{%
endblocktrans %}{% endblock %}
{% block body %}
- <p><span class="warning">Note</span>: this is an <b>experimental</b>
feature that is subject to massive change at any time.</p>
-
<h1>{% trans "Your accepted Swaps" %}</h1>
Modified: trunk/projects/complete_project/templates/swaps/dead.html
==============================================================================
--- trunk/projects/complete_project/templates/swaps/dead.html (original)
+++ trunk/projects/complete_project/templates/swaps/dead.html Tue Oct 14
08:40:04 2008
@@ -13,8 +13,6 @@
{% block head_title %}{% blocktrans %}Your dead Swaps{% endblocktrans %}{%
endblock %}
{% block body %}
- <p><span class="warning">Note</span>: this is an <b>experimental</b>
feature that is subject to massive change at any time.</p>
-
<h1>{% trans "Your dead Swaps" %}</h1>
Modified: trunk/projects/complete_project/templates/swaps/edit_offer.html
==============================================================================
--- trunk/projects/complete_project/templates/swaps/edit_offer.html
(original)
+++ trunk/projects/complete_project/templates/swaps/edit_offer.html Tue Oct
14 08:40:04 2008
@@ -10,8 +10,6 @@
{% block head_title %}{% blocktrans %}Editing Offer{% endblocktrans %}{%
endblock %}
{% block body %}
- <p><span class="warning">Note</span>: this is an <b>experimental</b>
feature that is subject to massive change at any time.</p>
-
<h1>{% trans "Editing Offer" %}</h1>
{% ifequal offer.offerer request.user %}
Modified: trunk/projects/complete_project/templates/swaps/new_offer.html
==============================================================================
--- trunk/projects/complete_project/templates/swaps/new_offer.html
(original)
+++ trunk/projects/complete_project/templates/swaps/new_offer.html Tue Oct
14 08:40:04 2008
@@ -5,8 +5,6 @@
{% block head_title %}{% blocktrans %}Add a new Offer{% endblocktrans %}{%
endblock %}
{% block body %}
- <p><span class="warning">Note</span>: this is an <b>experimental</b>
feature that is subject to massive change at any time.</p>
-
<h1>{% trans "Add a new Offer" %}</h1>
<form id="offer_form" method="POST" action="">
Modified: trunk/projects/complete_project/templates/swaps/offer.html
==============================================================================
--- trunk/projects/complete_project/templates/swaps/offer.html (original)
+++ trunk/projects/complete_project/templates/swaps/offer.html Tue Oct 14
08:40:04 2008
@@ -10,8 +10,6 @@
{% block body %}
- <p><span class="warning">Note</span>: this is an <b>experimental</b>
feature that is subject to massive change at any time.</p>
-
<div class="blog-post">
<h2>{{ offer.short_description }}</h2>
<div class="blog-meta"><p>Offered by: <a href="{% url
profiles.views.profile offer.offerer.username %}">{{ offer.offerer.username
}}</a> on {{ offer.offered_time|date }}</p></div>
@@ -32,10 +30,21 @@
{% endfor %}</p>
{% if offer.is_changeable %}
{% ifequal offer.offerer request.user %}
- <form action="{% url offer_edit
offer.id %}" method="GET">
+ <form style="display: inline;"
action="{% url offer_edit offer.id %}"
method="GET">
<input type="hidden"
name="returnto" value="offer_list_yours" />
<input type="submit" value="{%
trans "Edit Offer" %}" />
- </form>
+ </form>
+ {% if offer.is_deletable %}
+ <form style="display: inline;"
action="{% url offer_delete
offer.id %}" method="POST">
+ <input type="submit"
value="{% trans "Delete Offer" %}" />
+ </form>
+ {% else %}
+ {% if offer.is_cancelable %}
+ <form style="display:
inline;" action="{% url offer_cancel
offer.id %}" method="POST">
+ <input
type="submit" value="{% trans "Cancel Offer" %}" />
+ </form>
+ {% endif %}
+ {% endif %}
{% endifequal %}
{% endif %}
</div>
Modified: trunk/projects/complete_project/templates/swaps/offers.html
==============================================================================
--- trunk/projects/complete_project/templates/swaps/offers.html (original)
+++ trunk/projects/complete_project/templates/swaps/offers.html Tue Oct 14
08:40:04 2008
@@ -13,8 +13,44 @@
{% block head_title %}{% blocktrans %}All Open Offers{% endblocktrans %}{%
endblock %}
{% block body %}
- <p><span class="warning">Note</span>: this is an <b>experimental</b>
feature that is subject to massive change at any time.</p>
-
+
+ <a href="" id="what-toggle">Toggle What is this?</a>
+ <div id="swaps-what" style="display: none; font-size: 90%; " >
+ <p>
+ A much simpler version of <a
href="http://www.swaptree.com";
target="_blank" >SwapTree</a>.
+ </p>
+ <p>
+ Trade anything for anything with any member of this
social network.
+ </p>
+ </div>
+ <a href="" id="how-toggle">Toggle How does this work?</a>
+ <div id="swaps-how" style="display: none; font-size: 90%; " >
+ <p>
+ Make an offer (of anything you are willing to give),
ask for something
you want to take in exchange.
+ Could be books, CDs, DVDs, games, work, gear, money -
anything.
+ </p>
+ <p>
+ Maybe somebody will propose a swap of something of
theirs for your
offer.
+ If so, the proposed swap goes into your <b>Proposed to
you</b> page and
their <b>Proposed by you</b> page.
+ </p>
+ <p>
+ Your offer remains on the <b>Open offers</b> page so
you may get other
proposals, until you finally accept a swap.
+ (Their offer is not open; it is bound to their proposal
unless you
accept the proposed swap, or they cancel their proposal.)
+ </p>
+ <p>
+ You can either accept or reject their proposal.
+ Or you can discuss it in swap comments, and maybe get
them to sweeten
their offer.
+ </p>
+ <p>
+ If you accept the proposal, the swap goes into the
<b>Accepted
swaps</b> page of both participants.
+ It is up to the participants to deliver on their
promises.
+ </p>
+ <p>
+ If you reject the proposal, the swap goes into the
<b>Dead swaps</b>
page of both participants,
+ and both offers are returned to the <b>Open offers</b>
page.
+ </p>
+ </div>
+
<h1>{% trans "All Open Offers" %}</h1>
@@ -62,4 +98,22 @@
No open offers.
{% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+{% block extra_body %}
+ <script>
+ $(document).ready(function(){
+
+ $('a#what-toggle').click(function() {
+ $('#swaps-what').toggle(400);
+ return false;
+ });
+
+ $('a#how-toggle').click(function() {
+ $('#swaps-how').toggle(400);
+ return false;
+ });
+
+ });
+ </script>
+{% endblock %}
Modified: trunk/projects/complete_project/templates/swaps/propose_swap.html
==============================================================================
--- trunk/projects/complete_project/templates/swaps/propose_swap.html
(original)
+++ trunk/projects/complete_project/templates/swaps/propose_swap.html Tue
Oct 14 08:40:04 2008
@@ -5,8 +5,6 @@
{% block head_title %}{% blocktrans %}Propose a Swap{% endblocktrans %}{%
endblock %}
{% block body %}
- <p><span class="warning">Note</span>: this is an <b>experimental</b>
feature that is subject to massive change at any time.</p>
-
<h1>{% trans "Propose a Swap" %}</h1>
<form id="proposal_form" method="POST" action="">
Modified:
trunk/projects/complete_project/templates/swaps/proposed_to_you.html
==============================================================================
--- trunk/projects/complete_project/templates/swaps/proposed_to_you.html
(original)
+++ trunk/projects/complete_project/templates/swaps/proposed_to_you.html
Tue Oct 14 08:40:04 2008
@@ -13,8 +13,6 @@
{% block head_title %}{% blocktrans %}Swaps proposed to you{%
endblocktrans %}{% endblock %}
{% block body %}
- <p><span class="warning">Note</span>: this is an <b>experimental</b>
feature that is subject to massive change at any time.</p>
-
<h1>{% trans "Swaps proposed to you" %}</h1>
Modified: trunk/projects/complete_project/templates/swaps/swap.html
==============================================================================
--- trunk/projects/complete_project/templates/swaps/swap.html (original)
+++ trunk/projects/complete_project/templates/swaps/swap.html Tue Oct 14
08:40:04 2008
@@ -12,7 +12,6 @@
<h1>{{ swap.get_state_display }} {% blocktrans %}Swap{%
endblocktrans %}</h1>
- <p><span class="warning">Note</span>: this is an <b>experimental</b>
feature that is subject to massive change at any time.</p>
<h2>Proposing Offer:</h2>
<div class="blog-post">
<h3>{{ swap.proposing_offer.short_description }}</h3>
Modified: trunk/projects/complete_project/templates/swaps/your_offers.html
==============================================================================
--- trunk/projects/complete_project/templates/swaps/your_offers.html
(original)
+++ trunk/projects/complete_project/templates/swaps/your_offers.html Tue
Oct 14 08:40:04 2008
@@ -13,8 +13,6 @@
{% block head_title %}{% blocktrans %}Your Offers{% endblocktrans %}{%
endblock %}
{% block body %}
- <p><span class="warning">Note</span>: this is an <b>experimental</b>
feature that is subject to massive change at any time.</p>
-
<h1>{% trans "Your Offers" %}</h1>
@@ -40,10 +38,15 @@
<td>{{ offer.want|urlize }}</td>
<td>{{ offer.get_state_display
}}</td>
<td>
- {%if offer.swapped_by %}
+ {% if offer.swapped_by
%}
<a href="{{
offer.swapped_by.get_absolute_url }}">{{
offer.swapped_by }}</a>
{% else %}
-
+
+ {% if offer.proposed_swap %}
+ <a
href="{{ offer.proposed_swap.get_absolute_url }}">{{
offer.proposed_swap }}</a>
+ {% else %}
+
+ {% endif %}
{% endif %}
</td>
</tr>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
