From 04922555e6fd395e607f25407593a127bde01657 Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Fri, 24 Nov 2023 16:37:05 +0100
Subject: [PATCH] fix html
---
.../deployment/classes/actionlog.class.php | 10 +++++++--
.../deployment/classes/formgen.class.php | 4 ++--
.../deployment/classes/projectlist.class.php | 7 ++++---
public_html/deployment/main.css | 3 +--
public_html/deployment/ui/page.tpl.php | 21 ++++++-------------
5 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/public_html/deployment/classes/actionlog.class.php b/public_html/deployment/classes/actionlog.class.php
index 4742fb27..b970b249 100644
--- a/public_html/deployment/classes/actionlog.class.php
+++ b/public_html/deployment/classes/actionlog.class.php
@@ -282,7 +282,7 @@ class Actionlog {
);
$aForms["filter"]["form"]['line'] = array(
'type' => 'markup',
- 'value' => '<div><hr>',
+ 'value' => '',
);
@@ -311,7 +311,7 @@ class Actionlog {
'onkeypress' => 'filterLogTable();',
'onchange' => 'filterLogTable();',
'size' => 20,
- );
+ );
if (!$bIsFullsearch){
$aForms["filter"]["form"]['btnalllogs'] = array(
'type' => 'button',
@@ -320,6 +320,12 @@ class Actionlog {
'href'=>'/deployment/all/setup/actionlog/',
'onclick'=>'location.href=\'/deployment/all/setup/actionlog/\'; return false;',
);
+ } else {
+ // $aForms["filter"]["form"]['closediv'] = array(
+ // 'type' => 'markup',
+ // 'value' => '</div><!-- closediv -->',
+ // );
+
}
// generate html output
diff --git a/public_html/deployment/classes/formgen.class.php b/public_html/deployment/classes/formgen.class.php
index c0de4abf..f60936bb 100644
--- a/public_html/deployment/classes/formgen.class.php
+++ b/public_html/deployment/classes/formgen.class.php
@@ -271,7 +271,7 @@ class formgen {
$this->_checkReqiredKeys($elementData, array("name"));
$sFormElement.=' <input type="'.$elementData["type"].'" id="' . $sId . '" class="form-control col-sm-10" ';
$aAllowedHtmlAttributes["text"] = explode(",", "");
- $sFormElement.=$this->_addHtmlAtrributes(explode(",", "$sDefaultAttributes,name,autocomplete,autofocus,list,disabled,onkeyup,onkeydown,onchange,pattern,placeholder,required,size,value"), $elementData);
+ $sFormElement.=$this->_addHtmlAtrributes(explode(",", "$sDefaultAttributes,name,autocomplete,autofocus,list,disabled,onchange,pattern,placeholder,required,size,value"), $elementData);
// $sFormElement.=$this->_addHtmlAtrributes(array("name", "value", "size", "placeholder", "required"), $elementData);
// IE: Return abfangen lassen
// $sFormElement.=' onkeypress="return checkKey(event);"';
@@ -296,7 +296,7 @@ class formgen {
$this->_checkReqiredKeys($elementData, array("name"));
$sFormElement.=' <textarea id="' . $sId . '" class="form-control col-sm-10" ';
$aAllowedHtmlAttributes["text"] = explode(",", "");
- $sFormElement.=$this->_addHtmlAtrributes(explode(",", "$sDefaultAttributes,name,onkeyup,onkeydown,onchange,placeholder,required,cols,rows"), $elementData);
+ $sFormElement.=$this->_addHtmlAtrributes(explode(",", "$sDefaultAttributes,name,onchange,placeholder,required,cols,rows"), $elementData);
// $sFormElement.=$this->_addHtmlAtrributes(array("name", "value", "size", "placeholder", "required"), $elementData);
$sFormElement.='>'.$elementData['value'].'</textarea>';
$sFormElement.="\n";
diff --git a/public_html/deployment/classes/projectlist.class.php b/public_html/deployment/classes/projectlist.class.php
index c43ee54c..6569fd76 100644
--- a/public_html/deployment/classes/projectlist.class.php
+++ b/public_html/deployment/classes/projectlist.class.php
@@ -177,14 +177,15 @@ class projectlist extends base
// render output
$sOut .= '
<tr class="' . $sClasses . '" '
- . 'ondblclick="location.href=\'/deployment/' . $sPrj . '/\'" '
- . 'title="' . sprintf(t("overview-hint-dblclick"), $sPrj) . '">
+ . 'ondblclick="location.href=\'/deployment/' . $sPrj . '/\'" '
+ . 'title="' . sprintf(t("overview-hint-dblclick"), $sPrj)
+ . '">
<td class="prj">
<span class="float-right"><i class="fa-solid fa-tag"></i> ' . $sPrjGroup . '</span>
<strong>'
. $oHtml->getLink(array(
'href' => '/deployment/' . $sPrj . '/',
- 'title' => $oPrj->getDescription(),
+ // 'title' => $oPrj->getDescription(),
'icon' => 'project',
'label' => $oPrj->getLabel()
))
diff --git a/public_html/deployment/main.css b/public_html/deployment/main.css
index a96b7f5e..4b73a0ee 100644
--- a/public_html/deployment/main.css
+++ b/public_html/deployment/main.css
@@ -261,13 +261,12 @@ tr.progresshasqueue {
td.prj:nth-child(1) {
max-width: 30em;
min-width: 30em;
+ padding-left: 0.5em !important;
}
td.prj:nth-child(1) a {
display: block;
- padding: 0.3em 0.5em;
border-radius: 0.3em;
- background-color: #f0f4f8;
}
/*
diff --git a/public_html/deployment/ui/page.tpl.php b/public_html/deployment/ui/page.tpl.php
index 11276de8..156322fa 100644
--- a/public_html/deployment/ui/page.tpl.php
+++ b/public_html/deployment/ui/page.tpl.php
@@ -7,21 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{PAGE_TITLE}}</title>
- <!--
- <script type="text/javascript" src="js/asimax.class.js"></script>
-
- visjs
- <script type="text/javascript" src="vendor/vis/4.21.0/vis.min.js"></script>
- <link href="vendor/vis/4.21.0/vis-timeline-graph2d.min.css" rel="stylesheet" type="text/css"/>
-
- -->
-
<script type="text/javascript" src="/vendor/jquery/3.6.1/jquery.js"></script>
-
- <!-- datatable
- <script type="text/javascript" src="../vendor/datatables/1.10.15/js/jquery.dataTables.min.js"></script>
- <link href="../vendor/datatables/1.10.15/css/jquery.dataTables.min.css" rel="stylesheet" type="text/css"/>
- -->
<!-- fontawesome -->
<link href="/vendor/font-awesome/6.4.0/css/all.min.css" rel="stylesheet" type="text/css"/>
@@ -29,9 +15,14 @@
<!-- Adminlte -->
<link rel="stylesheet" href="{{DIR_ADMINLTE}}/css/adminlte.min.css?v=3.2.0">
+ <!--
<link rel="stylesheet" href="{{DIR_ADMINLTEPLUGINS}}/summernote/summernote-bs4.min.css">
<link rel="stylesheet" href="{{DIR_ADMINLTEPLUGINS}}/dropzone/dropzone.css" type="text/css" />
+ <script type="text/javascript" src="../vendor/datatables/1.10.15/js/jquery.dataTables.min.js"></script>
+ <link href="../vendor/datatables/1.10.15/css/jquery.dataTables.min.css" rel="stylesheet" type="text/css"/>
+ -->
+
<link rel="stylesheet" href="/deployment/main.css">
<link rel="stylesheet" href="/deployment/main_new_ui.css">
@@ -110,7 +101,6 @@
<div id="divmodalmessage">please wait ...</div>
</div>
- <script>{{INJECT_JS}}</script>
<script src="{{DIR_ADMINLTEPLUGINS}}/bootstrap/js/bootstrap.bundle.min.js"></script>
<!--
<script src="{{DIR_ADMINLTEPLUGINS}}/summernote/summernote-bs4.min.js"></script>
@@ -119,6 +109,7 @@
<script src="{{DIR_ADMINLTE}}/js/adminlte.min.js?v=3.2.0"></script>
<script type="text/javascript" src="/deployment/js/functions.js"></script>
+ <script>{{INJECT_JS}}</script>
</body>
</html>
\ No newline at end of file
--
GitLab