twisterarmy
/
twister-html
mirror of https://github.com/twisterarmy/twister-html.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

merging master 3a0e983e63

master
toyg 11 years ago
parent
a9ad87eb1f 3a0e983e63
commit
93e44070cf
5 changed files with 70 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      abort.html
  2. 1
      css/style.css
  3. 5
      network.html
  4. 1
      tmobile.html
  5. 22
      twister_network.js

40
abort.html
Unescape View File

@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8"/>
<title>Aborting...</title>
<link rel="stylesheet" href="css/style.css" type="text/css"/>
<script src="jquery.min.js"></script>
<script src="jQueryPlugins.js"></script>
<script src="jquery.json-2.4.js"></script>
<script src="jquery.jsonrpcclient.js"></script>
<script src="jquery.storageapi.js"></script>
<script src="mobile_abstract.js"></script>
<script src="twister_io.js"></script>
<script src="twister_user.js"></script>
<script src="twister_formatpost.js"></script>
<script src="twister_following.js"></script>
<script src="twister_newmsgs.js"></script>
<script src="twister_network.js"></script>
<script src="interface_common.js"></script>
<link rel="icon" type="image/png" href="img/twister_mini.png" />
</head>
<body>
<!-- MENU SUPERIOR INIT -->
<nav class="userMenu">
</nav>
<!-- MENU SUPERIOR END -->
<div class="wrapper">
<div class="network singleBlock">
<h2 style="text-align: center"> Daemon exited... </h2>
</div>
</div>
</body>
</html>

1
css/style.css
Unescape View File

@ -839,6 +839,7 @@ button.disabled:hover @@ -839,6 +839,7 @@ button.disabled:hover
{
font-size: 13px;
margin: 2px 10px 4px 60px;
word-break: break-all;
}
.post-context
{

5
network.html
Unescape View File

@ -85,6 +85,11 @@ @@ -85,6 +85,11 @@
<li>
<label>Client Version: </label>
<span class="version">00.00.00.00</label>
</li>
<li>
<label>Terminate Daemon:</label>
<button class="terminate-daemon">Exit</button>
</li>
</ul>
<h3> Detailed information </h3>

1
tmobile.html
Unescape View File

@ -478,6 +478,7 @@ @@ -478,6 +478,7 @@
</div>
<div>&nbsp;</div>
</ul>
<button class="terminate-daemon">Terminate Daemon</button>
<h3> Detailed information </h3>
<ul>

22
twister_network.js
Unescape View File

@ -220,6 +220,27 @@ function setSpamMsg() { @@ -220,6 +220,27 @@ function setSpamMsg() {
}, {});
}
function exitDaemon() {
if (confirm('Are you sure you want to exit the daemon?\nThe Twister client will stop working.')) {
$( ".terminate-daemon").text("Exiting...");
$( ".terminate-daemon").addClass("disabled");
$.MAL.disableButton( $( ".terminate-daemon") );
twisterRpc("stop", undefined,
function(args, ret) {
console.log("daemon exiting");
setTimeout(function _reload_after_exit() {
window.location.href = '/abort.html';
}, 2000);
}, {},
function(args, ret) {
console.log("error while exiting daemon");
}, {});
}
}
// handlers common to both desktop and mobile
function interfaceNetworkHandlers() {
$( ".new-peer-addr" ).keyup( peerKeypress );
@ -228,6 +249,7 @@ function interfaceNetworkHandlers() { @@ -228,6 +249,7 @@ function interfaceNetworkHandlers() {
$( ".add-dns").bind( "click", addDNSClick );
$( "select.genblock").change( setGenerate );
$( ".update-spam-msg").bind( "click", setSpamMsg );
$( ".terminate-daemon").bind( "click", exitDaemon )
}

Write Preview
Loading…
Cancel
Save