aimeos / ai-cms-grapesjs

admin/jqadm/templates/type/cms/lists/list-standard.php

Spacing +105 added lines, -105 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/type/cms/lists/fields
@@ -49,74 +49,74 @@ 
  * @category Developer
  */
 $default = ['cms.lists.type.domain', 'cms.lists.type.status', 'cms.lists.type.code', 'cms.lists.type.label'];
-$default = $this->config( 'admin/jqadm/type/cms/lists/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/type/cms/lists/fields', $default );
+$default = $this->config('admin/jqadm/type/cms/lists/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/type/cms/lists/fields', $default);
 
-$searchParams = $params = $this->get( 'pageParams', [] );
+$searchParams = $params = $this->get('pageParams', []);
 $searchParams['page']['start'] = 0;
 
-$searchAttributes = map( $this->get( 'filterAttributes', [] ) )->filter( function( $item ) {
+$searchAttributes = map($this->get('filterAttributes', []))->filter(function($item) {
 	return $item->isPublic();
-} )->call( 'toArray' )->each( function( &$val ) {
-	$val = $this->translate( 'admin/ext', $val['label'] ?? '' );
+} )->call('toArray')->each(function(&$val) {
+	$val = $this->translate('admin/ext', $val['label'] ?? '');
 } )->all();
 
-$operators = map( $this->get( 'filterOperators/compare', [] ) )->flip()->map( function( $val, $key ) {
-	return $this->translate( 'admin/ext', $key );
+$operators = map($this->get('filterOperators/compare', []))->flip()->map(function($val, $key) {
+	return $this->translate('admin/ext', $key);
 } )->all();
 
 $columnList = [
-	'cms.lists.type.id' => $this->translate( 'admin', 'ID' ),
-	'cms.lists.type.domain' => $this->translate( 'admin', 'Domain' ),
-	'cms.lists.type.status' => $this->translate( 'admin', 'Status' ),
-	'cms.lists.type.code' => $this->translate( 'admin', 'Code' ),
-	'cms.lists.type.label' => $this->translate( 'admin', 'Label' ),
-	'cms.lists.type.position' => $this->translate( 'admin', 'Position' ),
-	'cms.lists.type.ctime' => $this->translate( 'admin', 'Created' ),
-	'cms.lists.type.mtime' => $this->translate( 'admin', 'Modified' ),
-	'cms.lists.type.editor' => $this->translate( 'admin', 'Editor' ),
+	'cms.lists.type.id' => $this->translate('admin', 'ID'),
+	'cms.lists.type.domain' => $this->translate('admin', 'Domain'),
+	'cms.lists.type.status' => $this->translate('admin', 'Status'),
+	'cms.lists.type.code' => $this->translate('admin', 'Code'),
+	'cms.lists.type.label' => $this->translate('admin', 'Label'),
+	'cms.lists.type.position' => $this->translate('admin', 'Position'),
+	'cms.lists.type.ctime' => $this->translate('admin', 'Created'),
+	'cms.lists.type.mtime' => $this->translate('admin', 'Modified'),
+	'cms.lists.type.editor' => $this->translate('admin', 'Editor'),
 ];
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
-<?= $this->partial( $this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ) ) ?>
+<?= $this->partial($this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard')) ?>
 
 <div class="list-view"
 	data-domain="cms/lists/type"
-	data-items="<?= $enc->attr( $this->get( 'items', map() )->call( 'toArray' )->all() ) ?>">
+	data-items="<?= $enc->attr($this->get('items', map())->call('toArray')->all()) ?>">
 
 <nav class="main-navbar">
 
 	<span class="navbar-brand">
-		<?= $enc->html( $this->translate( 'admin', 'CMS Lists Types' ) ); ?>
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
+		<?= $enc->html($this->translate('admin', 'CMS Lists Types')); ?>
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
 	</span>
 
 	<div class="btn fa act-search" v-on:click="search = true"
-		title="<?= $enc->attr( $this->translate( 'admin', 'Show search form' ) ) ?>"
-		aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show search form' ) ); ?>">
+		title="<?= $enc->attr($this->translate('admin', 'Show search form')) ?>"
+		aria-label="<?= $enc->attr($this->translate('admin', 'Show search form')); ?>">
 	</div>
 </nav>
 
 <nav-search v-bind:show="search" v-on:close="search = false"
-	v-bind:url="'<?= $enc->attr( $this->link( 'admin/jqadm/url/search', map( $searchParams )->except( 'filter' )->all() ) ) ?>'"
-	v-bind:filter="<?= $enc->attr( $this->session( 'aimeos/admin/jqadm/type/cms/lists/filter', [] ) ) ?>"
-	v-bind:operators="<?= $enc->attr( $operators ) ?>"
-	v-bind:name="'<?= $enc->formparam( ['filter', '_key_', '0'] ) ?>'"
-	v-bind:attributes="<?= $enc->attr( $searchAttributes ) ?>">
+	v-bind:url="'<?= $enc->attr($this->link('admin/jqadm/url/search', map($searchParams)->except('filter')->all())) ?>'"
+	v-bind:filter="<?= $enc->attr($this->session('aimeos/admin/jqadm/type/cms/lists/filter', [])) ?>"
+	v-bind:operators="<?= $enc->attr($operators) ?>"
+	v-bind:name="'<?= $enc->formparam(['filter', '_key_', '0']) ?>'"
+	v-bind:attributes="<?= $enc->attr($searchAttributes) ?>">
 </nav-search>
 
 <?= $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/type/cms/lists/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/type/cms/lists/page', [])]
 	);
 ?>
 
 <form ref="form" class="list list-cms-lists-type" method="POST"
-	action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>"
-	data-deleteurl="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, $params, [], $delConfig ) ); ?>">
+	action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>"
+	data-deleteurl="<?= $enc->attr($this->url($delTarget, $delCntl, $delAction, $params, [], $delConfig)); ?>">
 
 	<?= $this->csrf()->formfield(); ?>
 
@@ -126,26 +126,26 @@ 
 				<th class="select">
 					<a href="#" class="btn act-delete fa" tabindex="1"
 						v-on:click.prevent.stop="askDelete()"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete selected entries' ) ); ?>"
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>">
+						title="<?= $enc->attr($this->translate('admin', 'Delete selected entries')); ?>"
+						aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>">
 					</a>
 				</th>
 
 				<?= $this->partial(
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/type/cms/lists/sort' )]
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/type/cms/lists/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]
 						);
 					?>
@@ -155,19 +155,19 @@ 
 		<tbody>
 
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'fields' => array_merge( $fields, ['select'] ), 'filter' => $this->session( 'aimeos/admin/jqadm/type/cms/lists/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'fields' => array_merge($fields, ['select']), 'filter' => $this->session('aimeos/admin/jqadm/type/cms/lists/filter', []),
 					'data' => [
 						'cms.lists.type.id' => ['op' => '=='],
 						'cms.lists.type.domain' => ['op' => '==', 'type' => 'select', 'val' => [
-							'media' => $this->translate( 'admin', 'media' ),
-							'text' => $this->translate( 'admin', 'text' ),
+							'media' => $this->translate('admin', 'media'),
+							'text' => $this->translate('admin', 'text'),
 						]],
 						'cms.lists.type.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'),
 						]],
 						'cms.lists.type.code' => [],
 						'cms.lists.type.label' => [],
@@ -179,49 +179,49 @@ 
 				] );
 			?>
 
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig ) ); ?>
-				<tr class="list-item <?= $this->site()->readonly( $item->getSiteId() ); ?>" data-label="<?= $enc->attr( $item->getLabel() ) ?>">
-					<td class="select"><input v-on:click="toggle('<?= $id ?>')" v-bind:checked="items['<?= $id ?>'].checked" class="form-check-input" type="checkbox" tabindex="1" name="<?= $enc->attr( $this->formparam( ['id', ''] ) ) ?>" value="<?= $enc->attr( $item->getId() ) ?>" /></td>
-					<?php if( in_array( 'cms.lists.type.id', $fields ) ) : ?>
-						<td class="cms-type-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="list-item <?= $this->site()->readonly($item->getSiteId()); ?>" data-label="<?= $enc->attr($item->getLabel()) ?>">
+					<td class="select"><input v-on:click="toggle('<?= $id ?>')" v-bind:checked="items['<?= $id ?>'].checked" class="form-check-input" type="checkbox" tabindex="1" name="<?= $enc->attr($this->formparam(['id', ''])) ?>" value="<?= $enc->attr($item->getId()) ?>" /></td>
+					<?php if (in_array('cms.lists.type.id', $fields)) : ?>
+						<td class="cms-type-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.lists.type.domain', $fields ) ) : ?>
-						<td class="cms-type-domain"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDomain() ); ?></a></td>
+					<?php if (in_array('cms.lists.type.domain', $fields)) : ?>
+						<td class="cms-type-domain"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDomain()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.lists.type.status', $fields ) ) : ?>
-						<td class="cms-type-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
+					<?php if (in_array('cms.lists.type.status', $fields)) : ?>
+						<td class="cms-type-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.lists.type.code', $fields ) ) : ?>
-						<td class="cms-type-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html( $item->getCode() ); ?></a></td>
+					<?php if (in_array('cms.lists.type.code', $fields)) : ?>
+						<td class="cms-type-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html($item->getCode()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.lists.type.label', $fields ) ) : ?>
-						<td class="cms-type-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
+					<?php if (in_array('cms.lists.type.label', $fields)) : ?>
+						<td class="cms-type-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.lists.type.position', $fields ) ) : ?>
-						<td class="cms-type-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getPosition() ); ?></a></td>
+					<?php if (in_array('cms.lists.type.position', $fields)) : ?>
+						<td class="cms-type-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getPosition()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.lists.type.ctime', $fields ) ) : ?>
-						<td class="cms-type-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
+					<?php if (in_array('cms.lists.type.ctime', $fields)) : ?>
+						<td class="cms-type-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.lists.type.mtime', $fields ) ) : ?>
-						<td class="cms-type-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
+					<?php if (in_array('cms.lists.type.mtime', $fields)) : ?>
+						<td class="cms-type-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.lists.type.editor', $fields ) ) : ?>
-						<td class="cms-type-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
+					<?php if (in_array('cms.lists.type.editor', $fields)) : ?>
+						<td class="cms-type-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' ) ); ?>">
+							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() ) ) : ?>
+						<?php if (!$this->site()->readonly($item->getSiteId())) : ?>
 							<a class="btn act-delete fa" tabindex="1" href="#"
-								v-on:click.prevent.stop="askDelete('<?= $enc->attr( $id ) ?>')"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>">
+								v-on:click.prevent.stop="askDelete('<?= $enc->attr($id) ?>')"
+								title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
+								aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>">
 							</a>
 						<?php endif; ?>
 					</td>
@@ -230,15 +230,15 @@ 
 		</tbody>
 	</table>
 
-	<?php if( $this->get( 'items', map() )->isEmpty() ) : ?>
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
+	<?php if ($this->get('items', map())->isEmpty()) : ?>
+		<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/type/cms/lists/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/type/cms/lists/page', [])]
 	);
 ?>
 
@@ -248,4 +248,4 @@ 
 </div>
 <?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/cms/item-seo-standard.php

Spacing +75 added lines, -75 removed lines

@@ -25,8 +25,8 @@ 
 <div id="seo" class="item-seo tab-pane fade" role="tablist" aria-labelledby="seo">
 
 	<div id="item-text-group"
-		data-translate="<?= $enc->attr( $this->config( 'admin/jqadm/api/translate', [] ) ) ?>"
-		data-items="<?= $enc->attr( $this->get( 'seoData', [] ) ); ?>"
+		data-translate="<?= $enc->attr($this->config('admin/jqadm/api/translate', [])) ?>"
+		data-items="<?= $enc->attr($this->get('seoData', [])); ?>"
 		data-siteid="<?= $this->site()->siteid() ?>"
 		data-domain="cms" >
 
@@ -38,8 +38,8 @@ 
 						v-bind:data-target="'#item-text-group-data-' + idx" data-bs-toggle="collapse" role="tab" class="card-header header"
 						v-bind:aria-controls="'item-text-group-data-' + idx" aria-expanded="false" v-on:click="toggle('_show', idx)">
 						<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-bind:class="{disabled: !active(idx)}">{{ label(idx) }}</span>
@@ -47,22 +47,22 @@ 
 						<div class="card-tools-right">
 							<div class="dropdown">
 								<a v-bind:id="'translate-menu-' + idx" class="btn btn-card-header act-translate fa dropdown-toggle" href="#"
-									tabindex="<?= $this->get( 'tabindex' ); ?>" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
-									title="<?= $enc->attr( $this->translate( 'admin', 'Translate text' ) ); ?>">
+									tabindex="<?= $this->get('tabindex'); ?>" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+									title="<?= $enc->attr($this->translate('admin', 'Translate text')); ?>">
  								</a>
 								<div class="dropdown-menu dropdown-menu-end" v-bind:aria-labelledby="'translate-menu-' + idx">
-									<?php foreach( ['de', 'en', 'es', 'fr', 'it', 'nl', 'pl', 'pt', 'ru'] as $lang ) : ?>
-										<a class="dropdown-item" href="#" v-on:click="translate(idx, '<?= strtoupper( $lang ) ?>')"><?= $enc->html( $this->translate( 'language', $lang ) ); ?></a>
+									<?php foreach (['de', 'en', 'es', 'fr', 'it', 'nl', 'pl', 'pt', 'ru'] as $lang) : ?>
+										<a class="dropdown-item" href="#" v-on:click="translate(idx, '<?= strtoupper($lang) ?>')"><?= $enc->html($this->translate('language', $lang)); ?></a>
 									<?php endforeach ?>
 								</div>
 							</div>
 							<div v-if="item['cms.lists.siteid'] == siteid && !item['_nosort']"
-								class="btn btn-card-header act-move fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Move this entry up/down' ) ); ?>">
+								class="btn btn-card-header act-move fa" tabindex="<?= $this->get('tabindex'); ?>"
+								title="<?= $enc->attr($this->translate('admin', 'Move this entry up/down')); ?>">
 							</div>
 							<div v-if="item['cms.lists.siteid'] == siteid"
-								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="remove(idx)">
 							</div>
 						</div>
@@ -72,7 +72,7 @@ 
 						v-bind:aria-labelledby="'item-text-group-item-' + idx" role="tabpanel" class="card-block collapse row">
 
 						<input type="hidden" v-model="item['text.id']"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'seo', '_idx_', 'text.id' ) ) ); ?>'.replace('_idx_', idx)" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('seo', '_idx_', 'text.id'))); ?>'.replace('_idx_', idx)" />
 
 						<div class="col-xl-6">
 
@@ -82,9 +82,9 @@ 
 										v-bind:key="idx"
 										v-bind:id="'cke-' + idx"
 										v-bind:value="item['text.content']"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'seo', '_idx_', 'text.content' ) ) ); ?>'.replace('_idx_', idx)"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('seo', '_idx_', 'text.content'))); ?>'.replace('_idx_', idx)"
 										v-bind:readonly="item['text.siteid'] != siteid"
-										v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
+										v-bind:tabindex="<?= $this->get('tabindex'); ?>"
 										v-model="item['text.content']"
 									></textarea>
 								</div>
@@ -95,85 +95,85 @@ 
 						<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 form-select item-status" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'seo', '_idx_', 'text.status' ) ) ); ?>'.replace('_idx_', idx)"
+									<select class="form-control form-select item-status" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('seo', '_idx_', 'text.status'))); ?>'.replace('_idx_', idx)"
 										v-bind:readonly="item['text.siteid'] != siteid"
 										v-model="item['text.status']" >
-										<option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option>
+										<option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option>
 										<option value="1" v-bind:selected="item['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="item['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="item['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="item['text.status'] == -2" >
-											<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+											<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 										</option>
 									</select>
 								</div>
 							</div>
 
-							<?php if( !( $languages = $this->get( 'pageLangItems', map() ) )->count() !== 1 ) : ?>
+							<?php if (!($languages = $this->get('pageLangItems', map()))->count() !== 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 is="select-component" required class="form-control form-select item-languageid" tabindex="<?= $enc->attr( $this->get( 'tabindex' ) ); ?>"
-											v-bind:items="JSON.parse('<?= $enc->attr( $languages->col( 'locale.language.label', 'locale.language.id' )->toArray() ) ?>')"
-											v-bind:name="'<?= $enc->attr( $this->formparam( ['seo', '_idx_', 'text.languageid'] ) ); ?>'.replace('_idx_', idx)"
-											v-bind:text="'<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>'"
-											v-bind:all="'<?= $enc->html( $this->translate( 'admin', 'All' ) ); ?>'"
+										<select is="select-component" required class="form-control form-select item-languageid" tabindex="<?= $enc->attr($this->get('tabindex')); ?>"
+											v-bind:items="JSON.parse('<?= $enc->attr($languages->col('locale.language.label', 'locale.language.id')->toArray()) ?>')"
+											v-bind:name="'<?= $enc->attr($this->formparam(['seo', '_idx_', 'text.languageid'])); ?>'.replace('_idx_', idx)"
+											v-bind:text="'<?= $enc->html($this->translate('admin', 'Please select')); ?>'"
+											v-bind:all="'<?= $enc->html($this->translate('admin', 'All')); ?>'"
 											v-bind:readonly="item['text.siteid'] != siteid"
 											v-model="item['text.languageid']" >
 										</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( 'seo', '_idx_', 'text.languageid' ) ) ); ?>'.replace('_idx_', idx)"
-									value="<?= $enc->attr( $languages->getCode()->first() ) ?>" />
+									v-bind:name="'<?= $enc->attr($this->formparam(array('seo', '_idx_', 'text.languageid'))); ?>'.replace('_idx_', idx)"
+									value="<?= $enc->attr($languages->getCode()->first()) ?>" />
 							<?php endif; ?>
 
-							<?php if( ( $textTypes = $this->get( 'textTypes', map() ) )->count() !== 1 ) : ?>
+							<?php if (($textTypes = $this->get('textTypes', map()))->count() !== 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 is="select-component" required class="form-control form-select item-type" tabindex="<?= $enc->attr( $this->get( 'tabindex' ) ); ?>"
-											v-bind:items="JSON.parse('<?= $enc->attr( $textTypes->col( 'text.type.label', 'text.type.code' )->toArray() ) ?>')"
-											v-bind:name="'<?= $enc->attr( $this->formparam( ['seo', '_idx_', 'text.type'] ) ); ?>'.replace('_idx_', idx)"
-											v-bind:text="'<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>'"
+										<select is="select-component" required class="form-control form-select item-type" tabindex="<?= $enc->attr($this->get('tabindex')); ?>"
+											v-bind:items="JSON.parse('<?= $enc->attr($textTypes->col('text.type.label', 'text.type.code')->toArray()) ?>')"
+											v-bind:name="'<?= $enc->attr($this->formparam(['seo', '_idx_', 'text.type'])); ?>'.replace('_idx_', idx)"
+											v-bind:text="'<?= $enc->html($this->translate('admin', 'Please select')); ?>'"
 											v-bind:readonly="item['text.siteid'] != siteid"
 											v-model="item['text.type']" >
 										</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( 'seo', '_idx_', 'text.type' ) ) ); ?>'.replace('_idx_', idx)"
-									value="<?= $enc->attr( $textTypes->getCode()->first() ) ?>" />
+									v-bind:name="'<?= $enc->attr($this->formparam(array('seo', '_idx_', 'text.type'))); ?>'.replace('_idx_', idx)"
+									value="<?= $enc->attr($textTypes->getCode()->first()) ?>" />
 							<?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( 'seo', '_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('seo', '_idx_', 'text.label'))); ?>'.replace('_idx_', idx)"
+										placeholder="<?= $enc->attr($this->translate('admin', 'Label')); ?>"
 										v-bind:readonly="item['text.siteid'] != siteid"
 										v-model="item['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>
 
@@ -182,85 +182,85 @@ 
 
 						<div v-on:click="toggle('_ext', idx)" class="col-xl-12 advanced" v-bind:class="{'collapsed': !item['_ext']}">
 							<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="item['_ext']" class="col-xl-6 secondary">
 
-							<?php if( !( $listTypes = $this->get( 'textListTypes', map() ) )->count() !== 1 ) : ?>
+							<?php if (!($listTypes = $this->get('textListTypes', map()))->count() !== 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 is="select-component" required class="form-control form-select listitem-type" tabindex="<?= $enc->attr( $this->get( 'tabindex' ) ); ?>"
-											v-bind:items="JSON.parse('<?= $enc->attr( $listTypes->col( 'cms.lists.type.label', 'cms.lists.type.code' )->toArray() ) ?>')"
-											v-bind:name="'<?= $enc->attr( $this->formparam( ['seo', '_idx_', 'cms.lists.type'] ) ); ?>'.replace('_idx_', idx)"
-											v-bind:text="'<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>'"
+										<select is="select-component" required class="form-control form-select listitem-type" tabindex="<?= $enc->attr($this->get('tabindex')); ?>"
+											v-bind:items="JSON.parse('<?= $enc->attr($listTypes->col('cms.lists.type.label', 'cms.lists.type.code')->toArray()) ?>')"
+											v-bind:name="'<?= $enc->attr($this->formparam(['seo', '_idx_', 'cms.lists.type'])); ?>'.replace('_idx_', idx)"
+											v-bind:text="'<?= $enc->html($this->translate('admin', 'Please select')); ?>'"
 											v-bind:readonly="item['cms.lists.siteid'] != siteid"
 											v-model="item['cms.lists.type']" >
 										</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( ['seo', '_idx_', 'cms.lists.type'] ) ); ?>'.replace('_idx_', idx)"
-									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
+									v-bind:name="'<?= $enc->attr($this->formparam(['seo', '_idx_', 'cms.lists.type'])); ?>'.replace('_idx_', idx)"
+									value="<?= $enc->attr($listTypes->getCode()->first()) ?>" />
 							<?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 is="flat-pickr" class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'seo', '_idx_', 'cms.lists.datestart' ) ) ); ?>'.replace('_idx_', idx)"
-										placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+									<input is="flat-pickr" class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('seo', '_idx_', 'cms.lists.datestart'))); ?>'.replace('_idx_', idx)"
+										placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 										v-bind:disabled="item['cms.lists.siteid'] != siteid"
 										v-bind:config="Aimeos.flatpickr.datetime"
 										v-model="item['cms.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 is="flat-pickr" class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'seo', '_idx_', 'cms.lists.dateend' ) ) ); ?>'.replace('_idx_', idx)"
-										placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+									<input is="flat-pickr" class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('seo', '_idx_', 'cms.lists.dateend'))); ?>'.replace('_idx_', idx)"
+										placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 										v-bind:disabled="item['cms.lists.siteid'] != siteid"
 										v-bind:config="Aimeos.flatpickr.datetime"
 										v-model="item['cms.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>
 
 						<div v-show="item['_ext']" class="col-xl-6 secondary" v-bind:class="{readonly: item['cms.lists.siteid'] != siteid}">
-							<config-table v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:keys="JSON.parse('<?= $enc->attr( $this->config( 'admin/jqadm/cms/item/seo/config/suggest', [] ) ) ?>')"
-								v-bind:name="'<?= $enc->attr( $this->formparam( ['seo', '_idx_', 'config', '_pos_', '_key_'] ) ); ?>'"
+							<config-table v-bind:tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:keys="JSON.parse('<?= $enc->attr($this->config('admin/jqadm/cms/item/seo/config/suggest', [])) ?>')"
+								v-bind:name="'<?= $enc->attr($this->formparam(['seo', '_idx_', 'config', '_pos_', '_key_'])); ?>'"
 								v-bind:index="idx" v-bind:readonly="item['cms.lists.siteid'] != siteid"
 								v-bind:items="item['config']" v-on:update:config="item['config'] = $event">
 							</config-table>
 						</div>
 
-						<?= $this->get( 'seoBody' ); ?>
+						<?= $this->get('seoBody'); ?>
 
 					</div>
 				</div>
 			</div>
 
 			<div slot="footer" 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="add()" >
 				</div>
 			</div>

Braces +15 added lines, -6 removed lines

@@ -135,9 +135,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( 'seo', '_idx_', 'text.languageid' ) ) ); ?>'.replace('_idx_', idx)"
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'seo', '_idx_', 'text.languageid' ) ) );
+}
+?>'.replace('_idx_', idx)"
 									value="<?= $enc->attr( $languages->getCode()->first() ) ?>" />
 							<?php endif; ?>
 
@@ -157,9 +160,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( 'seo', '_idx_', 'text.type' ) ) ); ?>'.replace('_idx_', idx)"
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'seo', '_idx_', 'text.type' ) ) );
+}
+?>'.replace('_idx_', idx)"
 									value="<?= $enc->attr( $textTypes->getCode()->first() ) ?>" />
 							<?php endif; ?>
 
@@ -207,9 +213,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( ['seo', '_idx_', 'cms.lists.type'] ) ); ?>'.replace('_idx_', idx)"
+									v-bind:name="'<?= $enc->attr( $this->formparam( ['seo', '_idx_', 'cms.lists.type'] ) );
+}
+?>'.replace('_idx_', idx)"
 									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
 							<?php endif; ?>
 

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

Spacing +83 added lines, -83 removed lines

@@ -5,69 +5,69 @@ 
  * @copyright Aimeos (aimeos.org), 2021
  */
 
-$selected = function( $key, $code ) {
-	return ( $key == $code ? 'selected="selected"' : '' );
+$selected = function($key, $code) {
+	return ($key == $code ? 'selected="selected"' : '');
 };
 
 
 $enc = $this->encoder();
 
-$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', []);
 
-$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', []);
 
-$listTarget = $this->config( 'admin/jqadm/url/search/target' );
-$listCntl = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
-$listAction = $this->config( 'admin/jqadm/url/search/action', 'search' );
-$listConfig = $this->config( 'admin/jqadm/url/search/config', [] );
+$listTarget = $this->config('admin/jqadm/url/search/target');
+$listCntl = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
+$listAction = $this->config('admin/jqadm/url/search/action', 'search');
+$listConfig = $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', []);
 
-$jsonTarget = $this->config( 'admin/jsonadm/url/target' );
-$jsonCntl = $this->config( 'admin/jsonadm/url/controller', 'Jsonadm' );
-$jsonAction = $this->config( 'admin/jsonadm/url/action', 'get' );
-$jsonConfig = $this->config( 'admin/jsonadm/url/config', [] );
+$jsonTarget = $this->config('admin/jsonadm/url/target');
+$jsonCntl = $this->config('admin/jsonadm/url/controller', 'Jsonadm');
+$jsonAction = $this->config('admin/jsonadm/url/action', 'get');
+$jsonConfig = $this->config('admin/jsonadm/url/config', []);
 
-$params = $this->get( 'pageParams', [] );
+$params = $this->get('pageParams', []);
 
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
 <form class="item item-cms item-tree form-horizontal container-fluid" method="POST" enctype="multipart/form-data"
-	action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>"
-	data-rootid="<?= $enc->attr( $this->get( 'itemRootId' ) ); ?>"
-	data-geturl="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'cms', 'id' => '_ID_'] + $params, [], $getConfig ) ); ?>"
-	data-createurl="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, ['resource' => 'cms', 'id' => '_ID_'] + $params, [], $newConfig ) ); ?>"
-	data-jsonurl="<?= $enc->attr( $this->url( $jsonTarget, $jsonCntl, $jsonAction, ['resource' => 'cms'], [], $jsonConfig ) ); ?>"
-	data-idname="<?= $this->formparam( 'id' ); ?>" >
-
-	<input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'cms.id' ) ) ); ?>"
-		value="<?= $enc->attr( $this->get( 'itemData/cms.id' ) ); ?>" />
-	<input id="item-parentid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'cms.parentid' ) ) ); ?>"
-		value="<?= $enc->attr( $this->get( 'itemData/cms.parentid', $this->param( 'parentid', $this->param( 'id', $this->get( 'itemRootId' ) ) ) ) ); ?>" />
-	<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)); ?>"
+	data-rootid="<?= $enc->attr($this->get('itemRootId')); ?>"
+	data-geturl="<?= $enc->attr($this->url($getTarget, $getCntl, $getAction, ['resource' => 'cms', 'id' => '_ID_'] + $params, [], $getConfig)); ?>"
+	data-createurl="<?= $enc->attr($this->url($newTarget, $newCntl, $newAction, ['resource' => 'cms', 'id' => '_ID_'] + $params, [], $newConfig)); ?>"
+	data-jsonurl="<?= $enc->attr($this->url($jsonTarget, $jsonCntl, $jsonAction, ['resource' => 'cms'], [], $jsonConfig)); ?>"
+	data-idname="<?= $this->formparam('id'); ?>" >
+
+	<input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'cms.id'))); ?>"
+		value="<?= $enc->attr($this->get('itemData/cms.id')); ?>" />
+	<input id="item-parentid" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'cms.parentid'))); ?>"
+		value="<?= $enc->attr($this->get('itemData/cms.parentid', $this->param('parentid', $this->param('id', $this->get('itemRootId'))))); ?>" />
+	<input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" />
 	<?= $this->csrf()->formfield(); ?>
 
 	<nav class="main-navbar">
 		<h1 class="navbar-brand">
-			<span class="navbar-title"><?= $enc->html( $this->translate( 'admin', 'CMS page' ) ); ?></span>
-			<span class="navbar-id"><?= $enc->html( $this->get( 'itemData/cms.id' ) ); ?></span>
-			<span class="navbar-label"><?= $enc->html( $this->get( 'itemData/cms.label' ) ?: $this->translate( 'admin', 'New' ) ); ?></span>
-			<span class="navbar-site"><?= $enc->html( $this->site()->match( $this->get( 'itemData/cms.siteid' ) ) ); ?></span>
+			<span class="navbar-title"><?= $enc->html($this->translate('admin', 'CMS page')); ?></span>
+			<span class="navbar-id"><?= $enc->html($this->get('itemData/cms.id')); ?></span>
+			<span class="navbar-label"><?= $enc->html($this->get('itemData/cms.label') ?: $this->translate('admin', 'New')); ?></span>
+			<span class="navbar-site"><?= $enc->html($this->site()->match($this->get('itemData/cms.siteid'))); ?></span>
 		</h1>
 		<div class="item-actions">
-			<?php if( isset( $this->itemData ) ) : ?>
-				<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
+			<?php if (isset($this->itemData)) : ?>
+				<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
 			<?php else : ?>
 				<span class="placeholder">&nbsp;</span>
 			<?php endif; ?>
@@ -83,7 +83,7 @@ 
 						--><span class="btn btn-secondary fa expand-all" tabindex="1"></span><!--
 						--><span class="btn btn-secondary fa collapse-all" tabindex="1"></span><!--
 					--></div><!--
-					--><input type="text" class="form-control search-input" tabindex="1" placeholder="<?= $enc->attr( $this->translate( 'admin', 'Find page' ) ); ?>"><!--
+					--><input type="text" class="form-control search-input" tabindex="1" placeholder="<?= $enc->attr($this->translate('admin', 'Find page')); ?>"><!--
 					--><div class="input-group-append"><!--
 						--><span class="btn btn-secondary fa act-delete " tabindex="1"></span><!--
 						--><span class="btn btn-primary fa act-add" tabindex="1"></span><!--
@@ -93,7 +93,7 @@ 
 			</div>
 		</div>
 
-		<?php if( isset( $this->itemData ) ) : ?>
+		<?php if (isset($this->itemData)) : ?>
 			<div class="col-xl-9 cms-content">
 				<div class="row">
 
@@ -102,14 +102,14 @@ 
 							<ul class="nav nav-tabs flex-row flex-wrap d-flex box" role="tablist">
 								<li class="nav-item basic">
 									<a class="nav-link active" href="#basic" data-bs-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic" tabindex="1">
-										<?= $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-bs-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-bs-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
+											<?= $enc->html($this->translate('admin', $subpart)); ?>
 										</a>
 									</li>
 								<?php endforeach; ?>
@@ -117,16 +117,16 @@ 
 
 							<div class="item-meta text-muted">
 								<small>
-									<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
-									<span class="meta-value"><?= $enc->html( $this->get( 'itemData/cms.mtime' ) ); ?></span>
+									<?= $enc->html($this->translate('admin', 'Modified')); ?>:
+									<span class="meta-value"><?= $enc->html($this->get('itemData/cms.mtime')); ?></span>
 								</small>
 								<small>
-									<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
-									<span class="meta-value"><?= $enc->html( $this->get( 'itemData/cms.ctime' ) ); ?></span>
+									<?= $enc->html($this->translate('admin', 'Created')); ?>:
+									<span class="meta-value"><?= $enc->html($this->get('itemData/cms.ctime')); ?></span>
 								</small>
 								<small>
-									<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
-									<span class="meta-value"><?= $enc->html( $this->get( 'itemData/cms.editor' ) ); ?></span>
+									<?= $enc->html($this->translate('admin', 'Editor')); ?>:
+									<span class="meta-value"><?= $enc->html($this->get('itemData/cms.editor')); ?></span>
 								</small>
 							</div>
 
@@ -140,55 +140,55 @@ 
 
 							<div class="box">
 								<div class="row">
-									<div class="col-xl-6 <?= $this->site()->readonly( $this->get( 'itemData/cms.siteid' ) ); ?>">
+									<div class="col-xl-6 <?= $this->site()->readonly($this->get('itemData/cms.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 form-select item-status" required="required" tabindex="1"
-													name="<?= $enc->attr( $this->formparam( array( 'item', 'cms.status' ) ) ); ?>"
-													<?= $this->site()->readonly( $this->get( 'itemData/cms.siteid' ) ); ?> >
+													name="<?= $enc->attr($this->formparam(array('item', 'cms.status'))); ?>"
+													<?= $this->site()->readonly($this->get('itemData/cms.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/cms.status', 1 ), 1 ); ?> >
-														<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+													<option value="1" <?= $selected($this->get('itemData/cms.status', 1), 1); ?> >
+														<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 													</option>
-													<option value="0" <?= $selected( $this->get( 'itemData/cms.status', 1 ), 0 ); ?> >
-														<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+													<option value="0" <?= $selected($this->get('itemData/cms.status', 1), 0); ?> >
+														<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 													</option>
-													<option value="-1" <?= $selected( $this->get( 'itemData/cms.status', 1 ), -1 ); ?> >
-														<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+													<option value="-1" <?= $selected($this->get('itemData/cms.status', 1), -1); ?> >
+														<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 													</option>
-													<option value="-2" <?= $selected( $this->get( 'itemData/cms.status', 1 ), -2 ); ?> >
-														<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+													<option value="-2" <?= $selected($this->get('itemData/cms.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 help"><?= $enc->html( $this->translate( 'admin', 'URL' ) ); ?></label>
+											<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'URL')); ?></label>
 											<div class="col-sm-8">
 												<input class="form-control item-url" type="text" required="required" tabindex="1"
-													name="<?= $enc->attr( $this->formparam( array( 'item', 'cms.url' ) ) ); ?>"
-													placeholder="<?= $enc->attr( $this->translate( 'admin', 'Unique page URL (required)' ) ); ?>"
-													value="<?= $enc->attr( $this->get( 'itemData/cms.url' ) ); ?>"
-													<?= $this->site()->readonly( $this->get( 'itemData/cms.siteid' ) ); ?> />
+													name="<?= $enc->attr($this->formparam(array('item', 'cms.url'))); ?>"
+													placeholder="<?= $enc->attr($this->translate('admin', 'Unique page URL (required)')); ?>"
+													value="<?= $enc->attr($this->get('itemData/cms.url')); ?>"
+													<?= $this->site()->readonly($this->get('itemData/cms.siteid')); ?> />
 											</div>
 											<div class="col-sm-12 form-text text-muted help-text">
-												<?= $enc->html( $this->translate( 'admin', 'Unique page URL, e.g. "/page-name"' ) ); ?>
+												<?= $enc->html($this->translate('admin', 'Unique page URL, e.g. "/page-name"')); ?>
 											</div>
 										</div>
 										<div class="form-group row mandatory">
-											<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Title' ) ); ?></label>
+											<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Title')); ?></label>
 											<div class="col-sm-8">
 												<input class="form-control item-label" type="text" required="required" tabindex="1"
-													name="<?= $this->formparam( array( 'item', 'cms.label' ) ); ?>"
-													placeholder="<?= $enc->attr( $this->translate( 'admin', 'Internal name (required)' ) ); ?>"
-													value="<?= $enc->attr( $this->get( 'itemData/cms.label' ) ); ?>"
-													<?= $this->site()->readonly( $this->get( 'itemData/cms.siteid' ) ); ?> />
+													name="<?= $this->formparam(array('item', 'cms.label')); ?>"
+													placeholder="<?= $enc->attr($this->translate('admin', 'Internal name (required)')); ?>"
+													value="<?= $enc->attr($this->get('itemData/cms.label')); ?>"
+													<?= $this->site()->readonly($this->get('itemData/cms.siteid')); ?> />
 											</div>
 											<div class="col-sm-12 form-text text-muted help-text">
-												<?= $enc->html( $this->translate( 'admin', 'Page title, will be used on the web site if no title for the language is available' ) ); ?>
+												<?= $enc->html($this->translate('admin', 'Page title, will be used on the web site if no title for the language is available')); ?>
 											</div>
 										</div>
 									</div>
@@ -197,12 +197,12 @@ 
 							</div>
 						</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>
 
@@ -216,4 +216,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')); ?>

Braces +5 added lines, -2 removed lines

@@ -68,9 +68,12 @@
 		<div class="item-actions">
 			<?php if( isset( $this->itemData ) ) : ?>
 				<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
-			<?php else : ?>
+			<?php else {
+	: ?>
 				<span class="placeholder">&nbsp;</span>
-			<?php endif; ?>
+			<?php endif;
+}
+?>
 		</div>
 	</nav>
 

admin/jqadm/templates/cms/item-content-standard.php

Braces +10 added lines, -4 removed lines

@@ -112,9 +112,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( 'content', '_idx_', 'text.languageid' ) ) ); ?>'.replace('_idx_', idx)"
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'content', '_idx_', 'text.languageid' ) ) );
+}
+?>'.replace('_idx_', idx)"
 									value="<?= $enc->attr( $languages->getCode()->first() ) ?>" />
 							<?php endif; ?>
 
@@ -148,9 +151,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( 'content', '_idx_', 'cms.lists.type' ) ) ); ?>'.replace('_idx_', idx)"
+									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'content', '_idx_', 'cms.lists.type' ) ) );
+}
+?>'.replace('_idx_', idx)"
 									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
 							<?php endif; ?>
 

Spacing +58 added lines, -58 removed lines

@@ -25,7 +25,7 @@ 
 <div id="content" class="item-content tab-pane fade" role="tablist" aria-labelledby="content">
 
 	<div id="item-content-group"
-		data-items="<?= $enc->attr( $this->get( 'contentData', [] ) ); ?>"
+		data-items="<?= $enc->attr($this->get('contentData', [])); ?>"
 		data-siteid="<?= $this->site()->siteid() ?>"
 		data-domain="cms" >
 
@@ -37,24 +37,24 @@ 
 						v-bind:data-target="'#item-text-group-data-' + idx" data-bs-toggle="collapse" role="tab" class="card-header header"
 						v-bind:aria-controls="'item-text-group-data-' + idx" aria-expanded="false" v-on:click="toggle('_show', idx)">
 						<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-bind:class="{disabled: !active(idx)}">{{ label(idx) }}</span>
 						&nbsp;
 						<div class="card-tools-right">
-							<div class="btn btn-card-header act-copy fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Duplicate entry (Ctrl+D)' ) ); ?>"
+							<div class="btn btn-card-header act-copy fa" tabindex="<?= $this->get('tabindex'); ?>"
+								title="<?= $enc->attr($this->translate('admin', 'Duplicate entry (Ctrl+D)')); ?>"
 								v-on:click.stop="duplicate(idx)">
 							</div>
 							<div v-if="item['cms.lists.siteid'] == siteid && !item['_nosort']"
-								class="btn btn-card-header act-move fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Move this entry up/down' ) ); ?>">
+								class="btn btn-card-header act-move fa" tabindex="<?= $this->get('tabindex'); ?>"
+								title="<?= $enc->attr($this->translate('admin', 'Move this entry up/down')); ?>">
 							</div>
 							<div v-if="item['cms.lists.siteid'] == siteid"
-								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="remove(idx)">
 							</div>
 						</div>
@@ -64,29 +64,29 @@ 
 						v-bind:aria-labelledby="'item-text-group-item-' + idx" role="tabpanel" class="card-block collapse row">
 
 						<input type="hidden" v-model="item['text.id']"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'content', '_idx_', 'text.id' ) ) ); ?>'.replace('_idx_', idx)" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('content', '_idx_', 'text.id'))); ?>'.replace('_idx_', idx)" />
 
 						<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 form-select item-status" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'content', '_idx_', 'text.status' ) ) ); ?>'.replace('_idx_', idx)"
+									<select class="form-control form-select item-status" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('content', '_idx_', 'text.status'))); ?>'.replace('_idx_', idx)"
 										v-bind:readonly="item['text.siteid'] != siteid"
 										v-model="item['text.status']" >
-										<option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option>
+										<option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option>
 										<option value="1" v-bind:selected="item['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="item['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="item['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="item['text.status'] == -2" >
-											<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+											<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 										</option>
 									</select>
 								</div>
@@ -95,35 +95,35 @@ 
 						</div>
 						<div class="col-xl-6">
 
-							<?php if( !( $languages = $this->get( 'pageLangItems', map() ) )->count() !== 1 ) : ?>
+							<?php if (!($languages = $this->get('pageLangItems', map()))->count() !== 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 is="select-component" required class="form-control form-select item-languageid" tabindex="<?= $enc->attr( $this->get( 'tabindex' ) ); ?>"
-											v-bind:items="JSON.parse('<?= $enc->attr( $languages->col( 'locale.language.label', 'locale.language.id' )->toArray() ) ?>')"
-											v-bind:name="'<?= $enc->attr( $this->formparam( ['content', '_idx_', 'text.languageid'] ) ); ?>'.replace('_idx_', idx)"
-											v-bind:text="'<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>'"
-											v-bind:all="'<?= $enc->html( $this->translate( 'admin', 'All' ) ); ?>'"
+										<select is="select-component" required class="form-control form-select item-languageid" tabindex="<?= $enc->attr($this->get('tabindex')); ?>"
+											v-bind:items="JSON.parse('<?= $enc->attr($languages->col('locale.language.label', 'locale.language.id')->toArray()) ?>')"
+											v-bind:name="'<?= $enc->attr($this->formparam(['content', '_idx_', 'text.languageid'])); ?>'.replace('_idx_', idx)"
+											v-bind:text="'<?= $enc->html($this->translate('admin', 'Please select')); ?>'"
+											v-bind:all="'<?= $enc->html($this->translate('admin', 'All')); ?>'"
 											v-bind:readonly="item['text.siteid'] != siteid"
 											v-model="item['text.languageid']" >
 										</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( 'content', '_idx_', 'text.languageid' ) ) ); ?>'.replace('_idx_', idx)"
-									value="<?= $enc->attr( $languages->getCode()->first() ) ?>" />
+									v-bind:name="'<?= $enc->attr($this->formparam(array('content', '_idx_', 'text.languageid'))); ?>'.replace('_idx_', idx)"
+									value="<?= $enc->attr($languages->getCode()->first()) ?>" />
 							<?php endif; ?>
 
 						</div>
 
 						<div class="col-xl-12">
 							<grapesjs v-bind:setup="Aimeos.CMSContent.GrapesJS"
-								v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'content', '_idx_', 'text.content' ) ) ); ?>'.replace('_idx_', idx)"
+								v-bind:tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('content', '_idx_', 'text.content'))); ?>'.replace('_idx_', idx)"
 								v-bind:readonly="item['text.siteid'] != siteid"
 								v-bind:value="item['text.content']"
 								v-model="item['text.content']"
@@ -132,85 +132,85 @@ 
 
 						<div v-on:click="toggle('_ext', idx)" class="col-xl-12 advanced" v-bind:class="{'collapsed': !item['_ext']}">
 							<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="item['_ext']" class="col-xl-6 secondary">
 
-							<?php if( !( $listTypes = $this->get( 'textListTypes', map() ) )->count() !== 1 ) : ?>
+							<?php if (!($listTypes = $this->get('textListTypes', map()))->count() !== 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 is="select-component" required class="form-control form-select listitem-type" tabindex="<?= $enc->attr( $this->get( 'tabindex' ) ); ?>"
-											v-bind:items="JSON.parse('<?= $enc->attr( $listTypes->col( 'cms.lists.type.label', 'cms.lists.type.code' )->toArray() ) ?>')"
-											v-bind:name="'<?= $enc->attr( $this->formparam( ['content', '_idx_', 'cms.lists.type'] ) ); ?>'.replace('_idx_', idx)"
-											v-bind:text="'<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>'"
+										<select is="select-component" required class="form-control form-select listitem-type" tabindex="<?= $enc->attr($this->get('tabindex')); ?>"
+											v-bind:items="JSON.parse('<?= $enc->attr($listTypes->col('cms.lists.type.label', 'cms.lists.type.code')->toArray()) ?>')"
+											v-bind:name="'<?= $enc->attr($this->formparam(['content', '_idx_', 'cms.lists.type'])); ?>'.replace('_idx_', idx)"
+											v-bind:text="'<?= $enc->html($this->translate('admin', 'Please select')); ?>'"
 											v-bind:readonly="item['cms.lists.siteid'] != siteid"
 											v-model="item['cms.lists.type']" >
 										</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( 'content', '_idx_', 'cms.lists.type' ) ) ); ?>'.replace('_idx_', idx)"
-									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
+									v-bind:name="'<?= $enc->attr($this->formparam(array('content', '_idx_', 'cms.lists.type'))); ?>'.replace('_idx_', idx)"
+									value="<?= $enc->attr($listTypes->getCode()->first()) ?>" />
 							<?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 is="flat-pickr" class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'content', '_idx_', 'cms.lists.datestart' ) ) ); ?>'.replace('_idx_', idx)"
-										placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+									<input is="flat-pickr" class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('content', '_idx_', 'cms.lists.datestart'))); ?>'.replace('_idx_', idx)"
+										placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 										v-bind:disabled="item['cms.lists.siteid'] != siteid"
 										v-bind:config="Aimeos.flatpickr.datetime"
 										v-model="item['cms.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 is="flat-pickr" class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'content', '_idx_', 'cms.lists.dateend' ) ) ); ?>'.replace('_idx_', idx)"
-										placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+									<input is="flat-pickr" class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('content', '_idx_', 'cms.lists.dateend'))); ?>'.replace('_idx_', idx)"
+										placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 										v-bind:disabled="item['cms.lists.siteid'] != siteid"
 										v-bind:config="Aimeos.flatpickr.datetime"
 										v-model="item['cms.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>
 
 						<div v-show="item['_ext']" class="col-xl-6 secondary" v-bind:class="{readonly: item['cms.lists.siteid'] != siteid}">
-							<config-table v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:keys="JSON.parse('<?= $enc->attr( $this->config( 'admin/jqadm/cms/item/content/config/suggest', [] ) ) ?>')"
-								v-bind:name="'<?= $enc->attr( $this->formparam( ['content', '_idx_', 'config', '_pos_', '_key_'] ) ); ?>'"
+							<config-table v-bind:tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:keys="JSON.parse('<?= $enc->attr($this->config('admin/jqadm/cms/item/content/config/suggest', [])) ?>')"
+								v-bind:name="'<?= $enc->attr($this->formparam(['content', '_idx_', 'config', '_pos_', '_key_'])); ?>'"
 								v-bind:index="idx" v-bind:readonly="item['cms.lists.siteid'] != siteid"
 								v-bind:items="item['config']" v-on:update:config="item['config'] = $event">
 							</config-table>
 						</div>
 
-						<?= $this->get( 'contentBody' ); ?>
+						<?= $this->get('contentBody'); ?>
 
 					</div>
 				</div>
 			</div>
 
 			<div slot="footer" 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="add()" >
 				</div>
 			</div>

admin/jqadm/templates/cms/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/cms/fields
@@ -53,72 +53,72 @@ 
  * @category Developer
  */
 $default = ['cms.status', 'cms.url', 'cms.label'];
-$default = $this->config( 'admin/jqadm/cms/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/cms/fields', $default );
+$default = $this->config('admin/jqadm/cms/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/cms/fields', $default);
 
-$searchParams = $params = $this->get( 'pageParams', [] );
+$searchParams = $params = $this->get('pageParams', []);
 $searchParams['page']['start'] = 0;
 
-$searchAttributes = map( $this->get( 'filterAttributes', [] ) )->filter( function( $item ) {
+$searchAttributes = map($this->get('filterAttributes', []))->filter(function($item) {
 	return $item->isPublic();
-} )->call( 'toArray' )->each( function( &$val ) {
-	$val = $this->translate( 'admin/ext', $val['label'] ?? '' );
+} )->call('toArray')->each(function(&$val) {
+	$val = $this->translate('admin/ext', $val['label'] ?? '');
 } )->all();
 
-$operators = map( $this->get( 'filterOperators/compare', [] ) )->flip()->map( function( $val, $key ) {
-	return $this->translate( 'admin/ext', $key );
+$operators = map($this->get('filterOperators/compare', []))->flip()->map(function($val, $key) {
+	return $this->translate('admin/ext', $key);
 } )->all();
 
 $columnList = [
-	'cms.id' => $this->translate( 'admin', 'ID' ),
-	'cms.status' => $this->translate( 'admin', 'Status' ),
-	'cms.url' => $this->translate( 'admin', 'URL' ),
-	'cms.label' => $this->translate( 'admin', 'Title' ),
-	'cms.ctime' => $this->translate( 'admin', 'Created' ),
-	'cms.mtime' => $this->translate( 'admin', 'Modified' ),
-	'cms.editor' => $this->translate( 'admin', 'Editor' ),
+	'cms.id' => $this->translate('admin', 'ID'),
+	'cms.status' => $this->translate('admin', 'Status'),
+	'cms.url' => $this->translate('admin', 'URL'),
+	'cms.label' => $this->translate('admin', 'Title'),
+	'cms.ctime' => $this->translate('admin', 'Created'),
+	'cms.mtime' => $this->translate('admin', 'Modified'),
+	'cms.editor' => $this->translate('admin', 'Editor'),
 ];
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
-<?= $this->partial( $this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ) ) ?>
+<?= $this->partial($this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard')) ?>
 
 <div class="list-view"
 	data-domain="cms"
-	data-items="<?= $enc->attr( $this->get( 'items', map() )->call( 'toArray' )->all() ) ?>">
+	data-items="<?= $enc->attr($this->get('items', map())->call('toArray')->all()) ?>">
 
 <nav class="main-navbar">
 
 	<span class="navbar-brand">
-		<?= $enc->html( $this->translate( 'admin', 'CMS pages' ) ); ?>
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
+		<?= $enc->html($this->translate('admin', 'CMS pages')); ?>
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
 	</span>
 
 	<div class="btn fa act-search" v-on:click="search = true"
-		title="<?= $enc->attr( $this->translate( 'admin', 'Show search form' ) ) ?>"
-		aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show search form' ) ); ?>">
+		title="<?= $enc->attr($this->translate('admin', 'Show search form')) ?>"
+		aria-label="<?= $enc->attr($this->translate('admin', 'Show search form')); ?>">
 	</div>
 </nav>
 
 <nav-search v-bind:show="search" v-on:close="search = false"
-	v-bind:url="'<?= $enc->attr( $this->link( 'admin/jqadm/url/search', map( $searchParams )->except( 'filter' )->all() ) ) ?>'"
-	v-bind:filter="<?= $enc->attr( $this->session( 'aimeos/admin/jqadm/cms/filter', [] ) ) ?>"
-	v-bind:operators="<?= $enc->attr( $operators ) ?>"
-	v-bind:name="'<?= $enc->formparam( ['filter', '_key_', '0'] ) ?>'"
-	v-bind:cmss="<?= $enc->attr( $searchAttributes ) ?>">
+	v-bind:url="'<?= $enc->attr($this->link('admin/jqadm/url/search', map($searchParams)->except('filter')->all())) ?>'"
+	v-bind:filter="<?= $enc->attr($this->session('aimeos/admin/jqadm/cms/filter', [])) ?>"
+	v-bind:operators="<?= $enc->attr($operators) ?>"
+	v-bind:name="'<?= $enc->formparam(['filter', '_key_', '0']) ?>'"
+	v-bind:cmss="<?= $enc->attr($searchAttributes) ?>">
 </nav-search>
 
 <?= $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/cms/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/cms/page', [])]
 	);
 ?>
 
 <form ref="form" class="list list-cms" method="POST"
-	action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>"
-	data-deleteurl="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, $params, [], $delConfig ) ); ?>">
+	action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>"
+	data-deleteurl="<?= $enc->attr($this->url($delTarget, $delCntl, $delAction, $params, [], $delConfig)); ?>">
 
 	<?= $this->csrf()->formfield(); ?>
 
@@ -128,26 +128,26 @@ 
 				<th class="select">
 					<a href="#" class="btn act-delete fa" tabindex="1"
 						v-on:click.prevent.stop="askDelete()"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete selected entries' ) ); ?>"
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>">
+						title="<?= $enc->attr($this->translate('admin', 'Delete selected entries')); ?>"
+						aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>">
 					</a>
 				</th>
 
 				<?= $this->partial(
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/cms/sort' )]
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/cms/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]
 						);
 					?>
@@ -157,15 +157,15 @@ 
 		<tbody>
 
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'fields' => array_merge( $fields, ['select'] ), 'filter' => $this->session( 'aimeos/admin/jqadm/cms/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'fields' => array_merge($fields, ['select']), 'filter' => $this->session('aimeos/admin/jqadm/cms/filter', []),
 					'data' => [
 						'cms.id' => ['op' => '=='],
 						'cms.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'),
 						]],
 						'cms.url' => [],
 						'cms.label' => [],
@@ -176,43 +176,43 @@ 
 				] );
 			?>
 
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig ) ); ?>
-				<tr class="list-item <?= $this->site()->readonly( $item->getSiteId() ); ?>" data-label="<?= $enc->attr( $item->getLabel() ) ?>">
-					<td class="select"><input v-on:click="toggle('<?= $id ?>')" v-bind:checked="items['<?= $id ?>'].checked" class="form-check-input" type="checkbox" tabindex="1" name="<?= $enc->attr( $this->formparam( ['id', ''] ) ) ?>" value="<?= $enc->attr( $item->getId() ) ?>" /></td>
-					<?php if( in_array( 'cms.id', $fields ) ) : ?>
-						<td class="cms-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="list-item <?= $this->site()->readonly($item->getSiteId()); ?>" data-label="<?= $enc->attr($item->getLabel()) ?>">
+					<td class="select"><input v-on:click="toggle('<?= $id ?>')" v-bind:checked="items['<?= $id ?>'].checked" class="form-check-input" type="checkbox" tabindex="1" name="<?= $enc->attr($this->formparam(['id', ''])) ?>" value="<?= $enc->attr($item->getId()) ?>" /></td>
+					<?php if (in_array('cms.id', $fields)) : ?>
+						<td class="cms-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.status', $fields ) ) : ?>
-						<td class="cms-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
+					<?php if (in_array('cms.status', $fields)) : ?>
+						<td class="cms-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.url', $fields ) ) : ?>
-						<td class="cms-url"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getUrl() ); ?></a></td>
+					<?php if (in_array('cms.url', $fields)) : ?>
+						<td class="cms-url"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getUrl()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.label', $fields ) ) : ?>
-						<td class="cms-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
+					<?php if (in_array('cms.label', $fields)) : ?>
+						<td class="cms-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.ctime', $fields ) ) : ?>
-						<td class="cms-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
+					<?php if (in_array('cms.ctime', $fields)) : ?>
+						<td class="cms-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.mtime', $fields ) ) : ?>
-						<td class="cms-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
+					<?php if (in_array('cms.mtime', $fields)) : ?>
+						<td class="cms-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'cms.editor', $fields ) ) : ?>
-						<td class="cms-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
+					<?php if (in_array('cms.editor', $fields)) : ?>
+						<td class="cms-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' ) ); ?>">
+							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() ) ) : ?>
+						<?php if (!$this->site()->readonly($item->getSiteId())) : ?>
 							<a class="btn act-delete fa" tabindex="1" href="#"
-								v-on:click.prevent.stop="askDelete('<?= $enc->attr( $id ) ?>')"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>">
+								v-on:click.prevent.stop="askDelete('<?= $enc->attr($id) ?>')"
+								title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
+								aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>">
 							</a>
 						<?php endif; ?>
 					</td>
@@ -221,15 +221,15 @@ 
 		</tbody>
 	</table>
 
-	<?php if( $this->get( 'items', map() )->isEmpty() ) : ?>
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
+	<?php if ($this->get('items', map())->isEmpty()) : ?>
+		<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/cms/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/cms/page', [])]
 	);
 ?>
 
@@ -239,4 +239,4 @@ 
 </div>
 <?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/tests/TestHelperJqadm.php

Spacing +51 added lines, -51 removed lines

@@ -17,16 +17,16 @@ 
 
 		$includepaths = $aimeos->getIncludePaths();
 		$includepaths[] = get_include_path();
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
+		set_include_path(implode(PATH_SEPARATOR, $includepaths));
 	}
 
 
 	public static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
 			self::$aimeos = new \Aimeos\Bootstrap();
 		}
@@ -35,60 +35,60 @@ 
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
 	}
 
 
-	public static function getView( $site = 'unittest', \Aimeos\MW\Config\Iface $config = null )
+	public static function getView($site = 'unittest', \Aimeos\MW\Config\Iface $config = null)
 	{
-		if( $config === null ) {
-			$config = self::getContext( $site )->getConfig();
+		if ($config === null) {
+			$config = self::getContext($site)->getConfig();
 		}
 
-		$view = new \Aimeos\MW\View\Standard( self::getTemplatePaths() );
+		$view = new \Aimeos\MW\View\Standard(self::getTemplatePaths());
 
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, ['site' => 'unittest'] );
-		$view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, ['site' => 'unittest']);
+		$view->addHelper('param', $helper);
 
-		$trans = new \Aimeos\MW\Translation\None( 'de_DE' );
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $trans );
-		$view->addHelper( 'translate', $helper );
+		$trans = new \Aimeos\MW\Translation\None('de_DE');
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $trans);
+		$view->addHelper('translate', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Standard( $view, 'http://baseurl' );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Standard($view, 'http://baseurl');
+		$view->addHelper('url', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, '.', '' );
-		$view->addHelper( 'number', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, '.', '');
+		$view->addHelper('number', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Date\Standard( $view, 'Y-m-d' );
-		$view->addHelper( 'date', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Date\Standard($view, 'Y-m-d');
+		$view->addHelper('date', $helper);
 
-		$config = new \Aimeos\MW\Config\Decorator\Protect( $config, array( 'admin', 'client/html', 'controller/jsonadm' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect($config, array('admin', 'client/html', 'controller/jsonadm'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, new \Aimeos\MW\Session\None() );
-		$view->addHelper( 'session', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Session\Standard($view, new \Aimeos\MW\Session\None());
+		$view->addHelper('session', $helper);
 
 		$psr17Factory = new \Nyholm\Psr7\Factory\Psr17Factory();
-		$helper = new \Aimeos\MW\View\Helper\Request\Standard( $view, $psr17Factory->createServerRequest( 'GET', 'https://aimeos.org' ) );
-		$view->addHelper( 'request', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Request\Standard($view, $psr17Factory->createServerRequest('GET', 'https://aimeos.org'));
+		$view->addHelper('request', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Response\Standard( $view, $psr17Factory->createResponse() );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Standard($view, $psr17Factory->createResponse());
+		$view->addHelper('response', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_csrf_token', '_csrf_value' );
-		$view->addHelper( 'csrf', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_csrf_token', '_csrf_value');
+		$view->addHelper('csrf', $helper);
 
-		$fcn = function() { return array( 'admin' ); };
-		$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
-		$view->addHelper( 'access', $helper );
+		$fcn = function() { return array('admin'); };
+		$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn);
+		$view->addHelper('access', $helper);
 
 		$view->pageSitePath = [];
 
@@ -98,11 +98,11 @@ 
 
 	public static function getTemplatePaths()
 	{
-		return self::getAimeos()->getCustomPaths( 'admin/jqadm/templates' );
+		return self::getAimeos()->getCustomPaths('admin/jqadm/templates');
 	}
 
 
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
@@ -111,36 +111,36 @@ 
 		$paths = $aimeos->getConfigPaths();
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), $paths );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), $paths);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
 		$cache = new \Aimeos\MW\Cache\None();
-		$ctx->setCache( $cache );
+		$ctx->setCache($cache);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'en' );
-		$ctx->setI18n( array( 'en' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('en');
+		$ctx->setI18n(array('en' => $i18n));
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::create( $ctx );
-		$locale = $localeManager->bootstrap( $site, '', '', false );
-		$ctx->setLocale( $locale );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::create($ctx);
+		$locale = $localeManager->bootstrap($site, '', '', false);
+		$ctx->setLocale($locale);
 
 
-		$ctx->setEditor( 'ai-cms-grapejs:admin/jqadm' );
+		$ctx->setEditor('ai-cms-grapejs:admin/jqadm');
 
 		return $ctx;
 	}

admin/jqadm/tests/Admin/JQAdm/Type/Cms/Lists/FactoryTest.php

Spacing +11 added lines, -11 removed lines

@@ -17,42 +17,42 @@
 	protected function setUp() : void
 	{
 		$this->context = \TestHelperJqadm::getContext();
-		$this->context->setView( \TestHelperJqadm::getView() );
+		$this->context->setView(\TestHelperJqadm::getView());
 	}
 
 
 	public function testCreateClient()
 	{
-		$client = \Aimeos\Admin\JQAdm\Type\Cms\Lists\Factory::create( $this->context );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JQAdm\\Iface', $client );
+		$client = \Aimeos\Admin\JQAdm\Type\Cms\Lists\Factory::create($this->context);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JQAdm\\Iface', $client);
 	}
 
 
 	public function testCreateClientName()
 	{
-		$client = \Aimeos\Admin\JQAdm\Type\Cms\Lists\Factory::create( $this->context, 'Standard' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JQAdm\\Iface', $client );
+		$client = \Aimeos\Admin\JQAdm\Type\Cms\Lists\Factory::create($this->context, 'Standard');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JQAdm\\Iface', $client);
 	}
 
 
 	public function testCreateClientNameEmpty()
 	{
-		$this->expectException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Type\Cms\Lists\Factory::create( $this->context, '' );
+		$this->expectException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Type\Cms\Lists\Factory::create($this->context, '');
 	}
 
 
 	public function testCreateClientNameInvalid()
 	{
-		$this->expectException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Type\Cms\Lists\Factory::create( $this->context, '%type/cms/lists' );
+		$this->expectException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Type\Cms\Lists\Factory::create($this->context, '%type/cms/lists');
 	}
 
 
 	public function testCreateClientNameNotFound()
 	{
-		$this->expectException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Type\Cms\Lists\Factory::create( $this->context, 'test' );
+		$this->expectException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Type\Cms\Lists\Factory::create($this->context, 'test');
 	}
 
 }

admin/jqadm/tests/Admin/JQAdm/Type/Cms/Lists/StandardTest.php

Spacing +91 added lines, -91 removed lines

@@ -21,16 +21,16 @@ 
 		$this->view = \TestHelperJqadm::getView();
 		$this->context = \TestHelperJqadm::getContext();
 
-		$this->object = new \Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard( $this->context );
-		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Page( $this->object, $this->context );
-		$this->object->setAimeos( \TestHelperJqadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard($this->context);
+		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Page($this->object, $this->context);
+		$this->object->setAimeos(\TestHelperJqadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
 	protected function tearDown() : void
 	{
-		unset( $this->object, $this->view, $this->context );
+		unset($this->object, $this->view, $this->context);
 	}
 
 
@@ -38,22 +38,22 @@ 
 	{
 		$result = $this->object->create();
 
-		$this->assertStringContainsString( 'item-cms-lists-type', $result );
-		$this->assertEmpty( $this->view->get( 'errors' ) );
+		$this->assertStringContainsString('item-cms-lists-type', $result);
+		$this->assertEmpty($this->view->get('errors'));
 	}
 
 
 	public function testCreateException()
 	{
-		$object = $this->getMockBuilder( \Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder(\Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class)
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->create();
 	}
@@ -61,29 +61,29 @@ 
 
 	public function testCopy()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'cms/lists/type' );
+		$manager = \Aimeos\MShop::create($this->context, 'cms/lists/type');
 
-		$param = ['type' => 'unittest', 'id' => $manager->find( 'default', [], 'text' )->getId()];
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$param = ['type' => 'unittest', 'id' => $manager->find('default', [], 'text')->getId()];
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$result = $this->object->copy();
 
-		$this->assertStringContainsString( 'default', $result );
+		$this->assertStringContainsString('default', $result);
 	}
 
 
 	public function testCopyException()
 	{
-		$object = $this->getMockBuilder( \Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder(\Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class)
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->copy();
 	}
@@ -91,21 +91,21 @@ 
 
 	public function testDelete()
 	{
-		$this->assertNull( $this->getClientMock( ['redirect'], false )->delete() );
+		$this->assertNull($this->getClientMock(['redirect'], false)->delete());
 	}
 
 
 	public function testDeleteException()
 	{
-		$object = $this->getMockBuilder( \Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients', 'search' ) )
+		$object = $this->getMockBuilder(\Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class)
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients', 'search'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->delete();
 	}
@@ -113,29 +113,29 @@ 
 
 	public function testGet()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'cms/lists/type' );
+		$manager = \Aimeos\MShop::create($this->context, 'cms/lists/type');
 
-		$param = ['type' => 'unittest', 'id' => $manager->find( 'default', [], 'text' )->getId()];
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$param = ['type' => 'unittest', 'id' => $manager->find('default', [], 'text')->getId()];
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$result = $this->object->get();
 
-		$this->assertStringContainsString( 'default', $result );
+		$this->assertStringContainsString('default', $result);
 	}
 
 
 	public function testGetException()
 	{
-		$object = $this->getMockBuilder( \Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder(\Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class)
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->get();
 	}
@@ -143,16 +143,16 @@ 
 
 	public function testGetViewException()
 	{
-		$object = new \Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard( $this->context, [] );
+		$object = new \Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard($this->context, []);
 
-		$this->expectException( \Aimeos\Admin\JQAdm\Exception::class );
+		$this->expectException(\Aimeos\Admin\JQAdm\Exception::class);
 		$object->getView();
 	}
 
 
 	public function testSave()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'cms/lists/type' );
+		$manager = \Aimeos\MShop::create($this->context, 'cms/lists/type');
 
 		$param = array(
 			'type' => 'unittest',
@@ -165,29 +165,29 @@ 
 			),
 		);
 
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$result = $this->object->save();
 
-		$manager->delete( $manager->find( 'jqadm@test', [], 'text' )->getId() );
+		$manager->delete($manager->find('jqadm@test', [], 'text')->getId());
 
-		$this->assertEmpty( $this->view->get( 'errors' ) );
-		$this->assertNull( $result );
+		$this->assertEmpty($this->view->get('errors'));
+		$this->assertNull($result);
 	}
 
 
 	public function testSaveException()
 	{
-		$object = $this->getMockBuilder( \Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'fromArray' ) )
+		$object = $this->getMockBuilder(\Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class)
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('fromArray'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'fromArray' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('fromArray')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->save();
 	}
@@ -198,32 +198,32 @@ 
 		$param = array(
 			'type' => 'unittest', 'lang' => 'de',
 			'filter' => array(
-				'key' => array( 0 => 'cms.lists.type.code' ),
-				'op' => array( 0 => '==' ),
-				'val' => array( 0 => 'default' ),
+				'key' => array(0 => 'cms.lists.type.code'),
+				'op' => array(0 => '=='),
+				'val' => array(0 => 'default'),
 			),
-			'sort' => array( '-cms.lists.type.id' ),
+			'sort' => array('-cms.lists.type.id'),
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$result = $this->object->search();
 
-		$this->assertStringContainsString( '>default<', $result );
+		$this->assertStringContainsString('>default<', $result);
 	}
 
 
 	public function testSearchException()
 	{
-		$object = $this->getMockBuilder( \Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'initCriteria' ) )
+		$object = $this->getMockBuilder(\Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class)
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('initCriteria'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'initCriteria' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('initCriteria')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->search();
 	}
@@ -231,50 +231,50 @@ 
 
 	public function testGetSubClientInvalid()
 	{
-		$this->expectException( \Aimeos\Admin\JQAdm\Exception::class );
-		$this->object->getSubClient( '$unknown$' );
+		$this->expectException(\Aimeos\Admin\JQAdm\Exception::class);
+		$this->object->getSubClient('$unknown$');
 	}
 
 
 	public function testGetSubClientUnknown()
 	{
-		$this->expectException( \Aimeos\Admin\JQAdm\Exception::class );
-		$this->object->getSubClient( 'unknown' );
+		$this->expectException(\Aimeos\Admin\JQAdm\Exception::class);
+		$this->object->getSubClient('unknown');
 	}
 
 
-	public function getClientMock( $methods, $real = true )
+	public function getClientMock($methods, $real = true)
 	{
-		$object = $this->getMockBuilder( \Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( (array) $methods )
+		$object = $this->getMockBuilder(\Aimeos\Admin\JQAdm\Type\Cms\Lists\Standard::class)
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods((array) $methods)
 			->getMock();
 
-		$object->setAimeos( \TestHelperJqadm::getAimeos() );
-		$object->setView( $this->getViewNoRender( $real ) );
+		$object->setAimeos(\TestHelperJqadm::getAimeos());
+		$object->setView($this->getViewNoRender($real));
 
 		return $object;
 	}
 
 
-	protected function getViewNoRender( $real = true )
+	protected function getViewNoRender($real = true)
 	{
-		$view = $this->getMockBuilder( \Aimeos\MW\View\Standard::class )
-			->setConstructorArgs( array( [] ) )
-			->setMethods( array( 'render' ) )
+		$view = $this->getMockBuilder(\Aimeos\MW\View\Standard::class)
+			->setConstructorArgs(array([]))
+			->setMethods(array('render'))
 			->getMock();
 
-		$manager = \Aimeos\MShop::create( $this->context, 'cms/lists/type' );
+		$manager = \Aimeos\MShop::create($this->context, 'cms/lists/type');
 
-		$param = ['site' => 'unittest', 'id' => $real ? $manager->find( 'default', [], 'text' )->getId() : -1];
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $param );
-		$view->addHelper( 'param', $helper );
+		$param = ['site' => 'unittest', 'id' => $real ? $manager->find('default', [], 'text')->getId() : -1];
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $param);
+		$view->addHelper('param', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $this->context->getConfig() );
-		$view->addHelper( 'config', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $this->context->getConfig());
+		$view->addHelper('config', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, [] );
-		$view->addHelper( 'access', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, []);
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}

admin/jqadm/tests/Admin/JQAdm/Cms/FactoryTest.php

Spacing +11 added lines, -11 removed lines

@@ -17,42 +17,42 @@
 	protected function setUp() : void
 	{
 		$this->context = \TestHelperJqadm::getContext();
-		$this->context->setView( \TestHelperJqadm::getView() );
+		$this->context->setView(\TestHelperJqadm::getView());
 	}
 
 
 	public function testCreateClient()
 	{
-		$client = \Aimeos\Admin\JQAdm\Cms\Factory::create( $this->context );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JQAdm\\Iface', $client );
+		$client = \Aimeos\Admin\JQAdm\Cms\Factory::create($this->context);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JQAdm\\Iface', $client);
 	}
 
 
 	public function testCreateClientName()
 	{
-		$client = \Aimeos\Admin\JQAdm\Cms\Factory::create( $this->context, 'Standard' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JQAdm\\Iface', $client );
+		$client = \Aimeos\Admin\JQAdm\Cms\Factory::create($this->context, 'Standard');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JQAdm\\Iface', $client);
 	}
 
 
 	public function testCreateClientNameEmpty()
 	{
-		$this->expectException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Cms\Factory::create( $this->context, '' );
+		$this->expectException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Cms\Factory::create($this->context, '');
 	}
 
 
 	public function testCreateClientNameInvalid()
 	{
-		$this->expectException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Cms\Factory::create( $this->context, '%service' );
+		$this->expectException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Cms\Factory::create($this->context, '%service');
 	}
 
 
 	public function testCreateClientNameNotFound()
 	{
-		$this->expectException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Cms\Factory::create( $this->context, 'test' );
+		$this->expectException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Cms\Factory::create($this->context, 'test');
 	}
 
 }