[minor] fixes to bounty

foundation/erpnext_foundation/doctype/bounty/bounty.py

@@ -67,7 +67,15 @@ def get_list_context(context):
 	context.title = 'ERPNext Bounties'
 	context.no_breadcrumbs = True
 	context.order_by = 'creation desc'
-	context.introduction = '<div style="margin-bottom: 20px;"><a href="new-bounty" class="btn btn-primary">Start a new Bounty</a><a style="margin-left: 10px;" href="/bounties-faq">FAQ</a></div>'
+	context.introduction = '''
+	<div style="margin-bottom: 20px;">
+		<a href="new-bounty" class="btn btn-primary">
+			Start a new Bounty</a>
+	</div>'''
+	context.list_footer = '''
+		<p><a class='text-muted small'
+			href="/bounties-faq">Bounty FAQ</a></p>
+	'''
 	context.fmt_money = fmt_money
 	context.get_paid_backers = get_paid_backers
 

foundation/erpnext_foundation/doctype/bounty/templates/bounty.html

@@ -36,7 +36,6 @@
 	{% if can_edit %}
 	<a href="/new-bounty?name={{doc.name}}" class="btn btn-default btn-xs">Edit</a>
 	{% endif %}
-	<span style="font-size: 14px; line-height: 44px;" class="pull-right small">{{days_to_go}} days to go</span>
 </h1>
 {% set bounty_progress = ((doc.bounty_collected/doc.goal)*100) %}
 <div class="progress" style="height: 12px;">
@@ -109,6 +108,10 @@
 	<h6 class="text-muted uppercase">About this feature</h6>
 	<p>{{doc.description}}</p>
 </p>
+<p>
+	<p><a href="/bounties-faq" class='text-muted'>Bounties FAQ</a></p>
+</p>
+
 <hr style="margin: 50px 0;">
 <h3>Discuss</h3>
 {% include 'templates/includes/comments/comments.html' %}

foundation/erpnext_foundation/doctype/bounty/templates/bounty_row.html

@@ -3,6 +3,7 @@
 	<a href={{ route }}>
 		<h3>{{ doc.feature_name }}</h3>
 		{% set bounty_progress = ((doc.bounty_collected/doc.goal)*100) %}
+		{% set comments = (json.loads(doc._comments or '[]'))|len %}
 		<div class="progress" style="height: 6px;">
 			<div class="progress-bar progress-bar-success" role="progressbar"
 				aria-valuenow="{{bounty_progress}}" aria-valuemin="0" aria-valuemax="100" style="width: {{bounty_progress}}%">
@@ -11,7 +12,10 @@
 		</div>
 		<p>
 			<span class="label">{{ fmt_money(doc.goal, currency="USD") }}</span>
-			<span class="label">Ends on {{ doc.end_date }}</span>
+			{% if comments %}
+			<span class="label">{{ comments }} <i
+				class='octicon octicon-comment-discussion'></i></span>
+			{% endif %}
 			{% set paid_backers = get_paid_backers(doc.bounty_backer) %}
 			{% if paid_backers|len > 0 %}
 			<span class="label">

foundation/www/bounties-faq.md

@@ -15,19 +15,43 @@ These bounties will be moderated by the Frappé Team and other foundation member
 
 ---
 
-### 3. How do I contribute?
+### 3. How is the bounty amount set?
+
+The creator of the bounty will set an initial amount and a descirption. This amount can be updated, modified by bounty moderators based on fairness and scope.
+
+---
+
+### 4. How do I contribute?
 
 After the bounty is created, you (and others) can back it by going to the Bounty page. We have 2 payments options, PayPal and Razorpay for International and Indian participants respectively. People can also discuss about the feature and provide feedback.
 
 ---
 
-### 4. I am a developer. How do I pitch for the Bounty?
+### 5. How long do I have to wait for the feature to be built?
+
+This will depend on the developer who has setup the bounty or the initial sponsor. Since there is no end-date, you must also try and market your bounty on the user form and get it completed. If a bounty is not update for a few months, the moderators can choose to close the bounty and you can reassign your fund to another bounty
+
+---
+
+### 6. Can I re-assign my bounty?
+
+Yes you can re-assign your fund to another bounty any time before the bounty is closed. Please send a mail at foundation@erpnext.com with the details of your bounty.
+
+---
+
+### 7. Who will build the feature?
+
+The bounty can be claimed by any developer in the community. If the bounty amount has been reached, and no developer shows interest, then the foundation will guarantee that the bounty will be delivered by foundation developers.
+
+---
+
+### 8. I am a developer. How do I pitch for the Bounty?
 
 You can indicate your interest in taking on the bounty in the discussion section of the Bounty page. Once the goal is reached, you can start development of the feature by sending pull requests against the GitHub Issue for this feature.
 
 ---
 
-### 5. What if the goal is not reached?
+### 9. What if the goal is not reached?
 
 If the goal is not reached, the bounty will be remain open until the moderators decide whether it should be closed. If the Bounty is closed, the moderators can choose to reassign the amount to another bounty.
 
@@ -35,6 +59,6 @@ If any developer is happy with the Bounty Amount collected so far and is ready t
 
 ---
 
-### 6. How to track the development of the feature?
+### 10. How to track the development of the feature?
 
 There is an option of linking the bounty to a GitHub Issue. You can see it on the Bounty page.