Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

fix/windows-app-alert

+ js path update for login page
  • Loading branch information...
Stoyvo committed Feb 14, 2015
1 parent 115c7c0 commit 46fe76435a3c82e71051b4ef08f2248b44333c0c
Showing with 26 additions and 12 deletions.
  1. +16 −2 includes/head.php
  2. +2 −0 includes/login-head.php
  3. +1 −3 includes/scripts.php
  4. +7 −7 login.php
@@ -32,7 +32,8 @@
<!-- Custom cryptoGlance styles -->
<link href="css/cryptoglance-base.css?v=<?php echo CURRENT_VERSION; ?>" rel="stylesheet">
<!--/build-->


<script type="text/javascript" src="js/packages/jquery-1.10.2.min.js?v=<?php echo CURRENT_VERSION; ?>"></script>
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
@@ -42,9 +43,22 @@
var documentTitle = document.title;
var DATA_FOLDER = '<?php echo DATA_FOLDER; ?>';
var CURRENT_VERSION = '<?php echo CURRENT_VERSION?>';
<?php echo ($settings['general']['updates']['enabled'] == '1') ? 'var updateType = "' . $updateFeed[$settings['general']['updates']['type']]['feed'] . '";' : '' ?>
<?php if ($settings['general']['updates']['enabled'] == '1') {
echo 'var updateType = "' . $updateFeed[$settings['general']['updates']['type']]['feed'] . '";';
} ?>
var rigUpdateTime = <?php echo $settings['general']['updateTimes']['rig'] ?>;
var poolUpdateTime = <?php echo $settings['general']['updateTimes']['pool'] ?>;
var walletUpdateTime = <?php echo $settings['general']['updateTimes']['wallet'] ?>;
<?php if (isset($_SERVER['PHPDESKTOP_VERSION']) && floatval($_SERVER['PHPDESKTOP_VERSION']) < 31.9) { ?>
$(document).ready(function() {
$().toastmessage('showToast', {
sticky : true,
text : 'App Update!<br />There is a critical update for the Windows application. Please update your app to the latest version:<br /> <a href="http://sourceforge.net/projects/cryptoglance/files/latest/download?source=files" target="_blank" rel="external" style="word-wrap: break-word;">http://sourceforge.net/projects/cryptoglance/files/latest/download?source=files</a>',
type : 'error',
position: 'top-center'
});
});
<?php } ?>
</script>
</head>
@@ -17,6 +17,8 @@
<link href="css/whhg.css" rel="stylesheet">
<!-- Custom cryptoGlance styles -->
<link href="css/cryptoglance-base.css" rel="stylesheet">

<script type="text/javascript" src="js/packages/jquery-1.10.2.min.js?v=<?php echo CURRENT_VERSION; ?>"></script>

<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
@@ -1,5 +1,3 @@

<script type="text/javascript" src="js/packages/jquery-1.10.2.min.js?v=<?php echo CURRENT_VERSION; ?>"></script>
<script type="text/javascript" src="js/packages/jquery-ui-1.10.3.custom.min.js?v=<?php echo CURRENT_VERSION; ?>"></script>
<script type="text/javascript" src="js/packages/jquery.cookie.js?v=<?php echo CURRENT_VERSION; ?>"></script>
<script type="text/javascript" src="js/packages/jquery.scrollTo.min.js?v=<?php echo CURRENT_VERSION; ?>"></script>
@@ -25,4 +23,4 @@
showToastWriteError();
});</script>
<?php } ?>
<!--/build-->
<!--/build-->
@@ -67,17 +67,17 @@
</div>
</div>
<!-- /container -->
<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.10.3.custom.min.js"></script>
<script type="text/javascript" src="js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/jquery.toastmessage.js"></script>
<script type="text/javascript" src="js/bootstrap-switch.min.js"></script>
<script type="text/javascript" src="js/packages/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="js/packages/jquery-ui-1.10.3.custom.min.js"></script>
<script type="text/javascript" src="js/packages/bootstrap.min.js"></script>
<script type="text/javascript" src="js/packages/jquery.toastmessage.js"></script>
<script type="text/javascript" src="js/packages/bootstrap-switch.min.js"></script>

<?php if (!$loginObj->firstLogin()) { ?>
<script type="text/javascript">
// (Toast) First login (no account.json)
function showToastFirstLogin() {
var toastMsgFirstLogin = '<b>Read Carefully!</b> This is your first time logging into cryptoGlance. Please set a new username + password that will serve as your credentials.';
var toastMsgFirstLogin = '<b>Read Carefully!</b><br />This is your first time logging into cryptoGlance. Please set a new username + password that will serve as your credentials.';
$().toastmessage('showToast', {
sticky : true,
text : toastMsgFirstLogin,
@@ -99,7 +99,7 @@ function showToastFirstLogin() {
<script type="text/javascript">
// (Toast) Login error
function showToastLoginError() {
var toastMsgLoginError = '<b>You shall NOT pass!</b> You\'ve entered incorrect credentials. (If you\'re having trouble, read the notes below the login button.)';
var toastMsgLoginError = '<b>You shall NOT pass!</b><br />You\'ve entered incorrect credentials. (If you\'re having trouble, read the notes below the login button.)';
$().toastmessage('showToast', {
sticky : true,
text : toastMsgLoginError,

0 comments on commit 46fe764

Please sign in to comment.
You can’t perform that action at this time.