From 6de05caf0254dbfd10b0d95803729494ed29d8f0 Mon Sep 17 00:00:00 2001 From: Saptak Sengupta Date: Mon, 4 Jun 2018 22:35:19 +0530 Subject: [PATCH 1/8] Update top banners in different bounty flow pages --- app/assets/v2/css/base.css | 8 ++++++++ app/assets/v2/js/shared.js | 6 ++++++ app/dashboard/templates/fulfill_bounty.html | 21 +++++++++++++------- app/dashboard/templates/increase_bounty.html | 20 +++++++++++++------ app/dashboard/templates/kill_bounty.html | 20 +++++++++++++------ app/dashboard/templates/process_bounty.html | 21 +++++++++++++------- 6 files changed, 70 insertions(+), 26 deletions(-) diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index 1a530aac526..68766912718 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -1177,6 +1177,14 @@ input.is-invalid { background-color: #FF6700; } +.metamask-error img { + max-width: 150px; +} + +.metamask-banner #upper_left { + height: 100%; +} + @media (max-width: 1350px) { .profile_details .tips li div.details { width: 300px; diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js index bda55a4c04f..7ed1f3a4be0 100644 --- a/app/assets/v2/js/shared.js +++ b/app/assets/v2/js/shared.js @@ -569,17 +569,23 @@ var trigger_primary_form_web3_hooks = function() { if (typeof web3 == 'undefined') { $('#no_metamask_error').css('display', 'block'); + $('#zero_balance_error').css('display', 'none'); $('#primary_form').addClass('hidden'); + $('#unlock_metamask_error').css('display', 'none'); $('#no_issue_error').css('display', 'none'); mixpanel_track_once('No Metamask Error', params); } else if (!web3.eth.coinbase) { $('#unlock_metamask_error').css('display', 'block'); + $('#zero_balance_error').css('display', 'none'); + $('#no_metamask_error').css('display', 'none'); $('#primary_form').addClass('hidden'); $('#no_issue_error').css('display', 'none'); mixpanel_track_once('Unlock Metamask Error', params); } else if (is_zero_balance_not_okay && document.balance == 0) { $('#zero_balance_error').css('display', 'block'); $('#primary_form').addClass('hidden'); + $('#unlock_metamask_error').css('display', 'none'); + $('#no_metamask_error').css('display', 'none'); $('#no_issue_error').css('display', 'none'); mixpanel_track_once('Zero Balance Metamask Error', params); } else { diff --git a/app/dashboard/templates/fulfill_bounty.html b/app/dashboard/templates/fulfill_bounty.html index 62f6bec0c92..ddbea5af95e 100644 --- a/app/dashboard/templates/fulfill_bounty.html +++ b/app/dashboard/templates/fulfill_bounty.html @@ -27,16 +27,23 @@
{% include 'shared/nav.html' %}
-
-
-
+
+
+
+ {% include 'shared/current_balance.html' %} +
+
+ {% include 'shared/no_issue_error.html' %} + {% include 'shared/no_metamask_error.html' %} + {% include 'shared/zero_balance_error.html' %} + {% include 'shared/unlock_metamask.html' %} +
+
+
+
- {% include 'shared/no_metamask_error.html' %} - {% include 'shared/zero_balance_error.html' %} - {% include 'shared/unlock_metamask.html' %}
- {% include 'shared/bounty_nav.html' with active_item=3 %}

{% trans "Submit Work" %}

diff --git a/app/dashboard/templates/increase_bounty.html b/app/dashboard/templates/increase_bounty.html index 27bc7b1bd8b..5f628dc1221 100644 --- a/app/dashboard/templates/increase_bounty.html +++ b/app/dashboard/templates/increase_bounty.html @@ -29,13 +29,21 @@
{% include 'shared/nav.html' %}
-
-
-
+
+
+
+ {% include 'shared/current_balance.html' %} +
+
+ {% include 'shared/no_issue_error.html' %} + {% include 'shared/no_metamask_error.html' %} + {% include 'shared/zero_balance_error.html' %} + {% include 'shared/unlock_metamask.html' %} +
+
+
+
- {% include 'shared/no_metamask_error.html' %} - {% include 'shared/zero_balance_error.html' %} - {% include 'shared/unlock_metamask.html' %} {% include 'shared/nav.html' %}
-
-
-
+
+
+
+ {% include 'shared/current_balance.html' %} +
+
+ {% include 'shared/no_issue_error.html' %} + {% include 'shared/no_metamask_error.html' %} + {% include 'shared/zero_balance_error.html' %} + {% include 'shared/unlock_metamask.html' %} +
+
+
+
- {% include 'shared/no_metamask_error.html' %} - {% include 'shared/zero_balance_error.html' %} - {% include 'shared/unlock_metamask.html' %}
diff --git a/app/dashboard/templates/process_bounty.html b/app/dashboard/templates/process_bounty.html index ba5ebb9554f..4337cb48f56 100644 --- a/app/dashboard/templates/process_bounty.html +++ b/app/dashboard/templates/process_bounty.html @@ -28,16 +28,23 @@
{% include 'shared/nav.html' %}
-
-
-
+
+
+
+ {% include 'shared/current_balance.html' %} +
+
+ {% include 'shared/no_issue_error.html' %} + {% include 'shared/no_metamask_error.html' %} + {% include 'shared/zero_balance_error.html' %} + {% include 'shared/unlock_metamask.html' %} +
+
+
+
- {% include 'shared/no_metamask_error.html' %} - {% include 'shared/zero_balance_error.html' %} - {% include 'shared/unlock_metamask.html' %}
- {% include 'shared/bounty_nav.html' with active_item=4 %}

{% trans "Accept Bounty Fulfillment" %}

From 74aa0670241091151c87d0ecb074e74c687f54e8 Mon Sep 17 00:00:00 2001 From: Saptak Sengupta Date: Mon, 4 Jun 2018 22:39:29 +0530 Subject: [PATCH 2/8] Reduce width of upper left current balance label --- app/dashboard/templates/fulfill_bounty.html | 4 ++-- app/dashboard/templates/increase_bounty.html | 4 ++-- app/dashboard/templates/kill_bounty.html | 4 ++-- app/dashboard/templates/process_bounty.html | 4 ++-- app/dashboard/templates/submit_bounty.html | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/dashboard/templates/fulfill_bounty.html b/app/dashboard/templates/fulfill_bounty.html index ddbea5af95e..286ec888f36 100644 --- a/app/dashboard/templates/fulfill_bounty.html +++ b/app/dashboard/templates/fulfill_bounty.html @@ -29,10 +29,10 @@
-
+
{% include 'shared/current_balance.html' %}
-
+
{% include 'shared/no_issue_error.html' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} diff --git a/app/dashboard/templates/increase_bounty.html b/app/dashboard/templates/increase_bounty.html index 5f628dc1221..655aaff8319 100644 --- a/app/dashboard/templates/increase_bounty.html +++ b/app/dashboard/templates/increase_bounty.html @@ -31,10 +31,10 @@
-
+
{% include 'shared/current_balance.html' %}
-
+
{% include 'shared/no_issue_error.html' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} diff --git a/app/dashboard/templates/kill_bounty.html b/app/dashboard/templates/kill_bounty.html index 0fd1942c5ae..51d5748afdc 100644 --- a/app/dashboard/templates/kill_bounty.html +++ b/app/dashboard/templates/kill_bounty.html @@ -29,10 +29,10 @@
-
+
{% include 'shared/current_balance.html' %}
-
+
{% include 'shared/no_issue_error.html' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} diff --git a/app/dashboard/templates/process_bounty.html b/app/dashboard/templates/process_bounty.html index 4337cb48f56..e9be44291ac 100644 --- a/app/dashboard/templates/process_bounty.html +++ b/app/dashboard/templates/process_bounty.html @@ -30,10 +30,10 @@
-
+
{% include 'shared/current_balance.html' %}
-
+
{% include 'shared/no_issue_error.html' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} diff --git a/app/dashboard/templates/submit_bounty.html b/app/dashboard/templates/submit_bounty.html index a00dc7d3295..b65938c54ab 100644 --- a/app/dashboard/templates/submit_bounty.html +++ b/app/dashboard/templates/submit_bounty.html @@ -31,10 +31,10 @@
-
+
{% include 'shared/current_balance.html' %}
-
+
{% include 'shared/no_issue_error.html' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} From 995a954da08464709e93e5f34db0615a134347a4 Mon Sep 17 00:00:00 2001 From: Saptak Sengupta Date: Mon, 4 Jun 2018 23:36:33 +0530 Subject: [PATCH 3/8] Update banner content for different pages --- app/assets/v2/css/base.css | 11 ++- app/assets/v2/images/Box.svg | 68 +++++++++++++++++++ app/assets/v2/images/Refund.svg | 26 +++++++ app/assets/v2/js/shared.js | 4 ++ app/dashboard/templates/fulfill_bounty.html | 6 +- app/dashboard/templates/increase_bounty.html | 4 +- app/dashboard/templates/kill_bounty.html | 6 +- app/dashboard/templates/process_bounty.html | 6 +- .../templates/shared/accept_work_banner.html | 33 +++++++++ .../templates/shared/cancel_work_banner.html | 30 ++++++++ .../templates/shared/submit_work_banner.html | 30 ++++++++ .../templates/shared/zero_balance_error.html | 18 ++--- app/dashboard/templates/submit_bounty.html | 4 +- 13 files changed, 221 insertions(+), 25 deletions(-) create mode 100644 app/assets/v2/images/Box.svg create mode 100644 app/assets/v2/images/Refund.svg create mode 100644 app/dashboard/templates/shared/accept_work_banner.html create mode 100644 app/dashboard/templates/shared/cancel_work_banner.html create mode 100644 app/dashboard/templates/shared/submit_work_banner.html diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index 68766912718..6896cbeca6e 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -1178,13 +1178,22 @@ input.is-invalid { } .metamask-error img { - max-width: 150px; + max-width: 100px; } .metamask-banner #upper_left { height: 100%; } +.metamask-banner h3 { + letter-spacing: 0; +} + +.metamask-banner p, +.metamask-banner li { + font-size: 0.85rem; +} + @media (max-width: 1350px) { .profile_details .tips li div.details { width: 300px; diff --git a/app/assets/v2/images/Box.svg b/app/assets/v2/images/Box.svg new file mode 100644 index 00000000000..1b2a32012c4 --- /dev/null +++ b/app/assets/v2/images/Box.svg @@ -0,0 +1,68 @@ + + + + Metamask Copy 3 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/v2/images/Refund.svg b/app/assets/v2/images/Refund.svg new file mode 100644 index 00000000000..6960f310cde --- /dev/null +++ b/app/assets/v2/images/Refund.svg @@ -0,0 +1,26 @@ + + + + Metamask Copy 4 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js index 7ed1f3a4be0..f5becf056e4 100644 --- a/app/assets/v2/js/shared.js +++ b/app/assets/v2/js/shared.js @@ -571,6 +571,7 @@ var trigger_primary_form_web3_hooks = function() { $('#no_metamask_error').css('display', 'block'); $('#zero_balance_error').css('display', 'none'); $('#primary_form').addClass('hidden'); + $('.submit_bounty .newsletter').addClass('hidden'); $('#unlock_metamask_error').css('display', 'none'); $('#no_issue_error').css('display', 'none'); mixpanel_track_once('No Metamask Error', params); @@ -579,11 +580,13 @@ var trigger_primary_form_web3_hooks = function() { $('#zero_balance_error').css('display', 'none'); $('#no_metamask_error').css('display', 'none'); $('#primary_form').addClass('hidden'); + $('.submit_bounty .newsletter').addClass('hidden'); $('#no_issue_error').css('display', 'none'); mixpanel_track_once('Unlock Metamask Error', params); } else if (is_zero_balance_not_okay && document.balance == 0) { $('#zero_balance_error').css('display', 'block'); $('#primary_form').addClass('hidden'); + $('.submit_bounty .newsletter').addClass('hidden'); $('#unlock_metamask_error').css('display', 'none'); $('#no_metamask_error').css('display', 'none'); $('#no_issue_error').css('display', 'none'); @@ -594,6 +597,7 @@ var trigger_primary_form_web3_hooks = function() { $('#no_metamask_error').css('display', 'none'); $('#no_issue_error').css('display', 'block'); $('#primary_form').removeClass('hidden'); + $('.submit_bounty .newsletter').removeClass('hidden'); } } }; diff --git a/app/dashboard/templates/fulfill_bounty.html b/app/dashboard/templates/fulfill_bounty.html index 286ec888f36..f79912634fe 100644 --- a/app/dashboard/templates/fulfill_bounty.html +++ b/app/dashboard/templates/fulfill_bounty.html @@ -28,12 +28,12 @@ {% include 'shared/nav.html' %}
-
-
+
+
{% include 'shared/current_balance.html' %}
- {% include 'shared/no_issue_error.html' %} + {% include 'shared/submit_work_banner.html' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} {% include 'shared/unlock_metamask.html' %} diff --git a/app/dashboard/templates/increase_bounty.html b/app/dashboard/templates/increase_bounty.html index 655aaff8319..8886eba4cca 100644 --- a/app/dashboard/templates/increase_bounty.html +++ b/app/dashboard/templates/increase_bounty.html @@ -30,8 +30,8 @@ {% include 'shared/nav.html' %}
-
-
+
+
{% include 'shared/current_balance.html' %}
diff --git a/app/dashboard/templates/kill_bounty.html b/app/dashboard/templates/kill_bounty.html index 51d5748afdc..62a76806c1c 100644 --- a/app/dashboard/templates/kill_bounty.html +++ b/app/dashboard/templates/kill_bounty.html @@ -28,12 +28,12 @@ {% include 'shared/nav.html' %}
-
-
+
+
{% include 'shared/current_balance.html' %}
- {% include 'shared/no_issue_error.html' %} + {% include 'shared/cancel_work_banner.html' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} {% include 'shared/unlock_metamask.html' %} diff --git a/app/dashboard/templates/process_bounty.html b/app/dashboard/templates/process_bounty.html index e9be44291ac..8f6033f7e7e 100644 --- a/app/dashboard/templates/process_bounty.html +++ b/app/dashboard/templates/process_bounty.html @@ -29,12 +29,12 @@ {% include 'shared/nav.html' %}
-
-
+
+
{% include 'shared/current_balance.html' %}
- {% include 'shared/no_issue_error.html' %} + {% include 'shared/accept_work_banner.html' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} {% include 'shared/unlock_metamask.html' %} diff --git a/app/dashboard/templates/shared/accept_work_banner.html b/app/dashboard/templates/shared/accept_work_banner.html new file mode 100644 index 00000000000..78d4e20d0e5 --- /dev/null +++ b/app/dashboard/templates/shared/accept_work_banner.html @@ -0,0 +1,33 @@ +{% comment %} + Copyright (C) 2018 Gitcoin Core + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +{% endcomment %} +{% load i18n static %} +
+
+
+

{% trans "Accepting a Submission is Exciting" %}

+

+

    +
  1. {% trans "Make sure the submitter has completed the requirements to the specifications of your bounty." %}
    2. +
  2. {% trans "Feedbacks and gratitude are always nice ways to continue a relationship." %}
    3. +
+

+
+
+ +
+
+
diff --git a/app/dashboard/templates/shared/cancel_work_banner.html b/app/dashboard/templates/shared/cancel_work_banner.html new file mode 100644 index 00000000000..8c6c96507e3 --- /dev/null +++ b/app/dashboard/templates/shared/cancel_work_banner.html @@ -0,0 +1,30 @@ +{% comment %} + Copyright (C) 2018 Gitcoin Core + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +{% endcomment %} +{% load i18n static %} +
+
+
+

{% trans "Cancelling a Bounty is Sometimes Necessary" %}

+

+ {% trans "Don't forget once you cancel you can reclaim the fund to reuse on your next bounty." %} +

+
+
+ +
+
+
diff --git a/app/dashboard/templates/shared/submit_work_banner.html b/app/dashboard/templates/shared/submit_work_banner.html new file mode 100644 index 00000000000..e8ef72b73e0 --- /dev/null +++ b/app/dashboard/templates/shared/submit_work_banner.html @@ -0,0 +1,30 @@ +{% comment %} + Copyright (C) 2018 Gitcoin Core + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +{% endcomment %} +{% load i18n static %} +
+
+
+

{% trans "Submit Work" %}

+

+ {% trans "You have worked really hard! Time to submit work and get paid" %} +

+
+
+ +
+
+
diff --git a/app/dashboard/templates/shared/zero_balance_error.html b/app/dashboard/templates/shared/zero_balance_error.html index bcc1f6159ca..f7d32a74f70 100644 --- a/app/dashboard/templates/shared/zero_balance_error.html +++ b/app/dashboard/templates/shared/zero_balance_error.html @@ -20,21 +20,17 @@

{% trans "You're almost there!" %}

- {% trans "In order to continue, you'll need some Ether." %} -

-

- {% trans "'Ether' is a digital asset that can be used to pay for the computational resources needed to run an application or program. In this case, Gitcoin." %} -

-

- {% trans "The easiest way to get Ether is to request it via the Gitcoin Faucet:" %} +

    +
  1. {% trans "In order to continue, you'll need some Ether." %}
    2. +
  2. {% trans "'Ether' is a digital asset that can be used to pay for the computational resources needed to run an application or program. In this case, Gitcoin." %}
    3. +
  3. {% trans "The easiest way to get Ether is to request it via the Gitcoin Faucet:" %}
    4. +

- {% trans "View Faucet" %} -
- - {% trans "or" %} - -
+ {% trans "View Faucet" %} +

{% trans "Can't get web3 to work? Get help here." %}

diff --git a/app/dashboard/templates/submit_bounty.html b/app/dashboard/templates/submit_bounty.html index b65938c54ab..bbd5260141e 100644 --- a/app/dashboard/templates/submit_bounty.html +++ b/app/dashboard/templates/submit_bounty.html @@ -30,8 +30,8 @@
-
-
+
+
{% include 'shared/current_balance.html' %}
From 98cbb33efb21d1cd1a789ea42a910b72284c03e0 Mon Sep 17 00:00:00 2001 From: Saptak Sengupta Date: Mon, 4 Jun 2018 23:51:47 +0530 Subject: [PATCH 4/8] Add robot in the blank area --- app/assets/v2/css/base.css | 9 +++++++++ app/assets/v2/js/shared.js | 4 ++++ app/dashboard/templates/fulfill_bounty.html | 3 +++ app/dashboard/templates/increase_bounty.html | 3 +++ app/dashboard/templates/kill_bounty.html | 3 +++ app/dashboard/templates/process_bounty.html | 3 +++ app/dashboard/templates/shared/cancel_work_banner.html | 2 +- app/dashboard/templates/submit_bounty.html | 3 +++ 8 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index 6896cbeca6e..3289d8c61df 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -1194,6 +1194,15 @@ input.is-invalid { font-size: 0.85rem; } +#robot_error { + width: 25%; + margin: 0 auto; +} + +#robot_error img { + width: 100%; +} + @media (max-width: 1350px) { .profile_details .tips li div.details { width: 300px; diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js index f5becf056e4..5158c3da112 100644 --- a/app/assets/v2/js/shared.js +++ b/app/assets/v2/js/shared.js @@ -570,6 +570,7 @@ var trigger_primary_form_web3_hooks = function() { if (typeof web3 == 'undefined') { $('#no_metamask_error').css('display', 'block'); $('#zero_balance_error').css('display', 'none'); + $('#robot_error').removeClass('hidden'); $('#primary_form').addClass('hidden'); $('.submit_bounty .newsletter').addClass('hidden'); $('#unlock_metamask_error').css('display', 'none'); @@ -579,12 +580,14 @@ var trigger_primary_form_web3_hooks = function() { $('#unlock_metamask_error').css('display', 'block'); $('#zero_balance_error').css('display', 'none'); $('#no_metamask_error').css('display', 'none'); + $('#robot_error').removeClass('hidden'); $('#primary_form').addClass('hidden'); $('.submit_bounty .newsletter').addClass('hidden'); $('#no_issue_error').css('display', 'none'); mixpanel_track_once('Unlock Metamask Error', params); } else if (is_zero_balance_not_okay && document.balance == 0) { $('#zero_balance_error').css('display', 'block'); + $('#robot_error').removeClass('hidden'); $('#primary_form').addClass('hidden'); $('.submit_bounty .newsletter').addClass('hidden'); $('#unlock_metamask_error').css('display', 'none'); @@ -596,6 +599,7 @@ var trigger_primary_form_web3_hooks = function() { $('#unlock_metamask_error').css('display', 'none'); $('#no_metamask_error').css('display', 'none'); $('#no_issue_error').css('display', 'block'); + $('#robot_error').addClass('hidden'); $('#primary_form').removeClass('hidden'); $('.submit_bounty .newsletter').removeClass('hidden'); } diff --git a/app/dashboard/templates/fulfill_bounty.html b/app/dashboard/templates/fulfill_bounty.html index f79912634fe..4400f4d7b2e 100644 --- a/app/dashboard/templates/fulfill_bounty.html +++ b/app/dashboard/templates/fulfill_bounty.html @@ -42,6 +42,9 @@
+
diff --git a/app/dashboard/templates/increase_bounty.html b/app/dashboard/templates/increase_bounty.html index 8886eba4cca..dbf7b5d2ee5 100644 --- a/app/dashboard/templates/increase_bounty.html +++ b/app/dashboard/templates/increase_bounty.html @@ -44,6 +44,9 @@
+
+
diff --git a/app/dashboard/templates/process_bounty.html b/app/dashboard/templates/process_bounty.html index 8f6033f7e7e..3eeb5b38fff 100644 --- a/app/dashboard/templates/process_bounty.html +++ b/app/dashboard/templates/process_bounty.html @@ -43,6 +43,9 @@
+
diff --git a/app/dashboard/templates/shared/cancel_work_banner.html b/app/dashboard/templates/shared/cancel_work_banner.html index 8c6c96507e3..dbf0ad455ec 100644 --- a/app/dashboard/templates/shared/cancel_work_banner.html +++ b/app/dashboard/templates/shared/cancel_work_banner.html @@ -20,7 +20,7 @@

{% trans "Cancelling a Bounty is Sometimes Necessary" %}

- {% trans "Don't forget once you cancel you can reclaim the fund to reuse on your next bounty." %} + {% trans "Don't forget once you cancel you can reclaim the fund to reuse it on your next bounty." %}

diff --git a/app/dashboard/templates/submit_bounty.html b/app/dashboard/templates/submit_bounty.html index bbd5260141e..df03dadbf12 100644 --- a/app/dashboard/templates/submit_bounty.html +++ b/app/dashboard/templates/submit_bounty.html @@ -45,6 +45,9 @@
+

{% trans "Fund an Issue" %}

From b056d1635d6e8b629a8b9a38654b4b9202549ce6 Mon Sep 17 00:00:00 2001 From: Saptak Sengupta Date: Tue, 5 Jun 2018 00:49:24 +0530 Subject: [PATCH 5/8] Handled Adity's comments --- app/dashboard/templates/shared/accept_work_banner.html | 2 +- app/dashboard/templates/shared/cancel_work_banner.html | 2 +- app/dashboard/templates/shared/no_issue_error.html | 2 +- app/dashboard/templates/shared/zero_balance_error.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/dashboard/templates/shared/accept_work_banner.html b/app/dashboard/templates/shared/accept_work_banner.html index 78d4e20d0e5..d466b58597c 100644 --- a/app/dashboard/templates/shared/accept_work_banner.html +++ b/app/dashboard/templates/shared/accept_work_banner.html @@ -27,7 +27,7 @@

{% trans "Accepting a Submission is Exciting" %}

- +
diff --git a/app/dashboard/templates/shared/cancel_work_banner.html b/app/dashboard/templates/shared/cancel_work_banner.html index dbf0ad455ec..6f7b8ad6e76 100644 --- a/app/dashboard/templates/shared/cancel_work_banner.html +++ b/app/dashboard/templates/shared/cancel_work_banner.html @@ -24,7 +24,7 @@

{% trans "Cancelling a Bounty is Sometimes Necessary" %}

- +
diff --git a/app/dashboard/templates/shared/no_issue_error.html b/app/dashboard/templates/shared/no_issue_error.html index f59fe89cbd3..4b9ae7b4cb0 100644 --- a/app/dashboard/templates/shared/no_issue_error.html +++ b/app/dashboard/templates/shared/no_issue_error.html @@ -27,7 +27,7 @@

{% trans "Tips for Funding an Issue" %}

- +
diff --git a/app/dashboard/templates/shared/zero_balance_error.html b/app/dashboard/templates/shared/zero_balance_error.html index f7d32a74f70..b8bfab11958 100644 --- a/app/dashboard/templates/shared/zero_balance_error.html +++ b/app/dashboard/templates/shared/zero_balance_error.html @@ -29,7 +29,7 @@

{% trans "You're almost there!" %}

- {% trans "View Faucet" %} + {% trans "View Faucet" %}

{% trans "Can't get web3 to work? Get help here." %}

From bd10b8d9102af9f162145c7a0786af21ccf57a4f Mon Sep 17 00:00:00 2001 From: Aditya Anand Date: Tue, 5 Jun 2018 01:11:38 +0530 Subject: [PATCH 6/8] renamed svg --- app/assets/v2/images/Box.svg | 68 --------------------------------- app/assets/v2/images/Refund.svg | 26 ------------- app/assets/v2/images/box.svg | 1 + app/assets/v2/images/refund.svg | 1 + 4 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 app/assets/v2/images/Box.svg delete mode 100644 app/assets/v2/images/Refund.svg create mode 100644 app/assets/v2/images/box.svg create mode 100644 app/assets/v2/images/refund.svg diff --git a/app/assets/v2/images/Box.svg b/app/assets/v2/images/Box.svg deleted file mode 100644 index 1b2a32012c4..00000000000 --- a/app/assets/v2/images/Box.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - Metamask Copy 3 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/v2/images/Refund.svg b/app/assets/v2/images/Refund.svg deleted file mode 100644 index 6960f310cde..00000000000 --- a/app/assets/v2/images/Refund.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - Metamask Copy 4 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/v2/images/box.svg b/app/assets/v2/images/box.svg new file mode 100644 index 00000000000..d66704edf0c --- /dev/null +++ b/app/assets/v2/images/box.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/v2/images/refund.svg b/app/assets/v2/images/refund.svg new file mode 100644 index 00000000000..9a63c4f259f --- /dev/null +++ b/app/assets/v2/images/refund.svg @@ -0,0 +1 @@ + \ No newline at end of file From 2849605640d218de2eb28e095708287c9f0370f5 Mon Sep 17 00:00:00 2001 From: Saptak Sengupta Date: Tue, 5 Jun 2018 04:05:12 +0530 Subject: [PATCH 7/8] Use a single template file for different banners --- app/dashboard/templates/fulfill_bounty.html | 2 +- app/dashboard/templates/increase_bounty.html | 2 +- app/dashboard/templates/kill_bounty.html | 2 +- app/dashboard/templates/process_bounty.html | 2 +- .../templates/shared/accept_work_banner.html | 33 ----------- .../templates/shared/cancel_work_banner.html | 30 ---------- .../templates/shared/no_issue_error.html | 55 +++++++++++++++++-- .../templates/shared/submit_work_banner.html | 30 ---------- app/dashboard/templates/submit_bounty.html | 2 +- 9 files changed, 56 insertions(+), 102 deletions(-) delete mode 100644 app/dashboard/templates/shared/accept_work_banner.html delete mode 100644 app/dashboard/templates/shared/cancel_work_banner.html delete mode 100644 app/dashboard/templates/shared/submit_work_banner.html diff --git a/app/dashboard/templates/fulfill_bounty.html b/app/dashboard/templates/fulfill_bounty.html index 4400f4d7b2e..48d3c955e59 100644 --- a/app/dashboard/templates/fulfill_bounty.html +++ b/app/dashboard/templates/fulfill_bounty.html @@ -33,7 +33,7 @@ {% include 'shared/current_balance.html' %}
- {% include 'shared/submit_work_banner.html' %} + {% include 'shared/no_issue_error.html' with page='fulfill_bounty' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} {% include 'shared/unlock_metamask.html' %} diff --git a/app/dashboard/templates/increase_bounty.html b/app/dashboard/templates/increase_bounty.html index dbf7b5d2ee5..c0a1de2af78 100644 --- a/app/dashboard/templates/increase_bounty.html +++ b/app/dashboard/templates/increase_bounty.html @@ -35,7 +35,7 @@ {% include 'shared/current_balance.html' %}
- {% include 'shared/no_issue_error.html' %} + {% include 'shared/no_issue_error.html' with page='submit_bounty' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} {% include 'shared/unlock_metamask.html' %} diff --git a/app/dashboard/templates/kill_bounty.html b/app/dashboard/templates/kill_bounty.html index 32ce4135f5c..c278049f703 100644 --- a/app/dashboard/templates/kill_bounty.html +++ b/app/dashboard/templates/kill_bounty.html @@ -33,7 +33,7 @@ {% include 'shared/current_balance.html' %}
- {% include 'shared/cancel_work_banner.html' %} + {% include 'shared/no_issue_error.html' with page='kill_bounty' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} {% include 'shared/unlock_metamask.html' %} diff --git a/app/dashboard/templates/process_bounty.html b/app/dashboard/templates/process_bounty.html index 3eeb5b38fff..04425c3475a 100644 --- a/app/dashboard/templates/process_bounty.html +++ b/app/dashboard/templates/process_bounty.html @@ -34,7 +34,7 @@ {% include 'shared/current_balance.html' %}
- {% include 'shared/accept_work_banner.html' %} + {% include 'shared/no_issue_error.html' with page='process_bounty' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} {% include 'shared/unlock_metamask.html' %} diff --git a/app/dashboard/templates/shared/accept_work_banner.html b/app/dashboard/templates/shared/accept_work_banner.html deleted file mode 100644 index d466b58597c..00000000000 --- a/app/dashboard/templates/shared/accept_work_banner.html +++ /dev/null @@ -1,33 +0,0 @@ -{% comment %} - Copyright (C) 2018 Gitcoin Core - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -{% endcomment %} -{% load i18n static %} -
-
-
-

{% trans "Accepting a Submission is Exciting" %}

-

-

    -
  1. {% trans "Make sure the submitter has completed the requirements to the specifications of your bounty." %}
    2. -
  2. {% trans "Feedbacks and gratitude are always nice ways to continue a relationship." %}
    3. -
-

-
-
- -
-
-
diff --git a/app/dashboard/templates/shared/cancel_work_banner.html b/app/dashboard/templates/shared/cancel_work_banner.html deleted file mode 100644 index 6f7b8ad6e76..00000000000 --- a/app/dashboard/templates/shared/cancel_work_banner.html +++ /dev/null @@ -1,30 +0,0 @@ -{% comment %} - Copyright (C) 2018 Gitcoin Core - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -{% endcomment %} -{% load i18n static %} -
-
-
-

{% trans "Cancelling a Bounty is Sometimes Necessary" %}

-

- {% trans "Don't forget once you cancel you can reclaim the fund to reuse it on your next bounty." %} -

-
-
- -
-
-
diff --git a/app/dashboard/templates/shared/no_issue_error.html b/app/dashboard/templates/shared/no_issue_error.html index 4b9ae7b4cb0..dc3b9922a65 100644 --- a/app/dashboard/templates/shared/no_issue_error.html +++ b/app/dashboard/templates/shared/no_issue_error.html @@ -15,19 +15,66 @@ along with this program. If not, see . {% endcomment %} {% load i18n static %} +{% if page == 'submit_bounty' %}
+
+
+

{% trans "Tips for Funding an Issue" %}

+

+

    +
  1. {% trans "Create an issue on Github so that we can reference the details of the issue." %}
    2. +
  2. {% trans "What to fund? A new feature, feature improvements, bug fixes, code review, design and more." %}
    3. +
+

+
+
+ +
+
+
+{% elif page == 'kill_bounty' %} +
-

{% trans "Tips for Funding an Issue" %}

+

{% trans "Cancelling a Bounty is Sometimes Necessary" %}

+

+ {% trans "Don't forget once you cancel you can reclaim the fund to reuse it on your next bounty." %} +

+
+
+ +
+
+
+{% elif page == 'process_bounty' %} +
+
+
+

{% trans "Accepting a Submission is Exciting" %}

    -
  1. {% trans "Create an issue on Github so that we can reference the details of the issue." %}
    2. -
  2. {% trans "What to fund? A new feature, feature improvements, bug fixes, code review, design and more." %}
    3. +
  3. {% trans "Make sure the submitter has completed the requirements to the specifications of your bounty." %}
    4. +
  4. {% trans "Feedbacks and gratitude are always nice ways to continue a relationship." %}

- + +
+
+
+{% elif page == 'fulfill_bounty' %} +
+
+
+

{% trans "Submit Work" %}

+

+ {% trans "You have worked really hard! Time to submit work and get paid" %} +

+
+
+
+{% endif %} diff --git a/app/dashboard/templates/shared/submit_work_banner.html b/app/dashboard/templates/shared/submit_work_banner.html deleted file mode 100644 index e8ef72b73e0..00000000000 --- a/app/dashboard/templates/shared/submit_work_banner.html +++ /dev/null @@ -1,30 +0,0 @@ -{% comment %} - Copyright (C) 2018 Gitcoin Core - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -{% endcomment %} -{% load i18n static %} -
-
-
-

{% trans "Submit Work" %}

-

- {% trans "You have worked really hard! Time to submit work and get paid" %} -

-
-
- -
-
-
diff --git a/app/dashboard/templates/submit_bounty.html b/app/dashboard/templates/submit_bounty.html index df03dadbf12..625b14f990a 100644 --- a/app/dashboard/templates/submit_bounty.html +++ b/app/dashboard/templates/submit_bounty.html @@ -35,7 +35,7 @@ {% include 'shared/current_balance.html' %}
- {% include 'shared/no_issue_error.html' %} + {% include 'shared/no_issue_error.html' with page='submit_bounty' %} {% include 'shared/no_metamask_error.html' %} {% include 'shared/zero_balance_error.html' %} {% include 'shared/unlock_metamask.html' %} From 958a7c68cffd1e3bd38ab0aceab02162edd65508 Mon Sep 17 00:00:00 2001 From: Aditya Anand Date: Thu, 7 Jun 2018 13:21:06 +0530 Subject: [PATCH 8/8] banner: fixed padding + margin on mobile --- app/assets/v2/css/base.css | 28 +++++++++++++++++++ .../templates/shared/no_issue_error.html | 4 +-- .../templates/shared/unlock_metamask.html | 4 +-- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index 3289d8c61df..fafa2d2bf6f 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -1187,6 +1187,11 @@ input.is-invalid { .metamask-banner h3 { letter-spacing: 0; + padding-bottom: 4px; +} + +.metamask-banner p { + margin-bottom: 0 !important; } .metamask-banner p, @@ -1439,6 +1444,11 @@ input.is-invalid { #primary_form { max-width: 100%; } + + .no_issue_error ol { + padding-left: 1px; + padding-right: 1px; + } } @media (max-width: 481px) { @@ -1610,6 +1620,24 @@ input.is-invalid { .bounty_nav li { display: block; } + + .metamask-banner ol { + margin-bottom: 0; + } + + .metamask-banner h3 { + margin-top: 0.5rem; + margin-bottom: 0.5rem; + } + + .metamask-banner li { + text-align: left; + margin-top: 0.5rem; + } + + .metamask-banner img { + margin-bottom: 5px; + } } @media (max-width: 991.98px) { diff --git a/app/dashboard/templates/shared/no_issue_error.html b/app/dashboard/templates/shared/no_issue_error.html index dc3b9922a65..c86fad76ce8 100644 --- a/app/dashboard/templates/shared/no_issue_error.html +++ b/app/dashboard/templates/shared/no_issue_error.html @@ -17,8 +17,8 @@ {% load i18n static %} {% if page == 'submit_bounty' %}
-
-
+
+

{% trans "Tips for Funding an Issue" %}

    diff --git a/app/dashboard/templates/shared/unlock_metamask.html b/app/dashboard/templates/shared/unlock_metamask.html index c7f46bcc317..17160661720 100644 --- a/app/dashboard/templates/shared/unlock_metamask.html +++ b/app/dashboard/templates/shared/unlock_metamask.html @@ -16,8 +16,8 @@ {% endcomment %} {% load i18n static %}