cleaned up code and moved everything to bs5.0.2

This commit is contained in:
dcore94 2024-04-17 17:47:28 +02:00
parent e8c71ecb55
commit 96030670c2
4 changed files with 9 additions and 14 deletions

View File

@ -10,14 +10,13 @@
<script src="js/inputwidgetcontroller.js"></script> <script src="js/inputwidgetcontroller.js"></script>
<script src="js/outputwidgetcontroller.js"></script> <script src="js/outputwidgetcontroller.js"></script>
<link href="css/common.css" rel="stylesheet"> <link href="css/common.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
<script src="https://cdn.cloud-dev.d4science.org/common/js/bss-min-1.2.6.js"></script> <script src="https://cdn.cloud-dev.d4science.org/common/js/bss-min-1.2.6.js"></script>
<script src="../storage/d4s-storage.js"></script> <script src="../storage/d4s-storage.js"></script>
</head> </head>
<body class="m-4"> <body class="m-4">
<d4s-boot-2 clientid="https://next.dev.d4science.org" context="%2Fgcube%2Fdevsec%2FCCP" gateway="next.dev.d4science.org" redirect-url="http://localhost:8080/ccp/index.html" url="https://accounts.dev.d4science.org/auth"> <script src="https://cdn.dev.d4science.org/boot/d4s-boot.js"></script> </d4s-boot-2> <d4s-boot-2 clientid="https://next.dev.d4science.org" context="%2Fgcube%2Fdevsec%2FCCP" gateway="next.dev.d4science.org" redirect-url="http://localhost:8080/ccp/index.html" url="https://accounts.dev.d4science.org/auth"> <script src="https://cdn.dev.d4science.org/boot/d4s-boot.js"></script> </d4s-boot-2>
<span class="badge badge-info material-icons">&#xe415;</span>
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<d4s-ccp-methodlist serviceurl="https://ccp.cloud-dev.d4science.org" allow-edit="true"></d4s-ccp-methodlist> <d4s-ccp-methodlist serviceurl="https://ccp.cloud-dev.d4science.org" allow-edit="true"></d4s-ccp-methodlist>

View File

@ -57,7 +57,7 @@ class CCPExecutionForm extends HTMLElement{
<div> <div>
<link rel="canonical" href="https://getbootstrap.com/docs/5.0/components/modal/"> <link rel="canonical" href="https://getbootstrap.com/docs/5.0/components/modal/">
<link rel="stylesheet" href="https://cdn.dev.d4science.org/ccp/css/common.css"></link> <link rel="stylesheet" href="https://cdn.dev.d4science.org/ccp/css/common.css"></link>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" crossorigin="anonymous">
<style> <style>
.ccp-execution-form{ .ccp-execution-form{
position: relative; position: relative;
@ -95,12 +95,12 @@ class CCPExecutionForm extends HTMLElement{
<h5>Outputs</h5> <h5>Outputs</h5>
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="form-row ccp-outputs"> <div class="row ccp-outputs">
<div class="col form-group"></div> <div class="col form-group"></div>
</div> </div>
</div> </div>
</div> </div>
<div class="form-row"> <div class="row">
<div class="col-6"> <div class="col-6">
<button id="execute_method_button" class="btn btn-info">Execute</button> <button id="execute_method_button" class="btn btn-info">Execute</button>
</div> </div>

View File

@ -609,7 +609,7 @@ class CCPRemoteFileInputWidgetController extends CCPBaseInputWidgetController {
allow-drag="true"/> allow-drag="true"/>
</div> </div>
<div class="d-flex justify-content-end mt-1 pt-1" style="border-top: solid 1px gray;"> <div class="d-flex justify-content-end mt-1 pt-1" style="border-top: solid 1px gray;">
<button class="btn btn-primary" name="selectbtn">SELECT</span> <span class="btn btn-primary" name="selectbtn">SELECT</span>
</div> </div>
</div> </div>
<div class="modal fade" style="background-color:rgba(0,0,0,0.3)" name="publicorprotected" tabindex="-1" role="dialog"> <div class="modal fade" style="background-color:rgba(0,0,0,0.3)" name="publicorprotected" tabindex="-1" role="dialog">
@ -619,9 +619,9 @@ class CCPRemoteFileInputWidgetController extends CCPBaseInputWidgetController {
Choose whether you want to use the public link or the protected link (requires authentication and authorization). Choose whether you want to use the public link or the protected link (requires authentication and authorization).
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button name="public" type="button" class="btn btn-info">Public link</button> <span name="public" class="btn btn-info">Public link</span>
<button name="protected" type="button" class="btn btn-primary">Protected link</button> <span name="protected" class="btn btn-primary">Protected link</span>
<button name="cancel" type="button" class="btn btn-danger">Cancel</button> <span name="cancel" class="btn btn-danger">Cancel</span>
</div> </div>
</div> </div>
</div> </div>

View File

@ -42,13 +42,9 @@ class CCPMethodEditorController extends HTMLElement {
links: [] links: []
} }
#scripts = `
<link rel="canonical" href="https://getbootstrap.com/docs/5.0/components/modal/">
`
#style = ` #style = `
<link rel="stylesheet" href="https://cdn.dev.d4science.org/ccp/css/common.css"></link> <link rel="stylesheet" href="https://cdn.dev.d4science.org/ccp/css/common.css"></link>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
<style> <style>
.ccp-method-editor { .ccp-method-editor {