Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added colspan attribute to workflow items

Browse Source
This commit is contained in:
Frank Schubert
2021-09-09 23:37:24 +02:00
parent 235c8bc15b
commit 7ee687c201
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Linework/Index.php
+2 -2
View File
@@ -1,5 +1,5 @@
<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?> <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
<?php $wftype = "termination"; ?> <?php $wftype = "term"; ?>
<!-- start page title --> <!-- start page title -->
@@ -141,7 +141,7 @@
<td> <td>
<form method="post" name="wf-termination-<?=$term->id?>" id="wf-termination-<?=$term->id?>" action="<?=self::getUrl("Linework","save", ["filter" => $filter])?>" enctype="multipart/form-data" > <form method="post" name="wf-termination-<?=$term->id?>" id="wf-termination-<?=$term->id?>" action="<?=self::getUrl("Linework","save", ["filter" => $filter])?>" enctype="multipart/form-data" >
<input type="hidden" name="id" value="<?=$term->id?>" /> <input type="hidden" name="id" value="<?=$term->id?>" />
<table class="table workflow-table"> <table class="table ">
<?php $i = 0; foreach($term->workflowitems as $item): ?> <?php $i = 0; foreach($term->workflowitems as $item): ?>
<?php if($i==0): ?> <?php if($i==0): ?>
<?php if($item->type == "delimiter"): ?> <?php if($item->type == "delimiter"): ?>
Layout/default/Workflow/form.php
+1 -1
View File
@@ -1,4 +1,4 @@
<td class="workflow-item"> <td class="workflow-item" <?=($item->width > 1) ? "colspan='".$item->width."'" : ""?>>
<?php if($item->type != "gps"): ?> <?php if($item->type != "gps"): ?>
<label class="form-label" for="wfitem_<?=$item->name?>_<?=$$wftype->id?>"> <label class="form-label" for="wfitem_<?=$item->name?>_<?=$$wftype->id?>">
<?=($item->label) ? $item->label : "&nbsp;"?> <?=($item->label) ? $item->label : "&nbsp;"?>
application/Linework/LineworkController.php
+1 -1
View File
@@ -109,7 +109,7 @@ class LineworkController extends mfBaseController {
break; break;
} }
$i++; $i += ($wfitem->width) ? $wfitem->width : 1;
} }
} }
//var_dump($item_colspan);exit; //var_dump($item_colspan);exit;
public/assets/css/thetool.css
+3 -3
View File
@@ -61,7 +61,7 @@
padding-bottom: 4px; padding-bottom: 4px;
border-top: none; border-top: none;
min-width: 138px; min-width: 138px;
max-width: 138px;
} }
.workflow-header { .workflow-header {
@@ -76,13 +76,13 @@
.workflow-table .workflow-item select { .workflow-table .workflow-item select {
padding-left: 4px; padding-left: 4px;
width:100%; min-width:138px;
/*max-width: 138px;*/ /*max-width: 138px;*/
} }
.workflow-item input[type=text] { .workflow-item input[type=text] {
max-width:100%; max-width:100%;
/*width: 128px;*/ 0width: 138px;
} }
.padding-left-2 { .padding-left-2 {