DMC/boka3
13
0
Fork 0
Code Issues13 Pull Requests Projects Releases Wiki Activity

Merge branch 'prod' into test

Browse Source
This commit is contained in:
Erik Thuning 2024-02-26 16:36:21 +01:00
commit dd6c270fa3
5 changed files with 11 additions and 11 deletions

8
html/en/fragments.html

@ -105,7 +105,7 @@
</td>
</tr>
¤¤ product_detail_row ¤¤
¤¤ product_match_row ¤¤
<tr>
<td class="status ¤status¤">
</td>
@ -116,7 +116,7 @@
</td>
</tr>
¤¤ product_detail ¤¤
¤¤ product_match ¤¤
<dt>
¤name¤:
</dt>
@ -152,7 +152,7 @@
</form>
</div>
¤¤ product_form ¤¤
¤¤ product_details ¤¤
<div id="product-details">
<h2>Product details</h2>
<form id="product-data"
@ -814,7 +814,7 @@
<div class="clear"></div>
</form>
<p id="hints">
Advanced searches are possible by prefixing a search term with a keyword ending with a colon, for example: <strong>serial:123456</strong> or <strong>tag:computer</tag>
Advanced searches are possible by prefixing a search term with a keyword ending with a colon, for example: <strong>serial:123456</strong> or <strong>tag:computer</strong>
</p>
<div id="found-products"
class="¤hidden¤">

6
html/sv/fragments.html

@ -105,7 +105,7 @@
</td>
</tr>
¤¤ product_detail_row ¤¤
¤¤ product_match_row ¤¤
<tr>
<td class="status ¤status¤">
</td>
@ -116,7 +116,7 @@
</td>
</tr>
¤¤ product_detail ¤¤
¤¤ product_match ¤¤
<dt>
¤name¤:
</dt>
@ -152,7 +152,7 @@
</form>
</div>
¤¤ product_form ¤¤
¤¤ product_details ¤¤
<div id="product-details">
<h2>Artikeldata</h2>
<form id="product-data"

2
include/NewPage.php

@ -49,7 +49,7 @@ class NewPage extends Page {
'info' => $fields,
'label' => '',
'hidden' => 'hidden'),
$this->fragments['product_form']);
$this->fragments['product_details']);
return $out;
}
}

4
include/Page.php

@ -182,7 +182,7 @@ abstract class Page extends Responder {
$details = $this->build_product_details($product, $matches);
$out .= replace(array('status' => $status,
'details' => $details),
$this->fragments['product_detail_row']);
$this->fragments['product_match_row']);
}
return $out;
}
@ -195,7 +195,7 @@ abstract class Page extends Responder {
}
$out .= replace(array('name' => $product->get_label($name),
'value' => $value),
$this->fragments['product_detail']);
$this->fragments['product_match']);
}
return $out;
}

2
include/ProductPage.php

@ -87,7 +87,7 @@ class ProductPage extends Page {
$fields['checkout_hidden'] = '';
}
}
$out = replace($fields, $this->fragments['product_form']);
$out = replace($fields, $this->fragments['product_details']);
$out .= replace($fields, $this->fragments['product_meta']);
return $out;
}