From 998bba7349f8e2d01562e055adac98d2354a0579 Mon Sep 17 00:00:00 2001 From: Aditya Anand Date: Tue, 27 Mar 2018 01:40:11 +0530 Subject: [PATCH] bounty: css changed - vertical aligned activity section - Changed Kill Bounty -> Cancelled Bounty - Changed Order of Cancel Bounty & Add contribution - updated tooltip text - refactored code - gave breathing space to bounty_info - changed contribute button to white --- app/assets/v2/css/bounty.css | 37 +++++----- app/assets/v2/js/pages/bounty_details.js | 82 +++++++++++---------- app/dashboard/templates/bounty_details.html | 16 +++- 3 files changed, 76 insertions(+), 59 deletions(-) diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css index c8aba133649..18cb30fa086 100644 --- a/app/assets/v2/css/bounty.css +++ b/app/assets/v2/css/bounty.css @@ -33,7 +33,7 @@ body { } .box { - padding: 1em; + padding: 14px; border: 1px solid #DBDBDB; border-radius: 3px; margin: 0; @@ -93,7 +93,7 @@ body { .bounty-info div { display: inline; - margin-right: .6em; + margin-right: 15px; font-family: "Muli-Light"; } @@ -124,6 +124,11 @@ body { border-bottom: 1px solid #D4D4D4; } +.bounty-actions .tag.usd { + padding-left: 10px; + padding-right: 10px; +} + .tag.keyword { min-width: 0; font-size: 11px; @@ -180,7 +185,7 @@ body { .contributor-box svg { font-size: 24px; - margin-top: .8em; + margin-top: 15px; margin-bottom: 10px; color: #333333; } @@ -189,11 +194,12 @@ a.btn{ border-radius: 0.2rem; } -#right_actions, -#github-link { - display: inline; +.funder-avatar, +.activity-avatar { + text-align: center; } + #right_actions .button--primary { margin-right: 10px; position: relative; @@ -201,19 +207,19 @@ a.btn{ } #right_actions .button--primary, -#github-btn { +#btn-white { padding: 6px 15px; box-shadow: none; font-size: 12px; } -#github-btn { +#btn-white { border: 1px solid #979797; color: #0D0764; border-radius: 3px; } -#github-btn .github-comment { +#btn-white .github-comment { border-left: 1px solid #979797; padding-left: 12px; margin-left: 5px; @@ -223,6 +229,11 @@ a.btn{ margin-bottom: 10px; } +.funder-avatar, +.activity div { + margin: auto; +} + .fulfilled .activity-status { margin-bottom: 10px; } @@ -232,10 +243,6 @@ a.btn{ color: #717171; } -.activity-avatar { - text-align: center; -} - .activity .activity-status svg { margin-left: 10px; color: #0ECF7C; @@ -289,10 +296,6 @@ a.btn{ float: none; } - #github-link { - display: inline-flex; - } - #bounty_details .row { margin: 0px; padding-left: 10px; diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js index c5f6b83eeee..730eb37ce75 100644 --- a/app/assets/v2/js/pages/bounty_details.js +++ b/app/assets/v2/js/pages/bounty_details.js @@ -129,6 +129,9 @@ var callbacks = { var keywords = result.metadata.issueKeywords.split(','); var tags = []; + if (result.metadata.issueKeywords.length == 0) + return [ 'issue_keywords', null ]; + keywords.forEach(function(keyword) { tags.push('
' + keyword + '
'); }); @@ -431,28 +434,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 @@ -462,7 +443,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); @@ -477,20 +458,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); @@ -501,9 +469,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); @@ -525,8 +493,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 @@

-
@@ -142,7 +141,7 @@
All Activity
Funder
-
+
@@ -174,6 +173,19 @@
Funder
[[:text]] ( [[:pending_acceptance]] ) + [[else color == 'white']] + + [[if comments]] + + [[:text]] + + [[:comments]] + + + [[else]] + [[:text]] + [[/if]] + [[else]] [[:text]]