aimeos / ai-admin-jqadm

admin/jqadm/templates/attribute/item-text-standard.php

Spacing +85 added lines, -85 removed lines

@@ -17,9 +17,9 @@ 
 ?>
 <div id="text" class="item-text content-block tab-pane fade" role="tablist" aria-labelledby="text">
 	<div id="item-text-group" role="tablist" aria-multiselectable="true"
-		data-items="<?= $enc->attr( json_encode( $this->get( 'textData', [] ) ) ); ?>"
-		data-listtype="<?= key( $this->get( 'textListTypes', [] ) ) ?>"
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
+		data-items="<?= $enc->attr(json_encode($this->get('textData', []))); ?>"
+		data-listtype="<?= key($this->get('textListTypes', [])) ?>"
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
 		data-siteid="<?= $this->site()->siteid() ?>" >
 
 		<div v-for="(entry, idx) in items" class="group-item card">
@@ -28,16 +28,16 @@ 
 				v-bind:data-target="'#item-text-group-data-' + idx" data-toggle="collapse" role="tab" class="card-header header"
 				v-bind:aria-controls="'item-text-group-data-' + idx" aria-expanded="false">
 				<div class="card-tools-left">
-					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide this entry') ); ?>">
+					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Show/hide this entry')); ?>">
 					</div>
 				</div>
 				<span class="item-label header-label" v-html="getLabel(idx)"></span>
 				&nbsp;
 				<div class="card-tools-right">
 					<div v-if="!checkSite('attribute.lists.siteid', idx)"
-						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removeItem(idx)">
 					</div>
 				</div>
@@ -47,7 +47,7 @@ 
 				v-bind:aria-labelledby="'item-text-group-item-' + idx" role="tabpanel" class="card-block collapse row">
 
 				<input type="hidden" v-model="items[idx]['text.id']"
-					v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.id' ) ) ); ?>'.replace('idx', idx)" />
+					v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.id'))); ?>'.replace('idx', idx)" />
 
 				<div class="col-xl-6">
 
@@ -56,9 +56,9 @@ 
 							<textarea is="html-editor" class="form-control item-content" required="required" v-once
 								v-model="items[idx]['text.content']"
 								v-bind:value="items[idx]['text.content']"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.content' ) ) ); ?>'.replace('idx', idx)"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.content'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('text.siteid', idx)"
-								v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
+								v-bind:tabindex="<?= $this->get('tabindex'); ?>"
 							></textarea>
 						</div>
 					</div>
@@ -68,101 +68,101 @@ 
 				<div class="col-xl-6">
 
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
 						<div class="col-sm-8">
-							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.status' ) ) ); ?>'.replace('idx', idx)"
+							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.status'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('text.siteid', idx)"
 								v-model="items[idx]['text.status']" >
 								<option value="1" v-bind:selected="entry['text.status'] == 1" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
 								<option value="0" v-bind:selected="entry['text.status'] == 0" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
 								<option value="-1" v-bind:selected="entry['text.status'] == -1" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
 								<option value="-2" v-bind:selected="entry['text.status'] == -2" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</div>
 					</div>
 
-					<?php $languages = $this->get( 'pageLangItems', [] ); ?>
-					<?php if( count( $languages ) > 1 ) : ?>
+					<?php $languages = $this->get('pageLangItems', []); ?>
+					<?php if (count($languages) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Language')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-languageid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-languageid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.languageid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('text.siteid', idx)"
 									v-model="items[idx]['text.languageid']" >
 
 									<option value="" disable >
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( $languages as $langId => $langItem ) : ?>
-										<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="entry['text.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-											<?= $enc->html( $langItem->getLabel() ); ?>
+									<?php foreach ($languages as $langId => $langItem) : ?>
+										<option value="<?= $enc->attr($langId); ?>" v-bind:selected="entry['text.languageid'] == '<?= $enc->attr($langId) ?>'" >
+											<?= $enc->html($langItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Language of the entered text')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="text-langid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $languages ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.languageid'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($languages)); ?>" />
 					<?php endif; ?>
 
-					<?php $textTypes = $this->get( 'textTypes', [] ); ?>
-					<?php if( count( $textTypes ) > 1 ) : ?>
+					<?php $textTypes = $this->get('textTypes', []); ?>
+					<?php if (count($textTypes) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Type')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.type'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('text.siteid', idx)"
 									v-model="items[idx]['text.type']" >
 
 									<option value="" disable >
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( (array) $textTypes as $typeItem ) : ?>
-										<option value="<?= $enc->attr( $typeItem->getCode() ); ?>" v-bind:selected="entry['text.type'] == '<?= $enc->attr( $typeItem->getCode() ) ?>'" >
-											<?= $enc->html( $typeItem->getLabel() ); ?>
+									<?php foreach ((array) $textTypes as $typeItem) : ?>
+										<option value="<?= $enc->attr($typeItem->getCode()); ?>" v-bind:selected="entry['text.type'] == '<?= $enc->attr($typeItem->getCode()) ?>'" >
+											<?= $enc->html($typeItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Types for additional texts like per one lb/kg or per month')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="item-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $textTypes ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.type'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($textTypes)); ?>" />
 					<?php endif; ?>
 
 					<div class="form-group row optional">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-label" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.label' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Label' ) ); ?>"
+							<input class="form-control item-label" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.label'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Label')); ?>"
 								v-bind:readonly="checkSite('text.siteid', idx)"
 								v-model="items[idx]['text.label']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Description of the text content if it\'s in a foreign language' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Description of the text content if it\'s in a foreign language')); ?>
 						</div>
 					</div>
 
@@ -171,70 +171,70 @@ 
 
 				<div v-on:click="toggle(idx)" class="col-xl-12 advanced" v-bind:class="{ 'collapsed': !advanced[idx] }">
 					<div class="card-tools-left">
-						<div class="btn act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-							title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide advanced data') ); ?>">
+						<div class="btn act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+							title="<?= $enc->attr($this->translate('admin', 'Show/hide advanced data')); ?>">
 						</div>
 					</div>
-					<span class="header-label"><?= $enc->html( $this->translate( 'admin', 'Advanced' ) ); ?></span>
+					<span class="header-label"><?= $enc->html($this->translate('admin', 'Advanced')); ?></span>
 				</div>
 
 				<div v-show="advanced[idx]" class="col-xl-6 content-block secondary">
 
 					<input type="hidden" v-model="items[idx]['attribute.lists.type']"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'attribute.lists.type' ) ) ); ?>'.replace( 'idx', idx )" />
+						v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'attribute.lists.type'))); ?>'.replace( 'idx', idx )" />
 
-					<?php $listTypes = $this->get( 'textListTypes', [] ); ?>
-					<?php if( count( $listTypes ) > 1 ) : ?>
+					<?php $listTypes = $this->get('textListTypes', []); ?>
+					<?php if (count($listTypes) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'List type' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'List type')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select listitem-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'attribute.lists.type' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select listitem-type" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'attribute.lists.type'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
 									v-model="items[idx]['attribute.lists.type']" >
 
-									<?php foreach( $this->get( 'textListTypes', [] ) as $typeItem ) : ?>
-										<option value="<?= $enc->attr( $typeItem->getCode() ); ?>" v-bind:selected="entry['attribute.lists.type'] == '<?= $enc->attr( $typeItem->getCode() ) ?>'" >
-											<?= $enc->html( $typeItem->getLabel() ); ?>
+									<?php foreach ($this->get('textListTypes', []) as $typeItem) : ?>
+										<option value="<?= $enc->attr($typeItem->getCode()); ?>" v-bind:selected="entry['attribute.lists.type'] == '<?= $enc->attr($typeItem->getCode()) ?>'" >
+											<?= $enc->html($typeItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Second level type for grouping items')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="listitem-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'attribute.lists.type' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $listTypes ) ); ?>"
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'attribute.lists.type'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($listTypes)); ?>"
 							v-model="items[idx]['attribute.lists.type']" />
 					<?php endif; ?>
 
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Start date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Start date')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'attribute.lists.datestart' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+							<input class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'attribute.lists.datestart'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 								v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
 								v-model="items[idx]['attribute.lists.datestart']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The item is only shown on the web site after that date and time' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The item is only shown on the web site after that date and time')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'End date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'End date')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'attribute.lists.dateend' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+							<input class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'attribute.lists.dateend'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 								v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
 								v-model="items[idx]['attribute.lists.dateend']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The item is only shown on the web site until that date and time' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The item is only shown on the web site until that date and time')); ?>
 						</div>
 					</div>
 				</div>
@@ -244,17 +244,17 @@ 
 						<thead>
 							<tr>
 								<th>
-									<span class="help"><?= $enc->html( $this->translate( 'admin', 'Option' ) ); ?></span>
+									<span class="help"><?= $enc->html($this->translate('admin', 'Option')); ?></span>
 									<div class="form-text text-muted help-text">
-										<?= $enc->html( $this->translate( 'admin', 'Configuration options, will be available as key/value pairs in the list item' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Configuration options, will be available as key/value pairs in the list item')); ?>
 									</div>
 								</th>
 								<th>
-									<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Value')); ?>
 								</th>
 								<th class="actions">
-									<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+									<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+										title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 										v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
 										v-on:click="addConfig(idx)" >
 									</div>
@@ -267,21 +267,21 @@ 
 								<td>
 									<input is="auto-complete"
 										v-model="items[idx]['config']['key'][pos]"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'config', 'key', '' ) ) ); ?>'.replace('idx', idx)"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'config', 'key', ''))); ?>'.replace('idx', idx)"
 										v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
-										v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
+										v-bind:tabindex="<?= $this->get('tabindex'); ?>"
 										v-bind:keys="[]" />
 								</td>
 								<td>
-									<input type="text" class="form-control" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'config', 'val', '' ) ) ); ?>'.replace('idx', idx)"
+									<input type="text" class="form-control" tabindex="<?= $this->get('tabindex'); ?>"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'config', 'val', ''))); ?>'.replace('idx', idx)"
 										v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
 										v-model="items[idx]['config']['val'][pos]" />
 								</td>
 								<td class="actions">
 									<div v-if="!checkSite('attribute.lists.siteid', idx)" v-on:click="removeConfig(idx, pos)"
-										class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+										class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+										title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 									</div>
 								</td>
 							</tr>
@@ -290,14 +290,14 @@ 
 					</table>
 				</div>
 
-				<?= $this->get( 'textBody' ); ?>
+				<?= $this->get('textBody'); ?>
 
 			</div>
 		</div>
 
 		<div class="card-tools-more">
-			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-				title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+				title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 				v-on:click="addItem('attribute.lists.')" >
 			</div>
 		</div>

Braces +15 added lines, -6 removed lines

@@ -115,9 +115,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="text-langid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $languages ) ); ?>" />
 					<?php endif; ?>
 
@@ -146,9 +149,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="item-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $textTypes ) ); ?>" />
 					<?php endif; ?>
 
@@ -204,9 +210,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="listitem-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'attribute.lists.type' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'attribute.lists.type' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $listTypes ) ); ?>"
 							v-model="items[idx]['attribute.lists.type']" />
 					<?php endif; ?>

admin/jqadm/templates/attribute/item-property-standard.php

Spacing +24 added lines, -24 removed lines

@@ -18,21 +18,21 @@ 
 <div id="property" class="item-property tab-pane fade" role="tabpanel" aria-labelledby="property">
 
 	<table class="property-list table table-default"
-		data-items="<?= $enc->attr( json_encode( $this->get( 'propertyData', [] ) ) ); ?>"
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
+		data-items="<?= $enc->attr(json_encode($this->get('propertyData', []))); ?>"
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
 		data-siteid="<?= $this->site()->siteid() ?>" >
 
 		<thead>
 			<tr>
 				<th colspan="3">
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Properties' ) ); ?></span>
+					<span class="help"><?= $enc->html($this->translate('admin', 'Properties')); ?></span>
 					<div class="form-text text-muted help-text">
-						<?= $enc->html( $this->translate( 'admin', 'Attribute properties that are not shared with other attributes' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Attribute properties that are not shared with other attributes')); ?>
 					</div>
 				</th>
 				<th class="actions">
-					<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+					<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 						v-on:click="addItem('attribute.property.')">
 					</div>
 				</th>
@@ -44,16 +44,16 @@ 
 			<tr v-for="(entry, idx) in items" v-bind:key="idx" v-bind:class="checkSite('attribute.property.siteid', idx) ? 'readonly' : ''">
 				<td class="property-type">
 					<input class="item-id" type="hidden" v-bind:value="entry['attribute.property.id']"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'property', 'idx', 'attribute.property.id' ) ) ); ?>'.replace('idx', idx)" />
+						v-bind:name="'<?= $enc->attr($this->formparam(array('property', 'idx', 'attribute.property.id'))); ?>'.replace('idx', idx)" />
 
-					<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'property', 'idx', 'attribute.property.type' ) ) ); ?>'.replace('idx', idx)"
+					<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('property', 'idx', 'attribute.property.type'))); ?>'.replace('idx', idx)"
 						v-bind:readonly="checkSite('attribute.property.siteid', idx)"
 						v-model="items[idx]['attribute.property.type']" >
 
-						<?php foreach( $this->get( 'propertyTypes', [] ) as $id => $item ) : ?>
-							<option value="<?= $enc->attr( $id ); ?>" v-bind:selected="entry['attribute.property.type'] == '<?= $enc->attr( $id ) ?>'" >
-								<?= $enc->html( $item->getLabel() ); ?>
+						<?php foreach ($this->get('propertyTypes', []) as $id => $item) : ?>
+							<option value="<?= $enc->attr($id); ?>" v-bind:selected="entry['attribute.property.type'] == '<?= $enc->attr($id) ?>'" >
+								<?= $enc->html($item->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 
@@ -61,34 +61,34 @@ 
 				</td>
 
 				<td class="property-language">
-					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'property', 'idx', 'attribute.property.languageid' ) ) ); ?>'.replace('idx', idx)"
+					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('property', 'idx', 'attribute.property.languageid'))); ?>'.replace('idx', idx)"
 						v-bind:readonly="checkSite('attribute.property.siteid', idx)"
 						v-model="items[idx]['attribute.property.languageid']" >
 
 						<option v-bind:value="null">
-							<?= $enc->html( $this->translate( 'admin', 'All' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'All')); ?>
 						</option>
 
-						<?php foreach( $this->get( 'pageLangItems', [] ) as $langId => $langItem ) : ?>
-							<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="entry['attribute.property.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-								<?= $enc->html( $langItem->getLabel() ); ?>
+						<?php foreach ($this->get('pageLangItems', []) as $langId => $langItem) : ?>
+							<option value="<?= $enc->attr($langId); ?>" v-bind:selected="entry['attribute.property.languageid'] == '<?= $enc->attr($langId) ?>'" >
+								<?= $enc->html($langItem->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 					</select>
 				</td>
 
 				<td class="property-value">
-					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'property', 'idx', 'attribute.property.value' ) ) ); ?>'.replace('idx', idx)"
-						placeholder="<?= $enc->attr( $this->translate( 'admin', 'Property value (required)' ) ); ?>"
+					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('property', 'idx', 'attribute.property.value'))); ?>'.replace('idx', idx)"
+						placeholder="<?= $enc->attr($this->translate('admin', 'Property value (required)')); ?>"
 						v-bind:readonly="checkSite('attribute.property.siteid', idx)"
 						v-model="items[idx]['attribute.property.value']" >
 				</td>
 
 				<td class="actions">
-					<div v-if="!checkSite('attribute.property.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+					<div v-if="!checkSite('attribute.property.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removeItem(idx)">
 					</div>
 				</td>
@@ -97,5 +97,5 @@ 
 		</tbody>
 	</table>
 
-	<?= $this->get( 'propertyBody' ); ?>
+	<?= $this->get('propertyBody'); ?>
 </div>

admin/jqadm/templates/attribute/list-standard.php

Spacing +97 added lines, -97 removed lines

@@ -8,34 +8,34 @@ 
 $enc = $this->encoder();
 
 
-$target = $this->config( 'admin/jqadm/url/search/target' );
-$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
-$config = $this->config( 'admin/jqadm/url/search/config', [] );
+$target = $this->config('admin/jqadm/url/search/target');
+$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/search/action', 'search');
+$config = $this->config('admin/jqadm/url/search/config', []);
 
 
-$newTarget = $this->config( 'admin/jqadm/url/create/target' );
-$newCntl = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
-$newAction = $this->config( 'admin/jqadm/url/create/action', 'create' );
-$newConfig = $this->config( 'admin/jqadm/url/create/config', [] );
+$newTarget = $this->config('admin/jqadm/url/create/target');
+$newCntl = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
+$newAction = $this->config('admin/jqadm/url/create/action', 'create');
+$newConfig = $this->config('admin/jqadm/url/create/config', []);
 
 
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
+$getTarget = $this->config('admin/jqadm/url/get/target');
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
 
 
-$copyTarget = $this->config( 'admin/jqadm/url/copy/target' );
-$copyCntl = $this->config( 'admin/jqadm/url/copy/controller', 'Jqadm' );
-$copyAction = $this->config( 'admin/jqadm/url/copy/action', 'copy' );
-$copyConfig = $this->config( 'admin/jqadm/url/copy/config', [] );
+$copyTarget = $this->config('admin/jqadm/url/copy/target');
+$copyCntl = $this->config('admin/jqadm/url/copy/controller', 'Jqadm');
+$copyAction = $this->config('admin/jqadm/url/copy/action', 'copy');
+$copyConfig = $this->config('admin/jqadm/url/copy/config', []);
 
 
-$delTarget = $this->config( 'admin/jqadm/url/delete/target' );
-$delCntl = $this->config( 'admin/jqadm/url/delete/controller', 'Jqadm' );
-$delAction = $this->config( 'admin/jqadm/url/delete/action', 'delete' );
-$delConfig = $this->config( 'admin/jqadm/url/delete/config', [] );
+$delTarget = $this->config('admin/jqadm/url/delete/target');
+$delCntl = $this->config('admin/jqadm/url/delete/controller', 'Jqadm');
+$delAction = $this->config('admin/jqadm/url/delete/action', 'delete');
+$delConfig = $this->config('admin/jqadm/url/delete/config', []);
 
 
 /** admin/jqadm/attribute/fields
@@ -53,45 +53,45 @@ 
  * @category Developer
  */
 $default = ['attribute.status', 'attribute.type', 'attribute.code', 'attribute.label'];
-$default = $this->config( 'admin/jqadm/attribute/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/attribute/fields', $default );
+$default = $this->config('admin/jqadm/attribute/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/attribute/fields', $default);
 
-$searchParams = $params = $this->get( 'pageParams', [] );
+$searchParams = $params = $this->get('pageParams', []);
 $searchParams['page']['start'] = 0;
 
 $typeList = [];
-foreach( $this->get( 'itemTypes', [] ) as $typeItem ) {
+foreach ($this->get('itemTypes', []) as $typeItem) {
 	$typeList[$typeItem->getCode()] = $typeItem->getCode();
 }
 
 $columnList = [
-	'attribute.id' => $this->translate( 'admin', 'ID' ),
-	'attribute.domain' => $this->translate( 'admin', 'Domain' ),
-	'attribute.status' => $this->translate( 'admin', 'Status' ),
-	'attribute.type' => $this->translate( 'admin', 'Type' ),
-	'attribute.code' => $this->translate( 'admin', 'Code' ),
-	'attribute.label' => $this->translate( 'admin', 'Label' ),
-	'attribute.position' => $this->translate( 'admin', 'Position' ),
-	'attribute.ctime' => $this->translate( 'admin', 'Created' ),
-	'attribute.mtime' => $this->translate( 'admin', 'Modified' ),
-	'attribute.editor' => $this->translate( 'admin', 'Editor' ),
+	'attribute.id' => $this->translate('admin', 'ID'),
+	'attribute.domain' => $this->translate('admin', 'Domain'),
+	'attribute.status' => $this->translate('admin', 'Status'),
+	'attribute.type' => $this->translate('admin', 'Type'),
+	'attribute.code' => $this->translate('admin', 'Code'),
+	'attribute.label' => $this->translate('admin', 'Label'),
+	'attribute.position' => $this->translate('admin', 'Position'),
+	'attribute.ctime' => $this->translate('admin', 'Created'),
+	'attribute.mtime' => $this->translate('admin', 'Modified'),
+	'attribute.editor' => $this->translate('admin', 'Editor'),
 ];
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
 <nav class="main-navbar">
 
 	<span class="navbar-brand">
-		<?= $enc->html( $this->translate( 'admin', 'Attribute' ) ); ?>
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
+		<?= $enc->html($this->translate('admin', 'Attribute')); ?>
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
 	</span>
 
 	<?= $this->partial(
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
-			'filter' => $this->session( 'aimeos/admin/jqadm/attribute/filter', [] ),
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
-			'filterOperators' => $this->get( 'filterOperators', [] ),
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
+			'filter' => $this->session('aimeos/admin/jqadm/attribute/filter', []),
+			'filterAttributes' => $this->get('filterAttributes', []),
+			'filterOperators' => $this->get('filterOperators', []),
 			'params' => $params,
 		]
 	); ?>
@@ -99,33 +99,33 @@ 
 
 
 <?= $this->partial(
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/attribute/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/attribute/page', [])]
 	);
 ?>
 
-<form class="list list-attribute" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
+<form class="list list-attribute" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
 	<?= $this->csrf()->formfield(); ?>
 
 	<table class="list-items table table-hover table-striped">
 		<thead class="list-header">
 			<tr>
 				<?= $this->partial(
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/attribute/sort' )]
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/attribute/sort')]
 					);
 				?>
 
 				<th class="actions">
 					<a class="btn fa act-add" tabindex="1"
-						href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
+						href="<?= $enc->attr($this->url($newTarget, $newCntl, $newAction, $params, [], $newConfig)); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
+						aria-label="<?= $enc->attr($this->translate('admin', 'Add')); ?>">
 					</a>
 
 					<?= $this->partial(
-							$this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ),
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
 							['fields' => $fields, 'data' => $columnList]
 						);
 					?>
@@ -135,21 +135,21 @@ 
 		<tbody>
 
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/attribute/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/attribute/filter', []),
 					'data' => [
 						'attribute.id' => ['op' => '=='],
 						'attribute.domain' => ['op' => '==', 'type' => 'select', 'val' => [
-							'product' => $this->translate( 'admin', 'product' ),
-							'catalog' => $this->translate( 'admin', 'catalog' ),
-							'media' => $this->translate( 'admin', 'media' ),
-							'text' => $this->translate( 'admin', 'text' ),
+							'product' => $this->translate('admin', 'product'),
+							'catalog' => $this->translate('admin', 'catalog'),
+							'media' => $this->translate('admin', 'media'),
+							'text' => $this->translate('admin', 'text'),
 						]],
 						'attribute.status' => ['op' => '==', 'type' => 'select', 'val' => [
-							'1' => $this->translate( 'mshop/code', 'status:1' ),
-							'0' => $this->translate( 'mshop/code', 'status:0' ),
-							'-1' => $this->translate( 'mshop/code', 'status:-1' ),
-							'-2' => $this->translate( 'mshop/code', 'status:-2' ),
+							'1' => $this->translate('mshop/code', 'status:1'),
+							'0' => $this->translate('mshop/code', 'status:0'),
+							'-1' => $this->translate('mshop/code', 'status:-1'),
+							'-2' => $this->translate('mshop/code', 'status:-2'),
 						]],
 						'attribute.type' => ['op' => '==', 'type' => 'select', 'val' => $typeList],
 						'attribute.code' => [],
@@ -162,50 +162,50 @@ 
 				] );
 			?>
 
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig ) ); ?>
-				<tr class="<?= $this->site()->readonly( $item->getSiteId() ); ?>">
-					<?php if( in_array( 'attribute.id', $fields ) ) : ?>
-						<td class="attribute-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getId() ); ?></a></td>
+			<?php foreach ($this->get('items', []) as $id => $item) : ?>
+				<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig)); ?>
+				<tr class="<?= $this->site()->readonly($item->getSiteId()); ?>">
+					<?php if (in_array('attribute.id', $fields)) : ?>
+						<td class="attribute-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'attribute.domain', $fields ) ) : ?>
-						<td class="attribute-domain"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDomain() ); ?></a></td>
+					<?php if (in_array('attribute.domain', $fields)) : ?>
+						<td class="attribute-domain"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDomain()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'attribute.status', $fields ) ) : ?>
-						<td class="attribute-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
+					<?php if (in_array('attribute.status', $fields)) : ?>
+						<td class="attribute-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'attribute.type', $fields ) ) : ?>
-						<td class="attribute-type"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getType() ); ?></a></td>
+					<?php if (in_array('attribute.type', $fields)) : ?>
+						<td class="attribute-type"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getType()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'attribute.code', $fields ) ) : ?>
-						<td class="attribute-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html( $item->getCode() ); ?></a></td>
+					<?php if (in_array('attribute.code', $fields)) : ?>
+						<td class="attribute-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html($item->getCode()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'attribute.label', $fields ) ) : ?>
-						<td class="attribute-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
+					<?php if (in_array('attribute.label', $fields)) : ?>
+						<td class="attribute-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'attribute.position', $fields ) ) : ?>
-						<td class="attribute-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getPosition() ); ?></a></td>
+					<?php if (in_array('attribute.position', $fields)) : ?>
+						<td class="attribute-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getPosition()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'attribute.ctime', $fields ) ) : ?>
-						<td class="attribute-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
+					<?php if (in_array('attribute.ctime', $fields)) : ?>
+						<td class="attribute-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'attribute.mtime', $fields ) ) : ?>
-						<td class="attribute-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
+					<?php if (in_array('attribute.mtime', $fields)) : ?>
+						<td class="attribute-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'attribute.editor', $fields ) ) : ?>
-						<td class="attribute-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
+					<?php if (in_array('attribute.editor', $fields)) : ?>
+						<td class="attribute-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getEditor()); ?></a></td>
 					<?php endif; ?>
 
 					<td class="actions">
 						<a class="btn act-copy fa" tabindex="1"
-							href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>"
-							title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>"
-							aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a>
-						<?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?>
+							href="<?= $enc->attr($this->url($copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig)); ?>"
+							title="<?= $enc->attr($this->translate('admin', 'Copy this entry')); ?>"
+							aria-label="<?= $enc->attr($this->translate('admin', 'Copy')); ?>"></a>
+						<?php if (!$this->site()->readonly($item->getSiteId())) : ?>
 							<a class="btn act-delete fa" tabindex="1"
-								href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'attribute', 'id' => $id] + $params, [], $delConfig ) ); ?>"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
+								href="<?= $enc->attr($this->url($delTarget, $delCntl, $delAction, ['resource' => 'attribute', 'id' => $id] + $params, [], $delConfig)); ?>"
+								title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
+								aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>"></a>
 						<?php endif; ?>
 					</td>
 				</tr>
@@ -213,18 +213,18 @@ 
 		</tbody>
 	</table>
 
-	<?php if( $this->get( 'items', [] ) === [] ) : ?>
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
+	<?php if ($this->get('items', []) === []) : ?>
+		<div class="noitems"><?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?></div>
 	<?php endif; ?>
 </form>
 
 <?= $this->partial(
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/attribute/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/attribute/page', [])]
 	);
 ?>
 
 <?php $this->block()->stop(); ?>
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/templates/attribute/item-price-standard.php

Spacing +102 added lines, -102 removed lines

@@ -13,15 +13,15 @@ 
 	'price.siteid', 'price.type', 'price.currencyid', 'price.status', 'price.quantity', 'price.taxrate', 'price.value', 'price.rebate', 'price.costs'
 ];
 
-$currencies = $this->get( 'priceCurrencies', [] );
+$currencies = $this->get('priceCurrencies', []);
 
 
 ?>
 <div id="price" class="item-price content-block tab-pane fade" role="tablist" aria-labelledby="price">
 	<div id="item-price-group" role="tablist" aria-multiselectable="true"
-		data-items="<?= $enc->attr( json_encode( $this->get( 'priceData', [] ) ) ); ?>"
-		data-listtype="<?= key( $this->get( 'priceListTypes', [] ) ) ?>"
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
+		data-items="<?= $enc->attr(json_encode($this->get('priceData', []))); ?>"
+		data-listtype="<?= key($this->get('priceListTypes', [])) ?>"
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
 		data-siteid="<?= $this->site()->siteid() ?>" >
 
 		<div v-for="(entry, idx) in items" class="group-item card">
@@ -30,16 +30,16 @@ 
 				v-bind:data-target="'#item-price-group-data-' + idx" data-toggle="collapse" role="tab" class="card-header header"
 				v-bind:aria-controls="'item-price-group-data-' + idx" aria-expanded="false">
 				<div class="card-tools-left">
-					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide this entry') ); ?>">
+					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Show/hide this entry')); ?>">
 					</div>
 				</div>
 				<span class="item-label header-label" v-html="getLabel(idx)"></span>
 				&nbsp;
 				<div class="card-tools-right">
 					<div v-if="!checkSite('attribute.lists.siteid', idx)"
-						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removeItem(idx)">
 					</div>
 				</div>
@@ -49,60 +49,60 @@ 
 				v-bind:aria-labelledby="'item-price-group-item-' + idx" role="tabpanel" class="card-block collapse row">
 
 				<input type="hidden" v-model="items[idx]['price.id']"
-					v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.id' ) ) ); ?>'.replace('idx', idx)" />
+					v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'price.id'))); ?>'.replace('idx', idx)" />
 
 				<div class="col-xl-6">
 
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Tax rate in %' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Tax rate in %')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-taxrate" type="number" step="0.01" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.taxrate' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Tax rate in %' ) ); ?>"
+							<input class="form-control item-taxrate" type="number" step="0.01" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'price.taxrate'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Tax rate in %')); ?>"
 								v-bind:readonly="checkSite('price.siteid', idx)"
 								v-model="items[idx]['price.taxrate']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Country specific tax rate to calculate and display the included tax (B2C) or add the tax if required (B2B)' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Country specific tax rate to calculate and display the included tax (B2C) or add the tax if required (B2B)')); ?>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Actual current price' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Actual current price')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-value" type="number" step="0.01" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.value' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Actual current price' ) ); ?>"
+							<input class="form-control item-value" type="number" step="0.01" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'price.value'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Actual current price')); ?>"
 								v-bind:readonly="checkSite('price.siteid', idx)"
 								v-model="items[idx]['price.value']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Actual price customers can buy the article for on the web site' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Actual price customers can buy the article for on the web site')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Substracted rebate amount' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Substracted rebate amount')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-rebate" type="number" step="0.01" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.rebate' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Substracted rebate amount' ) ); ?>"
+							<input class="form-control item-rebate" type="number" step="0.01" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'price.rebate'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Substracted rebate amount')); ?>"
 								v-bind:readonly="checkSite('price.siteid', idx)"
 								v-model="items[idx]['price.rebate']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Reduction from the original price, used to calculate the rebate in % and the cross price' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Reduction from the original price, used to calculate the rebate in % and the cross price')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Shipping costs per item' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Shipping costs per item')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-costs" type="number" step="0.01" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.costs' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Shipping costs per item' ) ); ?>"
+							<input class="form-control item-costs" type="number" step="0.01" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'price.costs'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Shipping costs per item')); ?>"
 								v-bind:readonly="checkSite('price.siteid', idx)"
 								v-model="items[idx]['price.costs']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Additional delivery costs for each item, e.g. $20 for one heavy item will be $100 for five items it total' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Additional delivery costs for each item, e.g. $20 for one heavy item will be $100 for five items it total')); ?>
 						</div>
 					</div>
 
@@ -111,43 +111,43 @@ 
 				<div class="col-xl-6">
 
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
 						<div class="col-sm-8">
-							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.status' ) ) ); ?>'.replace('idx', idx)"
+							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'price.status'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('price.siteid', idx)"
 								v-model="items[idx]['price.status']" >
 								<option value="1" v-bind:selected="items[idx]['price.status'] == 1" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
 								<option value="0" v-bind:selected="items[idx]['price.status'] == 0" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
 								<option value="-1" v-bind:selected="items[idx]['price.status'] == -1" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
 								<option value="-2" v-bind:selected="items[idx]['price.status'] == -2" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</div>
 					</div>
 
-					<?php if( count( $currencies ) > 1 ) : ?>
+					<?php if (count($currencies) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Currency' ) ); ?></label>
+							<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Currency')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-currencyid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-currencyid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'price.currencyid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('price.siteid', idx)"
 									v-model="items[idx]['price.currencyid']" >
 									<option value="" disabled>
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( $currencies as $currencyId => $currencyItem ) : ?>
-										<option value="<?= $enc->attr( $currencyItem->getCode() ); ?>" v-bind:selected="items[idx]['price.currencyid'] == '<?= $enc->attr( $currencyId ) ?>'" >
-											<?= $enc->html( $currencyItem->getCode() ); ?>
+									<?php foreach ($currencies as $currencyId => $currencyItem) : ?>
+										<option value="<?= $enc->attr($currencyItem->getCode()); ?>" v-bind:selected="items[idx]['price.currencyid'] == '<?= $enc->attr($currencyId) ?>'" >
+											<?= $enc->html($currencyItem->getCode()); ?>
 										</option>
 									<?php endforeach; ?>
 
@@ -156,51 +156,51 @@ 
 						</div>
 					<?php else : ?>
 						<input class="item-currencyid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $currencies ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'price.currencyid'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($currencies)); ?>" />
 					<?php endif; ?>
 
-					<?php $priceTypes = $this->get( 'priceTypes', [] ); ?>
-					<?php if( count( $priceTypes ) > 1 ) : ?>
+					<?php $priceTypes = $this->get('priceTypes', []); ?>
+					<?php if (count($priceTypes) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Type')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'price.type'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('price.siteid', idx)"
 									v-model="items[idx]['price.type']" >
 									<option value="">
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( (array) $priceTypes as $typeItem ) : ?>
-										<option value="<?= $enc->attr( $typeItem->getCode() ); ?>" v-bind:selected="items[idx]['price.type'] == '<?= $enc->attr( $typeItem->getCode() ) ?>'" >
-											<?= $enc->html( $typeItem->getLabel() ); ?>
+									<?php foreach ((array) $priceTypes as $typeItem) : ?>
+										<option value="<?= $enc->attr($typeItem->getCode()); ?>" v-bind:selected="items[idx]['price.type'] == '<?= $enc->attr($typeItem->getCode()) ?>'" >
+											<?= $enc->html($typeItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Types for additional prices like per one lb/kg or per month' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Types for additional prices like per one lb/kg or per month')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="item-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $priceTypes ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'price.type'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($priceTypes)); ?>" />
 					<?php endif; ?>
 
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Minimum quantity' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Minimum quantity')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-quantity" type="number" step="1" min="1" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.quantity' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Minimum quantity' ) ); ?>"
+							<input class="form-control item-quantity" type="number" step="1" min="1" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'price.quantity'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Minimum quantity')); ?>"
 								v-bind:readonly="checkSite('price.siteid', idx)"
 								v-model="items[idx]['price.quantity']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Required quantity of articles for block pricing, e.g. one article for $5.00, ten articles for $45.00' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Required quantity of articles for block pricing, e.g. one article for $5.00, ten articles for $45.00')); ?>
 						</div>
 					</div>
 
@@ -209,70 +209,70 @@ 
 
 				<div v-on:click="toggle(idx)" class="col-xl-12 advanced" v-bind:class="{ 'collapsed': !advanced[idx] }">
 					<div class="card-tools-left">
-						<div class="btn act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-							title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide advanced data') ); ?>">
+						<div class="btn act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+							title="<?= $enc->attr($this->translate('admin', 'Show/hide advanced data')); ?>">
 						</div>
 					</div>
-					<span class="header-label"><?= $enc->html( $this->translate( 'admin', 'Advanced' ) ); ?></span>
+					<span class="header-label"><?= $enc->html($this->translate('admin', 'Advanced')); ?></span>
 				</div>
 
 				<div v-show="advanced[idx]" class="col-xl-6 content-block secondary">
 
 					<input type="hidden" v-model="items[idx]['attribute.lists.type']"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'attribute.lists.type' ) ) ); ?>'.replace( 'idx', idx )" />
+						v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'attribute.lists.type'))); ?>'.replace( 'idx', idx )" />
 
-					<?php $listTypes = $this->get( 'priceListTypes', [] ); ?>
-					<?php if( count( $listTypes ) > 1 ) : ?>
+					<?php $listTypes = $this->get('priceListTypes', []); ?>
+					<?php if (count($listTypes) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'List type' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'List type')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select listitem-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'attribute.lists.type' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select listitem-type" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'attribute.lists.type'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
 									v-model="items[idx]['attribute.lists.type']" >
 
-									<?php foreach( $this->get( 'priceListTypes', [] ) as $typeItem ) : ?>
-										<option value="<?= $enc->attr( $typeItem->getCode() ); ?>" v-bind:selected="entry['attribute.lists.type'] == '<?= $enc->attr( $typeItem->getCode() ) ?>'" >
-											<?= $enc->html( $typeItem->getLabel() ); ?>
+									<?php foreach ($this->get('priceListTypes', []) as $typeItem) : ?>
+										<option value="<?= $enc->attr($typeItem->getCode()); ?>" v-bind:selected="entry['attribute.lists.type'] == '<?= $enc->attr($typeItem->getCode()) ?>'" >
+											<?= $enc->html($typeItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Second level type for grouping items')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="listitem-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'attribute.lists.type' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $listTypes ) ); ?>"
+							v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'attribute.lists.type'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($listTypes)); ?>"
 							v-model="items[idx]['attribute.lists.type']" />
 					<?php endif; ?>
 
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Start date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Start date')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'attribute.lists.datestart' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+							<input class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'attribute.lists.datestart'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 								v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
 								v-model="items[idx]['attribute.lists.datestart']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The item is only shown on the web site after that date and time' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The item is only shown on the web site after that date and time')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'End date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'End date')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'attribute.lists.dateend' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+							<input class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'attribute.lists.dateend'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 								v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
 								v-model="items[idx]['attribute.lists.dateend']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The item is only shown on the web site until that date and time' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The item is only shown on the web site until that date and time')); ?>
 						</div>
 					</div>
 				</div>
@@ -282,17 +282,17 @@ 
 						<thead>
 							<tr>
 								<th>
-									<span class="help"><?= $enc->html( $this->translate( 'admin', 'Option' ) ); ?></span>
+									<span class="help"><?= $enc->html($this->translate('admin', 'Option')); ?></span>
 									<div class="form-text text-muted help-text">
-										<?= $enc->html( $this->translate( 'admin', 'Configuration options, will be available as key/value pairs in the list item' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Configuration options, will be available as key/value pairs in the list item')); ?>
 									</div>
 								</th>
 								<th>
-									<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Value')); ?>
 								</th>
 								<th class="actions">
-									<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+									<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+										title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 										v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
 										v-on:click="addConfig(idx)" >
 									</div>
@@ -305,21 +305,21 @@ 
 								<td>
 									<input is="auto-complete"
 										v-model="items[idx]['config']['key'][pos]"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'config', 'key', '' ) ) ); ?>'.replace('idx', idx)"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'config', 'key', ''))); ?>'.replace('idx', idx)"
 										v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
-										v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
+										v-bind:tabindex="<?= $this->get('tabindex'); ?>"
 										v-bind:keys="[]" />
 								</td>
 								<td>
-									<input type="text" class="form-control" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'config', 'val', '' ) ) ); ?>'.replace('idx', idx)"
+									<input type="text" class="form-control" tabindex="<?= $this->get('tabindex'); ?>"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('price', 'idx', 'config', 'val', ''))); ?>'.replace('idx', idx)"
 										v-bind:readonly="checkSite('attribute.lists.siteid', idx)"
 										v-model="items[idx]['config']['val'][pos]" />
 								</td>
 								<td class="actions">
 									<div v-if="!checkSite('attribute.lists.siteid', idx)" v-on:click="removeConfig(idx, pos)"
-										class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+										class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+										title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 									</div>
 								</td>
 							</tr>
@@ -328,14 +328,14 @@ 
 					</table>
 				</div>
 
-				<?= $this->get( 'priceBody' ); ?>
+				<?= $this->get('priceBody'); ?>
 
 			</div>
 		</div>
 
 		<div class="card-tools-more">
-			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-				title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+				title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 				v-on:click="addItem('attribute.lists.')" >
 			</div>
 		</div>

Braces +15 added lines, -6 removed lines

@@ -154,9 +154,12 @@ 
 								</select>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="item-currencyid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $currencies ) ); ?>" />
 					<?php endif; ?>
 
@@ -184,9 +187,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Types for additional prices like per one lb/kg or per month' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="item-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $priceTypes ) ); ?>" />
 					<?php endif; ?>
 
@@ -242,9 +248,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="listitem-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'attribute.lists.type' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'attribute.lists.type' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $listTypes ) ); ?>"
 							v-model="items[idx]['attribute.lists.type']" />
 					<?php endif; ?>

admin/jqadm/templates/plugin/item-standard.php

Spacing +108 added lines, -108 removed lines

@@ -5,46 +5,46 @@ 
  * @copyright Aimeos (aimeos.org), 2017-2018
  */
 
-$attr = function( $list, $key, $code ) {
-	$map = ( isset( $list[$key] ) ? $list[$key]->toArray() : [] );
-	return ( isset( $map[$code] ) ? $map[$code] : '' );
+$attr = function($list, $key, $code) {
+	$map = (isset($list[$key]) ? $list[$key]->toArray() : []);
+	return (isset($map[$code]) ? $map[$code] : '');
 };
 
-$selected = function( $key, $code ) {
-	return ( $key == $code ? 'selected="selected"' : '' );
+$selected = function($key, $code) {
+	return ($key == $code ? 'selected="selected"' : '');
 };
 
 
-$target = $this->config( 'admin/jqadm/url/save/target' );
-$cntl = $this->config( 'admin/jqadm/url/save/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/save/action', 'save' );
-$config = $this->config( 'admin/jqadm/url/save/config', [] );
+$target = $this->config('admin/jqadm/url/save/target');
+$cntl = $this->config('admin/jqadm/url/save/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/save/action', 'save');
+$config = $this->config('admin/jqadm/url/save/config', []);
 
-$attributes = $this->get( 'itemAttributes', [] );
-$params = $this->get( 'pageParams', [] );
+$attributes = $this->get('itemAttributes', []);
+$params = $this->get('pageParams', []);
 
 $enc = $this->encoder();
 
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
 <form class="item item-plugin form-horizontal" method="POST" enctype="multipart/form-data"
-	action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>">
-	<input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'plugin.id' ) ) ); ?>"
-		value="<?= $enc->attr( $this->get( 'itemData/plugin.id' ) ); ?>" />
-	<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
+	action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>">
+	<input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'plugin.id'))); ?>"
+		value="<?= $enc->attr($this->get('itemData/plugin.id')); ?>" />
+	<input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" />
 	<?= $this->csrf()->formfield(); ?>
 
 	<nav class="main-navbar">
 		<span class="navbar-brand">
-			<?= $enc->html( $this->translate( 'admin', 'Plugin' ) ); ?>:
-			<?= $enc->html( $this->get( 'itemData/plugin.id' ) ); ?> -
-			<?= $enc->html( $this->get( 'itemData/plugin.provider', $this->translate( 'admin', 'New' ) ) ); ?>
-			<span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/plugin.siteid' ) ) ); ?>)</span>
+			<?= $enc->html($this->translate('admin', 'Plugin')); ?>:
+			<?= $enc->html($this->get('itemData/plugin.id')); ?> -
+			<?= $enc->html($this->get('itemData/plugin.provider', $this->translate('admin', 'New'))); ?>
+			<span class="navbar-secondary">(<?= $enc->html($this->site()->match($this->get('itemData/plugin.siteid'))); ?>)</span>
 		</span>
 		<div class="item-actions">
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
 		</div>
 	</nav>
 
@@ -55,14 +55,14 @@ 
 
 				<li class="nav-item basic">
 					<a class="nav-link active" href="#basic" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic">
-						<?= $enc->html( $this->translate( 'admin', 'Basic' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Basic')); ?>
 					</a>
 				</li>
 
-				<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?>
-					<li class="nav-item <?= $enc->attr( $subpart ); ?>">
-						<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>">
-							<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
+				<?php foreach (array_values($this->get('itemSubparts', [])) as $idx => $subpart) : ?>
+					<li class="nav-item <?= $enc->attr($subpart); ?>">
+						<a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
+							<?= $enc->html($this->translate('admin', $subpart)); ?>
 						</a>
 					</li>
 				<?php endforeach; ?>
@@ -71,16 +71,16 @@ 
 
 			<div class="item-meta text-muted">
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/plugin.mtime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Modified')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/plugin.mtime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/plugin.ctime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Created')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/plugin.ctime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/plugin.editor' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Editor')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/plugin.editor')); ?></span>
 				</small>
 			</div>
 		</div>
@@ -89,116 +89,116 @@ 
 
 			<div id="basic" class="row item-basic tab-pane fade show active" role="tabpanel" aria-labelledby="basic">
 
-				<div class="col-xl-6 content-block <?= $this->site()->readonly( $this->get( 'itemData/plugin.siteid' ) ); ?>">
+				<div class="col-xl-6 content-block <?= $this->site()->readonly($this->get('itemData/plugin.siteid')); ?>">
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
 						<div class="col-sm-8">
 							<select class="form-control custom-select item-status" required="required" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'plugin.status' ) ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/plugin.siteid' ) ); ?> >
+								name="<?= $enc->attr($this->formparam(array('item', 'plugin.status'))); ?>"
+								<?= $this->site()->readonly($this->get('itemData/plugin.siteid')); ?> >
 								<option value="">
-									<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Please select')); ?>
 								</option>
-								<option value="1" <?= $selected( $this->get( 'itemData/plugin.status', 1 ), 1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+								<option value="1" <?= $selected($this->get('itemData/plugin.status', 1), 1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
-								<option value="0" <?= $selected( $this->get( 'itemData/plugin.status', 1 ), 0 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+								<option value="0" <?= $selected($this->get('itemData/plugin.status', 1), 0); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
-								<option value="-1" <?= $selected( $this->get( 'itemData/plugin.status', 1 ), -1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+								<option value="-1" <?= $selected($this->get('itemData/plugin.status', 1), -1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
-								<option value="-2" <?= $selected( $this->get( 'itemData/plugin.status', 1 ), -2 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+								<option value="-2" <?= $selected($this->get('itemData/plugin.status', 1), -2); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Type')); ?></label>
 						<div class="col-sm-8">
 							<select class="form-control custom-select item-type" required="required" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'plugin.type' ) ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/plugin.siteid' ) ); ?> >
+								name="<?= $enc->attr($this->formparam(array('item', 'plugin.type'))); ?>"
+								<?= $this->site()->readonly($this->get('itemData/plugin.siteid')); ?> >
 								<option value="">
-									<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Please select')); ?>
 								</option>
 
-								<?php foreach( $this->get( 'itemTypes', [] ) as $typeItem ) : ?>
-									<option value="<?= $enc->attr( $typeItem->getCode() ); ?>" <?= $selected( $this->get( 'itemData/plugin.type', 'order' ), $typeItem->getCode() ); ?> >
-										<?= $enc->html( $typeItem->getLabel() ); ?>
+								<?php foreach ($this->get('itemTypes', []) as $typeItem) : ?>
+									<option value="<?= $enc->attr($typeItem->getCode()); ?>" <?= $selected($this->get('itemData/plugin.type', 'order'), $typeItem->getCode()); ?> >
+										<?= $enc->html($typeItem->getLabel()); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-label" type="text" required="required" tabindex="1"
-								name="<?= $this->formparam( array( 'item', 'plugin.label' ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Internal name (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/plugin.label' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/plugin.siteid' ) ); ?> />
+								name="<?= $this->formparam(array('item', 'plugin.label')); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Internal name (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/plugin.label')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/plugin.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Internal article name, will be used on the web site if no product name for the language is available' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Internal article name, will be used on the web site if no product name for the language is available')); ?>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Provider' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Provider')); ?></label>
 						<div class="col-sm-8 input-group">
 							<input class="form-control item-provider combobox" type="text" required="required" tabindex="1" pattern="[A-Za-z0-9]+(,[A-Za-z0-9]+)*"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'plugin.provider' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Provider/decorator class names (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/plugin.provider' ) ); ?>"
-								data-order="<?= implode( ',', $this->get( 'itemProviders/order', [] ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/plugin.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'plugin.provider'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Provider/decorator class names (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/plugin.provider')); ?>"
+								data-order="<?= implode(',', $this->get('itemProviders/order', [])); ?>"
+								<?= $this->site()->readonly($this->get('itemData/plugin.siteid')); ?> />
 							<div class="dropdown input-group-append">
 								<button class="btn btn-secondary" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+</button>
 								<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="decoratorButton">
-									<?php foreach( $this->get( 'itemDecorators', [] ) as $name ) : ?>
-										<li class="dropdown-item"><a class="decorator-name" href="#" data-name="<?= $enc->attr( $name ); ?>"><?= $enc->html( $name ); ?></a></li>
+									<?php foreach ($this->get('itemDecorators', []) as $name) : ?>
+										<li class="dropdown-item"><a class="decorator-name" href="#" data-name="<?= $enc->attr($name); ?>"><?= $enc->html($name); ?></a></li>
 									<?php endforeach; ?>
 								</ul>
 							</div>
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'One provider and zero or more decorator class names separated by commas' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'One provider and zero or more decorator class names separated by commas')); ?>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Position' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Position')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-position" type="number" required="required" tabindex="1"
-								name="<?= $this->formparam( array( 'item', 'plugin.position' ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Plugin position (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/plugin.position' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/plugin.siteid' ) ); ?> />
+								name="<?= $this->formparam(array('item', 'plugin.position')); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Plugin position (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/plugin.position')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/plugin.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Execution order of the plugins' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Execution order of the plugins')); ?>
 						</div>
 					</div>
 				</div><!--
 
-				--><div class="col-xl-6 content-block <?= $this->site()->readonly( $this->get( 'itemData/plugin.siteid' ) ); ?>">
+				--><div class="col-xl-6 content-block <?= $this->site()->readonly($this->get('itemData/plugin.siteid')); ?>">
 					<table class="item-config table table-striped">
 						<thead>
 							<tr>
 								<th class="config-row-key">
-									<span class="help"><?= $enc->html( $this->translate( 'admin', 'Option' ) ); ?></span>
+									<span class="help"><?= $enc->html($this->translate('admin', 'Option')); ?></span>
 									<div class="form-text text-muted help-text">
-										<?= $enc->html( $this->translate( 'admin', 'Plugin provider or plugin decorator configuration name' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Plugin provider or plugin decorator configuration name')); ?>
 									</div>
 								</th>
 								<th>
-									<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Value')); ?>
 								</th class="config-row-value">
 								<th class="actions">
-									<?php if( !$this->site()->readonly( $this->get( 'itemData/plugin.siteid' ) ) ) : ?>
+									<?php if (!$this->site()->readonly($this->get('itemData/plugin.siteid'))) : ?>
 										<div class="btn act-add fa" tabindex="1"
-											title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>">
+											title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>">
 										</div>
 									<?php endif; ?>
 								</th>
@@ -206,26 +206,26 @@ 
 						</thead>
 						<tbody>
 
-							<?php foreach( (array) $this->get( 'itemData/config/key', [] ) as $idx => $key ) : ?>
+							<?php foreach ((array) $this->get('itemData/config/key', []) as $idx => $key) : ?>
 								<tr class="config-item">
 									<td class="config-row-key">
 										<input type="text" class="config-key form-control" tabindex="1"
-											name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'key', '' ) ) ); ?>"
-											value="<?= $enc->attr( $this->get( 'itemData/config/key/' . $idx, $key ) ); ?>"
-											<?= $this->site()->readonly( $this->get( 'itemData/plugin.siteid' ) ); ?> />
+											name="<?= $enc->attr($this->formparam(array('item', 'config', 'key', ''))); ?>"
+											value="<?= $enc->attr($this->get('itemData/config/key/' . $idx, $key)); ?>"
+											<?= $this->site()->readonly($this->get('itemData/plugin.siteid')); ?> />
 										<div class="form-text text-muted help-text"></div>
 									</td>
 									<td class="config-row-value">
-										<?php $cfgval = $this->get( 'itemData/config/val/' . $idx ); ?>
+										<?php $cfgval = $this->get('itemData/config/val/' . $idx); ?>
 										<input type="text" class="config-value form-control config-type" tabindex="1"
-											name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>"
-											value="<?= $enc->attr( !is_scalar( $cfgval ) ? json_encode( $cfgval ) : $cfgval ); ?>"
-											<?= $this->site()->readonly( $this->get( 'itemData/plugin.siteid' ) ); ?> />
+											name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>"
+											value="<?= $enc->attr(!is_scalar($cfgval) ? json_encode($cfgval) : $cfgval); ?>"
+											<?= $this->site()->readonly($this->get('itemData/plugin.siteid')); ?> />
 									</td>
 									<td class="actions">
-										<?php if( !$this->site()->readonly( $this->get( 'itemData/plugin.siteid' ) ) ) : ?>
+										<?php if (!$this->site()->readonly($this->get('itemData/plugin.siteid'))) : ?>
 											<div class="btn act-delete fa" tabindex="1"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+												title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 											</div>
 										<?php endif; ?>
 									</td>
@@ -235,20 +235,20 @@ 
 							<tr class="config-item prototype">
 								<td class="config-row-key">
 									<input type="text" class="config-key form-control" tabindex="1" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'key', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('item', 'config', 'key', ''))); ?>" />
 									<div class="form-text text-muted help-text"></div>
 								</td>
 								<td class="config-row-value">
 
 									<div class="config-type config-type-map">
 										<input type="text" class="config-value form-control" tabindex="1" disabled="disabled"
-											name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" />
+											name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" />
 
 										<table class="table table-striped config-map-table">
 											<tr class="config-map-row prototype-map">
 												<td class="config-map-actions">
 													<div class="btn act-delete fa" tabindex="1"
-														title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+														title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 													</div>
 												</td>
 												<td class="config-map-row-key">
@@ -261,12 +261,12 @@ 
 											<tr class="config-map-actions">
 												<td class="config-map-action-add">
 													<div class="btn act-add fa" tabindex="1"
-														title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry') ); ?>">
+														title="<?= $enc->attr($this->translate('admin', 'Insert new entry')); ?>">
 													</div>
 												</td>
 												<td class="config-map-action-update" colspan="2">
 													<div class="btn btn-primary act-update" tabindex="1">
-														<?= $enc->attr( $this->translate( 'admin', 'OK') ); ?>
+														<?= $enc->attr($this->translate('admin', 'OK')); ?>
 													</div>
 												</td>
 											</tr>
@@ -274,37 +274,37 @@ 
 									</div>
 
 									<select class="config-value form-control config-type config-type-select" tabindex="1" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" >
+										name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" >
 									</select>
 
 									<select class="config-value form-control config-type config-type-boolean" tabindex="1" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" >
+										name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" >
 										<option value=""></option>
-										<option value="0"><?= $enc->html( $this->translate( 'client', 'no' ) ); ?></option>
-										<option value="1"><?= $enc->html( $this->translate( 'client', 'yes' ) ); ?></option>
+										<option value="0"><?= $enc->html($this->translate('client', 'no')); ?></option>
+										<option value="1"><?= $enc->html($this->translate('client', 'yes')); ?></option>
 									</select>
 
 									<input type="text" class="config-value form-control config-type config-type-string" tabindex="1" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" />
 
 									<input type="number" class="config-value form-control config-type config-type-number" tabindex="1" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" step="0.01" />
+										name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" step="0.01" />
 
 									<input type="number" class="config-value form-control config-type config-type-integer" tabindex="1" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" />
 
 									<input type="date" class="config-value form-control config-type config-type-date" tabindex="1" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" />
 
 									<input type="datetime-local" class="config-value form-control config-type config-type-datetime" tabindex="1" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" />
 
 									<input type="time" class="config-value form-control config-type config-type-time" tabindex="1" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" />
 								</td>
 								<td class="actions">
 									<div class="btn act-delete fa" tabindex="1"
-										title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+										title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 									</div>
 								</td>
 							</tr>
@@ -314,12 +314,12 @@ 
 
 			</div>
 
-			<?= $this->get( 'itemBody' ); ?>
+			<?= $this->get('itemBody'); ?>
 
 		</div>
 
 		<div class="item-actions">
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
 		</div>
 	</div>
 </form>
@@ -327,4 +327,4 @@ 
 <?php $this->block()->stop(); ?>
 
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/templates/plugin/list-standard.php

Spacing +95 added lines, -95 removed lines

@@ -8,30 +8,30 @@ 
 $enc = $this->encoder();
 
 
-$target = $this->config( 'admin/jqadm/url/search/target' );
-$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
-$config = $this->config( 'admin/jqadm/url/search/config', [] );
+$target = $this->config('admin/jqadm/url/search/target');
+$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/search/action', 'search');
+$config = $this->config('admin/jqadm/url/search/config', []);
 
-$newTarget = $this->config( 'admin/jqadm/url/create/target' );
-$newCntl = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
-$newAction = $this->config( 'admin/jqadm/url/create/action', 'create' );
-$newConfig = $this->config( 'admin/jqadm/url/create/config', [] );
+$newTarget = $this->config('admin/jqadm/url/create/target');
+$newCntl = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
+$newAction = $this->config('admin/jqadm/url/create/action', 'create');
+$newConfig = $this->config('admin/jqadm/url/create/config', []);
 
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
+$getTarget = $this->config('admin/jqadm/url/get/target');
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
 
-$copyTarget = $this->config( 'admin/jqadm/url/copy/target' );
-$copyCntl = $this->config( 'admin/jqadm/url/copy/controller', 'Jqadm' );
-$copyAction = $this->config( 'admin/jqadm/url/copy/action', 'copy' );
-$copyConfig = $this->config( 'admin/jqadm/url/copy/config', [] );
+$copyTarget = $this->config('admin/jqadm/url/copy/target');
+$copyCntl = $this->config('admin/jqadm/url/copy/controller', 'Jqadm');
+$copyAction = $this->config('admin/jqadm/url/copy/action', 'copy');
+$copyConfig = $this->config('admin/jqadm/url/copy/config', []);
 
-$delTarget = $this->config( 'admin/jqadm/url/delete/target' );
-$delCntl = $this->config( 'admin/jqadm/url/delete/controller', 'Jqadm' );
-$delAction = $this->config( 'admin/jqadm/url/delete/action', 'delete' );
-$delConfig = $this->config( 'admin/jqadm/url/delete/config', [] );
+$delTarget = $this->config('admin/jqadm/url/delete/target');
+$delCntl = $this->config('admin/jqadm/url/delete/controller', 'Jqadm');
+$delAction = $this->config('admin/jqadm/url/delete/action', 'delete');
+$delConfig = $this->config('admin/jqadm/url/delete/config', []);
 
 
 /** admin/jqadm/plugin/fields
@@ -49,45 +49,45 @@ 
  * @category Developer
  */
 $default = ['plugin.status', 'plugin.label', 'plugin.provider', 'plugin.position'];
-$default = $this->config( 'admin/jqadm/plugin/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/plugin/fields', $default );
+$default = $this->config('admin/jqadm/plugin/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/plugin/fields', $default);
 
-$searchParams = $params = $this->get( 'pageParams', [] );
+$searchParams = $params = $this->get('pageParams', []);
 $searchParams['page']['start'] = 0;
 
 $typeList = [];
-foreach( $this->get( 'itemTypes', [] ) as $typeItem ) {
+foreach ($this->get('itemTypes', []) as $typeItem) {
 	$typeList[$typeItem->getCode()] = $typeItem->getCode();
 }
 
 $columnList = [
-	'plugin.id' => $this->translate( 'admin', 'ID' ),
-	'plugin.status' => $this->translate( 'admin', 'Status' ),
-	'plugin.type' => $this->translate( 'admin', 'Type' ),
-	'plugin.position' => $this->translate( 'admin', 'Position' ),
-	'plugin.label' => $this->translate( 'admin', 'Label' ),
-	'plugin.provider' => $this->translate( 'admin', 'Provider' ),
-	'plugin.config' => $this->translate( 'admin', 'Config' ),
-	'plugin.ctime' => $this->translate( 'admin', 'Created' ),
-	'plugin.mtime' => $this->translate( 'admin', 'Modified' ),
-	'plugin.editor' => $this->translate( 'admin', 'Editor' ),
+	'plugin.id' => $this->translate('admin', 'ID'),
+	'plugin.status' => $this->translate('admin', 'Status'),
+	'plugin.type' => $this->translate('admin', 'Type'),
+	'plugin.position' => $this->translate('admin', 'Position'),
+	'plugin.label' => $this->translate('admin', 'Label'),
+	'plugin.provider' => $this->translate('admin', 'Provider'),
+	'plugin.config' => $this->translate('admin', 'Config'),
+	'plugin.ctime' => $this->translate('admin', 'Created'),
+	'plugin.mtime' => $this->translate('admin', 'Modified'),
+	'plugin.editor' => $this->translate('admin', 'Editor'),
 ];
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
 <nav class="main-navbar">
 
 	<span class="navbar-brand">
-		<?= $enc->html( $this->translate( 'admin', 'Plugin' ) ); ?>
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
+		<?= $enc->html($this->translate('admin', 'Plugin')); ?>
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
 	</span>
 
 	<?= $this->partial(
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
-			'filter' => $this->session( 'aimeos/admin/jqadm/plugin/filter', [] ),
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
-			'filterOperators' => $this->get( 'filterOperators', [] ),
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
+			'filter' => $this->session('aimeos/admin/jqadm/plugin/filter', []),
+			'filterAttributes' => $this->get('filterAttributes', []),
+			'filterOperators' => $this->get('filterOperators', []),
 			'params' => $params,
 		]
 	); ?>
@@ -95,33 +95,33 @@ 
 
 
 <?= $this->partial(
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/plugin/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/plugin/page', [])]
 	);
 ?>
 
-<form class="list list-product" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
+<form class="list list-product" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
 	<?= $this->csrf()->formfield(); ?>
 
 	<table class="list-items table table-hover table-striped">
 		<thead class="list-header">
 			<tr>
 				<?= $this->partial(
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/plugin/sort' )]
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/plugin/sort')]
 					);
 				?>
 
 				<th class="actions">
 					<a class="btn fa act-add" tabindex="1"
-						href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
+						href="<?= $enc->attr($this->url($newTarget, $newCntl, $newAction, $params, [], $newConfig)); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
+						aria-label="<?= $enc->attr($this->translate('admin', 'Add')); ?>">
 					</a>
 
 					<?= $this->partial(
-							$this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ),
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
 							['fields' => $fields, 'data' => $columnList]
 						);
 					?>
@@ -131,15 +131,15 @@ 
 		<tbody>
 
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/plugin/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/plugin/filter', []),
 					'data' => [
 						'plugin.id' => ['op' => '=='],
 						'plugin.status' => ['op' => '==', 'type' => 'select', 'val' => [
-							'1' => $this->translate( 'mshop/code', 'status:1' ),
-							'0' => $this->translate( 'mshop/code', 'status:0' ),
-							'-1' => $this->translate( 'mshop/code', 'status:-1' ),
-							'-2' => $this->translate( 'mshop/code', 'status:-2' ),
+							'1' => $this->translate('mshop/code', 'status:1'),
+							'0' => $this->translate('mshop/code', 'status:0'),
+							'-1' => $this->translate('mshop/code', 'status:-1'),
+							'-2' => $this->translate('mshop/code', 'status:-2'),
 						]],
 						'plugin.type' => ['op' => '==', 'type' => 'select', 'val' => $typeList],
 						'plugin.position' => ['op' => '>=', 'type' => 'number'],
@@ -153,58 +153,58 @@ 
 				] );
 			?>
 
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig ) ); ?>
-				<tr class="<?= $this->site()->readonly( $item->getSiteId() ); ?>">
-					<?php if( in_array( 'plugin.id', $fields ) ) : ?>
-						<td class="plugin-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getId() ); ?></a></td>
+			<?php foreach ($this->get('items', []) as $id => $item) : ?>
+				<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig)); ?>
+				<tr class="<?= $this->site()->readonly($item->getSiteId()); ?>">
+					<?php if (in_array('plugin.id', $fields)) : ?>
+						<td class="plugin-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'plugin.status', $fields ) ) : ?>
-						<td class="plugin-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
+					<?php if (in_array('plugin.status', $fields)) : ?>
+						<td class="plugin-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'plugin.type', $fields ) ) : ?>
-						<td class="plugin-type"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getType() ); ?></a></td>
+					<?php if (in_array('plugin.type', $fields)) : ?>
+						<td class="plugin-type"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getType()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'plugin.position', $fields ) ) : ?>
-						<td class="plugin-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getPosition() ); ?></a></td>
+					<?php if (in_array('plugin.position', $fields)) : ?>
+						<td class="plugin-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getPosition()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'plugin.label', $fields ) ) : ?>
-						<td class="plugin-label"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html( $item->getLabel() ); ?></a></td>
+					<?php if (in_array('plugin.label', $fields)) : ?>
+						<td class="plugin-label"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html($item->getLabel()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'plugin.provider', $fields ) ) : ?>
-						<td class="plugin-provider"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getProvider() ); ?></a></td>
+					<?php if (in_array('plugin.provider', $fields)) : ?>
+						<td class="plugin-provider"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getProvider()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'plugin.config', $fields ) ) : ?>
+					<?php if (in_array('plugin.config', $fields)) : ?>
 						<td class="plugin-config config-item">
 							<a class="items-field" href="<?= $url; ?>">
-								<?php foreach( $item->getConfig() as $key => $value ) : ?>
-									<span class="config-key"><?= $enc->html( $key ); ?></span>
-									<span class="config-value"><?= $enc->html( !is_scalar( $value ) ? json_encode( $value ) : $value ); ?></span>
+								<?php foreach ($item->getConfig() as $key => $value) : ?>
+									<span class="config-key"><?= $enc->html($key); ?></span>
+									<span class="config-value"><?= $enc->html(!is_scalar($value) ? json_encode($value) : $value); ?></span>
 									<br/>
 								<?php endforeach; ?>
 							</a>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'plugin.ctime', $fields ) ) : ?>
-						<td class="plugin-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
+					<?php if (in_array('plugin.ctime', $fields)) : ?>
+						<td class="plugin-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'plugin.mtime', $fields ) ) : ?>
-						<td class="plugin-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
+					<?php if (in_array('plugin.mtime', $fields)) : ?>
+						<td class="plugin-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'plugin.editor', $fields ) ) : ?>
-						<td class="plugin-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
+					<?php if (in_array('plugin.editor', $fields)) : ?>
+						<td class="plugin-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getEditor()); ?></a></td>
 					<?php endif; ?>
 
 					<td class="actions">
 						<a class="btn act-copy fa" tabindex="1"
-							href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>"
-							title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>"
-							aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a>
-						<?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?>
+							href="<?= $enc->attr($this->url($copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig)); ?>"
+							title="<?= $enc->attr($this->translate('admin', 'Copy this entry')); ?>"
+							aria-label="<?= $enc->attr($this->translate('admin', 'Copy')); ?>"></a>
+						<?php if (!$this->site()->readonly($item->getSiteId())) : ?>
 							<a class="btn act-delete fa" tabindex="1"
-								href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'plugin', 'id' => $id] + $params, [], $delConfig ) ); ?>"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
+								href="<?= $enc->attr($this->url($delTarget, $delCntl, $delAction, ['resource' => 'plugin', 'id' => $id] + $params, [], $delConfig)); ?>"
+								title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
+								aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>"></a>
 						<?php endif; ?>
 					</td>
 				</tr>
@@ -212,18 +212,18 @@ 
 		</tbody>
 	</table>
 
-	<?php if( $this->get( 'items', [] ) === [] ) : ?>
-		<?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?>
+	<?php if ($this->get('items', []) === []) : ?>
+		<?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?>
 	<?php endif; ?>
 </form>
 
 <?= $this->partial(
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/plugin/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/plugin/page', [])]
 	);
 ?>
 
 <?php $this->block()->stop(); ?>
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/templates/product/item-standard.php

Spacing +107 added lines, -107 removed lines

@@ -5,8 +5,8 @@ 
  * @copyright Aimeos (aimeos.org), 2015-2018
  */
 
-$selected = function( $key, $code ) {
-	return ( $key == $code ? 'selected="selected"' : '' );
+$selected = function($key, $code) {
+	return ($key == $code ? 'selected="selected"' : '');
 };
 
 $enc = $this->encoder();
@@ -26,7 +26,7 @@ 
  * @see admin/jqadm/url/save/action
  * @see admin/jqadm/url/save/config
  */
-$target = $this->config( 'admin/jqadm/url/save/target' );
+$target = $this->config('admin/jqadm/url/save/target');
 
 /** admin/jqadm/url/save/controller
  * Name of the controller whose action should be called
@@ -42,7 +42,7 @@ 
  * @see admin/jqadm/url/save/action
  * @see admin/jqadm/url/save/config
  */
-$cntl = $this->config( 'admin/jqadm/url/save/controller', 'Jqadm' );
+$cntl = $this->config('admin/jqadm/url/save/controller', 'Jqadm');
 
 /** admin/jqadm/url/save/action
  * Name of the action that should create the output
@@ -58,7 +58,7 @@ 
  * @see admin/jqadm/url/save/controller
  * @see admin/jqadm/url/save/config
  */
-$action = $this->config( 'admin/jqadm/url/save/action', 'save' );
+$action = $this->config('admin/jqadm/url/save/action', 'save');
 
 /** admin/jqadm/url/save/config
  * Associative list of configuration options used for generating the URL
@@ -80,7 +80,7 @@ 
  * @see admin/jqadm/url/save/controller
  * @see admin/jqadm/url/save/action
  */
-$config = $this->config( 'admin/jqadm/url/save/config', [] );
+$config = $this->config('admin/jqadm/url/save/config', []);
 
 
 /** admin/jqadm/product/item/config/suggest
@@ -94,7 +94,7 @@ 
  * @category Developer
  * @see admin/jqadm/catalog/item/config/suggest
  */
-$cfgSuggest = $this->config( 'admin/jqadm/product/item/config/suggest', ['css-class'] );
+$cfgSuggest = $this->config('admin/jqadm/product/item/config/suggest', ['css-class']);
 
 
 /** admin/jqadm/partial/itemactions
@@ -118,26 +118,26 @@ 
  */
 
 
-$params = $this->get( 'pageParams', [] );
+$params = $this->get('pageParams', []);
 
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
-<form class="item item-product form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>">
-	<input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'product.id' ) ) ); ?>" value="<?= $enc->attr( $this->get( 'itemData/product.id' ) ); ?>" />
-	<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
+<form class="item item-product form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>">
+	<input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'product.id'))); ?>" value="<?= $enc->attr($this->get('itemData/product.id')); ?>" />
+	<input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" />
 	<?= $this->csrf()->formfield(); ?>
 
 	<nav class="main-navbar">
 		<span class="navbar-brand">
-			<?= $enc->html( $this->translate( 'admin', 'Product' ) ); ?>:
-			<?= $enc->html( $this->get( 'itemData/product.id' ) ); ?> -
-			<?= $enc->html( $this->get( 'itemData/product.label', $this->translate( 'admin', 'New' ) ) ); ?>
-			<span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/product.siteid' ) ) ); ?>)</span>
+			<?= $enc->html($this->translate('admin', 'Product')); ?>:
+			<?= $enc->html($this->get('itemData/product.id')); ?> -
+			<?= $enc->html($this->get('itemData/product.label', $this->translate('admin', 'New'))); ?>
+			<span class="navbar-secondary">(<?= $enc->html($this->site()->match($this->get('itemData/product.siteid'))); ?>)</span>
 		</span>
 		<div class="item-actions">
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
 		</div>
 	</nav>
 
@@ -148,14 +148,14 @@ 
 
 				<li class="nav-item basic">
 					<a class="nav-link active" href="#basic" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic">
-						<?= $enc->html( $this->translate( 'admin', 'Basic' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Basic')); ?>
 					</a>
 				</li>
 
-				<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?>
-					<li class="nav-item <?= $enc->attr( $subpart ); ?>">
-						<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>">
-							<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
+				<?php foreach (array_values($this->get('itemSubparts', [])) as $idx => $subpart) : ?>
+					<li class="nav-item <?= $enc->attr($subpart); ?>">
+						<a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
+							<?= $enc->html($this->translate('admin', $subpart)); ?>
 						</a>
 					</li>
 				<?php endforeach; ?>
@@ -164,16 +164,16 @@ 
 
 			<div class="item-meta text-muted">
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/product.mtime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Modified')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/product.mtime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/product.ctime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Created')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/product.ctime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/product.editor' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Editor')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/product.editor')); ?></span>
 				</small>
 			</div>
 		</div>
@@ -182,146 +182,146 @@ 
 
 			<div id="basic" class="row item-basic tab-pane fade show active" role="tabpanel" aria-labelledby="basic">
 
-				<div class="col-xl-6 content-block <?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?>">
+				<div class="col-xl-6 content-block <?= $this->site()->readonly($this->get('itemData/product.siteid')); ?>">
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
 						<div class="col-sm-8">
 							<select class="form-control custom-select item-status" required="required" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'product.status' ) ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?> >
+								name="<?= $enc->attr($this->formparam(array('item', 'product.status'))); ?>"
+								<?= $this->site()->readonly($this->get('itemData/product.siteid')); ?> >
 								<option value="">
-									<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Please select')); ?>
 								</option>
-								<option value="1" <?= $selected( $this->get( 'itemData/product.status', 1 ), 1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+								<option value="1" <?= $selected($this->get('itemData/product.status', 1), 1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
-								<option value="0" <?= $selected( $this->get( 'itemData/product.status', 1 ), 0 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+								<option value="0" <?= $selected($this->get('itemData/product.status', 1), 0); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
-								<option value="-1" <?= $selected( $this->get( 'itemData/product.status', 1 ), -1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+								<option value="-1" <?= $selected($this->get('itemData/product.status', 1), -1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
-								<option value="-2" <?= $selected( $this->get( 'itemData/product.status', 1 ), -2 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+								<option value="-2" <?= $selected($this->get('itemData/product.status', 1), -2); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Type')); ?></label>
 						<div class="col-sm-8">
 							<select class="form-control custom-select item-type" required="required" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'product.type' ) ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?> >
+								name="<?= $enc->attr($this->formparam(array('item', 'product.type'))); ?>"
+								<?= $this->site()->readonly($this->get('itemData/product.siteid')); ?> >
 								<option value="">
-									<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Please select')); ?>
 								</option>
 
-								<?php foreach( $this->get( 'itemTypes', [] ) as $typeItem ) : ?>
-									<option value="<?= $enc->attr( $typeItem->getCode() ); ?>" <?= $selected( $this->get( 'itemData/product.type' ), $typeItem->getCode() ); ?> >
-										<?= $enc->html( $typeItem->getLabel() ); ?>
+								<?php foreach ($this->get('itemTypes', []) as $typeItem) : ?>
+									<option value="<?= $enc->attr($typeItem->getCode()); ?>" <?= $selected($this->get('itemData/product.type'), $typeItem->getCode()); ?> >
+										<?= $enc->html($typeItem->getLabel()); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'SKU' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'SKU')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-code" type="text" required="required" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'product.code' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'EAN, SKU or article number (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/product.code' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'product.code'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'EAN, SKU or article number (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/product.code')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/product.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Unique article code related to stock levels, e.g. from the ERP system, an EAN/GTIN number or self invented' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Unique article code related to stock levels, e.g. from the ERP system, an EAN/GTIN number or self invented')); ?>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-label" type="text" required="required" tabindex="1"
-								name="<?= $this->formparam( array( 'item', 'product.label' ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Internal name (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/product.label' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?> />
+								name="<?= $this->formparam(array('item', 'product.label')); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Internal name (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/product.label')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/product.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Internal article name, will be used on the web site and for searching only if no other product names in any language exist' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Internal article name, will be used on the web site and for searching only if no other product names in any language exist')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Start date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Start date')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-datestart" type="datetime-local" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'product.datestart' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
-								value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'itemData/product.datestart' ) ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'product.datestart'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
+								value="<?= $enc->attr(str_replace(' ', 'T', $this->get('itemData/product.datestart'))); ?>"
+								<?= $this->site()->readonly($this->get('itemData/product.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The article is only shown on the web site after that date and time, useful or seasonal articles' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The article is only shown on the web site after that date and time, useful or seasonal articles')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'End date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'End date')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-dateend" type="datetime-local" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'product.dateend' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
-								value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'itemData/product.dateend' ) ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'product.dateend'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
+								value="<?= $enc->attr(str_replace(' ', 'T', $this->get('itemData/product.dateend'))); ?>"
+								<?= $this->site()->readonly($this->get('itemData/product.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The article is only shown on the web site until that date and time, useful or seasonal articles' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The article is only shown on the web site until that date and time, useful or seasonal articles')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Created')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-ctime" type="datetime-local" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'product.ctime' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
-								value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'itemData/product.ctime' ) ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'product.ctime'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
+								value="<?= $enc->attr(str_replace(' ', 'T', $this->get('itemData/product.ctime'))); ?>"
+								<?= $this->site()->readonly($this->get('itemData/product.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Since when the product is available, used for sorting in the front-end' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Since when the product is available, used for sorting in the front-end')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional warning">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'URL target' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'URL target')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-target" type="text" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'product.target' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Route or page ID (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/product.target' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'product.target'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Route or page ID (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/product.target')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/product.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Route name or page ID of the product detail page if this product should shown on a different page' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Route name or page ID of the product detail page if this product should shown on a different page')); ?>
 						</div>
 					</div>
 				</div><!--
 
-				--><div class="col-xl-6 content-block <?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?>">
-							<table class="item-config table table-striped" data-keys="<?= $enc->attr( json_encode( $cfgSuggest ) ); ?>">
+				--><div class="col-xl-6 content-block <?= $this->site()->readonly($this->get('itemData/product.siteid')); ?>">
+							<table class="item-config table table-striped" data-keys="<?= $enc->attr(json_encode($cfgSuggest)); ?>">
 						<thead>
 							<tr>
 								<th>
-									<span class="help"><?= $enc->html( $this->translate( 'admin', 'Option' ) ); ?></span>
+									<span class="help"><?= $enc->html($this->translate('admin', 'Option')); ?></span>
 									<div class="form-text text-muted help-text">
-										<?= $enc->html( $this->translate( 'admin', 'Article specific configuration options, will be available as key/value pairs in the templates' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Article specific configuration options, will be available as key/value pairs in the templates')); ?>
 									</div>
 								</th>
 								<th>
-									<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Value')); ?>
 								</th>
 								<th class="actions">
-									<?php if( !$this->site()->readonly( $this->get( 'itemData/product.siteid' ) ) ) : ?>
+									<?php if (!$this->site()->readonly($this->get('itemData/product.siteid'))) : ?>
 										<div class="btn act-add fa" tabindex="1"
-											title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>">
+											title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>">
 										</div>
 									<?php endif; ?>
 								</th>
@@ -329,24 +329,24 @@ 
 						</thead>
 						<tbody>
 
-							<?php foreach( (array) $this->get( 'itemData/config/key', [] ) as $idx => $key ) : ?>
+							<?php foreach ((array) $this->get('itemData/config/key', []) as $idx => $key) : ?>
 								<tr class="config-item">
 									<td>
 										<input type="text" class="config-key form-control" tabindex="1"
-											name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'key', '' ) ) ); ?>"
-											value="<?= $enc->attr( $this->get( 'itemData/config/key/' . $idx, $key ) ); ?>"
-											<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?> />
+											name="<?= $enc->attr($this->formparam(array('item', 'config', 'key', ''))); ?>"
+											value="<?= $enc->attr($this->get('itemData/config/key/' . $idx, $key)); ?>"
+											<?= $this->site()->readonly($this->get('itemData/product.siteid')); ?> />
 									</td>
 									<td>
 										<input type="text" class="config-value form-control" tabindex="1"
-											name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>"
-											value="<?= $enc->attr( $this->get( 'itemData/config/val/' . $idx ) ); ?>"
-											<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ); ?> />
+											name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>"
+											value="<?= $enc->attr($this->get('itemData/config/val/' . $idx)); ?>"
+											<?= $this->site()->readonly($this->get('itemData/product.siteid')); ?> />
 									</td>
 									<td class="actions">
-										<?php if( !$this->site()->readonly( $this->get( 'itemData/product.siteid' ) ) ) : ?>
+										<?php if (!$this->site()->readonly($this->get('itemData/product.siteid'))) : ?>
 											<div class="btn act-delete fa" tabindex="1"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+												title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 											</div>
 										<?php endif; ?>
 									</td>
@@ -356,16 +356,16 @@ 
 							<tr class="prototype">
 								<td>
 									<input type="text" class="config-key form-control" tabindex="1" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'key', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('item', 'config', 'key', ''))); ?>" />
 								</td>
 								<td>
 									<input type="text" class="config-value form-control" tabindex="1" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" />
 								</td>
 								<td class="actions">
-									<?php if( !$this->site()->readonly( $this->get( 'itemData/product.siteid' ) ) ) : ?>
+									<?php if (!$this->site()->readonly($this->get('itemData/product.siteid'))) : ?>
 										<div class="btn act-delete fa" tabindex="1"
-											title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+											title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 										</div>
 									<?php endif; ?>
 								</td>
@@ -376,12 +376,12 @@ 
 
 			</div>
 
-			<?= $this->get( 'itemBody' ); ?>
+			<?= $this->get('itemBody'); ?>
 
 		</div>
 
 		<div class="item-actions">
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
 		</div>
 	</div>
 </form>
@@ -389,4 +389,4 @@ 
 <?php $this->block()->stop(); ?>
 
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/templates/product/item-stock-standard.php

Spacing +31 added lines, -31 removed lines

@@ -7,7 +7,7 @@ 
 
 
 $enc = $this->encoder();
-$stockTypes = $this->get( 'stockTypes', [] );
+$stockTypes = $this->get('stockTypes', []);
 
 $keys = ['stock.id', 'stock.siteid', 'stock.type', 'stock.stocklevel', 'stock.dateback'];
 
@@ -16,37 +16,37 @@ 
 <div id="stock" class="item-stock content-block tab-pane fade" role="tabpanel" aria-labelledby="stock">
 
 	<table class="stock-list table table-default"
-		data-items="<?= $enc->attr( json_encode( $this->get( 'stockData', [] ) ) ); ?>"
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
+		data-items="<?= $enc->attr(json_encode($this->get('stockData', []))); ?>"
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
 		data-prefix="stock."
 		data-siteid="<?= $this->site()->siteid() ?>"
-		data-numtypes="<?= count( $stockTypes ) ?>" >
+		data-numtypes="<?= count($stockTypes) ?>" >
 
 		<thead>
 			<tr>
-				<?php if( count( $stockTypes ) > 1 ) : ?>
+				<?php if (count($stockTypes) > 1) : ?>
 					<th class="stock-type">
-						<span class="help"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></span>
+						<span class="help"><?= $enc->html($this->translate('admin', 'Type')); ?></span>
 						<div class="form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Warehouse or local store if your articles are available at several locations' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Warehouse or local store if your articles are available at several locations')); ?>
 						</div>
 					</th>
 				<?php endif; ?>
 				<th class="stock-stocklevel">
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Stock level' ) ); ?></span>
+					<span class="help"><?= $enc->html($this->translate('admin', 'Stock level')); ?></span>
 					<div class="form-text text-muted help-text">
-						<?= $enc->html( $this->translate( 'admin', 'Number of articles currently in stock, leave empty for an unlimited quantity' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Number of articles currently in stock, leave empty for an unlimited quantity')); ?>
 					</div>
 				</th>
 				<th class="stock-databack">
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Back in stock' ) ); ?></span>
+					<span class="help"><?= $enc->html($this->translate('admin', 'Back in stock')); ?></span>
 					<div class="form-text text-muted help-text">
-						<?= $enc->html( $this->translate( 'admin', 'Shown if the article reached a stock level of zero' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Shown if the article reached a stock level of zero')); ?>
 					</div>
 				</th>
 				<th class="actions">
-					<div v-if="(items['stock.id'] || []).length < numtypes" class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+					<div v-if="(items['stock.id'] || []).length < numtypes" class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 						v-on:click="addItem()">
 					</div>
 				</th>
@@ -55,48 +55,48 @@ 
 		<tbody>
 
 			<tr v-for="(id, idx) in items['stock.id']" v-bind:key="idx" class="stock-row">
-				<?php if( count( $stockTypes ) > 1 ) : ?>
+				<?php if (count($stockTypes) > 1) : ?>
 					<td class="stock-type mandatory">
-						<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-							name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.type', '' ) ) ); ?>"
+						<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+							name="<?= $enc->attr($this->formparam(array('stock', 'stock.type', ''))); ?>"
 							v-bind:readonly="checkSite('stock.siteid', idx)"
 							v-model="items['stock.type'][idx]" >
 
 							<option value="" disable>
-								<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Please select')); ?>
 							</option>
 
-							<?php foreach( $stockTypes as $typeItem ) : ?>
-								<option value="<?= $enc->attr( $typeItem->getCode() ); ?>" v-bind:selected="items['stock.type'][idx] == '<?= $enc->attr( $typeItem->getCode() ) ?>'">
-									<?= $enc->html( $typeItem->getLabel() ) ?>
+							<?php foreach ($stockTypes as $typeItem) : ?>
+								<option value="<?= $enc->attr($typeItem->getCode()); ?>" v-bind:selected="items['stock.type'][idx] == '<?= $enc->attr($typeItem->getCode()) ?>'">
+									<?= $enc->html($typeItem->getLabel()) ?>
 								</option>
 							<?php endforeach; ?>
 						</select>
 					</td>
 				<?php else : ?>
 					<input class="item-type" type="hidden"
-						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.type', '' ) ) ); ?>"
-						value="<?= $enc->attr( key( $stockTypes ) ); ?>" />
+						name="<?= $enc->attr($this->formparam(array('stock', 'stock.type', ''))); ?>"
+						value="<?= $enc->attr(key($stockTypes)); ?>" />
 				<?php endif; ?>
 				<td class="stock-stocklevel optional">
-					<input class="form-control item-stocklevel" type="number" step="1" min="0" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.stocklevel', '' ) ) ); ?>"
+					<input class="form-control item-stocklevel" type="number" step="1" min="0" tabindex="<?= $this->get('tabindex'); ?>"
+						name="<?= $enc->attr($this->formparam(array('stock', 'stock.stocklevel', ''))); ?>"
 						v-bind:readonly="checkSite('stock.siteid', idx)"
 						v-model="items['stock.stocklevel'][idx]" />
 				</td>
 				<td class="stock-databack optional">
-					<input class="form-control item-dateback" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.dateback', '' ) ) ); ?>"
-						placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+					<input class="form-control item-dateback" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+						name="<?= $enc->attr($this->formparam(array('stock', 'stock.dateback', ''))); ?>"
+						placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 						v-bind:readonly="checkSite('stock.siteid', idx)"
 						v-model="items['stock.dateback'][idx]" />
 				</td>
 				<td class="actions">
 					<input class="item-id" type="hidden" v-model="items['stock.id'][idx]"
-						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.id', '' ) ) ); ?>" />
+						name="<?= $enc->attr($this->formparam(array('stock', 'stock.id', ''))); ?>" />
 
-					<div v-if="!checkSite('stock.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+					<div v-if="!checkSite('stock.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removeItem(idx)">
 					</div>
 				</td>
@@ -105,6 +105,6 @@ 
 		</tbody>
 	</table>
 
-	<?= $this->get( 'stockBody' ); ?>
+	<?= $this->get('stockBody'); ?>
 
 </div>

Braces +5 added lines, -2 removed lines

@@ -73,9 +73,12 @@
 							<?php endforeach; ?>
 						</select>
 					</td>
-				<?php else : ?>
+				<?php else {
+	: ?>
 					<input class="item-type" type="hidden"
-						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.type', '' ) ) ); ?>"
+						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.type', '' ) ) );
+}
+?>"
 						value="<?= $enc->attr( key( $stockTypes ) ); ?>" />
 				<?php endif; ?>
 				<td class="stock-stocklevel optional">

admin/jqadm/templates/product/item-text-standard.php

Spacing +85 added lines, -85 removed lines

@@ -17,9 +17,9 @@ 
 ?>
 <div id="text" class="item-text content-block tab-pane fade" role="tablist" aria-labelledby="text">
 	<div id="item-text-group" role="tablist" aria-multiselectable="true"
-		data-items="<?= $enc->attr( json_encode( $this->get( 'textData', [] ) ) ); ?>"
-		data-listtype="<?= key( $this->get( 'textListTypes', [] ) ) ?>"
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
+		data-items="<?= $enc->attr(json_encode($this->get('textData', []))); ?>"
+		data-listtype="<?= key($this->get('textListTypes', [])) ?>"
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
 		data-siteid="<?= $this->site()->siteid() ?>" >
 
 		<div v-for="(entry, idx) in items" class="group-item card">
@@ -28,16 +28,16 @@ 
 				v-bind:data-target="'#item-text-group-data-' + idx" data-toggle="collapse" role="tab" class="card-header header"
 				v-bind:aria-controls="'item-text-group-data-' + idx" aria-expanded="false">
 				<div class="card-tools-left">
-					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide this entry') ); ?>">
+					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Show/hide this entry')); ?>">
 					</div>
 				</div>
 				<span class="item-label header-label" v-html="getLabel(idx)"></span>
 				&nbsp;
 				<div class="card-tools-right">
 					<div v-if="!checkSite('product.lists.siteid', idx)"
-						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removeItem(idx)">
 					</div>
 				</div>
@@ -47,7 +47,7 @@ 
 				v-bind:aria-labelledby="'item-text-group-item-' + idx" role="tabpanel" class="card-block collapse row">
 
 				<input type="hidden" v-model="items[idx]['text.id']"
-					v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.id' ) ) ); ?>'.replace('idx', idx)" />
+					v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.id'))); ?>'.replace('idx', idx)" />
 
 				<div class="col-xl-6">
 
@@ -56,9 +56,9 @@ 
 							<textarea is="html-editor" class="form-control item-content" required="required" v-once
 								v-model="items[idx]['text.content']"
 								v-bind:value="items[idx]['text.content']"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.content' ) ) ); ?>'.replace('idx', idx)"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.content'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('text.siteid', idx)"
-								v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
+								v-bind:tabindex="<?= $this->get('tabindex'); ?>"
 							></textarea>
 						</div>
 					</div>
@@ -68,101 +68,101 @@ 
 				<div class="col-xl-6">
 
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
 						<div class="col-sm-8">
-							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.status' ) ) ); ?>'.replace('idx', idx)"
+							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.status'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('text.siteid', idx)"
 								v-model="items[idx]['text.status']" >
 								<option value="1" v-bind:selected="entry['text.status'] == 1" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
 								<option value="0" v-bind:selected="entry['text.status'] == 0" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
 								<option value="-1" v-bind:selected="entry['text.status'] == -1" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
 								<option value="-2" v-bind:selected="entry['text.status'] == -2" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</div>
 					</div>
 
-					<?php $languages = $this->get( 'pageLangItems', [] ); ?>
-					<?php if( count( $languages ) > 1 ) : ?>
+					<?php $languages = $this->get('pageLangItems', []); ?>
+					<?php if (count($languages) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Language')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-languageid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-languageid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.languageid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('text.siteid', idx)"
 									v-model="items[idx]['text.languageid']" >
 
 									<option value="" disable >
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( $languages as $langId => $langItem ) : ?>
-										<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="entry['text.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-											<?= $enc->html( $langItem->getLabel() ); ?>
+									<?php foreach ($languages as $langId => $langItem) : ?>
+										<option value="<?= $enc->attr($langId); ?>" v-bind:selected="entry['text.languageid'] == '<?= $enc->attr($langId) ?>'" >
+											<?= $enc->html($langItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Language of the entered text')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="text-langid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $languages ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.languageid'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($languages)); ?>" />
 					<?php endif; ?>
 
-					<?php $textTypes = $this->get( 'textTypes', [] ); ?>
-					<?php if( count( $textTypes ) > 1 ) : ?>
+					<?php $textTypes = $this->get('textTypes', []); ?>
+					<?php if (count($textTypes) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Type')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.type'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('text.siteid', idx)"
 									v-model="items[idx]['text.type']" >
 
 									<option value="" disable >
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( (array) $textTypes as $typeItem ) : ?>
-										<option value="<?= $enc->attr( $typeItem->getCode() ); ?>" v-bind:selected="entry['text.type'] == '<?= $enc->attr( $typeItem->getCode() ) ?>'" >
-											<?= $enc->html( $typeItem->getLabel() ); ?>
+									<?php foreach ((array) $textTypes as $typeItem) : ?>
+										<option value="<?= $enc->attr($typeItem->getCode()); ?>" v-bind:selected="entry['text.type'] == '<?= $enc->attr($typeItem->getCode()) ?>'" >
+											<?= $enc->html($typeItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Types for additional texts like per one lb/kg or per month')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="item-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $textTypes ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.type'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($textTypes)); ?>" />
 					<?php endif; ?>
 
 					<div class="form-group row optional">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-label" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.label' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Label' ) ); ?>"
+							<input class="form-control item-label" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.label'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Label')); ?>"
 								v-bind:readonly="checkSite('text.siteid', idx)"
 								v-model="items[idx]['text.label']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Description of the text content if it\'s in a foreign language' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Description of the text content if it\'s in a foreign language')); ?>
 						</div>
 					</div>
 
@@ -171,70 +171,70 @@ 
 
 				<div v-on:click="toggle(idx)" class="col-xl-12 advanced" v-bind:class="{ 'collapsed': !advanced[idx] }">
 					<div class="card-tools-left">
-						<div class="btn act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-							title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide advanced data') ); ?>">
+						<div class="btn act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+							title="<?= $enc->attr($this->translate('admin', 'Show/hide advanced data')); ?>">
 						</div>
 					</div>
-					<span class="header-label"><?= $enc->html( $this->translate( 'admin', 'Advanced' ) ); ?></span>
+					<span class="header-label"><?= $enc->html($this->translate('admin', 'Advanced')); ?></span>
 				</div>
 
 				<div v-show="advanced[idx]" class="col-xl-6 content-block secondary">
 
 					<input type="hidden" v-model="items[idx]['product.lists.type']"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'product.lists.type' ) ) ); ?>'.replace( 'idx', idx )" />
+						v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'product.lists.type'))); ?>'.replace( 'idx', idx )" />
 
-					<?php $listTypes = $this->get( 'textListTypes', [] ); ?>
-					<?php if( count( $listTypes ) > 1 ) : ?>
+					<?php $listTypes = $this->get('textListTypes', []); ?>
+					<?php if (count($listTypes) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'List type' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'List type')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select listitem-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'product.lists.type' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select listitem-type" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'product.lists.type'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('product.lists.siteid', idx)"
 									v-model="items[idx]['product.lists.type']" >
 
-									<?php foreach( $this->get( 'textListTypes', [] ) as $typeItem ) : ?>
-										<option value="<?= $enc->attr( $typeItem->getCode() ); ?>" v-bind:selected="entry['product.lists.type'] == '<?= $enc->attr( $typeItem->getCode() ) ?>'" >
-											<?= $enc->html( $typeItem->getLabel() ); ?>
+									<?php foreach ($this->get('textListTypes', []) as $typeItem) : ?>
+										<option value="<?= $enc->attr($typeItem->getCode()); ?>" v-bind:selected="entry['product.lists.type'] == '<?= $enc->attr($typeItem->getCode()) ?>'" >
+											<?= $enc->html($typeItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Second level type for grouping items')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="listitem-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'product.lists.type' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $listTypes ) ); ?>"
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'product.lists.type'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($listTypes)); ?>"
 							v-model="items[idx]['product.lists.type']" />
 					<?php endif; ?>
 
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Start date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Start date')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'product.lists.datestart' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+							<input class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'product.lists.datestart'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 								v-bind:readonly="checkSite('product.lists.siteid', idx)"
 								v-model="items[idx]['product.lists.datestart']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The item is only shown on the web site after that date and time' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The item is only shown on the web site after that date and time')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'End date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'End date')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'product.lists.dateend' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+							<input class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'product.lists.dateend'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 								v-bind:readonly="checkSite('product.lists.siteid', idx)"
 								v-model="items[idx]['product.lists.dateend']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The item is only shown on the web site until that date and time' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The item is only shown on the web site until that date and time')); ?>
 						</div>
 					</div>
 				</div>
@@ -244,17 +244,17 @@ 
 						<thead>
 							<tr>
 								<th>
-									<span class="help"><?= $enc->html( $this->translate( 'admin', 'Option' ) ); ?></span>
+									<span class="help"><?= $enc->html($this->translate('admin', 'Option')); ?></span>
 									<div class="form-text text-muted help-text">
-										<?= $enc->html( $this->translate( 'admin', 'Configuration options, will be available as key/value pairs in the list item' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Configuration options, will be available as key/value pairs in the list item')); ?>
 									</div>
 								</th>
 								<th>
-									<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Value')); ?>
 								</th>
 								<th class="actions">
-									<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+									<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+										title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 										v-bind:readonly="checkSite('product.lists.siteid', idx)"
 										v-on:click="addConfig(idx)" >
 									</div>
@@ -267,21 +267,21 @@ 
 								<td>
 									<input is="auto-complete"
 										v-model="items[idx]['config']['key'][pos]"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'config', 'key', '' ) ) ); ?>'.replace('idx', idx)"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'config', 'key', ''))); ?>'.replace('idx', idx)"
 										v-bind:readonly="checkSite('product.lists.siteid', idx)"
-										v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
+										v-bind:tabindex="<?= $this->get('tabindex'); ?>"
 										v-bind:keys="[]" />
 								</td>
 								<td>
-									<input type="text" class="form-control" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'config', 'val', '' ) ) ); ?>'.replace('idx', idx)"
+									<input type="text" class="form-control" tabindex="<?= $this->get('tabindex'); ?>"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'config', 'val', ''))); ?>'.replace('idx', idx)"
 										v-bind:readonly="checkSite('product.lists.siteid', idx)"
 										v-model="items[idx]['config']['val'][pos]" />
 								</td>
 								<td class="actions">
 									<div v-if="!checkSite('product.lists.siteid', idx)" v-on:click="removeConfig(idx, pos)"
-										class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+										class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+										title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 									</div>
 								</td>
 							</tr>
@@ -290,14 +290,14 @@ 
 					</table>
 				</div>
 
-				<?= $this->get( 'textBody' ); ?>
+				<?= $this->get('textBody'); ?>
 
 			</div>
 		</div>
 
 		<div class="card-tools-more">
-			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-				title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+				title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 				v-on:click="addItem('product.lists.')" >
 			</div>
 		</div>

Braces +15 added lines, -6 removed lines

@@ -115,9 +115,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="text-langid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $languages ) ); ?>" />
 					<?php endif; ?>
 
@@ -146,9 +149,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="item-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $textTypes ) ); ?>" />
 					<?php endif; ?>
 
@@ -204,9 +210,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="listitem-type" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'product.lists.type' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'product.lists.type' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $listTypes ) ); ?>"
 							v-model="items[idx]['product.lists.type']" />
 					<?php endif; ?>