');
});
@@ -432,28 +435,6 @@ var do_actions = function(result) {
// actions
var actions = [];
- if (show_github_link) {
-
- var github_url = result['github_url'];
-
- // hack to get around the renamed repo for piper's work. can't change the data layer since blockchain is immutable
- github_url = github_url.replace('pipermerriam/web3.py', 'ethereum/web3.py');
- github_url = github_url.replace('ethereum/browser-solidity', 'ethereum/remix-ide');
- var github_tooltip = 'Github is where the issue scope lives. Its also a great place to collaborate with, and get to know, other developers (and sometimes even the repo maintainer themselves!).';
-
- if (result['github_comments']) {
- $('#github-link').html(
- ('") + github_tooltip + '">View On Github').concat('') + result['github_comments'] + ''
- );
- } else {
- $('#github-link').html(
- ('") + github_tooltip + '">View On Github').concat('')
- );
- }
- }
-
if (show_start_stop_work) {
// is enabled
@@ -463,7 +444,7 @@ var do_actions = function(result) {
href: is_interested ? '/uninterested' : '/interested',
text: is_interested ? 'Stop Work' : 'Start Work',
parent: 'right_actions',
- title: 'Start Work in an issue to let the issue funder know that youre starting work on this issue.'
+ title: is_interested ? 'Notify the funder that you will not be working on this project' : 'Notify the funder that you would like to take on this project'
};
actions.push(interest_entry);
@@ -478,20 +459,7 @@ var do_actions = function(result) {
href: '/funding/fulfill?source=' + result['github_url'],
text: 'Submit Work',
parent: 'right_actions',
- title: 'Use Submit Work when you FINISH work on a bounty. '
- };
-
- actions.push(_entry);
- }
-
- if (show_increase_bounty) {
- var enabled = increase_bounty_enabled;
- var _entry = {
- enabled: enabled,
- href: '/funding/increase?source=' + result['github_url'],
- text: 'Add Contribution',
- parent: 'right_actions',
- title: 'Increase the funding of this bounty'
+ title: 'Submit work for the funder to review'
};
actions.push(_entry);
@@ -502,9 +470,9 @@ var do_actions = function(result) {
var _entry = {
enabled: enabled,
href: '/funding/kill?source=' + result['github_url'],
- text: 'Kill Bounty',
+ text: 'Cancel Bounty',
parent: 'right_actions',
- title: 'Use Kill Bounty if you want to CANCEL your bounty'
+ title: 'Cancel bounty and reclaim funds for this issue'
};
actions.push(_entry);
@@ -526,8 +494,42 @@ var do_actions = function(result) {
actions.push(_entry);
}
- render_actions(actions);
+ if (show_increase_bounty) {
+ var enabled = increase_bounty_enabled;
+ var _entry = {
+ enabled: enabled,
+ href: '/funding/increase?source=' + result['github_url'],
+ text: 'Add Contribution',
+ parent: 'right_actions',
+ title: 'Increase the funding for this issue',
+ color: 'white'
+ };
+
+ actions.push(_entry);
+ }
+
+ if (show_github_link) {
+ var github_url = result['github_url'];
+ // hack to get around the renamed repo for piper's work. can't change the data layer since blockchain is immutable
+ github_url = github_url.replace('pipermerriam/web3.py', 'ethereum/web3.py');
+ github_url = github_url.replace('ethereum/browser-solidity', 'ethereum/remix-ide');
+ var github_tooltip = 'View issue details and comments on Github';
+
+ var _entry = {
+ enabled: true,
+ href: github_url,
+ text: 'View On Github',
+ parent: 'right_actions',
+ title: 'View issue details and comments on Github',
+ comments: result['github_comments'],
+ color: 'white'
+ };
+
+ actions.push(_entry);
+ }
+
+ render_actions(actions);
});
};
diff --git a/app/dashboard/templates/bounty_details.html b/app/dashboard/templates/bounty_details.html
index 12b67d67128..28e82c5d91d 100644
--- a/app/dashboard/templates/bounty_details.html
+++ b/app/dashboard/templates/bounty_details.html
@@ -89,7 +89,6 @@