Merge branch 'fronkdev' into 'master'

Lauout tweaks for Pipe- and Linework

See merge request fronk/thetool!1231
This commit is contained in:
Frank Schubert
2025-04-15 17:00:40 +00:00
2 changed files with 4 additions and 4 deletions

View File

@@ -358,13 +358,13 @@
<?php $i = 0; foreach($term->workflowitems as $item): ?>
<?php if($i==0): ?>
<?php if($item->type == "delimiter"): ?>
<tr class="workflow-header"><th colspan='<?=$wfColspan?>'><h4 <?=($item->style) ? "style='".$item->style."'" : ""?>><?=$item->label?></h4></th></tr><tr>
<tr class="workflow-header"><th colspan='<?=$wfColspan?>' <?=($item->style) ? "style='".$item->style."'" : ""?>><?=$item->label?></th></tr><tr>
<?php else: ?>
<tr>
<?php endif; ?>
<?php else: ?>
<?php if($item->type == "delimiter"): ?>
<tr class="workflow-header"><th colspan='<?=$wfColspan?>'><h4 <?=($item->style) ? "style='".$item->style."'" : ""?>><?=$item->label?></h4></th></tr><tr>
<tr class="workflow-header"><th colspan='<?=$wfColspan?>' <?=($item->style) ? "style='".$item->style."'" : ""?>><?=$item->label?></th></tr><tr>
<?php else: ?>
<?php include(realpath(dirname(__FILE__)."/../")."/Workflow/form.php"); ?>
<?php if(!$me->is("Admin") && $item->required == 1 && $term->workflowitems['customer_passive_finished']->value->id && $term->workflowitems['customer_passive_finished']->value->value_int == 1): ?>

View File

@@ -183,13 +183,13 @@
<?php $i = 0; foreach($building->workflowitems as $item): ?>
<?php if($i==0): ?>
<?php if($item->type == "delimiter"): ?>
<tr class="workflow-header"><th colspan='<?=$wfColspan?>'><h4 <?=($item->style) ? "style='".$item->style."'" : ""?>><?=$item->label?></h4></th></tr><tr>
<tr class="workflow-header"><th colspan='<?=$wfColspan?>' <?=($item->style) ? "style='".$item->style."'" : ""?>><?=$item->label?></th></tr><tr>
<?php else: ?>
<tr>
<?php endif; ?>
<?php else: ?>
<?php if($item->type == "delimiter"): ?>
</tr><tr class="workflow-header"><th colspan='<?=$wfColspan?>'><h4 <?=($item->style) ? "style='".$item->style."'" : ""?>><?=$item->label?></h4></th></tr><tr>
</tr><tr class="workflow-header"><th colspan='<?=$wfColspan?>' <?=($item->style) ? "style='".$item->style."'" : ""?>><?=$item->label?></th></tr><tr>
<?php else: ?>
<?php include(realpath(dirname(__FILE__)."/../")."/Workflow/form.php"); ?>
<?php endif; ?>