Skip to content
Snippets Groups Projects
Commit 04922555 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

fix html

parent e3fbc7c1
No related branches found
No related tags found
1 merge request!62V2.0
...@@ -282,7 +282,7 @@ class Actionlog { ...@@ -282,7 +282,7 @@ class Actionlog {
); );
$aForms["filter"]["form"]['line'] = array( $aForms["filter"]["form"]['line'] = array(
'type' => 'markup', 'type' => 'markup',
'value' => '<div><hr>', 'value' => '',
); );
...@@ -320,6 +320,12 @@ class Actionlog { ...@@ -320,6 +320,12 @@ class Actionlog {
'href'=>'/deployment/all/setup/actionlog/', 'href'=>'/deployment/all/setup/actionlog/',
'onclick'=>'location.href=\'/deployment/all/setup/actionlog/\'; return false;', 'onclick'=>'location.href=\'/deployment/all/setup/actionlog/\'; return false;',
); );
} else {
// $aForms["filter"]["form"]['closediv'] = array(
// 'type' => 'markup',
// 'value' => '</div><!-- closediv -->',
// );
} }
// generate html output // generate html output
......
...@@ -271,7 +271,7 @@ class formgen { ...@@ -271,7 +271,7 @@ class formgen {
$this->_checkReqiredKeys($elementData, array("name")); $this->_checkReqiredKeys($elementData, array("name"));
$sFormElement.=' <input type="'.$elementData["type"].'" id="' . $sId . '" class="form-control col-sm-10" '; $sFormElement.=' <input type="'.$elementData["type"].'" id="' . $sId . '" class="form-control col-sm-10" ';
$aAllowedHtmlAttributes["text"] = explode(",", ""); $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); // $sFormElement.=$this->_addHtmlAtrributes(array("name", "value", "size", "placeholder", "required"), $elementData);
// IE: Return abfangen lassen // IE: Return abfangen lassen
// $sFormElement.=' onkeypress="return checkKey(event);"'; // $sFormElement.=' onkeypress="return checkKey(event);"';
...@@ -296,7 +296,7 @@ class formgen { ...@@ -296,7 +296,7 @@ class formgen {
$this->_checkReqiredKeys($elementData, array("name")); $this->_checkReqiredKeys($elementData, array("name"));
$sFormElement.=' <textarea id="' . $sId . '" class="form-control col-sm-10" '; $sFormElement.=' <textarea id="' . $sId . '" class="form-control col-sm-10" ';
$aAllowedHtmlAttributes["text"] = explode(",", ""); $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.=$this->_addHtmlAtrributes(array("name", "value", "size", "placeholder", "required"), $elementData);
$sFormElement.='>'.$elementData['value'].'</textarea>'; $sFormElement.='>'.$elementData['value'].'</textarea>';
$sFormElement.="\n"; $sFormElement.="\n";
......
...@@ -178,13 +178,14 @@ class projectlist extends base ...@@ -178,13 +178,14 @@ class projectlist extends base
$sOut .= ' $sOut .= '
<tr class="' . $sClasses . '" ' <tr class="' . $sClasses . '" '
. 'ondblclick="location.href=\'/deployment/' . $sPrj . '/\'" ' . 'ondblclick="location.href=\'/deployment/' . $sPrj . '/\'" '
. 'title="' . sprintf(t("overview-hint-dblclick"), $sPrj) . '"> . 'title="' . sprintf(t("overview-hint-dblclick"), $sPrj)
. '">
<td class="prj"> <td class="prj">
<span class="float-right"><i class="fa-solid fa-tag"></i> ' . $sPrjGroup . '</span> <span class="float-right"><i class="fa-solid fa-tag"></i> ' . $sPrjGroup . '</span>
<strong>' <strong>'
. $oHtml->getLink(array( . $oHtml->getLink(array(
'href' => '/deployment/' . $sPrj . '/', 'href' => '/deployment/' . $sPrj . '/',
'title' => $oPrj->getDescription(), // 'title' => $oPrj->getDescription(),
'icon' => 'project', 'icon' => 'project',
'label' => $oPrj->getLabel() 'label' => $oPrj->getLabel()
)) ))
......
...@@ -261,13 +261,12 @@ tr.progresshasqueue { ...@@ -261,13 +261,12 @@ tr.progresshasqueue {
td.prj:nth-child(1) { td.prj:nth-child(1) {
max-width: 30em; max-width: 30em;
min-width: 30em; min-width: 30em;
padding-left: 0.5em !important;
} }
td.prj:nth-child(1) a { td.prj:nth-child(1) a {
display: block; display: block;
padding: 0.3em 0.5em;
border-radius: 0.3em; border-radius: 0.3em;
background-color: #f0f4f8;
} }
/* /*
......
...@@ -7,31 +7,22 @@ ...@@ -7,31 +7,22 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{PAGE_TITLE}}</title> <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> <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 --> <!-- fontawesome -->
<link href="/vendor/font-awesome/6.4.0/css/all.min.css" rel="stylesheet" type="text/css"/> <link href="/vendor/font-awesome/6.4.0/css/all.min.css" rel="stylesheet" type="text/css"/>
<!-- Adminlte --> <!-- Adminlte -->
<link rel="stylesheet" href="{{DIR_ADMINLTE}}/css/adminlte.min.css?v=3.2.0"> <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}}/summernote/summernote-bs4.min.css">
<link rel="stylesheet" href="{{DIR_ADMINLTEPLUGINS}}/dropzone/dropzone.css" type="text/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.css">
<link rel="stylesheet" href="/deployment/main_new_ui.css"> <link rel="stylesheet" href="/deployment/main_new_ui.css">
...@@ -110,7 +101,6 @@ ...@@ -110,7 +101,6 @@
<div id="divmodalmessage">please wait ...</div> <div id="divmodalmessage">please wait ...</div>
</div> </div>
<script>{{INJECT_JS}}</script>
<script src="{{DIR_ADMINLTEPLUGINS}}/bootstrap/js/bootstrap.bundle.min.js"></script> <script src="{{DIR_ADMINLTEPLUGINS}}/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- <!--
<script src="{{DIR_ADMINLTEPLUGINS}}/summernote/summernote-bs4.min.js"></script> <script src="{{DIR_ADMINLTEPLUGINS}}/summernote/summernote-bs4.min.js"></script>
...@@ -119,6 +109,7 @@ ...@@ -119,6 +109,7 @@
<script src="{{DIR_ADMINLTE}}/js/adminlte.min.js?v=3.2.0"></script> <script src="{{DIR_ADMINLTE}}/js/adminlte.min.js?v=3.2.0"></script>
<script type="text/javascript" src="/deployment/js/functions.js"></script> <script type="text/javascript" src="/deployment/js/functions.js"></script>
<script>{{INJECT_JS}}</script>
</body> </body>
</html> </html>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment