Skip to content

Commit

Permalink
Merge pull request #239 from EGA-archive/permissions-ui
Browse files Browse the repository at this point in the history 
Permissions UI
  • Loading branch information
@costero-e
costero-e authored Nov 8, 2023
2 parents d981351 + a14e8de commit 1023f69
Show file tree
Hide file tree
Showing 9 changed files with 655 additions and 386 deletions.
Binary file added permissions/permissions-ui/media/delete-hover.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added permissions/permissions-ui/media/delete.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
413 changes: 316 additions & 97 deletions permissions/permissions-ui/media/mystyle.css
View file

Large diffs are not rendered by default.

Binary file added permissions/permissions-ui/media/plus-hover.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added permissions/permissions-ui/media/plus.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion permissions/permissions-ui/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<nav class="navbar navbar-expand-lg">
<div class="container-fluid">
<span class="navbar-text ">
<img src="media/logo.png" alt="EGA" height="70px">
<img class="logo" src="media/logo.png" alt="EGA" height="70px">
</span>
<a class="navbar-brand " href="/"><h1 class="bi bi-kanban display-6 mx-auto p-2 fw-bold ms-5" style="color: #760509;"> Beacon Admin Page</h1></a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
Expand Down
226 changes: 121 additions & 105 deletions permissions/permissions-ui/templates/controlled.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,137 +2,153 @@

<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="media/mystyle.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" crossorigin="anonymous">
<link href="https://unpkg.com/@popperjs/core@2" rel="stylesheet" integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" crossorigin="anonymous">
<script src="media/tablesorter.js"></script>
<script src="media/arrows.js"></script>
</head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="media/mystyle.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" crossorigin="anonymous">
<link href="https://unpkg.com/@popperjs/core@2" rel="stylesheet"
integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" crossorigin="anonymous">
<script src="media/tablesorter.js"></script>
<script src="media/arrows.js"></script>
</head>

<body>
<nav class="navbar navbar-expand-lg">
<div class="container-fluid">
<span class="navbar-text ">
<img src="media/logo.png" alt="EGA" height="70px">
</span>
<a class="navbar-brand " href="/"><h1 class="bi bi-kanban display-6 mx-auto p-2 fw-bold ms-5" style="color: #760509;"> Beacon Admin Page</h1></a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<nav class="navbar navbar-expand-lg">
<div class="container-fluid">
<span class="navbar-text ">
<img class="logo" src="media/logo.png" alt="EGA" height="70px">
</span>
<a class="navbar-brand " href="/">
<h1 class="bi bi-kanban display-6 mx-auto p-2 fw-bold ms-5" style="color: #760509;"> Beacon Admin Page</h1>
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText"
aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">

</div>
</div>
</div>
</div>

</nav>

<div class="container pt-3 " style="font-size: 14px; ">
<div class="col">
<div class="containerfirst">
<div class="row">
</nav>

<div class="col-3" style="display: inline">

<div class="container pt-3 " style="font-size: 14px; ">
<div class="col">
<div class="containerfirst">
<div class="row">

<div class="col-3" style="display: inline">


<div>


<div>
</div>
</div>
<div class="col">
<div id="missatge" style="display: none;">
<button class="btn btn-success" type="button" disabled>
<span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
Verifying your beacon ...
</button>


</div>
<div class="col">
<div id="missatge" style="display: none;">
<button class="btn btn-success" type="button" disabled>
<span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
Verifying your beacon ...
</button>
</div>
<div id="boxdatasets">
<div><h2 style="color: #760509;">Controlled datasets manager</h2></div>
<form method="post">
<div class="second-tittle">
<h2 style="color: #760509;">Controlled datasets manager</h2>
</div>
<form class="form-datasets" method="post">
{% csrf_token %}
<label for="datasets">Datasets:</label>

<select id="datasets" name="datasets" multiple>
{% for dataset in datasets %}
<option value="{{dataset}}" selected="selected">{{dataset}}</option>
{% endfor %}
</select>
<button id="btnAdd2">Add</button>
<label for="list">Controlled Datasets List:</label>
<select id="list" name="list" multiple>
{% for item in bash_out %}
<option value="{{item}}" selected="selected">{{item}}</option>
{% endfor %}
</select>
<button id="btnRemove">Remove Dataset</button>
<div class="col-5">
<button type="submit" class="btn btn-success mb-3">Add datasets</button>
</div>

<div class="divPublicForm">
<label for="datasets">Dataset:</label>
<select id="datasets" name="datasets" multiple>
<option value="dataset1" selected="selected">dataset1</option>
</select>
<button id="btnAdd2"><img class="plusIcon" src="media/plus.png" alt="plusIcon" height="22px">
<img class="plusIconHover" src="media/plus-hover.png" alt="plusIconHover" height="22px"></button>
</div>
<div class="divPublicForm">
<label for="list">Public Datasets List:</label>
<select id="list" name="list" multiple>
{% for item in bash_out %}
<option value="{{item}}" selected="selected">{{item}}</option>
{% endfor %}
</select>
<button id="btnRemove"><img class="deleteIcon" src="media/delete.png" alt="deleteIcon" height="20px">
<img class="deleteIconHover" src="media/delete-hover.png" alt="deleteIconHover"
height="23px"></button>
</div>
<div class="col-5">
<button type="submit" class="btn btn-success mb-3">Add datasets</button>
</div>

</form>
</div>

</div>

















</div>
</div>
</div>


</div>
</div>
</div>



</div>
</div>
</div>
</div>
{% include "footer.html" %}
<script>
function myFunction() {
var x = document.getElementById("myDIV");
if (x.style.display === "block") {
x.style.display = "none";
} else {
x.style.display = "block";
}
}
</script>
<script>
function myFunction2() {
var x = document.getElementById("example");
if (x.style.display === "inline-flex") {
x.style.display = "none";
} else {
x.style.display = "inline-flex";
}
}
</script>
<script>

function openLoader() {


</div>
</div>
</div>


</div>
</div>
</div>
{% include "footer.html" %}
<script>
function myFunction() {
var x = document.getElementById("myDIV");
if (x.style.display === "block") {
x.style.display = "none";
} else {
x.style.display = "block";
}
}
</script>
<script>
function myFunction2() {
var x = document.getElementById("example");
if (x.style.display === "inline-flex") {
x.style.display = "none";
} else {
x.style.display = "inline-flex";
}
}
</script>
<script>

function openLoader() {
document.getElementById("missatge").style.display = "block";
}

</script>
<script src="media/app2.js"></script>
</body>
</html>

</html>
Loading

0 comments on commit 1023f69

Please sign in to comment.