diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index 4a87b948d27..b6764574481 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -547,14 +547,6 @@ input[type=text].loading { color: white; } -.submit_bounty #network_status div { - display: inline; -} - -#network_status div span { - color: #4aeba8; -} - .submit_bounty select[name=denomination] { text-align: left; } diff --git a/app/assets/v2/js/pages/process_bounty.js b/app/assets/v2/js/pages/process_bounty.js index 24bd5e1451d..7c9a11e0fe7 100644 --- a/app/assets/v2/js/pages/process_bounty.js +++ b/app/assets/v2/js/pages/process_bounty.js @@ -32,7 +32,7 @@ window.onload = function() { var account = web3.eth.accounts[0]; if (getParam('source')) { - $('input[name=issueURL]').val(getParam('source')); + $('#issueURL').html(getParam('source')); } $('#tipPercent').change(function() { @@ -64,7 +64,7 @@ window.onload = function() { }; - var issueURL = $('input[name=issueURL]').val(); + var issueURL = $('#issueURL').text(); waitforWeb3(function() { var uri = '/api/v0.1/bounties/?github_url=' + issueURL + '&network=' + document.web3network; @@ -85,7 +85,7 @@ window.onload = function() { var pct = parseFloat($('#tipPercent').val()) * 0.01; var email = ''; - var github_url = $('#issueURL').val(); + var github_url = $('#issueURL').text(); var from_name = document.contxt['github_handle']; var username = getSelectedFulfillment() && getSelectedFulfillment().getAttribute('username'); var amountInEth = bounty_amount * pct; @@ -117,7 +117,7 @@ window.onload = function() { // get form data var email = ''; - var github_url = $('#issueURL').val(); + var github_url = $('#issueURL').text(); var from_name = document.contxt['github_handle']; var username = getSelectedFulfillment() && getSelectedFulfillment().getAttribute('username'); var amountInEth = selected_kudos.price_finney / 1000.0; @@ -157,7 +157,7 @@ window.onload = function() { } e.preventDefault(); - var issueURL = $('input[name=issueURL]').val(); + var issueURL = $('#issueURL').text(); var fulfillmentId = getSelectedFulfillment() && getSelectedFulfillment().getAttribute('value'); sessionStorage['bountyId'] = getURLParams('pk'); diff --git a/app/dashboard/templates/process_bounty.html b/app/dashboard/templates/process_bounty.html index d1a16b49f78..5d0eac8d84f 100644 --- a/app/dashboard/templates/process_bounty.html +++ b/app/dashboard/templates/process_bounty.html @@ -62,15 +62,23 @@
-
+ - {% include 'shared/network_status.html' %} -
- - +
+ +

{{ bounty.title }}

+
+
+ +

{{ bounty.github_url }}

@@ -93,7 +101,7 @@

{% trans "Basic Payout" %}

-

Suggested Kudos

+

Suggested Kudos

What is kudos?
@@ -106,7 +114,7 @@

Suggested Kudos

{% include 'shared/bounty_actions_hidden_vars.html' %} {% include 'shared/wallet_estimate.html' %}
-
+
diff --git a/app/dashboard/templates/shared/network_status.html b/app/dashboard/templates/shared/network_status.html deleted file mode 100644 index c57752a3ef3..00000000000 --- a/app/dashboard/templates/shared/network_status.html +++ /dev/null @@ -1,24 +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 %} -
-
- Web3: ☑ - {% trans "Enabled" %} -
- Eth: ☑ - {% trans "Available" %} -
-
diff --git a/app/faucet/templates/faucet_form.html b/app/faucet/templates/faucet_form.html index 4cae4165845..53ec2c274be 100644 --- a/app/faucet/templates/faucet_form.html +++ b/app/faucet/templates/faucet_form.html @@ -47,13 +47,10 @@

{% trans "Faucet Request" %} {% trans "Alpha" %}

-
+
{% include 'svgs/gas.svg' %}
-
- {% include 'shared/faucet_network_status.html' %} -

{% trans "Please note, all input fields are required. Comment is optional." %} diff --git a/app/faucet/templates/shared/faucet_network_status.html b/app/faucet/templates/shared/faucet_network_status.html deleted file mode 100644 index 39e80412092..00000000000 --- a/app/faucet/templates/shared/faucet_network_status.html +++ /dev/null @@ -1,26 +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 %} - -

-
- Web3: ☑ - {% trans "Enabled" %} -
- Eth: ☑ - {% trans "About Zero" %} -
-