poanetwork
/
poa-dapps-voting
mirror of https://github.com/poanetwork/poa-dapps-voting.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Link to Oracles wiki in alerts

This commit is contained in:
viktor 2017-06-23 19:47:20 +03:00
parent d5482e8e62
commit 1339ce56a6
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/javascripts/application.js
View File

@ -893,7 +893,7 @@ function getWeb3(callback) {
if (typeof window.web3 === 'undefined') {
// no web3, use fallback
console.error("Please use a web3 browser");
var msgNotEthereum = "You are not connected to Ethereum. Please, switch on Parity or MetaMask client and refresh the page.";
var msgNotEthereum = "You are not connected to Ethereum. Please, switch on Parity or MetaMask client and refresh the page. Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.";
swal("Warning", msgNotEthereum, "warning");
callback(myWeb3, false);
} else {
@ -912,7 +912,7 @@ function getWeb3(callback) {
}
function checkNetworkVersion(web3, cb) {
var msgNotOracles = "You are not connected to Oracles network. Please, switch on Parity or MetaMask client and choose Oracles network.";
var msgNotOracles = "You aren't connected to Oracles network. Please, switch on Parity or MetaMask client and choose Oracles network. Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.";
web3.version.getNetwork(function(err, netId) {
console.log(netId);
switch (netId) {
@ -984,7 +984,7 @@ function startDapp(web3, isOraclesNetwork) {
config.Ethereum[config.environment].contractAddress,
function(_isActive) {
_isActive = !!+_isActive;
if (!_isActive) swal("Warning", "Current key isn't valid voting key. Please, add your voting key to client (MetaMask or Parity) and reload the page", "warning");
if (!_isActive) swal("Warning", "Current key isn't valid voting key. Please, choose your voting key in MetaMask client and reload the page. Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.", "warning");
else $(".choose-key-button").trigger("click");
});
}

6
assets/javascripts/application/index.js
View File

@ -2,7 +2,7 @@ function getWeb3(callback) {
if (typeof window.web3 === 'undefined') {
// no web3, use fallback
console.error("Please use a web3 browser");
var msgNotEthereum = "You are not connected to Ethereum. Please, switch on Parity or MetaMask client and refresh the page.";
var msgNotEthereum = "You are not connected to Ethereum. Please, switch on Parity or MetaMask client and refresh the page. Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.";
swal("Warning", msgNotEthereum, "warning");
callback(myWeb3, false);
} else {
@ -21,7 +21,7 @@ function getWeb3(callback) {
}
function checkNetworkVersion(web3, cb) {
var msgNotOracles = "You are not connected to Oracles network. Please, switch on Parity or MetaMask client and choose Oracles network.";
var msgNotOracles = "You aren't connected to Oracles network. Please, switch on Parity or MetaMask client and choose Oracles network. Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.";
web3.version.getNetwork(function(err, netId) {
console.log(netId);
switch (netId) {
@ -93,7 +93,7 @@ function startDapp(web3, isOraclesNetwork) {
config.Ethereum[config.environment].contractAddress,
function(_isActive) {
_isActive = !!+_isActive;
if (!_isActive) swal("Warning", "Current key isn't valid voting key. Please, add your voting key to client (MetaMask or Parity) and reload the page", "warning");
if (!_isActive) swal("Warning", "Current key isn't valid voting key. Please, choose your voting key in MetaMask client and reload the page. Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.", "warning");
else $(".choose-key-button").trigger("click");
});
}

1
assets/javascripts/sweetalert.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
assets/stylesheets/index.css
View File

File diff suppressed because one or more lines are too long

4
assets/stylesheets/index/addition.scss
View File

@ -1,3 +1,7 @@
.hidden {
display:none;
}
button:focus {
outline: none;
}

5
assets/stylesheets/sweetalert.css
View File

File diff suppressed because one or more lines are too long

6
index.html
View File

@ -12,7 +12,7 @@
<!-- <meta property="og:image" content="https://www.notarycoin.com/assets/images/share.png"> -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="./assets/stylesheets/index.css">
<link rel="stylesheet" type="text/css" href="./assets/stylesheets/sweetalert.css">
<link rel="stylesheet" type="text/css" href="./assets/stylesheets/sweetalert2.min.css">
<link rel="apple-touch-icon" href="./favicons/favicon-192x192.png">
<link rel="icon" type="image/png" sizes="192x192" href="./favicons/favicon-192x192.png">
<link rel="mask-icon" color="#6151cc" href="./favicons/safari-pinned-tab.svg">
@ -77,7 +77,7 @@
<p class="footer-rights">2017 Oracles. All rights reserved.</p>
</div>
</footer>
<script src="./assets/javascripts/sweetalert.min.js" type="text/javascript"></script>
<script src="./assets/javascripts/application.js?v=1.63" type="text/javascript"></script>
<script src="./assets/javascripts/sweetalert2.min.js" type="text/javascript"></script>
<script src="./assets/javascripts/application.js?v=1.64" type="text/javascript"></script>
</body>
</html>