diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index 4151f8743ec..b45ba16bcf3 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -1177,6 +1177,37 @@ input.is-invalid { background-color: #FF6700; } +.metamask-error img { + max-width: 100px; +} + +.metamask-banner #upper_left { + height: 100%; +} + +.metamask-banner h3 { + letter-spacing: 0; + padding-bottom: 4px; +} + +.metamask-banner p { + margin-bottom: 0 !important; +} + +.metamask-banner p, +.metamask-banner li { + 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; @@ -1413,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) { @@ -1584,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/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 diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js index 91fed75269b..f7940773dc2 100644 --- a/app/assets/v2/js/shared.js +++ b/app/assets/v2/js/shared.js @@ -575,17 +575,29 @@ 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'); $('#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'); + $('#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'); + $('#no_metamask_error').css('display', 'none'); $('#no_issue_error').css('display', 'none'); mixpanel_track_once('Zero Balance Metamask Error', params); } else { @@ -593,7 +605,9 @@ 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 62f6bec0c92..48d3c955e59 100644 --- a/app/dashboard/templates/fulfill_bounty.html +++ b/app/dashboard/templates/fulfill_bounty.html @@ -27,16 +27,26 @@
{% include 'shared/nav.html' %}
-
-
-
+
+
+
+ {% include 'shared/current_balance.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' %} +
+
+
+
- {% 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..c0a1de2af78 100644 --- a/app/dashboard/templates/increase_bounty.html +++ b/app/dashboard/templates/increase_bounty.html @@ -29,13 +29,24 @@
{% include 'shared/nav.html' %}
-
-
-
+
+
+
+ {% include 'shared/current_balance.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' %} +
+
+
+
- {% 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' with page='kill_bounty' %} + {% 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..04425c3475a 100644 --- a/app/dashboard/templates/process_bounty.html +++ b/app/dashboard/templates/process_bounty.html @@ -28,16 +28,26 @@
{% include 'shared/nav.html' %}
-
-
-
+
+
+
+ {% include 'shared/current_balance.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' %} +
+
+
+
- {% 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" %}

diff --git a/app/dashboard/templates/shared/no_issue_error.html b/app/dashboard/templates/shared/no_issue_error.html index f59fe89cbd3..c86fad76ce8 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 "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 "Tips for Funding an Issue" %}

+

{% 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/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 %}