Commit 4b9e2349 authored by jlopez's avatar jlopez
Browse files

Minor fix

parent 59454844
<?php
session_start ();
require_once "./inc/php/buildHeader.php";
?>
<div class="container">
<br/>
<div class="row justify-content-center">
<h1> FAQ </h1>
</div>
</div>
</body>
</html>
......@@ -46,11 +46,9 @@ if(isset($_GET['patternDescription'])) {
}
}*/
$limit = 20;
/*if(isset($_GET['limit'])) {
if(isset($_GET['limit'])) {
$limit = $_GET['limit'];
}*/
}
$result = array();
......
......@@ -19,7 +19,7 @@ $( "#generateButton" ).click(function() {
});
function buildRecipe() {
function buildCommand() {
var filename = document.getElementById("imageNameInput").value;
......@@ -730,7 +730,7 @@ function showPackage(distribName) {
var str = document.getElementById("find"+distribName+"Packages").value;
//var limit = document.getElementById("limit"+distribName).value;
var limit = 20;
var limit = 30;
if (str == "") {
document.getElementById("containPackages"+distribName).innerHTML = "";
......
......@@ -25,7 +25,7 @@ echo '
<nav class="navbar navbar-expand-md navbar-dark navbar-custom p-1">
<a class="navbar-brand" href="#">WICOPA</a>
<div class="navbar-brand">WICOPA</div>
<div class="collapse navbar-collapse justify-content-between" id="navbar">
<div class="navbar-nav">
';
......@@ -34,7 +34,7 @@ echo '
echo ' <a class="nav-item nav-link" href="./index.php"> Home </a>';
echo ' <a class="nav-item nav-link" href="./container.php"> Containers </a>';
echo ' <a class="nav-item nav-link" href="./container.php"> Contributed Containers </a>';
if(isset($_SESSION['username']) && !empty($_SESSION['username']))
{
......@@ -46,6 +46,9 @@ echo '
}
}
echo ' <a class="nav-item nav-link" href="./faq.php"> FAQ </a>';
echo '
</div>
......
......@@ -70,7 +70,33 @@ function printSection($name, $db) {
function printPanel($name) {
echo '
<label for="find'.$name.'Packages">Find packages with pattern :</label>
<input type="email" class="form-control" id="find'.$name.'Packages">
<input type="email" class="form-control" id="find'.$name.'Packages">';
if($name == "CRAN") {
echo '<small class="form-text text-muted">exemple: genepop</small>';
}
else if($name == "Bioconductor") {
echo '<small class="form-text text-muted">exemple: GenomicFeatures</small>';
}
else if($name == "CPAN") {
echo '<small class="form-text text-muted">exemple: cpanminus</small>';
}
else if ($name == "Rubygems") {
echo '<small class="form-text text-muted">exemple: math-api</small>';
}
else if ($name == "Python") {
echo '<small class="form-text text-muted">exemple: math3d</small>';
}
else if ($name == "NPM") {
echo '<small class="form-text text-muted">exemple: math</small>';
}
else {
echo '<small class="form-text text-muted">exemple: python</small>';
}
echo '
<!--
<div class="form-check">
......
......@@ -31,21 +31,20 @@ require_once "./inc/php/buildHeader.php";
<input type="text" class="form-control" id="imageNameInput">
</div>
<div class="form-group">
<label for="baseNameInput" class="font-weight-bold">From :</label>
<input type="text" class="form-control" id="baseNameInput">
<small id="help0" class="form-text text-muted">You can find images name on <a href="https://hub.docker.com/search?q=&type=image" >docker hub </a>.</small>
<small id="help1" class="form-text text-muted">If the above "From" field is empty, then <a href="https://docs.docker.com/engine/reference/builder/#from">"From"</a> is chosen from distribution bellow. </small>
<small id="help2" class="form-text text-muted">You must make sure that the OS of your base container is compatible with the chosen distribution. </small>
</div>
<div class="form-group">
<label for="selectedOS" class="font-weight-bold">Distribution <span style="font-size:20px;" class="status text-danger">*</span>:</label>
<label for="selectedOS" class="font-weight-bold">From Distribution <span style="font-size:20px;" class="status text-danger">*</span>:</label>
<select class="custom-select" id="selectedOS" onchange="hide_os_rows()">
<?php
foreach ($db->getActiveDistributionsFullName() as $name){
echo ' <option value="'.$name.'">'.$name.'</option>';
if(strpos($name, "ubuntu") !== false) {
echo ' <option value="'.$name.'" selected="selected">'.$name.'</option>';
}
else {
echo ' <option value="'.$name.'">'.$name.'</option>';
}
}
?>
......@@ -53,8 +52,16 @@ require_once "./inc/php/buildHeader.php";
</div>
<div class="form-group">
<label for="selectedOS" class="font-weight-bold">Package manager :</label>
<select class="custom-select" id="selectedInstaller">
<label for="baseNameInput" class="font-weight-bold">From Image :</label>
<input type="text" class="form-control" id="baseNameInput">
<small id="help0" class="form-text text-muted">You can find images name on <a href="https://hub.docker.com/search?q=&type=image" >docker hub </a>.</small>
<small id="help1" class="form-text text-muted">If the above "From Image" field is empty, then <a href="https://docs.docker.com/engine/reference/builder/#from">"From Distribution"</a> is chosen from distribution bellow. </small>
<small id="help2" class="form-text text-muted">You must make sure that the OS of your base container is compatible with the chosen distribution. </small>
</div>
<div class="form-group">
<label for="selectedOS" class="font-weight-bold" hidden >Package manager :</label>
<select class="custom-select" id="selectedInstaller" hidden>
<?php
foreach ($db->getManagers() as $manager){
......@@ -79,8 +86,8 @@ require_once "./inc/php/buildHeader.php";
<div class="form-group">
<button type="button" id="generateButton" class="btn btn-primary">Generate recipe</button>
<button type="button" id="downloadButton" class="btn btn-primary" onclick="downloadFile()">Download recipe</button>
<button type="button" id="generateButton" class="btn btn-primary" onclick="buildRecipe()">Build recipe</button>
<button type="button" id="generateButton" class="btn btn-primary">Push recipe</button>
<button type="button" id="generateButton" class="btn btn-primary" onclick="buildCommand()">Build command</button>
<!--<button type="button" id="generateButton" class="btn btn-primary">Push recipe</button>-->
</div>
<div class="form-group">
......@@ -126,7 +133,7 @@ require_once "./inc/php/buildHeader.php";
<div class="col-12">
<div class="card border border-dark">
<div class="card-header bg-dark text-light">
Environment configs :
Local Environment configs :
</div>
<div class="card-body">
<table id="Table_EnvConfig" class="table table-striped table-bordered">
......@@ -165,7 +172,7 @@ require_once "./inc/php/buildHeader.php";
<div class="col-12">
<div class="card border border-dark">
<div class="card-header bg-dark text-light">
Post configs :
Local Post configs :
</div>
<div class="card-body">
<table id="Table_PostConfig" class="table table-striped table-bordered">
......@@ -219,11 +226,11 @@ require_once "./inc/php/buildHeader.php";
<div class="col-12">
<div class="card border border-dark">
<div class="card-header bg-dark text-light">
Exec line (%Runscript / CMD) :
The default command line executed when yourun the container :
</div>
<div class="card-body">
<div class="form-group">
<label for="ExecLineInput" class="font-weight-bold">Exec Line :</label>
<label for="ExecLineInput" class="font-weight-bold">Exec Line (%Runscript / CMD) :</label>
<input type="text" class="form-control" id="ExecLineInput" value='exec /bin/bash "$@"'>
</div>
......@@ -236,7 +243,7 @@ require_once "./inc/php/buildHeader.php";
<div class="col-8">
<div class="card border border-dark">
<div class="card-header bg-dark text-light">
Tools :
Tools packages :
</div>
<div class="card-body">
<nav>
......
Supports Markdown
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