+ Once confirmed on blockchain, your bounty is posted to Gitcoin!
+ Wait for developers across the world to discover your bounty and
+ start working on your issue.
+
In our experience, the following are not good candidates for bounties:
+
In our experience, the following are not good candidates for bounties:
@@ -144,4 +144,18 @@
In our experience, the following are not good candidates
+
+
+
+ {% include 'shared/analytics.html' %}
+ {% include 'shared/footer_scripts.html' %}
+ {% include 'shared/rollbar.html' %}
+ {% include 'shared/footer.html' %}
+
+
+
+
+
\ No newline at end of file
diff --git a/app/dashboard/templates/quickstart_video.html b/app/dashboard/templates/quickstart_video.html
new file mode 100644
index 00000000000..ff51d754305
--- /dev/null
+++ b/app/dashboard/templates/quickstart_video.html
@@ -0,0 +1,22 @@
+{% comment %}
+ Copyright (C) 2017 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 %}
+
From ce710e6185a878958b1165f5e910895a0981b1e1 Mon Sep 17 00:00:00 2001
From: Saptak Sengupta
Date: Sat, 5 May 2018 13:18:07 +0530
Subject: [PATCH 05/23] Funder Flow: Clean forms and put labels
---
app/assets/v2/css/base.css | 36 ++-
app/assets/v2/images/Lightbulb.svg | 19 ++
app/assets/v2/images/metamask-color.svg | 1 +
app/assets/v2/images/metamask.svg | 2 +-
.../templates/shared/no_issue_error.html | 32 ++
.../templates/shared/no_metamask_error.html | 35 ++-
.../templates/shared/unlock_metamask.html | 34 ++-
.../templates/shared/zero_balance_error.html | 45 +--
app/dashboard/templates/submit_bounty.html | 277 +++++++++---------
9 files changed, 270 insertions(+), 211 deletions(-)
create mode 100644 app/assets/v2/images/Lightbulb.svg
create mode 100644 app/assets/v2/images/metamask-color.svg
create mode 100644 app/dashboard/templates/shared/no_issue_error.html
diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
index 2e3d3af75f8..4ce9005c70c 100644
--- a/app/assets/v2/css/base.css
+++ b/app/assets/v2/css/base.css
@@ -520,21 +520,6 @@ input[type=text].loading {
background-size: 30px;
}
-.blocking_error {
- padding: 0 4em;
- text-align: center;
- margin: 100px auto;
- max-width: 100%;
-}
-
-.blocking_error img {
- max-width: 150px;
- filter: grayscale(80%);
- -moz-filter: grayscale(80%);
- -ms-filter: grayscale(80%);
- -o-filter: grayscale(80%);
-}
-
#no_metamask_error img {
filter: grayscale(100%);
-moz-filter: grayscale(100%);
@@ -1252,6 +1237,27 @@ input.is-invalid {
background: #FAFAFA !important;
}
+.submit-notification {
+ color: #fff;
+ font-family: "Muli";
+ font-size: 10px !important;
+ min-height: 100px;
+}
+
+.submit-notification h3 {
+ font-size: 20px !important;
+ text-transform: capitalize;
+}
+
+.submit-notification a {
+ color: #fff;
+}
+
+.metamask-error {
+ background-color: #FF6700;
+}
+
+
@media (max-width: 1350px) {
.profile_details .tips li div.details {
width: 300px;
diff --git a/app/assets/v2/images/Lightbulb.svg b/app/assets/v2/images/Lightbulb.svg
new file mode 100644
index 00000000000..ddd8f2f7d74
--- /dev/null
+++ b/app/assets/v2/images/Lightbulb.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/app/assets/v2/images/metamask-color.svg b/app/assets/v2/images/metamask-color.svg
new file mode 100644
index 00000000000..963c73efa67
--- /dev/null
+++ b/app/assets/v2/images/metamask-color.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/assets/v2/images/metamask.svg b/app/assets/v2/images/metamask.svg
index c92aed33942..11c26ffb8c0 100644
--- a/app/assets/v2/images/metamask.svg
+++ b/app/assets/v2/images/metamask.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/app/dashboard/templates/shared/no_issue_error.html b/app/dashboard/templates/shared/no_issue_error.html
new file mode 100644
index 00000000000..eca64dfb662
--- /dev/null
+++ b/app/dashboard/templates/shared/no_issue_error.html
@@ -0,0 +1,32 @@
+{% comment %}
+ Copyright (C) 2017 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 static %}
+
\ No newline at end of file
diff --git a/app/dashboard/templates/shared/no_metamask_error.html b/app/dashboard/templates/shared/no_metamask_error.html
index a07c3438c39..d9fa0e1f0a8 100644
--- a/app/dashboard/templates/shared/no_metamask_error.html
+++ b/app/dashboard/templates/shared/no_metamask_error.html
@@ -15,22 +15,21 @@
along with this program. If not, see .
{% endcomment %}
{% load i18n static %}
-
- {% include 'shared/bounty_nav.html' with active_item=1 %}
-
-
-
{% trans "To continue, enable Web3." %}
-
- {% trans "Web3 is the same web you know and love, but with Ethereum-enabled functionality." %}
-
-
- {% blocktrans %}The fastest and easiest way to add Web3 to your browser is to install Metamask. To continue submitting a bounty, please install Metamask and return to this page.{% endblocktrans %}
-
+ {% blocktrans %}To interact with the Ethereum Blockchain, you need to install the Metamask Browser Extension.
+ Can't get web3 to work? Get help here.{% endblocktrans %}
+
+
+ {% blocktrans %}The fastest and easiest way to add Web3 to your browser is to install Metamask. To continue submitting a bounty, please install Metamask and return to this page.{% endblocktrans %}
+
+
+
+ +
+
+
diff --git a/app/dashboard/templates/shared/unlock_metamask.html b/app/dashboard/templates/shared/unlock_metamask.html
index e4c70b69a9d..63f3a39fb2e 100644
--- a/app/dashboard/templates/shared/unlock_metamask.html
+++ b/app/dashboard/templates/shared/unlock_metamask.html
@@ -15,19 +15,23 @@
along with this program. If not, see .
{% endcomment %}
{% load i18n static %}
-
- {% include 'shared/bounty_nav.html' with active_item=1 %}
-
-
-
{% trans "You're almost there!" %}
-
- {% trans "In order to continue, you'll need to unlock metamask." %}
-
diff --git a/app/dashboard/templates/shared/zero_balance_error.html b/app/dashboard/templates/shared/zero_balance_error.html
index c4416f550d9..b1c0fa3f00d 100644
--- a/app/dashboard/templates/shared/zero_balance_error.html
+++ b/app/dashboard/templates/shared/zero_balance_error.html
@@ -15,25 +15,28 @@
along with this program. If not, see .
{% endcomment %}
{% load i18n static %}
-
- {% include 'shared/bounty_nav.html' with active_item=1 %}
-
-
-
{% 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:" %}
-
+ {% 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:" %}
+
diff --git a/app/dashboard/templates/submit_bounty.html b/app/dashboard/templates/submit_bounty.html
index 39055bb7b33..aeaccc807ed 100644
--- a/app/dashboard/templates/submit_bounty.html
+++ b/app/dashboard/templates/submit_bounty.html
@@ -1,18 +1,18 @@
{% comment %}
- Copyright (C) 2017 Gitcoin Core
+ Copyright (C) 2017 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 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.
+ 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 .
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
{% endcomment %}
{% load i18n static %}
@@ -20,153 +20,148 @@
- {% include 'shared/head.html' %}
- {% include 'shared/cards.html' %}
+ {% include 'shared/head.html' %}
+ {% include 'shared/cards.html' %}
-
- {% include 'shared/tag_manager_2.html' %}
-
- {% include 'shared/nav.html' %}
-
+
+ {% include 'shared/tag_manager_2.html' %}
+
+ {% include 'shared/nav.html' %}
+
-
-
-
-
- {% include 'shared/no_metamask_error.html' %}
- {% include 'shared/zero_balance_error.html' %}
- {% include 'shared/unlock_metamask.html' %}
-
-
-
- {% include 'shared/newsletter.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/bottom_notification.html' %}
- {% include 'shared/analytics.html' %}
- {% include 'shared/footer_scripts.html' %}
- {% include 'shared/rollbar.html' %}
- {% include 'shared/footer.html' %}
-
+