Skip to content

GitLab

Commit 1fce4f7b authored by Alejandro Alvarez Ayllon's avatar Alejandro Alvarez Ayllon
Browse files

FTS-664: Make code html compliant

parent fc0ce9d8
Hide whitespace changes
Inline Side-by-side
src/fts3rest/fts3rest/public/js/config/authz.js
View file @ 1fce4f7b
......@@ -33,7 +33,7 @@ function refreshAuthzList()
$.each(data, function(i, user) {
var tr = $("<tr></tr>");
var deleteBtn = $("<button class='btn btn-link'></button>")
var deleteBtn = $("<button class='btn btn-link' type='button'></button>")
.append("<i class='glyphicon glyphicon-trash'></i>");
deleteBtn.click(function() {
......
src/fts3rest/fts3rest/public/js/config/debug.js
View file @ 1fce4f7b
......@@ -76,7 +76,7 @@ function refreshDebugList()
$.each(data, function(i, debug) {
var tr = $("<tr></tr>");
var deleteBtn = $("<button class='btn btn-link'></button>")
var deleteBtn = $("<button class='btn btn-link' type='button'></button>")
.append("<i class='glyphicon glyphicon-trash'></i>");
deleteBtn.click(function() {
......
src/fts3rest/fts3rest/public/js/config/global.js
View file @ 1fce4f7b
......@@ -35,7 +35,7 @@ function refreshVoConfigList()
if (vo_name && vo_name != "*") {
var tr = $("<tr></tr>");
var deleteBtn = $("<button class='btn btn-link'></button>")
var deleteBtn = $("<button class='btn btn-link' type='button'></button>")
.append("<i class='glyphicon glyphicon-trash'></i>");
deleteBtn.click(function() {
......@@ -64,7 +64,7 @@ function refreshVoConfigList()
type: "POST",
dataType: "json",
contentType: "application/json",
data: {vo_name: vo_name, retry: retryInput.val()}
data: JSON.stringify({vo_name: vo_name, retry: retryInput.val()})
})
.done(function() {
retryInput.prop("disabled", false);
......
src/fts3rest/fts3rest/public/js/config/groups.js
View file @ 1fce4f7b
......@@ -34,7 +34,7 @@ function refreshGroupList()
$.each(data, function(i, member) {
var tr = $("<tr></tr>");
var deleteBtn = $("<button class='btn btn-link'></button>")
var deleteBtn = $("<button class='btn btn-link' type='button'></button>")
.append("<i class='glyphicon glyphicon-trash'></i>");
deleteBtn.click(function() {
......
src/fts3rest/fts3rest/public/js/config/links.js
View file @ 1fce4f7b
......@@ -34,7 +34,7 @@ function refreshLinks()
$.each(data, function(i, link) {
var tr = $("<tr></tr>");
var deleteBtn = $("<button class='btn btn-link'></button>")
var deleteBtn = $("<button class='btn btn-link' type='button'></button>")
.append("<i class='glyphicon glyphicon-trash'></i>");
deleteBtn.click(function() {
......@@ -135,7 +135,7 @@ function setupLinks()
// Attach to forms
$("#share-add-frm").submit(function(event) {
var addFrm = $("#share-add");
var addFrm = $("#share-add-frm");
var payload = {
source: addFrm.find("[name=source]").val(),
destination: addFrm.find("[name=destination]").val(),
......@@ -169,8 +169,8 @@ function setupLinks()
event.preventDefault();
});
$("#link-config-add").submit(function(event) {
var addFrm = $("#link-config-add");
$("#link-config-add-frm").submit(function(event) {
var addFrm = $("#link-config-add-frm");
var payload = {
symbolicname: addFrm.find("[name=symbolicname]").val(),
source: addFrm.find("[name=source]").val(),
......@@ -198,7 +198,7 @@ function setupLinks()
alert(jqXHR.responseJSON.message);
})
.always(function() {
$("#link-config-add-frm").prop("disabled", false);
$("#link-config-add-frm input").prop("disabled", false);
$("#link-config-add-frm>i").attr("class", "glyphicon glyphicon-plus");
});
......
src/fts3rest/fts3rest/templates/config/authz.html
View file @ 1fce4f7b
......@@ -11,6 +11,7 @@
This is particularly handy precisely for the web configuration.
</p>
<form method="POST" id="authz-add-frm">
<table class="table">
<thead>
<tr>
......@@ -23,7 +24,6 @@
</tbody>
<tbody id="authz-add">
<tr>
<form method="POST" id="authz-add-frm">
<td>
<button class="btn btn-link" type="submit" id="auth-add-frm-submit">
<i class="glyphicon glyphicon-plus" onclick=""></i>
......@@ -37,10 +37,10 @@
<option value="config">Configure</option>
</select>
</td>
</form>
</tr>
</tbody>
</table>
</form>
</div>
<script src="/js/config/authz.js" onload="setupAuthz()"></script>
......
src/fts3rest/fts3rest/templates/config/cloud_storage.html
View file @ 1fce4f7b
......@@ -163,7 +163,7 @@
<input type="submit" class="btn btn-info" value="Add">
</div>
</form>
</div>
<script src="/js/config/cloud_storage.js" onload="setupCloudStorage()"></script>
<%include file="footer.html"/>
src/fts3rest/fts3rest/templates/config/debug.html
View file @ 1fce4f7b
......@@ -8,6 +8,7 @@
To remove the debug output, just click on the trash can.
</p>
<form method="POST" id="debug-add-frm">
<table class="table">
<thead>
<tr>
......@@ -21,7 +22,6 @@
</tbody>
<tbody id="debug-add">
<tr>
<form method="POST" id="debug-add-frm">
<td>
<button type="submit" class="btn btn-link" id="debug-add-frm-submit">
<i class="glyphicon glyphicon-plus"></i>
......@@ -42,10 +42,10 @@
<option value="3">Extremely verbose</option>
</select>
</td>
</form>
</tr>
</tbody>
</table>
</form>
<div class="panel panel-default">
<div class="panel-heading">
......
src/fts3rest/fts3rest/templates/config/global.html
View file @ 1fce4f7b
......@@ -8,6 +8,7 @@
These settings apply to all transfers belonging to the same Virtual Organization.
</p>
<form method="POST" id="vo-config-add-frm">
<table class="table">
<thead>
<tr>
......@@ -23,7 +24,6 @@
</tbody>
<tbody id="vo-config-add">
<tr>
<form method="POST" id="vo-config-add-frm">
<td>
<button class="btn btn-link" type="submit">
<i class="glyphicon glyphicon-plus"></i>
......@@ -36,10 +36,10 @@
<td>
<input type="number" name="retry" value="1" min="1" max="10" class="form-control"/>
</td>
</form>
</tr>
</tbody>
</table>
</form>
<h3>Global configuration</h3>
<p>
......@@ -90,7 +90,7 @@
<p class="form-group">
<label for="optimizer_mode">Optimizer mode</label>
<span class="input-group">
<select id="optimizer_mode" name="optimizer_mode" class="form-control" value="3" class="form-control">
<select id="optimizer_mode" name="optimizer_mode" class="form-control">
% if not data['*']['optimizer_mode']:
<option>-- Default --</option>
% endif
......
src/fts3rest/fts3rest/templates/config/groups.html
View file @ 1fce4f7b
......@@ -9,6 +9,7 @@
to the same site, or having similar characteristics.
</p>
<form id="group-add-frm" method="POST">
<table class="table">
<thead>
<tr>
......@@ -21,7 +22,6 @@
</tbody>
<tbody id="group-add">
<tr>
<form id="group-add-frm" method="POST">
<td>
<button class="btn btn-link" type="submit">
<i class="glyphicon glyphicon-plus"></i>
......@@ -33,10 +33,10 @@
<td>
<input type="text" name="member" id="group-add-field-member" class="form-control"/>
</td>
</form>
</tr>
</tbody>
</table>
</form>
</div>
<script src="/js/config/groups.js" onload="setupGroups()"></script>
......
src/fts3rest/fts3rest/templates/config/header.html
View file @ 1fce4f7b
......@@ -33,7 +33,7 @@
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="#">
<img src="/img/logo.png" width="24"/>
<img src="/img/logo.png" width="24" alt=""/>
${config['fts3.SiteName'] | h} FTS3
</a>
</div>
......
src/fts3rest/fts3rest/templates/config/links.html
View file @ 1fce4f7b
......@@ -8,6 +8,7 @@
transfer from/to that storage.
</p>
<form id="link-config-add-frm">
<table class="table">
<thead>
<tr>
......@@ -25,7 +26,6 @@
</tbody>
<tbody id="link-config-add">
<tr>
<form id="link-config-add-frm">
<td>
<button class="btn btn-link" type="submit">
<i class="glyphicon glyphicon-plus"></i>
......@@ -57,10 +57,10 @@
<input class="form-control" type="number" placeholder="Timeout" name="urlcopy_tx_to"
min="0" max="999999"/>
</td>
</form>
</tr>
</tbody>
</table>
</form>
<h2>Share configuration</h2>
<p>
......@@ -71,6 +71,7 @@
When configuring shares, do not forget the <kbd>public</kbd> "VO", so any other VO can have access too.
</p>
<form id="share-add-frm">
<table class="table">
<thead>
<tr>
......@@ -85,7 +86,6 @@
</tbody>
<tbody id="share-add">
<tr>
<form id="share-add-frm">
<td>
<button class="btn btn-link" type="submit">
<i class="glyphicon glyphicon-plus"></i>
......@@ -105,10 +105,10 @@
<td>
<input type="number" name="share" placeholder="Share" class="form-control" min="0" max="100"/>
</td>
</form>
</tr>
</tbody>
</table>
</form>
</div>
<script src="/js/config/links.js" onload="setupLinks()"></script>
......
src/fts3rest/fts3rest/templates/config/se.html
View file @ 1fce4f7b
......@@ -161,7 +161,7 @@
<div class="panel-heading">
<h2 class="panel-title">
<input type="text" name="se" placeholder="Storage" class="form-control"
id="se-add-field-se"/>
id="se-add-field-se"/>&nbsp;
</h2>
</div>
<div class="panel-body">
......@@ -174,15 +174,15 @@
<div class="panel-body">
<div class="form-group">
<label for="as_source-active">Active limit</label>
<input class="form-control" name="active" type="number">
<input class="form-control" name="active" id="as_source-active" type="number">
</div>
<div class="form-group">
<label for="as_source-throughput">Throughput limit (MB/s)</label>
<input class="form-control" name="throughput" type="number">
<input class="form-control" name="throughput" id="as_source-throughput" type="number">
</div>
<div class="form-group">
<label for="as_source-ipv6">IPv6</label>
<select class="form-control" name="ipv6">
<select class="form-control" name="ipv6" id="as_source-ipv6">
<option value="true">Yes</option>
<option value="false">No</option>
</select>
......@@ -213,11 +213,11 @@
</div>
<div class="form-group">
<label for="as_destination-throughput">Throughput limit (MB/s)</label>
<input class="form-control" name="throughput" type="number">
<input class="form-control" name="throughput" id="as_destination-throughput" type="number">
</div>
<div class="form-group">
<label for="as_destination-ipv6">IPv6</label>
<select class="form-control" name="ipv6">
<select class="form-control" name="ipv6" id="as_destination-ipv6">
<option value="true">Yes</option>
<option value="false">No</option>
</select>
......@@ -228,7 +228,7 @@
<i class="glyphicon glyphicon-question-sign"
title="If set, FTS3 will enable UDT for this endpoint, but will fallback to non-UDT on error"></i>
</label>
<select class="form-control" name="udt">
<select class="form-control" name="udt" id="as_destination-udt">
<option value="true">Yes</option>
<option value="false">No</option>
</select>
......@@ -277,6 +277,7 @@
</table>
</div>
</div>
</div>
<div class="panel-footer">
<button type="submit" class="btn btn-primary">Add</button>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment