Skip to content

Commit

Permalink
#1341 use consistent spacing everywhere (convert to tabs where needed)
Browse files Browse the repository at this point in the history 
git-svn-id: https://xpra.org/svn/Xpra/trunk@14282 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
@totaam
totaam committed Oct 25, 2016
1 parent e73c47e commit 5ef7da9
Show file tree
Hide file tree
Showing 8 changed files with 238 additions and 238 deletions.
146 changes: 73 additions & 73 deletions src/html5/connect.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
Licensed under MPL 2.0
-->

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<!-- Bootstrap core CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="css/signin.css" rel="stylesheet">
<title>Xpra HTML5 Client</title>
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<!-- Bootstrap core CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="css/signin.css" rel="stylesheet">
<title>Xpra HTML5 Client</title>
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
<link rel="icon" type="image/png" href="favicon.png">

<script type="text/javascript" src="js/lib/jquery.min.js"></script>
Expand All @@ -29,25 +29,25 @@

<form class="form-signin">

<img src="icons/xpra-logo.png" alt="xpra logo">
<h2 class="form-signin-heading">Xpra HTML5 Client</h2>
<img src="icons/xpra-logo.png" alt="xpra logo">
<h2 class="form-signin-heading">Xpra HTML5 Client</h2>

<div id="alert-disconnect" class="alert alert-info" role="alert" style="display:none;">
<div id="alert-disconnect" class="alert alert-info" role="alert" style="display:none;">
<p>You were disconnected for the following reason:</p>
<p><span id="disconnect-reason"></span></p>
</div>

<div class="form-group form-inline">
<label class="sr-only" for="server">Server</label>
<input title="Server" type="text" class="form-control" id="server" placeholder="Server" maxlength="256">
<label class="sr-only" for="port">Port</label>
<input title="Port" type="text" class="form-control" id="port" placeholder="Port" size="5" maxlength="5">
<br>
<label class="sr-only" for="username">Username</label>
<input title="Username" type="text" class="form-control" id="username" placeholder="Username" size="16" maxlength="256">
<label class="sr-only" for="password">Password</label>
<input title="Password" type="password" class="form-control" id="password" placeholder="Password" size="16" maxlength="256">
<br>
<label class="sr-only" for="server">Server</label>
<input title="Server" type="text" class="form-control" id="server" placeholder="Server" maxlength="256">
<label class="sr-only" for="port">Port</label>
<input title="Port" type="text" class="form-control" id="port" placeholder="Port" size="5" maxlength="5">
<br>
<label class="sr-only" for="username">Username</label>
<input title="Username" type="text" class="form-control" id="username" placeholder="Username" size="16" maxlength="256">
<label class="sr-only" for="password">Password</label>
<input title="Password" type="password" class="form-control" id="password" placeholder="Password" size="16" maxlength="256">
<br>
<div class="panel-group">
<ul class="list-style-none action">
<li><input type="radio" name="action" class="radiobox" value="connect" id="action_connect" checked="checked"> Connect</li>
Expand All @@ -67,28 +67,28 @@ <h2 class="form-signin-heading">Xpra HTML5 Client</h2>
</div>

<div class="panel-group" role="tablist">
<div class="panel panel-default">
<div id="expandopts" class="panel-heading" role="tab">
<h4 class="panel-title">Advanced options</h4>
</div>
<div class="panel panel-default">
<div id="expandopts" class="panel-heading" role="tab">
<h4 class="panel-title">Advanced options</h4>
</div>

<div id="hiddenopts" class="panel-collapse collapse in" role="tabpanel" style="display:none;">
<ul class="list-group">
<div id="hiddenopts" class="panel-collapse collapse in" role="tabpanel" style="display:none;">
<ul class="list-group">

<li class="list-group-item">
<select id="encoding">
<option value="jpeg">JPEG</option>
<li class="list-group-item">
<select id="encoding">
<option value="jpeg">JPEG</option>
<option value="png">PNG</option>
<option value="rgb">Raw RGB</option>
</select>
Encoding
</li>

<li class="list-group-item">
<select id="keyboard_layout">
<option value="us">English USA</option>
<option value="gb">United Kingdom</option>
<option value="fr">France</option>
<li class="list-group-item">
<select id="keyboard_layout">
<option value="us">English USA</option>
<option value="gb">United Kingdom</option>
<option value="fr">France</option>
<option value="de">Germany</option>
<option value="ad">Andorra</option>
<option value="af">Afghanistan</option>
Expand Down Expand Up @@ -180,34 +180,34 @@ <h4 class="panel-title">Advanced options</h4>
Keyboard Layout
</li>

<li class="list-group-item">
<input type="checkbox" id="sound"> <span>Experimental sound support</span>
</li>
<li class="list-group-item exit_with_children">
<input type="checkbox" id="exit_with_children"> <span>Terminate server when command exits</span>
</li>
<li class="list-group-item exit_with_client">
<input type="checkbox" id="exit_with_client"> <span>Terminate server when client disconnects</span>
</li>
<li class="list-group-item">
<input type="checkbox" id="normal_fullscreen"> <span>Normal fullscreen windows</span>
</li>
<li class="list-group-item">
<input type="checkbox" id="debug"> <span>Debugging</span>
</li>
<li class="list-group-item">
<input type="checkbox" id="insecure"> <span>Insecure passwords - Dangerous!</span>
</li>
</ul>
</div>
</div>
<li class="list-group-item">
<input type="checkbox" id="sound"> <span>Experimental sound support</span>
</li>
<li class="list-group-item exit_with_children">
<input type="checkbox" id="exit_with_children"> <span>Terminate server when command exits</span>
</li>
<li class="list-group-item exit_with_client">
<input type="checkbox" id="exit_with_client"> <span>Terminate server when client disconnects</span>
</li>
<li class="list-group-item">
<input type="checkbox" id="normal_fullscreen"> <span>Normal fullscreen windows</span>
</li>
<li class="list-group-item">
<input type="checkbox" id="debug"> <span>Debugging</span>
</li>
<li class="list-group-item">
<input type="checkbox" id="insecure"> <span>Insecure passwords - Dangerous!</span>
</li>
</ul>
</div>
</div>
</div>

</form>



</div> <!-- /container -->
</div> <!-- /container -->

<script type="text/javascript">
/**
Expand Down Expand Up @@ -240,7 +240,7 @@ <h4 class="panel-title">Advanced options</h4>
}

function encodeData(s) {
return encodeURIComponent(s);
return encodeURIComponent(s);
}

function doConnect() {
Expand Down Expand Up @@ -332,20 +332,20 @@ <h4 class="panel-title">Advanced options</h4>
document.getElementById("action_connect").checked = true;
}
function set_exit_actions(disabled) {
var opacity = disabled ? 0.6 : 1;
$('input#exit_with_children').prop("disabled", disabled);
$('input#exit_with_client').prop("disabled", disabled);
$('li.exit_with_children span').css("opacity", opacity);
$('li.exit_with_client span').css("opacity", opacity);
if (disabled) {
$('input#exit_with_children').prop("checked", false);
$('input#exit_with_client').prop("checked", false);
}
}
var opacity = disabled ? 0.6 : 1;
$('input#exit_with_children').prop("disabled", disabled);
$('input#exit_with_client').prop("disabled", disabled);
$('li.exit_with_children span').css("opacity", opacity);
$('li.exit_with_client span').css("opacity", opacity);
if (disabled) {
$('input#exit_with_children').prop("checked", false);
$('input#exit_with_client').prop("checked", false);
}
}
function on_action_change() {
var action = $(this).val();
set_exit_actions(action=="connect");
}
var action = $(this).val();
set_exit_actions(action=="connect");
}
$(document).on('click', '[name="action"]', on_action_change);
var action = window.location.getParameter("action") || "connect";
$('input:radio[value='+action+']').click();
Expand Down
4 changes: 2 additions & 2 deletions src/html5/css/signin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ body {
.form-signin .form-control {
position: relative;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding: 10px;
font-size: 16px;
}
Expand Down
16 changes: 8 additions & 8 deletions src/html5/css/spinner.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@
}
@-webkit-keyframes load8 {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
@keyframes load8 {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
10 changes: 5 additions & 5 deletions src/html5/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@
var insecure = getparam("insecure") || null;

// create the client
var client = new XpraClient('screen');
var client = new XpraClient('screen');
client.debug = debug;

// the primary encoding can be set
if(encoding) {
client.enable_encoding(encoding);
}
// the primary encoding can be set
if(encoding) {
client.enable_encoding(encoding);
}
// encodings can be disabled like so
// client.disable_encoding("h264");
if(action && (action!="connect")) {
Expand Down
Loading

0 comments on commit 5ef7da9

Please sign in to comment.