Completed
Push — master ( 0229de...f71bfb )
by Aimeos
04:41
created
admin/jqadm/templates/locale/site/list-standard.php 1 patch
Spacing   +87 added lines, -87 removed lines patch added patch discarded remove patch
@@ -8,30 +8,30 @@  discard block
 block discarded – undo
8 8
 $enc = $this->encoder();
9 9
 
10 10
 
11
-$target = $this->config( 'admin/jqadm/url/search/target' );
12
-$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
13
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
14
-$config = $this->config( 'admin/jqadm/url/search/config', [] );
11
+$target = $this->config('admin/jqadm/url/search/target');
12
+$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
13
+$action = $this->config('admin/jqadm/url/search/action', 'search');
14
+$config = $this->config('admin/jqadm/url/search/config', []);
15 15
 
16
-$newTarget = $this->config( 'admin/jqadm/url/create/target' );
17
-$newCntl = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
18
-$newAction = $this->config( 'admin/jqadm/url/create/action', 'create' );
19
-$newConfig = $this->config( 'admin/jqadm/url/create/config', [] );
16
+$newTarget = $this->config('admin/jqadm/url/create/target');
17
+$newCntl = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
18
+$newAction = $this->config('admin/jqadm/url/create/action', 'create');
19
+$newConfig = $this->config('admin/jqadm/url/create/config', []);
20 20
 
21
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
22
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
23
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
24
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
21
+$getTarget = $this->config('admin/jqadm/url/get/target');
22
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
23
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
24
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
25 25
 
26
-$copyTarget = $this->config( 'admin/jqadm/url/copy/target' );
27
-$copyCntl = $this->config( 'admin/jqadm/url/copy/controller', 'Jqadm' );
28
-$copyAction = $this->config( 'admin/jqadm/url/copy/action', 'copy' );
29
-$copyConfig = $this->config( 'admin/jqadm/url/copy/config', [] );
26
+$copyTarget = $this->config('admin/jqadm/url/copy/target');
27
+$copyCntl = $this->config('admin/jqadm/url/copy/controller', 'Jqadm');
28
+$copyAction = $this->config('admin/jqadm/url/copy/action', 'copy');
29
+$copyConfig = $this->config('admin/jqadm/url/copy/config', []);
30 30
 
31
-$delTarget = $this->config( 'admin/jqadm/url/delete/target' );
32
-$delCntl = $this->config( 'admin/jqadm/url/delete/controller', 'Jqadm' );
33
-$delAction = $this->config( 'admin/jqadm/url/delete/action', 'delete' );
34
-$delConfig = $this->config( 'admin/jqadm/url/delete/config', [] );
31
+$delTarget = $this->config('admin/jqadm/url/delete/target');
32
+$delCntl = $this->config('admin/jqadm/url/delete/controller', 'Jqadm');
33
+$delAction = $this->config('admin/jqadm/url/delete/action', 'delete');
34
+$delConfig = $this->config('admin/jqadm/url/delete/config', []);
35 35
 
36 36
 
37 37
 /** admin/jqadm/locale/site/fields
@@ -49,38 +49,38 @@  discard block
 block discarded – undo
49 49
  * @category Developer
50 50
  */
51 51
 $default = ['locale.site.status', 'locale.site.code', 'locale.site.label', 'locale.site.config'];
52
-$default = $this->config( 'admin/jqadm/locale/site/fields', $default );
53
-$fields = $this->session( 'aimeos/admin/jqadm/locale/site/fields', $default );
52
+$default = $this->config('admin/jqadm/locale/site/fields', $default);
53
+$fields = $this->session('aimeos/admin/jqadm/locale/site/fields', $default);
54 54
 
55
-$searchParams = $params = $this->get( 'pageParams', [] );
55
+$searchParams = $params = $this->get('pageParams', []);
56 56
 $searchParams['page']['start'] = 0;
57 57
 
58 58
 $columnList = [
59
-	'locale.site.id' => $this->translate( 'admin', 'ID' ),
60
-	'locale.site.status' => $this->translate( 'admin', 'Status' ),
61
-	'locale.site.code' => $this->translate( 'admin', 'Code' ),
62
-	'locale.site.label' => $this->translate( 'admin', 'Label' ),
63
-	'locale.site.config' => $this->translate( 'admin', 'Config' ),
64
-	'locale.site.ctime' => $this->translate( 'admin', 'Created' ),
65
-	'locale.site.mtime' => $this->translate( 'admin', 'Modified' ),
66
-	'locale.site.editor' => $this->translate( 'admin', 'Editor' ),
59
+	'locale.site.id' => $this->translate('admin', 'ID'),
60
+	'locale.site.status' => $this->translate('admin', 'Status'),
61
+	'locale.site.code' => $this->translate('admin', 'Code'),
62
+	'locale.site.label' => $this->translate('admin', 'Label'),
63
+	'locale.site.config' => $this->translate('admin', 'Config'),
64
+	'locale.site.ctime' => $this->translate('admin', 'Created'),
65
+	'locale.site.mtime' => $this->translate('admin', 'Modified'),
66
+	'locale.site.editor' => $this->translate('admin', 'Editor'),
67 67
 ];
68 68
 
69 69
 
70 70
 ?>
71
-<?php $this->block()->start( 'jqadm_content' ); ?>
71
+<?php $this->block()->start('jqadm_content'); ?>
72 72
 
73 73
 <nav class="main-navbar">
74 74
 
75 75
 	<span class="navbar-brand">
76
-		<?= $enc->html( $this->translate( 'admin', 'Sites' ) ); ?>
76
+		<?= $enc->html($this->translate('admin', 'Sites')); ?>
77 77
 	</span>
78 78
 
79 79
 	<?= $this->partial(
80
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
81
-			'filter' => $this->session( 'aimeos/admin/jqadm/locale/site/filter', [] ),
82
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
83
-			'filterOperators' => $this->get( 'filterOperators', [] ),
80
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
81
+			'filter' => $this->session('aimeos/admin/jqadm/locale/site/filter', []),
82
+			'filterAttributes' => $this->get('filterAttributes', []),
83
+			'filterOperators' => $this->get('filterOperators', []),
84 84
 			'params' => $params,
85 85
 		]
86 86
 	); ?>
@@ -88,13 +88,13 @@  discard block
 block discarded – undo
88 88
 
89 89
 
90 90
 <?= $this->partial(
91
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
92
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
93
-		'page' => $this->session( 'aimeos/admin/jqadm/locale/site/page', [] )]
91
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
92
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
93
+		'page' => $this->session('aimeos/admin/jqadm/locale/site/page', [])]
94 94
 	);
95 95
 ?>
96 96
 
97
-<form class="list list-locale-site" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
97
+<form class="list list-locale-site" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
98 98
 	<?= $this->csrf()->formfield(); ?>
99 99
 
100 100
 	<table class="list-items table table-hover table-striped">
@@ -102,22 +102,22 @@  discard block
 block discarded – undo
102 102
 			<tr>
103 103
 
104 104
 				<?= $this->partial(
105
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
106
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/locale/site/sort' )]
105
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
106
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/locale/site/sort')]
107 107
 					);
108 108
 				?>
109 109
 
110 110
 				<th class="actions">
111
-					<?php if( $this->access( 'super' ) ) : ?>
111
+					<?php if ($this->access('super')) : ?>
112 112
 						<a class="btn fa act-add" tabindex="1"
113
-							href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>"
114
-							title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
115
-							aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
113
+							href="<?= $enc->attr($this->url($newTarget, $newCntl, $newAction, $params, [], $newConfig)); ?>"
114
+							title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
115
+							aria-label="<?= $enc->attr($this->translate('admin', 'Add')); ?>">
116 116
 						</a>
117 117
 					<?php endif; ?>
118 118
 
119 119
 					<?= $this->partial(
120
-							$this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ),
120
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
121 121
 							['fields' => $fields, 'data' => $columnList]
122 122
 						);
123 123
 					?>
@@ -127,15 +127,15 @@  discard block
 block discarded – undo
127 127
 		<tbody>
128 128
 
129 129
 			<?= $this->partial(
130
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
131
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/locale/site/filter', [] ),
130
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
131
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/locale/site/filter', []),
132 132
 					'data' => [
133 133
 						'locale.site.id' => ['op' => '=='],
134 134
 						'locale.site.status' => ['op' => '==', 'type' => 'select', 'val' => [
135
-							'1' => $this->translate( 'mshop/code', 'status:1' ),
136
-							'0' => $this->translate( 'mshop/code', 'status:0' ),
137
-							'-1' => $this->translate( 'mshop/code', 'status:-1' ),
138
-							'-2' => $this->translate( 'mshop/code', 'status:-2' ),
135
+							'1' => $this->translate('mshop/code', 'status:1'),
136
+							'0' => $this->translate('mshop/code', 'status:0'),
137
+							'-1' => $this->translate('mshop/code', 'status:-1'),
138
+							'-2' => $this->translate('mshop/code', 'status:-2'),
139 139
 						]],
140 140
 						'locale.site.code' => [],
141 141
 						'locale.site.label' => [],
@@ -147,52 +147,52 @@  discard block
 block discarded – undo
147 147
 				] );
148 148
 			?>
149 149
 
150
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
151
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig ) ); ?>
150
+			<?php foreach ($this->get('items', []) as $id => $item) : ?>
151
+				<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig)); ?>
152 152
 				<tr>
153
-					<?php if( in_array( 'locale.site.id', $fields ) ) : ?>
154
-						<td class="locale-site-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getId() ); ?></a></td>
153
+					<?php if (in_array('locale.site.id', $fields)) : ?>
154
+						<td class="locale-site-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
155 155
 					<?php endif; ?>
156
-					<?php if( in_array( 'locale.site.status', $fields ) ) : ?>
157
-						<td class="locale-site-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
156
+					<?php if (in_array('locale.site.status', $fields)) : ?>
157
+						<td class="locale-site-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
158 158
 					<?php endif; ?>
159
-					<?php if( in_array( 'locale.site.code', $fields ) ) : ?>
160
-						<td class="locale-site-code"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getCode() ); ?></a></td>
159
+					<?php if (in_array('locale.site.code', $fields)) : ?>
160
+						<td class="locale-site-code"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getCode()); ?></a></td>
161 161
 					<?php endif; ?>
162
-					<?php if( in_array( 'locale.site.label', $fields ) ) : ?>
163
-						<td class="locale-site-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
162
+					<?php if (in_array('locale.site.label', $fields)) : ?>
163
+						<td class="locale-site-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
164 164
 					<?php endif; ?>
165
-					<?php if( in_array( 'locale.site.config', $fields ) ) : ?>
165
+					<?php if (in_array('locale.site.config', $fields)) : ?>
166 166
 						<td class="locale.site-config config-item">
167 167
 							<a class="items-field" href="<?= $url; ?>">
168
-								<?php foreach( $item->getConfig() as $key => $value ) : ?>
169
-									<span class="config-key"><?= $enc->html( $key ); ?></span>
170
-									<span class="config-value"><?= $enc->html( !is_scalar( $value ) ? json_encode( $value ) : $value ); ?></span>
168
+								<?php foreach ($item->getConfig() as $key => $value) : ?>
169
+									<span class="config-key"><?= $enc->html($key); ?></span>
170
+									<span class="config-value"><?= $enc->html(!is_scalar($value) ? json_encode($value) : $value); ?></span>
171 171
 									<br/>
172 172
 								<?php endforeach; ?>
173 173
 							</a>
174 174
 						</td>
175 175
 					<?php endif; ?>
176
-					<?php if( in_array( 'locale.site.ctime', $fields ) ) : ?>
177
-						<td class="locale-site-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
176
+					<?php if (in_array('locale.site.ctime', $fields)) : ?>
177
+						<td class="locale-site-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
178 178
 					<?php endif; ?>
179
-					<?php if( in_array( 'locale.site.mtime', $fields ) ) : ?>
180
-						<td class="locale-site-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
179
+					<?php if (in_array('locale.site.mtime', $fields)) : ?>
180
+						<td class="locale-site-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
181 181
 					<?php endif; ?>
182
-					<?php if( in_array( 'locale.site.editor', $fields ) ) : ?>
183
-						<td class="locale-site-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
182
+					<?php if (in_array('locale.site.editor', $fields)) : ?>
183
+						<td class="locale-site-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getEditor()); ?></a></td>
184 184
 					<?php endif; ?>
185 185
 
186 186
 					<td class="actions">
187
-						<?php if( $this->access( 'super' ) ) : ?>
187
+						<?php if ($this->access('super')) : ?>
188 188
 							<a class="btn act-copy fa" tabindex="1"
189
-								href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>"
190
-								title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>"
191
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a>
189
+								href="<?= $enc->attr($this->url($copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig)); ?>"
190
+								title="<?= $enc->attr($this->translate('admin', 'Copy this entry')); ?>"
191
+								aria-label="<?= $enc->attr($this->translate('admin', 'Copy')); ?>"></a>
192 192
 							<a class="btn act-delete fa" tabindex="1"
193
-								href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['id' => $id] + $params, [], $delConfig ) ); ?>"
194
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
195
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
193
+								href="<?= $enc->attr($this->url($delTarget, $delCntl, $delAction, ['id' => $id] + $params, [], $delConfig)); ?>"
194
+								title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
195
+								aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>"></a>
196 196
 						<?php endif; ?>
197 197
 					</td>
198 198
 				</tr>
@@ -200,18 +200,18 @@  discard block
 block discarded – undo
200 200
 		</tbody>
201 201
 	</table>
202 202
 
203
-	<?php if( $this->get( 'items', [] ) === [] ) : ?>
204
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
203
+	<?php if ($this->get('items', []) === []) : ?>
204
+		<div class="noitems"><?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?></div>
205 205
 	<?php endif; ?>
206 206
 </form>
207 207
 
208 208
 <?= $this->partial(
209
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
210
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
211
-		'page' => $this->session( 'aimeos/admin/jqadm/locale/site/page', [] )]
209
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
210
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
211
+		'page' => $this->session('aimeos/admin/jqadm/locale/site/page', [])]
212 212
 	);
213 213
 ?>
214 214
 
215 215
 <?php $this->block()->stop(); ?>
216 216
 
217
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
217
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/locale/list-standard.php 1 patch
Spacing   +86 added lines, -86 removed lines patch added patch discarded remove patch
@@ -8,30 +8,30 @@  discard block
 block discarded – undo
8 8
 $enc = $this->encoder();
9 9
 
10 10
 
11
-$target = $this->config( 'admin/jqadm/url/search/target' );
12
-$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
13
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
14
-$config = $this->config( 'admin/jqadm/url/search/config', [] );
11
+$target = $this->config('admin/jqadm/url/search/target');
12
+$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
13
+$action = $this->config('admin/jqadm/url/search/action', 'search');
14
+$config = $this->config('admin/jqadm/url/search/config', []);
15 15
 
16
-$newTarget = $this->config( 'admin/jqadm/url/create/target' );
17
-$newCntl = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
18
-$newAction = $this->config( 'admin/jqadm/url/create/action', 'create' );
19
-$newConfig = $this->config( 'admin/jqadm/url/create/config', [] );
16
+$newTarget = $this->config('admin/jqadm/url/create/target');
17
+$newCntl = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
18
+$newAction = $this->config('admin/jqadm/url/create/action', 'create');
19
+$newConfig = $this->config('admin/jqadm/url/create/config', []);
20 20
 
21
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
22
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
23
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
24
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
21
+$getTarget = $this->config('admin/jqadm/url/get/target');
22
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
23
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
24
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
25 25
 
26
-$copyTarget = $this->config( 'admin/jqadm/url/copy/target' );
27
-$copyCntl = $this->config( 'admin/jqadm/url/copy/controller', 'Jqadm' );
28
-$copyAction = $this->config( 'admin/jqadm/url/copy/action', 'copy' );
29
-$copyConfig = $this->config( 'admin/jqadm/url/copy/config', [] );
26
+$copyTarget = $this->config('admin/jqadm/url/copy/target');
27
+$copyCntl = $this->config('admin/jqadm/url/copy/controller', 'Jqadm');
28
+$copyAction = $this->config('admin/jqadm/url/copy/action', 'copy');
29
+$copyConfig = $this->config('admin/jqadm/url/copy/config', []);
30 30
 
31
-$delTarget = $this->config( 'admin/jqadm/url/delete/target' );
32
-$delCntl = $this->config( 'admin/jqadm/url/delete/controller', 'Jqadm' );
33
-$delAction = $this->config( 'admin/jqadm/url/delete/action', 'delete' );
34
-$delConfig = $this->config( 'admin/jqadm/url/delete/config', [] );
31
+$delTarget = $this->config('admin/jqadm/url/delete/target');
32
+$delCntl = $this->config('admin/jqadm/url/delete/controller', 'Jqadm');
33
+$delAction = $this->config('admin/jqadm/url/delete/action', 'delete');
34
+$delConfig = $this->config('admin/jqadm/url/delete/config', []);
35 35
 
36 36
 
37 37
 /** admin/jqadm/locale/fields
@@ -49,39 +49,39 @@  discard block
 block discarded – undo
49 49
  * @category Developer
50 50
  */
51 51
 $default = ['locale.status', 'locale.languageid', 'locale.currencyid', 'locale.position'];
52
-$default = $this->config( 'admin/jqadm/locale/fields', $default );
53
-$fields = $this->session( 'aimeos/admin/jqadm/locale/fields', $default );
52
+$default = $this->config('admin/jqadm/locale/fields', $default);
53
+$fields = $this->session('aimeos/admin/jqadm/locale/fields', $default);
54 54
 
55
-$searchParams = $params = $this->get( 'pageParams', [] );
55
+$searchParams = $params = $this->get('pageParams', []);
56 56
 $searchParams['page']['start'] = 0;
57 57
 
58 58
 $columnList = [
59
-	'locale.id' => $this->translate( 'admin', 'ID' ),
60
-	'locale.status' => $this->translate( 'admin', 'Status' ),
61
-	'locale.languageid' => $this->translate( 'admin', 'Language' ),
62
-	'locale.currencyid' => $this->translate( 'admin', 'Currency' ),
63
-	'locale.position' => $this->translate( 'admin', 'Position' ),
64
-	'locale.ctime' => $this->translate( 'admin', 'Created' ),
65
-	'locale.mtime' => $this->translate( 'admin', 'Modified' ),
66
-	'locale.editor' => $this->translate( 'admin', 'Editor' ),
59
+	'locale.id' => $this->translate('admin', 'ID'),
60
+	'locale.status' => $this->translate('admin', 'Status'),
61
+	'locale.languageid' => $this->translate('admin', 'Language'),
62
+	'locale.currencyid' => $this->translate('admin', 'Currency'),
63
+	'locale.position' => $this->translate('admin', 'Position'),
64
+	'locale.ctime' => $this->translate('admin', 'Created'),
65
+	'locale.mtime' => $this->translate('admin', 'Modified'),
66
+	'locale.editor' => $this->translate('admin', 'Editor'),
67 67
 ];
68 68
 
69 69
 
70 70
 ?>
71
-<?php $this->block()->start( 'jqadm_content' ); ?>
71
+<?php $this->block()->start('jqadm_content'); ?>
72 72
 
73 73
 <nav class="main-navbar">
74 74
 
75 75
 	<span class="navbar-brand">
76
-		<?= $enc->html( $this->translate( 'admin', 'Locale' ) ); ?>
77
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
76
+		<?= $enc->html($this->translate('admin', 'Locale')); ?>
77
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
78 78
 	</span>
79 79
 
80 80
 	<?= $this->partial(
81
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
82
-			'filter' => $this->session( 'aimeos/admin/jqadm/locale/filter', [] ),
83
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
84
-			'filterOperators' => $this->get( 'filterOperators', [] ),
81
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
82
+			'filter' => $this->session('aimeos/admin/jqadm/locale/filter', []),
83
+			'filterAttributes' => $this->get('filterAttributes', []),
84
+			'filterOperators' => $this->get('filterOperators', []),
85 85
 			'params' => $params,
86 86
 		]
87 87
 	); ?>
@@ -89,13 +89,13 @@  discard block
 block discarded – undo
89 89
 
90 90
 
91 91
 <?= $this->partial(
92
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
93
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
94
-		'page' => $this->session( 'aimeos/admin/jqadm/locale/page', [] )]
92
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
93
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
94
+		'page' => $this->session('aimeos/admin/jqadm/locale/page', [])]
95 95
 	);
96 96
 ?>
97 97
 
98
-<form class="list list-locale" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
98
+<form class="list list-locale" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
99 99
 	<?= $this->csrf()->formfield(); ?>
100 100
 
101 101
 	<table class="list-items table table-hover table-striped">
@@ -103,20 +103,20 @@  discard block
 block discarded – undo
103 103
 			<tr>
104 104
 
105 105
 				<?= $this->partial(
106
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
107
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/locale/sort' )]
106
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
107
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/locale/sort')]
108 108
 					);
109 109
 				?>
110 110
 
111 111
 				<th class="actions">
112 112
 					<a class="btn fa act-add" tabindex="1"
113
-						href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>"
114
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
115
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
113
+						href="<?= $enc->attr($this->url($newTarget, $newCntl, $newAction, $params, [], $newConfig)); ?>"
114
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
115
+						aria-label="<?= $enc->attr($this->translate('admin', 'Add')); ?>">
116 116
 					</a>
117 117
 
118 118
 					<?= $this->partial(
119
-							$this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ),
119
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
120 120
 							['fields' => $fields, 'data' => $columnList]
121 121
 						);
122 122
 					?>
@@ -126,15 +126,15 @@  discard block
 block discarded – undo
126 126
 		<tbody>
127 127
 
128 128
 			<?= $this->partial(
129
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
130
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/locale/filter', [] ),
129
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
130
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/locale/filter', []),
131 131
 					'data' => [
132 132
 						'locale.id' => ['op' => '=='],
133 133
 						'locale.status' => ['op' => '==', 'type' => 'select', 'val' => [
134
-							'1' => $this->translate( 'mshop/code', 'status:1' ),
135
-							'0' => $this->translate( 'mshop/code', 'status:0' ),
136
-							'-1' => $this->translate( 'mshop/code', 'status:-1' ),
137
-							'-2' => $this->translate( 'mshop/code', 'status:-2' ),
134
+							'1' => $this->translate('mshop/code', 'status:1'),
135
+							'0' => $this->translate('mshop/code', 'status:0'),
136
+							'-1' => $this->translate('mshop/code', 'status:-1'),
137
+							'-2' => $this->translate('mshop/code', 'status:-2'),
138 138
 						]],
139 139
 						'locale.languageid' => [],
140 140
 						'locale.currencyid' => [],
@@ -146,44 +146,44 @@  discard block
 block discarded – undo
146 146
 				] );
147 147
 			?>
148 148
 
149
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
150
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig ) ); ?>
151
-				<tr class="<?= $this->site()->readonly( $item->getSiteId() ); ?>">
152
-					<?php if( in_array( 'locale.id', $fields ) ) : ?>
153
-						<td class="locale-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getId() ); ?></a></td>
149
+			<?php foreach ($this->get('items', []) as $id => $item) : ?>
150
+				<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig)); ?>
151
+				<tr class="<?= $this->site()->readonly($item->getSiteId()); ?>">
152
+					<?php if (in_array('locale.id', $fields)) : ?>
153
+						<td class="locale-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
154 154
 					<?php endif; ?>
155
-					<?php if( in_array( 'locale.status', $fields ) ) : ?>
156
-						<td class="locale-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
155
+					<?php if (in_array('locale.status', $fields)) : ?>
156
+						<td class="locale-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
157 157
 					<?php endif; ?>
158
-					<?php if( in_array( 'locale.languageid', $fields ) ) : ?>
159
-						<td class="locale-languageid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLanguageId() ); ?></a></td>
158
+					<?php if (in_array('locale.languageid', $fields)) : ?>
159
+						<td class="locale-languageid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLanguageId()); ?></a></td>
160 160
 					<?php endif; ?>
161
-					<?php if( in_array( 'locale.currencyid', $fields ) ) : ?>
162
-						<td class="locale-currencyid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getCurrencyId() ); ?></a></td>
161
+					<?php if (in_array('locale.currencyid', $fields)) : ?>
162
+						<td class="locale-currencyid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getCurrencyId()); ?></a></td>
163 163
 					<?php endif; ?>
164
-					<?php if( in_array( 'locale.position', $fields ) ) : ?>
165
-						<td class="locale-position"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html( $item->getPosition() ); ?></a></td>
164
+					<?php if (in_array('locale.position', $fields)) : ?>
165
+						<td class="locale-position"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html($item->getPosition()); ?></a></td>
166 166
 					<?php endif; ?>
167
-					<?php if( in_array( 'locale.ctime', $fields ) ) : ?>
168
-						<td class="locale-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
167
+					<?php if (in_array('locale.ctime', $fields)) : ?>
168
+						<td class="locale-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
169 169
 					<?php endif; ?>
170
-					<?php if( in_array( 'locale.mtime', $fields ) ) : ?>
171
-						<td class="locale-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
170
+					<?php if (in_array('locale.mtime', $fields)) : ?>
171
+						<td class="locale-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
172 172
 					<?php endif; ?>
173
-					<?php if( in_array( 'locale.editor', $fields ) ) : ?>
174
-						<td class="locale-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
173
+					<?php if (in_array('locale.editor', $fields)) : ?>
174
+						<td class="locale-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getEditor()); ?></a></td>
175 175
 					<?php endif; ?>
176 176
 
177 177
 					<td class="actions">
178 178
 						<a class="btn act-copy fa" tabindex="1"
179
-							href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>"
180
-							title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>"
181
-							aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a>
182
-						<?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?>
179
+							href="<?= $enc->attr($this->url($copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig)); ?>"
180
+							title="<?= $enc->attr($this->translate('admin', 'Copy this entry')); ?>"
181
+							aria-label="<?= $enc->attr($this->translate('admin', 'Copy')); ?>"></a>
182
+						<?php if (!$this->site()->readonly($item->getSiteId())) : ?>
183 183
 							<a class="btn act-delete fa" tabindex="1"
184
-								href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'locale', 'id' => $id] + $params, [], $delConfig ) ); ?>"
185
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
186
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
184
+								href="<?= $enc->attr($this->url($delTarget, $delCntl, $delAction, ['resource' => 'locale', 'id' => $id] + $params, [], $delConfig)); ?>"
185
+								title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
186
+								aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>"></a>
187 187
 						<?php endif; ?>
188 188
 					</td>
189 189
 				</tr>
@@ -191,18 +191,18 @@  discard block
 block discarded – undo
191 191
 		</tbody>
192 192
 	</table>
193 193
 
194
-	<?php if( $this->get( 'items', [] ) === [] ) : ?>
195
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
194
+	<?php if ($this->get('items', []) === []) : ?>
195
+		<div class="noitems"><?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?></div>
196 196
 	<?php endif; ?>
197 197
 </form>
198 198
 
199 199
 <?= $this->partial(
200
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
201
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
202
-		'page' => $this->session( 'aimeos/admin/jqadm/locale/page', [] )]
200
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
201
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
202
+		'page' => $this->session('aimeos/admin/jqadm/locale/page', [])]
203 203
 	);
204 204
 ?>
205 205
 
206 206
 <?php $this->block()->stop(); ?>
207 207
 
208
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
208
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/log/list-standard.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -8,10 +8,10 @@  discard block
 block discarded – undo
8 8
 $enc = $this->encoder();
9 9
 
10 10
 
11
-$target = $this->config( 'admin/jqadm/url/search/target' );
12
-$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
13
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
14
-$config = $this->config( 'admin/jqadm/url/search/config', [] );
11
+$target = $this->config('admin/jqadm/url/search/target');
12
+$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
13
+$action = $this->config('admin/jqadm/url/search/action', 'search');
14
+$config = $this->config('admin/jqadm/url/search/config', []);
15 15
 
16 16
 
17 17
 /** admin/jqadm/log/fields
@@ -29,41 +29,41 @@  discard block
 block discarded – undo
29 29
  * @category Developer
30 30
  */
31 31
 $default = ['log.timestamp', 'log.facility', 'log.priority', 'log.request', 'log.message'];
32
-$default = $this->config( 'admin/jqadm/log/fields', $default );
33
-$fields = $this->session( 'aimeos/admin/jqadm/log/fields', $default );
32
+$default = $this->config('admin/jqadm/log/fields', $default);
33
+$fields = $this->session('aimeos/admin/jqadm/log/fields', $default);
34 34
 
35
-$searchParams = $params = $this->get( 'pageParams', [] );
35
+$searchParams = $params = $this->get('pageParams', []);
36 36
 $searchParams['page']['start'] = 0;
37 37
 
38 38
 $columnList = [
39
-	'log.timestamp' => $this->translate( 'admin', 'Timestamp' ),
40
-	'log.facility' => $this->translate( 'admin', 'Facility' ),
41
-	'log.priority' => $this->translate( 'admin', 'Priority' ),
42
-	'log.request' => $this->translate( 'admin', 'Request' ),
43
-	'log.message' => $this->translate( 'admin', 'Message' ),
39
+	'log.timestamp' => $this->translate('admin', 'Timestamp'),
40
+	'log.facility' => $this->translate('admin', 'Facility'),
41
+	'log.priority' => $this->translate('admin', 'Priority'),
42
+	'log.request' => $this->translate('admin', 'Request'),
43
+	'log.message' => $this->translate('admin', 'Message'),
44 44
 ];
45 45
 
46 46
 
47 47
 ?>
48
-<?php $this->block()->start( 'jqadm_content' ); ?>
48
+<?php $this->block()->start('jqadm_content'); ?>
49 49
 
50 50
 <nav class="main-navbar log">
51 51
 	<span class="navbar-brand">
52
-		<?= $enc->html( $this->translate( 'admin', 'Log' ) ); ?>
53
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
52
+		<?= $enc->html($this->translate('admin', 'Log')); ?>
53
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
54 54
 	</span>
55 55
 	<span class="placeholder">&nbsp;</span>
56 56
 </nav>
57 57
 
58 58
 
59 59
 <?= $this->partial(
60
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
61
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
62
-		'page' => $this->session( 'aimeos/admin/jqadm/log/page', [] )]
60
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
61
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
62
+		'page' => $this->session('aimeos/admin/jqadm/log/page', [])]
63 63
 	);
64 64
 ?>
65 65
 
66
-<form class="list list-log" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
66
+<form class="list list-log" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
67 67
 	<?= $this->csrf()->formfield(); ?>
68 68
 
69 69
 	<table class="list-items table table-hover table-striped">
@@ -71,43 +71,43 @@  discard block
 block discarded – undo
71 71
 			<tr>
72 72
 
73 73
 				<?= $this->partial(
74
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
74
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
75 75
 						['fields' => $fields, 'params' => $params, 'data' => $columnList,
76
-						'sort' => $this->session( 'aimeos/admin/jqadm/log/sort', '-log.timestamp' )]
76
+						'sort' => $this->session('aimeos/admin/jqadm/log/sort', '-log.timestamp')]
77 77
 					);
78 78
 				?>
79 79
 
80 80
 				<th class="actions">
81 81
 					<?= $this->partial(
82
-							$this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ),
82
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
83 83
 							['fields' => $fields, 'data' => $columnList]
84 84
 						);
85 85
 					?>
86
-					<button type="submit" class="btn act-search fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
87
-						title="<?= $enc->attr( $this->translate( 'admin', 'Search') ); ?>"
88
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Search' ) ); ?>">
86
+					<button type="submit" class="btn act-search fa" tabindex="<?= $this->get('tabindex'); ?>"
87
+						title="<?= $enc->attr($this->translate('admin', 'Search')); ?>"
88
+						aria-label="<?= $enc->attr($this->translate('admin', 'Search')); ?>">
89 89
 					</button>
90 90
 				</th>
91 91
 			</tr>
92 92
 		</thead>
93 93
 		<tbody>
94 94
 
95
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
96
-				<tr class="<?= $this->site()->readonly( $item->getSiteId() ); ?>">
97
-					<?php if( in_array( 'log.timestamp', $fields ) ) : ?>
98
-						<td class="log-timestamp"><?= $enc->attr( $item->getTimestamp() ); ?></td>
95
+			<?php foreach ($this->get('items', []) as $id => $item) : ?>
96
+				<tr class="<?= $this->site()->readonly($item->getSiteId()); ?>">
97
+					<?php if (in_array('log.timestamp', $fields)) : ?>
98
+						<td class="log-timestamp"><?= $enc->attr($item->getTimestamp()); ?></td>
99 99
 					<?php endif; ?>
100
-					<?php if( in_array( 'log.facility', $fields ) ) : ?>
101
-						<td class="log-facility"><?= $enc->html( $item->getFacility() ); ?></td>
100
+					<?php if (in_array('log.facility', $fields)) : ?>
101
+						<td class="log-facility"><?= $enc->html($item->getFacility()); ?></td>
102 102
 					<?php endif; ?>
103
-					<?php if( in_array( 'log.priority', $fields ) ) : ?>
104
-						<td class="log-priority"><?= $enc->html( $item->getPriority() ); ?></td>
103
+					<?php if (in_array('log.priority', $fields)) : ?>
104
+						<td class="log-priority"><?= $enc->html($item->getPriority()); ?></td>
105 105
 					<?php endif; ?>
106
-					<?php if( in_array( 'log.request', $fields ) ) : ?>
107
-						<td class="log-request"><?= $enc->html( $item->getRequest() ); ?></td>
106
+					<?php if (in_array('log.request', $fields)) : ?>
107
+						<td class="log-request"><?= $enc->html($item->getRequest()); ?></td>
108 108
 					<?php endif; ?>
109
-					<?php if( in_array( 'log.message', $fields ) ) : ?>
110
-						<td class="log-message"><a class="items-field" href="#" tabindex="1"><?= nl2br( $enc->html( $item->getMessage() ) ); ?></a></td>
109
+					<?php if (in_array('log.message', $fields)) : ?>
110
+						<td class="log-message"><a class="items-field" href="#" tabindex="1"><?= nl2br($enc->html($item->getMessage())); ?></a></td>
111 111
 					<?php endif; ?>
112 112
 
113 113
 					<td class="actions"></td>
@@ -116,18 +116,18 @@  discard block
 block discarded – undo
116 116
 		</tbody>
117 117
 	</table>
118 118
 
119
-	<?php if( $this->get( 'items', [] ) === [] ) : ?>
120
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
119
+	<?php if ($this->get('items', []) === []) : ?>
120
+		<div class="noitems"><?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?></div>
121 121
 	<?php endif; ?>
122 122
 </form>
123 123
 
124 124
 <?= $this->partial(
125
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
126
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
127
-		'page' => $this->session( 'aimeos/admin/jqadm/log/page', [] )]
125
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
126
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
127
+		'page' => $this->session('aimeos/admin/jqadm/log/page', [])]
128 128
 	);
129 129
 ?>
130 130
 
131 131
 <?php $this->block()->stop(); ?>
132 132
 
133
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
133
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/group/item-standard.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -5,38 +5,38 @@  discard block
 block discarded – undo
5 5
  * @copyright Aimeos (aimeos.org), 2018
6 6
  */
7 7
 
8
-$selected = function( $key, $code ) {
9
-	return ( $key == $code ? 'selected="selected"' : '' );
8
+$selected = function($key, $code) {
9
+	return ($key == $code ? 'selected="selected"' : '');
10 10
 };
11 11
 
12 12
 $enc = $this->encoder();
13 13
 
14 14
 
15
-$target = $this->config( 'admin/jqadm/url/save/target' );
16
-$cntl = $this->config( 'admin/jqadm/url/save/controller', 'Jqadm' );
17
-$action = $this->config( 'admin/jqadm/url/save/action', 'save' );
18
-$config = $this->config( 'admin/jqadm/url/save/config', [] );
15
+$target = $this->config('admin/jqadm/url/save/target');
16
+$cntl = $this->config('admin/jqadm/url/save/controller', 'Jqadm');
17
+$action = $this->config('admin/jqadm/url/save/action', 'save');
18
+$config = $this->config('admin/jqadm/url/save/config', []);
19 19
 
20
-$params = $this->get( 'pageParams', [] );
20
+$params = $this->get('pageParams', []);
21 21
 
22 22
 
23 23
 ?>
24
-<?php $this->block()->start( 'jqadm_content' ); ?>
24
+<?php $this->block()->start('jqadm_content'); ?>
25 25
 
26
-<form class="item item-group form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>">
27
-	<input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.group.id' ) ) ); ?>" value="<?= $enc->attr( $this->get( 'itemData/customer.group.id' ) ); ?>" />
28
-	<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
26
+<form class="item item-group form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>">
27
+	<input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'customer.group.id'))); ?>" value="<?= $enc->attr($this->get('itemData/customer.group.id')); ?>" />
28
+	<input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" />
29 29
 	<?= $this->csrf()->formfield(); ?>
30 30
 
31 31
 	<nav class="main-navbar">
32 32
 		<span class="navbar-brand">
33
-			<?= $enc->html( $this->translate( 'admin', 'Group' ) ); ?>:
34
-			<?= $enc->html( $this->get( 'itemData/customer.group.id' ) ); ?> -
35
-			<?= $enc->html( $this->get( 'itemData/customer.group.label', $this->translate( 'admin', 'New' ) ) ) ?>
36
-			<span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/customer.group.siteid' ) ) ); ?>)</span>
33
+			<?= $enc->html($this->translate('admin', 'Group')); ?>:
34
+			<?= $enc->html($this->get('itemData/customer.group.id')); ?> -
35
+			<?= $enc->html($this->get('itemData/customer.group.label', $this->translate('admin', 'New'))) ?>
36
+			<span class="navbar-secondary">(<?= $enc->html($this->site()->match($this->get('itemData/customer.group.siteid'))); ?>)</span>
37 37
 		</span>
38 38
 		<div class="item-actions">
39
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
39
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
40 40
 		</div>
41 41
 	</nav>
42 42
 
@@ -47,14 +47,14 @@  discard block
 block discarded – undo
47 47
 
48 48
 				<li class="nav-item basic">
49 49
 					<a class="nav-link active" href="#basic" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic">
50
-						<?= $enc->html( $this->translate( 'admin', 'Basic' ) ); ?>
50
+						<?= $enc->html($this->translate('admin', 'Basic')); ?>
51 51
 					</a>
52 52
 				</li>
53 53
 
54
-				<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?>
55
-					<li class="nav-item <?= $enc->attr( $subpart ); ?>">
56
-						<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>">
57
-							<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
54
+				<?php foreach (array_values($this->get('itemSubparts', [])) as $idx => $subpart) : ?>
55
+					<li class="nav-item <?= $enc->attr($subpart); ?>">
56
+						<a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
57
+							<?= $enc->html($this->translate('admin', $subpart)); ?>
58 58
 						</a>
59 59
 					</li>
60 60
 				<?php endforeach; ?>
@@ -63,61 +63,61 @@  discard block
 block discarded – undo
63 63
 
64 64
 			<div class="item-meta text-muted">
65 65
 				<small>
66
-					<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
67
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.group.mtime' ) ); ?></span>
66
+					<?= $enc->html($this->translate('admin', 'Modified')); ?>:
67
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.group.mtime')); ?></span>
68 68
 				</small>
69 69
 				<small>
70
-					<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
71
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.group.ctime' ) ); ?></span>
70
+					<?= $enc->html($this->translate('admin', 'Created')); ?>:
71
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.group.ctime')); ?></span>
72 72
 				</small>
73 73
 				<small>
74
-					<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
75
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.group.editor' ) ); ?></span>
74
+					<?= $enc->html($this->translate('admin', 'Editor')); ?>:
75
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.group.editor')); ?></span>
76 76
 				</small>
77 77
 			</div>
78 78
 		</div>
79 79
 
80 80
 		<div class="col-md-9 item-content tab-content">
81
-			<?php $readonly = ( $this->access( ['admin', 'super'] ) === false ? $this->site()->readonly( $this->get( 'itemData/customer.group.siteid' ) ) : '' ); ?>
81
+			<?php $readonly = ($this->access(['admin', 'super']) === false ? $this->site()->readonly($this->get('itemData/customer.group.siteid')) : ''); ?>
82 82
 
83 83
 			<div id="basic" class="row item-basic tab-pane fade show active" role="tabpanel" aria-labelledby="basic">
84 84
 
85 85
 				<div class="col-xl-6 content-block <?= $readonly ?>">
86 86
 					<div class="form-group row mandatory">
87
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Code' ) ); ?></label>
87
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Code')); ?></label>
88 88
 						<div class="col-sm-8">
89 89
 							<input class="form-control item-code" type="text" required="required" tabindex="1"
90
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.group.code' ) ) ); ?>"
91
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Unique group code (required)' ) ); ?>"
92
-								value="<?= $enc->attr( $this->get( 'itemData/customer.group.code' ) ); ?>"
93
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.group.siteid' ) ); ?> />
90
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.group.code'))); ?>"
91
+								placeholder="<?= $enc->attr($this->translate('admin', 'Unique group code (required)')); ?>"
92
+								value="<?= $enc->attr($this->get('itemData/customer.group.code')); ?>"
93
+								<?= $this->site()->readonly($this->get('itemData/customer.group.siteid')); ?> />
94 94
 						</div>
95 95
 						<div class="col-sm-12 form-text text-muted help-text">
96
-							<?= $enc->html( $this->translate( 'admin', 'Alphanumeric string that can identify the group uniquely' ) ); ?>
96
+							<?= $enc->html($this->translate('admin', 'Alphanumeric string that can identify the group uniquely')); ?>
97 97
 						</div>
98 98
 					</div>
99 99
 					<div class="form-group row mandatory">
100
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
100
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label>
101 101
 						<div class="col-sm-8">
102 102
 							<input class="form-control item-label" type="text" required="required" tabindex="1"
103
-								name="<?= $this->formparam( array( 'item', 'customer.group.label' ) ); ?>"
104
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Internal name (required)' ) ); ?>"
105
-								value="<?= $enc->attr( $this->get( 'itemData/customer.group.label' ) ); ?>"
106
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.group.siteid' ) ); ?> />
103
+								name="<?= $this->formparam(array('item', 'customer.group.label')); ?>"
104
+								placeholder="<?= $enc->attr($this->translate('admin', 'Internal name (required)')); ?>"
105
+								value="<?= $enc->attr($this->get('itemData/customer.group.label')); ?>"
106
+								<?= $this->site()->readonly($this->get('itemData/customer.group.siteid')); ?> />
107 107
 						</div>
108 108
 						<div class="col-sm-12 form-text text-muted help-text">
109
-							<?= $enc->html( $this->translate( 'admin', 'Group name describing for which members the group is for' ) ); ?>
109
+							<?= $enc->html($this->translate('admin', 'Group name describing for which members the group is for')); ?>
110 110
 						</div>
111 111
 					</div>
112 112
 				</div>
113 113
 			</div>
114 114
 
115
-			<?= $this->get( 'itemBody' ); ?>
115
+			<?= $this->get('itemBody'); ?>
116 116
 
117 117
 		</div>
118 118
 
119 119
 		<div class="item-actions">
120
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
120
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
121 121
 		</div>
122 122
 	</div>
123 123
 </form>
@@ -125,4 +125,4 @@  discard block
 block discarded – undo
125 125
 <?php $this->block()->stop(); ?>
126 126
 
127 127
 
128
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
128
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/group/list-standard.php 1 patch
Spacing   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -8,30 +8,30 @@  discard block
 block discarded – undo
8 8
 $enc = $this->encoder();
9 9
 
10 10
 
11
-$target = $this->config( 'admin/jqadm/url/search/target' );
12
-$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
13
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
14
-$config = $this->config( 'admin/jqadm/url/search/config', [] );
11
+$target = $this->config('admin/jqadm/url/search/target');
12
+$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
13
+$action = $this->config('admin/jqadm/url/search/action', 'search');
14
+$config = $this->config('admin/jqadm/url/search/config', []);
15 15
 
16
-$newTarget = $this->config( 'admin/jqadm/url/create/target' );
17
-$newCntl = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
18
-$newAction = $this->config( 'admin/jqadm/url/create/action', 'create' );
19
-$newConfig = $this->config( 'admin/jqadm/url/create/config', [] );
16
+$newTarget = $this->config('admin/jqadm/url/create/target');
17
+$newCntl = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
18
+$newAction = $this->config('admin/jqadm/url/create/action', 'create');
19
+$newConfig = $this->config('admin/jqadm/url/create/config', []);
20 20
 
21
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
22
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
23
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
24
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
21
+$getTarget = $this->config('admin/jqadm/url/get/target');
22
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
23
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
24
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
25 25
 
26
-$copyTarget = $this->config( 'admin/jqadm/url/copy/target' );
27
-$copyCntl = $this->config( 'admin/jqadm/url/copy/controller', 'Jqadm' );
28
-$copyAction = $this->config( 'admin/jqadm/url/copy/action', 'copy' );
29
-$copyConfig = $this->config( 'admin/jqadm/url/copy/config', [] );
26
+$copyTarget = $this->config('admin/jqadm/url/copy/target');
27
+$copyCntl = $this->config('admin/jqadm/url/copy/controller', 'Jqadm');
28
+$copyAction = $this->config('admin/jqadm/url/copy/action', 'copy');
29
+$copyConfig = $this->config('admin/jqadm/url/copy/config', []);
30 30
 
31
-$delTarget = $this->config( 'admin/jqadm/url/delete/target' );
32
-$delCntl = $this->config( 'admin/jqadm/url/delete/controller', 'Jqadm' );
33
-$delAction = $this->config( 'admin/jqadm/url/delete/action', 'delete' );
34
-$delConfig = $this->config( 'admin/jqadm/url/delete/config', [] );
31
+$delTarget = $this->config('admin/jqadm/url/delete/target');
32
+$delCntl = $this->config('admin/jqadm/url/delete/controller', 'Jqadm');
33
+$delAction = $this->config('admin/jqadm/url/delete/action', 'delete');
34
+$delConfig = $this->config('admin/jqadm/url/delete/config', []);
35 35
 
36 36
 
37 37
 /** admin/jqadm/group/fields
@@ -49,37 +49,37 @@  discard block
 block discarded – undo
49 49
  * @category Developer
50 50
  */
51 51
 $default = ['customer.group.status', 'customer.group.label', 'customer.group.code'];
52
-$default = $this->config( 'admin/jqadm/group/fields', $default );
53
-$fields = $this->session( 'aimeos/admin/jqadm/group/fields', $default );
52
+$default = $this->config('admin/jqadm/group/fields', $default);
53
+$fields = $this->session('aimeos/admin/jqadm/group/fields', $default);
54 54
 
55
-$searchParams = $params = $this->get( 'pageParams', [] );
55
+$searchParams = $params = $this->get('pageParams', []);
56 56
 $searchParams['page']['start'] = 0;
57 57
 
58 58
 $columnList = [
59
-	'customer.group.id' => $this->translate( 'admin', 'ID' ),
60
-	'customer.group.code' => $this->translate( 'admin', 'Code' ),
61
-	'customer.group.label' => $this->translate( 'admin', 'Label' ),
62
-	'customer.group.ctime' => $this->translate( 'admin', 'Created' ),
63
-	'customer.group.mtime' => $this->translate( 'admin', 'Modified' ),
64
-	'customer.group.editor' => $this->translate( 'admin', 'Editor' ),
59
+	'customer.group.id' => $this->translate('admin', 'ID'),
60
+	'customer.group.code' => $this->translate('admin', 'Code'),
61
+	'customer.group.label' => $this->translate('admin', 'Label'),
62
+	'customer.group.ctime' => $this->translate('admin', 'Created'),
63
+	'customer.group.mtime' => $this->translate('admin', 'Modified'),
64
+	'customer.group.editor' => $this->translate('admin', 'Editor'),
65 65
 ];
66 66
 
67 67
 
68 68
 ?>
69
-<?php $this->block()->start( 'jqadm_content' ); ?>
69
+<?php $this->block()->start('jqadm_content'); ?>
70 70
 
71 71
 <nav class="main-navbar">
72 72
 
73 73
 	<span class="navbar-brand">
74
-		<?= $enc->html( $this->translate( 'admin', 'Group' ) ); ?>
75
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
74
+		<?= $enc->html($this->translate('admin', 'Group')); ?>
75
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
76 76
 	</span>
77 77
 
78 78
 	<?= $this->partial(
79
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
80
-			'filter' => $this->session( 'aimeos/admin/jqadm/group/filter', [] ),
81
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
82
-			'filterOperators' => $this->get( 'filterOperators', [] ),
79
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
80
+			'filter' => $this->session('aimeos/admin/jqadm/group/filter', []),
81
+			'filterAttributes' => $this->get('filterAttributes', []),
82
+			'filterOperators' => $this->get('filterOperators', []),
83 83
 			'params' => $params,
84 84
 		]
85 85
 	); ?>
@@ -87,13 +87,13 @@  discard block
 block discarded – undo
87 87
 
88 88
 
89 89
 <?= $this->partial(
90
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
91
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
92
-		'page' => $this->session( 'aimeos/admin/jqadm/group/page', [] )]
90
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
91
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
92
+		'page' => $this->session('aimeos/admin/jqadm/group/page', [])]
93 93
 	);
94 94
 ?>
95 95
 
96
-<form class="list list-group" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
96
+<form class="list list-group" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
97 97
 	<?= $this->csrf()->formfield(); ?>
98 98
 
99 99
 	<table class="list-items table table-hover table-striped">
@@ -101,20 +101,20 @@  discard block
 block discarded – undo
101 101
 			<tr>
102 102
 
103 103
 				<?= $this->partial(
104
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
105
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/group/sort' )]
104
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
105
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/group/sort')]
106 106
 					);
107 107
 				?>
108 108
 
109 109
 				<th class="actions">
110 110
 					<a class="btn fa act-add" tabindex="1"
111
-						href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>"
112
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
113
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
111
+						href="<?= $enc->attr($this->url($newTarget, $newCntl, $newAction, $params, [], $newConfig)); ?>"
112
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
113
+						aria-label="<?= $enc->attr($this->translate('admin', 'Add')); ?>">
114 114
 					</a>
115 115
 
116 116
 					<?= $this->partial(
117
-							$this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ),
117
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
118 118
 							['fields' => $fields, 'data' => $columnList]
119 119
 						);
120 120
 					?>
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
124 124
 		<tbody>
125 125
 
126 126
 			<?= $this->partial(
127
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
128
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/group/filter', [] ),
127
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
128
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/group/filter', []),
129 129
 					'data' => [
130 130
 						'customer.group.id' => ['op' => '=='],
131 131
 						'customer.group.code' => [],
@@ -137,38 +137,38 @@  discard block
 block discarded – undo
137 137
 				] );
138 138
 			?>
139 139
 
140
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
141
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig ) ); ?>
142
-				<tr class="<?= $this->site()->readonly( $item->getSiteId() ); ?>">
143
-					<?php if( in_array( 'customer.group.id', $fields ) ) : ?>
144
-						<td class="group-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getId() ); ?></a></td>
140
+			<?php foreach ($this->get('items', []) as $id => $item) : ?>
141
+				<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig)); ?>
142
+				<tr class="<?= $this->site()->readonly($item->getSiteId()); ?>">
143
+					<?php if (in_array('customer.group.id', $fields)) : ?>
144
+						<td class="group-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
145 145
 					<?php endif; ?>
146
-					<?php if( in_array( 'customer.group.code', $fields ) ) : ?>
147
-						<td class="group-code"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getCode() ); ?></a></td>
146
+					<?php if (in_array('customer.group.code', $fields)) : ?>
147
+						<td class="group-code"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getCode()); ?></a></td>
148 148
 					<?php endif; ?>
149
-					<?php if( in_array( 'customer.group.label', $fields ) ) : ?>
150
-						<td class="group-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
149
+					<?php if (in_array('customer.group.label', $fields)) : ?>
150
+						<td class="group-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
151 151
 					<?php endif; ?>
152
-					<?php if( in_array( 'customer.group.ctime', $fields ) ) : ?>
153
-						<td class="group-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
152
+					<?php if (in_array('customer.group.ctime', $fields)) : ?>
153
+						<td class="group-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
154 154
 					<?php endif; ?>
155
-					<?php if( in_array( 'customer.group.mtime', $fields ) ) : ?>
156
-						<td class="group-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
155
+					<?php if (in_array('customer.group.mtime', $fields)) : ?>
156
+						<td class="group-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
157 157
 					<?php endif; ?>
158
-					<?php if( in_array( 'customer.group.editor', $fields ) ) : ?>
159
-						<td class="group-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
158
+					<?php if (in_array('customer.group.editor', $fields)) : ?>
159
+						<td class="group-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getEditor()); ?></a></td>
160 160
 					<?php endif; ?>
161 161
 
162 162
 					<td class="actions">
163 163
 						<a class="btn act-copy fa" tabindex="1"
164
-							href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>"
165
-							title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>"
166
-							aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a>
167
-						<?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?>
164
+							href="<?= $enc->attr($this->url($copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig)); ?>"
165
+							title="<?= $enc->attr($this->translate('admin', 'Copy this entry')); ?>"
166
+							aria-label="<?= $enc->attr($this->translate('admin', 'Copy')); ?>"></a>
167
+						<?php if (!$this->site()->readonly($item->getSiteId())) : ?>
168 168
 							<a class="btn act-delete fa" tabindex="1"
169
-								href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'group', 'id' => $id] + $params, [], $delConfig ) ); ?>"
170
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
171
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
169
+								href="<?= $enc->attr($this->url($delTarget, $delCntl, $delAction, ['resource' => 'group', 'id' => $id] + $params, [], $delConfig)); ?>"
170
+								title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
171
+								aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>"></a>
172 172
 						<?php endif; ?>
173 173
 					</td>
174 174
 				</tr>
@@ -176,18 +176,18 @@  discard block
 block discarded – undo
176 176
 		</tbody>
177 177
 	</table>
178 178
 
179
-	<?php if( $this->get( 'items', [] ) === [] ) : ?>
180
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
179
+	<?php if ($this->get('items', []) === []) : ?>
180
+		<div class="noitems"><?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?></div>
181 181
 	<?php endif; ?>
182 182
 </form>
183 183
 
184 184
 <?= $this->partial(
185
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
186
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
187
-		'page' => $this->session( 'aimeos/admin/jqadm/group/page', [] )]
185
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
186
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
187
+		'page' => $this->session('aimeos/admin/jqadm/group/page', [])]
188 188
 	);
189 189
 ?>
190 190
 
191 191
 <?php $this->block()->stop(); ?>
192 192
 
193
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
193
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/customer/item-standard.php 1 patch
Spacing   +183 added lines, -183 removed lines patch added patch discarded remove patch
@@ -5,38 +5,38 @@  discard block
 block discarded – undo
5 5
  * @copyright Aimeos (aimeos.org), 2017-2018
6 6
  */
7 7
 
8
-$selected = function( $key, $code ) {
9
-	return ( $key == $code ? 'selected="selected"' : '' );
8
+$selected = function($key, $code) {
9
+	return ($key == $code ? 'selected="selected"' : '');
10 10
 };
11 11
 
12 12
 $enc = $this->encoder();
13 13
 
14 14
 
15
-$target = $this->config( 'admin/jqadm/url/save/target' );
16
-$cntl = $this->config( 'admin/jqadm/url/save/controller', 'Jqadm' );
17
-$action = $this->config( 'admin/jqadm/url/save/action', 'save' );
18
-$config = $this->config( 'admin/jqadm/url/save/config', [] );
15
+$target = $this->config('admin/jqadm/url/save/target');
16
+$cntl = $this->config('admin/jqadm/url/save/controller', 'Jqadm');
17
+$action = $this->config('admin/jqadm/url/save/action', 'save');
18
+$config = $this->config('admin/jqadm/url/save/config', []);
19 19
 
20
-$params = $this->get( 'pageParams', [] );
20
+$params = $this->get('pageParams', []);
21 21
 
22 22
 
23 23
 ?>
24
-<?php $this->block()->start( 'jqadm_content' ); ?>
24
+<?php $this->block()->start('jqadm_content'); ?>
25 25
 
26
-<form class="item item-customer form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>">
27
-	<input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.id' ) ) ); ?>" value="<?= $enc->attr( $this->get( 'itemData/customer.id' ) ); ?>" />
28
-	<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
26
+<form class="item item-customer form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>">
27
+	<input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'customer.id'))); ?>" value="<?= $enc->attr($this->get('itemData/customer.id')); ?>" />
28
+	<input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" />
29 29
 	<?= $this->csrf()->formfield(); ?>
30 30
 
31 31
 	<nav class="main-navbar">
32 32
 		<span class="navbar-brand">
33
-			<?= $enc->html( $this->translate( 'admin', 'Customer' ) ); ?>:
34
-			<?= $enc->html( $this->get( 'itemData/customer.id' ) ); ?> -
35
-			<?= $enc->html( $this->get( 'itemData/customer.label', $this->translate( 'admin', 'New' ) ) ); ?>
36
-			<span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/customer.siteid' ) ) ); ?>)</span>
33
+			<?= $enc->html($this->translate('admin', 'Customer')); ?>:
34
+			<?= $enc->html($this->get('itemData/customer.id')); ?> -
35
+			<?= $enc->html($this->get('itemData/customer.label', $this->translate('admin', 'New'))); ?>
36
+			<span class="navbar-secondary">(<?= $enc->html($this->site()->match($this->get('itemData/customer.siteid'))); ?>)</span>
37 37
 		</span>
38 38
 		<div class="item-actions">
39
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
39
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
40 40
 		</div>
41 41
 	</nav>
42 42
 
@@ -47,14 +47,14 @@  discard block
 block discarded – undo
47 47
 
48 48
 				<li class="nav-item basic">
49 49
 					<a class="nav-link active" href="#basic" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic">
50
-						<?= $enc->html( $this->translate( 'admin', 'Basic' ) ); ?>
50
+						<?= $enc->html($this->translate('admin', 'Basic')); ?>
51 51
 					</a>
52 52
 				</li>
53 53
 
54
-				<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?>
55
-					<li class="nav-item <?= $enc->attr( $subpart ); ?>">
56
-						<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>">
57
-							<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
54
+				<?php foreach (array_values($this->get('itemSubparts', [])) as $idx => $subpart) : ?>
55
+					<li class="nav-item <?= $enc->attr($subpart); ?>">
56
+						<a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
57
+							<?= $enc->html($this->translate('admin', $subpart)); ?>
58 58
 						</a>
59 59
 					</li>
60 60
 				<?php endforeach; ?>
@@ -63,89 +63,89 @@  discard block
 block discarded – undo
63 63
 
64 64
 			<div class="item-meta text-muted">
65 65
 				<small>
66
-					<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
67
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.mtime' ) ); ?></span>
66
+					<?= $enc->html($this->translate('admin', 'Modified')); ?>:
67
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.mtime')); ?></span>
68 68
 				</small>
69 69
 				<small>
70
-					<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
71
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.ctime' ) ); ?></span>
70
+					<?= $enc->html($this->translate('admin', 'Created')); ?>:
71
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.ctime')); ?></span>
72 72
 				</small>
73 73
 				<small>
74
-					<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
75
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.editor' ) ); ?></span>
74
+					<?= $enc->html($this->translate('admin', 'Editor')); ?>:
75
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.editor')); ?></span>
76 76
 				</small>
77 77
 			</div>
78 78
 		</div>
79 79
 
80 80
 		<div class="col-md-9 item-content tab-content">
81
-			<?php $readonly = ( $this->access( 'admin' ) === false ? $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ) : '' ); ?>
81
+			<?php $readonly = ($this->access('admin') === false ? $this->site()->readonly($this->get('itemData/customer.siteid')) : ''); ?>
82 82
 
83 83
 			<div id="basic" class="row item-basic tab-pane fade show active" role="tabpanel" aria-labelledby="basic">
84 84
 
85 85
 				<div class="col-xl-6 content-block <?= $readonly ?>">
86 86
 					<div class="form-group row mandatory">
87
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
87
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
88 88
 						<div class="col-sm-8">
89 89
 							<select class="form-control custom-select item-status" required="required" tabindex="1"
90
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.status' ) ) ); ?>"
91
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> >
90
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.status'))); ?>"
91
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> >
92 92
 								<option value="">
93
-									<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
93
+									<?= $enc->attr($this->translate('admin', 'Please select')); ?>
94 94
 								</option>
95
-								<option value="1" <?= $selected( $this->get( 'itemData/customer.status', 1 ), 1 ); ?> >
96
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
95
+								<option value="1" <?= $selected($this->get('itemData/customer.status', 1), 1); ?> >
96
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
97 97
 								</option>
98
-								<option value="0" <?= $selected( $this->get( 'itemData/customer.status', 1 ), 0 ); ?> >
99
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
98
+								<option value="0" <?= $selected($this->get('itemData/customer.status', 1), 0); ?> >
99
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
100 100
 								</option>
101
-								<option value="-1" <?= $selected( $this->get( 'itemData/customer.status', 1 ), -1 ); ?> >
102
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
101
+								<option value="-1" <?= $selected($this->get('itemData/customer.status', 1), -1); ?> >
102
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
103 103
 								</option>
104
-								<option value="-2" <?= $selected( $this->get( 'itemData/customer.status', 1 ), -2 ); ?> >
105
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
104
+								<option value="-2" <?= $selected($this->get('itemData/customer.status', 1), -2); ?> >
105
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
106 106
 								</option>
107 107
 							</select>
108 108
 						</div>
109 109
 					</div>
110 110
 					<div class="form-group row mandatory">
111
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'E-Mail' ) ); ?></label>
111
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'E-Mail')); ?></label>
112 112
 						<div class="col-sm-8">
113 113
 							<input class="form-control item-email" type="email" required="required" tabindex="1" autocomplete="off"
114
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.email' ) ) ); ?>"
115
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'E-Mail address (required)' ) ); ?>"
116
-								value="<?= $enc->attr( $this->get( 'itemData/customer.email' ) ); ?>"
117
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
114
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.email'))); ?>"
115
+								placeholder="<?= $enc->attr($this->translate('admin', 'E-Mail address (required)')); ?>"
116
+								value="<?= $enc->attr($this->get('itemData/customer.email')); ?>"
117
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
118 118
 						</div>
119 119
 						<div class="col-sm-12 form-text text-muted help-text">
120
-							<?= $enc->html( $this->translate( 'admin', 'Unique customer e-mail address' ) ); ?>
120
+							<?= $enc->html($this->translate('admin', 'Unique customer e-mail address')); ?>
121 121
 						</div>
122 122
 					</div>
123 123
 					<div class="form-group row mandatory">
124
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Password' ) ); ?></label>
124
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Password')); ?></label>
125 125
 						<div class="col-sm-8">
126 126
 							<input class="form-control item-password" type="password" required="required" tabindex="1" autocomplete="off"
127
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.password' ) ) ); ?>"
128
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Password (required)' ) ); ?>"
129
-								value="<?= $enc->attr( $this->get( 'itemData/customer.password' ) ); ?>"
130
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
127
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.password'))); ?>"
128
+								placeholder="<?= $enc->attr($this->translate('admin', 'Password (required)')); ?>"
129
+								value="<?= $enc->attr($this->get('itemData/customer.password')); ?>"
130
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
131 131
 						</div>
132 132
 						<div class="col-sm-12 form-text text-muted help-text">
133
-							<?= $enc->html( $this->translate( 'admin', 'Customer password' ) ); ?>
133
+							<?= $enc->html($this->translate('admin', 'Customer password')); ?>
134 134
 						</div>
135 135
 					</div>
136 136
 				</div><!--
137 137
 
138 138
 				--><div class="col-xl-6 content-block <?= $readonly ?>">
139 139
 					<div class="form-group row optional">
140
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'User groups' ) ); ?></label>
140
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'User groups')); ?></label>
141 141
 						<div class="col-sm-8">
142 142
 							<select class="form-control item-groups" tabindex="1" size="7" multiple
143
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.groups', '' ) ) ); ?>"
144
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> >
143
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.groups', ''))); ?>"
144
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> >
145 145
 
146
-								<?php foreach( $this->get( 'itemGroups', [] ) as $groupId => $groupItem ) : ?>
147
-									<option value="<?= $enc->attr( $groupId ); ?>" <?= $selected( in_array( $groupId, $this->get( 'itemData/customer.groups', [] ) ), true ); ?> >
148
-										<?= $enc->html( $groupItem->getLabel() ); ?>
146
+								<?php foreach ($this->get('itemGroups', []) as $groupId => $groupItem) : ?>
147
+									<option value="<?= $enc->attr($groupId); ?>" <?= $selected(in_array($groupId, $this->get('itemData/customer.groups', [])), true); ?> >
148
+										<?= $enc->html($groupItem->getLabel()); ?>
149 149
 									</option>
150 150
 								<?php endforeach; ?>
151 151
 							</select>
@@ -154,284 +154,284 @@  discard block
 block discarded – undo
154 154
 				</div><!--
155 155
 
156 156
 				--><div class="col-xl-6 content-block <?= $readonly ?>">
157
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Personal data' ) ); ?></h2>
157
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Personal data')); ?></h2>
158 158
 					<div class="form-group row mandatory">
159
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></label>
159
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Language')); ?></label>
160 160
 						<div class="col-sm-8">
161 161
 
162
-							<?php $languages = $this->get( 'pageLangItems', [] ); ?>
163
-							<?php if( count( $languages ) > 1 ) : ?>
162
+							<?php $languages = $this->get('pageLangItems', []); ?>
163
+							<?php if (count($languages) > 1) : ?>
164 164
 								<select class="form-control custom-select item-languageid" required="required" tabindex="1"
165
-									name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); ?>"
166
-									<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> >
165
+									name="<?= $enc->attr($this->formparam(array('item', 'customer.languageid'))); ?>"
166
+									<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> >
167 167
 									<option value="">
168
-										<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
168
+										<?= $enc->html($this->translate('admin', 'Please select')); ?>
169 169
 									</option>
170 170
 
171
-									<?php foreach( $languages as $langId => $langItem ) : ?>
172
-										<option value="<?= $enc->attr( $langId ); ?>" <?= $selected( $this->get( 'itemData/customer.languageid', '' ), $langId ); ?> >
173
-											<?= $enc->html( $this->translate( 'language', $langId ) ); ?>
171
+									<?php foreach ($languages as $langId => $langItem) : ?>
172
+										<option value="<?= $enc->attr($langId); ?>" <?= $selected($this->get('itemData/customer.languageid', ''), $langId); ?> >
173
+											<?= $enc->html($this->translate('language', $langId)); ?>
174 174
 										</option>
175 175
 									<?php endforeach; ?>
176 176
 								</select>
177 177
 							<?php else : ?>
178
-								<?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' ); ?>
179
-								<input class="item-languageid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); ?>" value="<?= $enc->attr( $language ); ?>" />
178
+								<?php $language = (($item = reset($languages)) !== false ? $item->getId() : ''); ?>
179
+								<input class="item-languageid" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'customer.languageid'))); ?>" value="<?= $enc->attr($language); ?>" />
180 180
 							<?php endif; ?>
181 181
 						</div>
182 182
 					</div>
183 183
 					<div class="form-group row optional">
184
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Salutation' ) ); ?></label>
184
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Salutation')); ?></label>
185 185
 						<div class="col-sm-8">
186 186
 							<select class="form-control custom-select item-salutation" tabindex="1"
187
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.salutation' ) ) ); ?>"
188
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> >
189
-								<option value="" <?= $selected( $this->get( 'itemData/customer.salutation', '' ), '' ); ?> >
190
-									<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
187
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.salutation'))); ?>"
188
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> >
189
+								<option value="" <?= $selected($this->get('itemData/customer.salutation', ''), ''); ?> >
190
+									<?= $enc->html($this->translate('admin', 'Please select')); ?>
191 191
 								</option>
192
-								<option value="company" <?= $selected( $this->get( 'itemData/customer.salutation', '' ), 'company' ); ?> >
193
-									<?= $enc->html( $this->translate( 'client/code', 'company' ) ); ?>
192
+								<option value="company" <?= $selected($this->get('itemData/customer.salutation', ''), 'company'); ?> >
193
+									<?= $enc->html($this->translate('client/code', 'company')); ?>
194 194
 								</option>
195
-								<option value="mr" <?= $selected( $this->get( 'itemData/customer.salutation', '' ), 'mr' ); ?> >
196
-									<?= $enc->html( $this->translate( 'client/code', 'mr' ) ); ?>
195
+								<option value="mr" <?= $selected($this->get('itemData/customer.salutation', ''), 'mr'); ?> >
196
+									<?= $enc->html($this->translate('client/code', 'mr')); ?>
197 197
 								</option>
198
-								<option value="mrs" <?= $selected( $this->get( 'itemData/customer.salutation', '' ), 'mrs' ); ?> >
199
-									<?= $enc->html( $this->translate( 'client/code', 'mrs' ) ); ?>
198
+								<option value="mrs" <?= $selected($this->get('itemData/customer.salutation', ''), 'mrs'); ?> >
199
+									<?= $enc->html($this->translate('client/code', 'mrs')); ?>
200 200
 								</option>
201
-								<option value="miss" <?= $selected( $this->get( 'itemData/customer.salutation', '' ), 'miss' ); ?> >
202
-									<?= $enc->html( $this->translate( 'client/code', 'miss' ) ); ?>
201
+								<option value="miss" <?= $selected($this->get('itemData/customer.salutation', ''), 'miss'); ?> >
202
+									<?= $enc->html($this->translate('client/code', 'miss')); ?>
203 203
 								</option>
204 204
 							</select>
205 205
 						</div>
206 206
 						<div class="col-sm-12 form-text text-muted help-text">
207
-							<?= $enc->html( $this->translate( 'admin', 'How the customer is addressed in e-mails' ) ); ?>
207
+							<?= $enc->html($this->translate('admin', 'How the customer is addressed in e-mails')); ?>
208 208
 						</div>
209 209
 					</div>
210 210
 					<div class="form-group row optional">
211
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Title' ) ); ?></label>
211
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Title')); ?></label>
212 212
 						<div class="col-sm-8">
213 213
 							<input class="form-control item-title" type="text" tabindex="1"
214
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.title' ) ) ); ?>"
215
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Honorary title (optional)' ) ); ?>"
216
-								value="<?= $enc->attr( $this->get( 'itemData/customer.title' ) ); ?>"
217
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
214
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.title'))); ?>"
215
+								placeholder="<?= $enc->attr($this->translate('admin', 'Honorary title (optional)')); ?>"
216
+								value="<?= $enc->attr($this->get('itemData/customer.title')); ?>"
217
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
218 218
 						</div>
219 219
 						<div class="col-sm-12 form-text text-muted help-text">
220
-							<?= $enc->html( $this->translate( 'admin', 'Honorary titles like Dr., Ph.D, etc.' ) ); ?>
220
+							<?= $enc->html($this->translate('admin', 'Honorary titles like Dr., Ph.D, etc.')); ?>
221 221
 						</div>
222 222
 					</div>
223 223
 					<div class="form-group row mandatory">
224
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Last name' ) ); ?></label>
224
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Last name')); ?></label>
225 225
 						<div class="col-sm-8">
226 226
 							<input class="form-control item-lastname" type="text" required="required" tabindex="1"
227
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.lastname' ) ) ); ?>"
228
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Last name (required)' ) ); ?>"
229
-								value="<?= $enc->attr( $this->get( 'itemData/customer.lastname' ) ); ?>"
230
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
227
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.lastname'))); ?>"
228
+								placeholder="<?= $enc->attr($this->translate('admin', 'Last name (required)')); ?>"
229
+								value="<?= $enc->attr($this->get('itemData/customer.lastname')); ?>"
230
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
231 231
 						</div>
232 232
 						<div class="col-sm-12 form-text text-muted help-text">
233
-							<?= $enc->html( $this->translate( 'admin', 'Last name of the person or full name in cultures where no first names are used' ) ); ?>
233
+							<?= $enc->html($this->translate('admin', 'Last name of the person or full name in cultures where no first names are used')); ?>
234 234
 						</div>
235 235
 					</div>
236 236
 					<div class="form-group row optional">
237
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'First name' ) ); ?></label>
237
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'First name')); ?></label>
238 238
 						<div class="col-sm-8">
239 239
 							<input class="form-control item-firstname" type="text" tabindex="1"
240
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.firstname' ) ) ); ?>"
241
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'First name (optional)' ) ); ?>"
242
-								value="<?= $enc->attr( $this->get( 'itemData/customer.firstname' ) ); ?>"
243
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
240
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.firstname'))); ?>"
241
+								placeholder="<?= $enc->attr($this->translate('admin', 'First name (optional)')); ?>"
242
+								value="<?= $enc->attr($this->get('itemData/customer.firstname')); ?>"
243
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
244 244
 						</div>
245 245
 						<div class="col-sm-12 form-text text-muted help-text">
246
-							<?= $enc->html( $this->translate( 'admin', 'First name of the person if used in cultures where they are used' ) ); ?>
246
+							<?= $enc->html($this->translate('admin', 'First name of the person if used in cultures where they are used')); ?>
247 247
 						</div>
248 248
 					</div>
249 249
 					<div class="form-group row optional">
250
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Birthday' ) ); ?></label>
250
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Birthday')); ?></label>
251 251
 						<div class="col-sm-8">
252 252
 							<input class="form-control item-birthday" type="date" tabindex="1"
253
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.birthday' ) ) ); ?>"
254
-								value="<?= $enc->attr( $this->get( 'itemData/customer.birthday' ) ); ?>"
255
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
253
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.birthday'))); ?>"
254
+								value="<?= $enc->attr($this->get('itemData/customer.birthday')); ?>"
255
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
256 256
 						</div>
257 257
 						<div class="col-sm-12 form-text text-muted help-text">
258
-							<?= $enc->html( $this->translate( 'admin', 'Birthday of the customer' ) ); ?>
258
+							<?= $enc->html($this->translate('admin', 'Birthday of the customer')); ?>
259 259
 						</div>
260 260
 					</div>
261 261
 				</div><!--
262 262
 
263 263
 				--><div class="col-xl-6 content-block <?= $readonly ?>">
264
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Billing address' ) ); ?></h2>
264
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Billing address')); ?></h2>
265 265
 					<div class="form-group row optional">
266
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Street' ) ); ?></label>
266
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Street')); ?></label>
267 267
 						<div class="col-sm-8">
268 268
 							<input class="form-control item-address1" type="text" tabindex="1"
269
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.address1' ) ) ); ?>"
270
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Street name (optional)' ) ); ?>"
271
-								value="<?= $enc->attr( $this->get( 'itemData/customer.address1' ) ); ?>"
272
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
269
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.address1'))); ?>"
270
+								placeholder="<?= $enc->attr($this->translate('admin', 'Street name (optional)')); ?>"
271
+								value="<?= $enc->attr($this->get('itemData/customer.address1')); ?>"
272
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
273 273
 						</div>
274 274
 						<div class="col-sm-12 form-text text-muted help-text">
275
-							<?= $enc->html( $this->translate( 'admin', 'First name of the person if used in cultures where they are used' ) ); ?>
275
+							<?= $enc->html($this->translate('admin', 'First name of the person if used in cultures where they are used')); ?>
276 276
 						</div>
277 277
 					</div>
278 278
 					<div class="form-group row optional">
279
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'House number' ) ); ?></label>
279
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'House number')); ?></label>
280 280
 						<div class="col-sm-8">
281 281
 							<input class="form-control item-address2" type="text" tabindex="1"
282
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.address2' ) ) ); ?>"
283
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'House number (optional)' ) ); ?>"
284
-								value="<?= $enc->attr( $this->get( 'itemData/customer.address2' ) ); ?>"
285
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
282
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.address2'))); ?>"
283
+								placeholder="<?= $enc->attr($this->translate('admin', 'House number (optional)')); ?>"
284
+								value="<?= $enc->attr($this->get('itemData/customer.address2')); ?>"
285
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
286 286
 						</div>
287 287
 						<div class="col-sm-12 form-text text-muted help-text">
288
-							<?= $enc->html( $this->translate( 'admin', 'Address identifier of the customer\'s house for delivery' ) ); ?>
288
+							<?= $enc->html($this->translate('admin', 'Address identifier of the customer\'s house for delivery')); ?>
289 289
 						</div>
290 290
 					</div>
291 291
 					<div class="form-group row optional">
292
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Floor / Appartment' ) ); ?></label>
292
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Floor / Appartment')); ?></label>
293 293
 						<div class="col-sm-8">
294 294
 							<input class="form-control item-address3" type="text" tabindex="1"
295
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.address3' ) ) ); ?>"
296
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Floor and/or apartment (optional)' ) ); ?>"
297
-								value="<?= $enc->attr( $this->get( 'itemData/customer.address3' ) ); ?>"
298
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
295
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.address3'))); ?>"
296
+								placeholder="<?= $enc->attr($this->translate('admin', 'Floor and/or apartment (optional)')); ?>"
297
+								value="<?= $enc->attr($this->get('itemData/customer.address3')); ?>"
298
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
299 299
 						</div>
300 300
 						<div class="col-sm-12 form-text text-muted help-text">
301
-							<?= $enc->html( $this->translate( 'admin', 'Additional information where the customer\'s apartment can be found' ) ); ?>
301
+							<?= $enc->html($this->translate('admin', 'Additional information where the customer\'s apartment can be found')); ?>
302 302
 						</div>
303 303
 					</div>
304 304
 					<div class="form-group row optional">
305
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Zip code' ) ); ?></label>
305
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Zip code')); ?></label>
306 306
 						<div class="col-sm-8">
307 307
 							<input class="form-control item-postal" type="text" tabindex="1"
308
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.postal' ) ) ); ?>"
309
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Zip code (optional)' ) ); ?>"
310
-								value="<?= $enc->attr( $this->get( 'itemData/customer.postal' ) ); ?>"
311
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
308
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.postal'))); ?>"
309
+								placeholder="<?= $enc->attr($this->translate('admin', 'Zip code (optional)')); ?>"
310
+								value="<?= $enc->attr($this->get('itemData/customer.postal')); ?>"
311
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
312 312
 						</div>
313 313
 						<div class="col-sm-12 form-text text-muted help-text">
314
-							<?= $enc->html( $this->translate( 'admin', 'Postal code for delivery if used in the area the customer is living' ) ); ?>
314
+							<?= $enc->html($this->translate('admin', 'Postal code for delivery if used in the area the customer is living')); ?>
315 315
 						</div>
316 316
 					</div>
317 317
 					<div class="form-group row mandatory">
318
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'City' ) ); ?></label>
318
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'City')); ?></label>
319 319
 						<div class="col-sm-8">
320 320
 							<input class="form-control item-city" type="text" required="required" tabindex="1"
321
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.city' ) ) ); ?>"
322
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'City or town name (required)' ) ); ?>"
323
-								value="<?= $enc->attr( $this->get( 'itemData/customer.city' ) ); ?>"
324
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
321
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.city'))); ?>"
322
+								placeholder="<?= $enc->attr($this->translate('admin', 'City or town name (required)')); ?>"
323
+								value="<?= $enc->attr($this->get('itemData/customer.city')); ?>"
324
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
325 325
 						</div>
326 326
 					</div>
327 327
 					<div class="form-group row mandatory">
328
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Country' ) ); ?></label>
328
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Country')); ?></label>
329 329
 						<div class="col-sm-8">
330 330
 							<select class="combobox item-countryid" required="required" tabindex="1" maxlength="2" pattern="^[a-zA-Z]{2}$"
331
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.countryid' ) ) ); ?>"
332
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
333
-								<option value="<?= $enc->attr( $this->get( 'itemData/customer.countryid' ) ); ?>" >
334
-									<?= $enc->html( $this->get( 'itemData/customer.countryid' ) ); ?>
331
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.countryid'))); ?>"
332
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
333
+								<option value="<?= $enc->attr($this->get('itemData/customer.countryid')); ?>" >
334
+									<?= $enc->html($this->get('itemData/customer.countryid')); ?>
335 335
 								</option>
336 336
 							</select>
337 337
 						</div>
338 338
 						<div class="col-sm-12 form-text text-muted help-text">
339
-							<?= $enc->html( $this->translate( 'admin', 'Two letter ISO country code' ) ); ?>
339
+							<?= $enc->html($this->translate('admin', 'Two letter ISO country code')); ?>
340 340
 						</div>
341 341
 					</div>
342 342
 					<div class="form-group row optional">
343
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'State' ) ); ?></label>
343
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'State')); ?></label>
344 344
 						<div class="col-sm-8">
345 345
 							<input class="form-control item-state" type="text" tabindex="1"
346
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.state' ) ) ); ?>"
347
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Country state code (optional)' ) ); ?>"
348
-								value="<?= $enc->attr( $this->get( 'itemData/customer.state' ) ); ?>"
349
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
346
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.state'))); ?>"
347
+								placeholder="<?= $enc->attr($this->translate('admin', 'Country state code (optional)')); ?>"
348
+								value="<?= $enc->attr($this->get('itemData/customer.state')); ?>"
349
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
350 350
 						</div>
351 351
 						<div class="col-sm-12 form-text text-muted help-text">
352
-							<?= $enc->html( $this->translate( 'admin', 'Short state code (e.g. NY) if used in the country the customer is living' ) ); ?>
352
+							<?= $enc->html($this->translate('admin', 'Short state code (e.g. NY) if used in the country the customer is living')); ?>
353 353
 						</div>
354 354
 					</div>
355 355
 				</div><!--
356 356
 
357 357
 				--><div class="col-xl-6 content-block <?= $readonly ?>">
358
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Communication' ) ); ?></h2>
358
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Communication')); ?></h2>
359 359
 					<div class="form-group row optional">
360
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Telephone' ) ); ?></label>
360
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Telephone')); ?></label>
361 361
 						<div class="col-sm-8">
362 362
 							<input class="form-control item-telephone" type="tel" tabindex="1"
363
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.telephone' ) ) ); ?>"
364
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Telephone number (optional)' ) ); ?>"
365
-								value="<?= $enc->attr( $this->get( 'itemData/customer.telephone' ) ); ?>"
366
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
363
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.telephone'))); ?>"
364
+								placeholder="<?= $enc->attr($this->translate('admin', 'Telephone number (optional)')); ?>"
365
+								value="<?= $enc->attr($this->get('itemData/customer.telephone')); ?>"
366
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
367 367
 						</div>
368 368
 						<div class="col-sm-12 form-text text-muted help-text">
369
-							<?= $enc->html( $this->translate( 'admin', '(International) telephone number without separation characters, can start with a "+"' ) ); ?>
369
+							<?= $enc->html($this->translate('admin', '(International) telephone number without separation characters, can start with a "+"')); ?>
370 370
 						</div>
371 371
 					</div>
372 372
 					<div class="form-group row optional">
373
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Facsimile' ) ); ?></label>
373
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Facsimile')); ?></label>
374 374
 						<div class="col-sm-8">
375 375
 							<input class="form-control item-telefax" type="text" tabindex="1"
376
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.telefax' ) ) ); ?>"
377
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Facsimile number (optional)' ) ); ?>"
378
-								value="<?= $enc->attr( $this->get( 'itemData/customer.telefax' ) ); ?>"
379
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
376
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.telefax'))); ?>"
377
+								placeholder="<?= $enc->attr($this->translate('admin', 'Facsimile number (optional)')); ?>"
378
+								value="<?= $enc->attr($this->get('itemData/customer.telefax')); ?>"
379
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
380 380
 						</div>
381 381
 						<div class="col-sm-12 form-text text-muted help-text">
382
-							<?= $enc->html( $this->translate( 'admin', '(International) facsimilie number without separation characters, can start with a "+"' ) ); ?>
382
+							<?= $enc->html($this->translate('admin', '(International) facsimilie number without separation characters, can start with a "+"')); ?>
383 383
 						</div>
384 384
 					</div>
385 385
 					<div class="form-group row optional">
386
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Web site' ) ); ?></label>
386
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Web site')); ?></label>
387 387
 						<div class="col-sm-8">
388 388
 							<input class="form-control item-website" type="url" tabindex="1"
389
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.website' ) ) ); ?>"
390
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Web site URL (optional)' ) ); ?>"
391
-								value="<?= $enc->attr( $this->get( 'itemData/customer.website' ) ); ?>"
392
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
389
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.website'))); ?>"
390
+								placeholder="<?= $enc->attr($this->translate('admin', 'Web site URL (optional)')); ?>"
391
+								value="<?= $enc->attr($this->get('itemData/customer.website')); ?>"
392
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
393 393
 						</div>
394 394
 						<div class="col-sm-12 form-text text-muted help-text">
395
-							<?= $enc->html( $this->translate( 'admin', 'URL of the customer web site' ) ); ?>
395
+							<?= $enc->html($this->translate('admin', 'URL of the customer web site')); ?>
396 396
 						</div>
397 397
 					</div>
398 398
 				</div><!--
399 399
 
400 400
 				--><div class="col-xl-6 content-block <?= $readonly ?>">
401
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Company details' ) ); ?></h2>
401
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Company details')); ?></h2>
402 402
 					<div class="form-group row optional">
403
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Company' ) ); ?></label>
403
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Company')); ?></label>
404 404
 						<div class="col-sm-8">
405 405
 							<input class="form-control item-company" type="text" tabindex="1"
406
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.company' ) ) ); ?>"
407
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Company name (optional)' ) ); ?>"
408
-								value="<?= $enc->attr( $this->get( 'itemData/customer.company' ) ); ?>"
409
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
406
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.company'))); ?>"
407
+								placeholder="<?= $enc->attr($this->translate('admin', 'Company name (optional)')); ?>"
408
+								value="<?= $enc->attr($this->get('itemData/customer.company')); ?>"
409
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
410 410
 						</div>
411 411
 					</div>
412 412
 					<div class="form-group row optional">
413
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'VAT ID' ) ); ?></label>
413
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'VAT ID')); ?></label>
414 414
 						<div class="col-sm-8">
415 415
 							<input class="form-control item-vatid" type="text" tabindex="1"
416
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.vatid' ) ) ); ?>"
417
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Value added tax identifier (optional)' ) ); ?>"
418
-								value="<?= $enc->attr( $this->get( 'itemData/customer.vatid' ) ); ?>"
419
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
416
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.vatid'))); ?>"
417
+								placeholder="<?= $enc->attr($this->translate('admin', 'Value added tax identifier (optional)')); ?>"
418
+								value="<?= $enc->attr($this->get('itemData/customer.vatid')); ?>"
419
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
420 420
 						</div>
421 421
 						<div class="col-sm-12 form-text text-muted help-text">
422
-							<?= $enc->html( $this->translate( 'admin', 'Official VAT ID to determine if the tax needs to be billed in invoices' ) ); ?>
422
+							<?= $enc->html($this->translate('admin', 'Official VAT ID to determine if the tax needs to be billed in invoices')); ?>
423 423
 						</div>
424 424
 					</div>
425 425
 				</div>
426 426
 
427 427
 			</div>
428 428
 
429
-			<?= $this->get( 'itemBody' ); ?>
429
+			<?= $this->get('itemBody'); ?>
430 430
 
431 431
 		</div>
432 432
 
433 433
 		<div class="item-actions">
434
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
434
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
435 435
 		</div>
436 436
 	</div>
437 437
 </form>
@@ -439,4 +439,4 @@  discard block
 block discarded – undo
439 439
 <?php $this->block()->stop(); ?>
440 440
 
441 441
 
442
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
442
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/customer/item-order-standard.php 1 patch
Spacing   +109 added lines, -109 removed lines patch added patch discarded remove patch
@@ -5,29 +5,29 @@  discard block
 block discarded – undo
5 5
  * @copyright Aimeos (aimeos.org), 2017-2018
6 6
  */
7 7
 
8
-$price = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat )
8
+$price = function(array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat)
9 9
 {
10
-	if( isset( $orders[$item->getBaseId()] ) )
10
+	if (isset($orders[$item->getBaseId()]))
11 11
 	{
12 12
 		$price = $orders[$item->getBaseId()]->getPrice();
13
-		return sprintf( $priceFormat, $price->getValue(), $price->getCurrencyId() );
13
+		return sprintf($priceFormat, $price->getValue(), $price->getCurrencyId());
14 14
 	}
15 15
 };
16 16
 
17 17
 
18
-$name = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item )
18
+$name = function(array $orders, \Aimeos\MShop\Order\Item\Iface $item)
19 19
 {
20
-	if( isset( $orders[$item->getBaseId()] ) )
20
+	if (isset($orders[$item->getBaseId()]))
21 21
 	{
22 22
 		$addresses = $orders[$item->getBaseId()]->getAddresses();
23 23
 
24
-		if( !isset( $addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT] ) ) {
24
+		if (!isset($addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT])) {
25 25
 			return;
26 26
 		}
27 27
 
28 28
 		$address = $addresses[\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT];
29 29
 
30
-		if( $address->getSalutation() !== \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY ) {
30
+		if ($address->getSalutation() !== \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY) {
31 31
 			return $address->getFirstName() . ' ' . $address->getLastName();
32 32
 		} else {
33 33
 			return $address->getCompany();
@@ -36,47 +36,47 @@  discard block
 block discarded – undo
36 36
 };
37 37
 
38 38
 
39
-$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item )
39
+$payment = function(array $orders, \Aimeos\MShop\Order\Item\Iface $item)
40 40
 {
41
-	if( isset( $orders[$item->getBaseId()] ) )
41
+	if (isset($orders[$item->getBaseId()]))
42 42
 	{
43 43
 		$services = $orders[$item->getBaseId()]->getServices();
44 44
 
45
-		if( isset( $services[\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT] ) ) {
45
+		if (isset($services[\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT])) {
46 46
 			return $services[\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT]->getCode();
47 47
 		}
48 48
 	}
49 49
 };
50 50
 
51 51
 
52
-$status = function( $list, $key )
52
+$status = function($list, $key)
53 53
 {
54
-	return ( isset( $list[$key] ) ? $list[$key] : '' );
54
+	return (isset($list[$key]) ? $list[$key] : '');
55 55
 };
56 56
 
57 57
 
58 58
 $enc = $this->encoder();
59
-$params = $this->get( 'pageParams', [] );
60
-$baseItems = $this->get( 'orderBaseItems', [] );
59
+$params = $this->get('pageParams', []);
60
+$baseItems = $this->get('orderBaseItems', []);
61 61
 
62 62
 /// price format with value (%1$s) and currency (%2$s)
63
-$priceFormat = $this->translate( 'admin', '%1$s %2$s' );
63
+$priceFormat = $this->translate('admin', '%1$s %2$s');
64 64
 
65 65
 
66
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
67
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
68
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
69
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
66
+$getTarget = $this->config('admin/jqadm/url/get/target');
67
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
68
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
69
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
70 70
 
71
-$newTarget = $this->config( 'admin/jqadm/url/create/target' );
72
-$newCntl = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
73
-$newAction = $this->config( 'admin/jqadm/url/create/action', 'create' );
74
-$newConfig = $this->config( 'admin/jqadm/url/create/config', [] );
71
+$newTarget = $this->config('admin/jqadm/url/create/target');
72
+$newCntl = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
73
+$newAction = $this->config('admin/jqadm/url/create/action', 'create');
74
+$newConfig = $this->config('admin/jqadm/url/create/config', []);
75 75
 
76
-$copyTarget = $this->config( 'admin/jqadm/url/copy/target' );
77
-$copyCntl = $this->config( 'admin/jqadm/url/copy/controller', 'Jqadm' );
78
-$copyAction = $this->config( 'admin/jqadm/url/copy/action', 'copy' );
79
-$copyConfig = $this->config( 'admin/jqadm/url/copy/config', [] );
76
+$copyTarget = $this->config('admin/jqadm/url/copy/target');
77
+$copyCntl = $this->config('admin/jqadm/url/copy/controller', 'Jqadm');
78
+$copyAction = $this->config('admin/jqadm/url/copy/action', 'copy');
79
+$copyConfig = $this->config('admin/jqadm/url/copy/config', []);
80 80
 
81 81
 
82 82
 /** admin/jqadm/customer/order/fields
@@ -94,44 +94,44 @@  discard block
 block discarded – undo
94 94
  * @category Developer
95 95
  */
96 96
 $default = ['order.id', 'order.datepayment', 'order.statuspayment', 'order.baseid'];
97
-$default = $this->config( 'admin/jqadm/customer/order/fields', $default );
98
-$fields = $this->session( 'aimeos/admin/jqadm/customerorder/fields', $default );
97
+$default = $this->config('admin/jqadm/customer/order/fields', $default);
98
+$fields = $this->session('aimeos/admin/jqadm/customerorder/fields', $default);
99 99
 
100 100
 $columns = [
101
-	'order.id' => $this->translate( 'admin', 'ID' ),
102
-	'order.type' => $this->translate( 'admin', 'Type' ),
103
-	'order.datepayment' => $this->translate( 'admin', 'Purchase' ),
104
-	'order.statuspayment' => $this->translate( 'admin', 'Pay status' ),
105
-	'order.datedelivery' => $this->translate( 'admin', 'Delivery' ),
106
-	'order.statusdelivery' => $this->translate( 'admin', 'Ship status' ),
107
-	'order.relatedid' => $this->translate( 'admin', 'Related ID' ),
108
-	'order.baseid' => $this->translate( 'admin', 'Basket' ),
109
-	'order.ctime' => $this->translate( 'admin', 'Created' ),
110
-	'order.mtime' => $this->translate( 'admin', 'Modifed' ),
111
-	'order.editor' => $this->translate( 'admin', 'Editor' ),
101
+	'order.id' => $this->translate('admin', 'ID'),
102
+	'order.type' => $this->translate('admin', 'Type'),
103
+	'order.datepayment' => $this->translate('admin', 'Purchase'),
104
+	'order.statuspayment' => $this->translate('admin', 'Pay status'),
105
+	'order.datedelivery' => $this->translate('admin', 'Delivery'),
106
+	'order.statusdelivery' => $this->translate('admin', 'Ship status'),
107
+	'order.relatedid' => $this->translate('admin', 'Related ID'),
108
+	'order.baseid' => $this->translate('admin', 'Basket'),
109
+	'order.ctime' => $this->translate('admin', 'Created'),
110
+	'order.mtime' => $this->translate('admin', 'Modifed'),
111
+	'order.editor' => $this->translate('admin', 'Editor'),
112 112
 ];
113 113
 
114 114
 $paymentStatusList = [
115
-	'-1' => $this->translate( 'mshop/code', 'pay:-1' ),
116
-	'0' => $this->translate( 'mshop/code', 'pay:0' ),
117
-	'1' => $this->translate( 'mshop/code', 'pay:1' ),
118
-	'2' => $this->translate( 'mshop/code', 'pay:2' ),
119
-	'3' => $this->translate( 'mshop/code', 'pay:3' ),
120
-	'4' => $this->translate( 'mshop/code', 'pay:4' ),
121
-	'5' => $this->translate( 'mshop/code', 'pay:5' ),
122
-	'6' => $this->translate( 'mshop/code', 'pay:6' ),
115
+	'-1' => $this->translate('mshop/code', 'pay:-1'),
116
+	'0' => $this->translate('mshop/code', 'pay:0'),
117
+	'1' => $this->translate('mshop/code', 'pay:1'),
118
+	'2' => $this->translate('mshop/code', 'pay:2'),
119
+	'3' => $this->translate('mshop/code', 'pay:3'),
120
+	'4' => $this->translate('mshop/code', 'pay:4'),
121
+	'5' => $this->translate('mshop/code', 'pay:5'),
122
+	'6' => $this->translate('mshop/code', 'pay:6'),
123 123
 ];
124 124
 
125 125
 $deliveryStatusList = [
126
-	'-1' => $this->translate( 'mshop/code', 'stat:-1' ),
127
-	'0' => $this->translate( 'mshop/code', 'stat:0' ),
128
-	'1' => $this->translate( 'mshop/code', 'stat:1' ),
129
-	'2' => $this->translate( 'mshop/code', 'stat:2' ),
130
-	'3' => $this->translate( 'mshop/code', 'stat:3' ),
131
-	'4' => $this->translate( 'mshop/code', 'stat:4' ),
132
-	'5' => $this->translate( 'mshop/code', 'stat:5' ),
133
-	'6' => $this->translate( 'mshop/code', 'stat:6' ),
134
-	'7' => $this->translate( 'mshop/code', 'stat:7' ),
126
+	'-1' => $this->translate('mshop/code', 'stat:-1'),
127
+	'0' => $this->translate('mshop/code', 'stat:0'),
128
+	'1' => $this->translate('mshop/code', 'stat:1'),
129
+	'2' => $this->translate('mshop/code', 'stat:2'),
130
+	'3' => $this->translate('mshop/code', 'stat:3'),
131
+	'4' => $this->translate('mshop/code', 'stat:4'),
132
+	'5' => $this->translate('mshop/code', 'stat:5'),
133
+	'6' => $this->translate('mshop/code', 'stat:6'),
134
+	'7' => $this->translate('mshop/code', 'stat:7'),
135 135
 ];
136 136
 
137 137
 
@@ -139,10 +139,10 @@  discard block
 block discarded – undo
139 139
 <div id="order" class="item-order content-block tab-pane fade" role="tabpanel" aria-labelledby="order">
140 140
 
141 141
 	<?= $this->partial(
142
-			$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
143
-			['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'orderTotal' ),
142
+			$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
143
+			['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('orderTotal'),
144 144
 			'group' => 'uo', 'action' => 'get', 'fragment' => 'order',
145
-			'page' =>$this->session( 'aimeos/admin/jqadm/customerorder/page', [] )]
145
+			'page' =>$this->session('aimeos/admin/jqadm/customerorder/page', [])]
146 146
 		);
147 147
 	?>
148 148
 
@@ -150,23 +150,23 @@  discard block
 block discarded – undo
150 150
 		<thead class="list-header">
151 151
 			<tr>
152 152
 				<?= $this->partial(
153
-					$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ), [
154
-						'fields' => $fields, 'params' => $params, 'tabindex' => $this->get( 'tabindex' ),
153
+					$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'), [
154
+						'fields' => $fields, 'params' => $params, 'tabindex' => $this->get('tabindex'),
155 155
 						'data' => $columns, 'group' => 'uo', 'action' => 'get', 'fragment' => 'order',
156
-						'sort' => $this->session( 'aimeos/admin/jqadm/customerorder/sort' ),
156
+						'sort' => $this->session('aimeos/admin/jqadm/customerorder/sort'),
157 157
 					] );
158 158
 				?>
159 159
 
160 160
 				<th class="actions">
161
-					<!-- a class="btn fa act-add" tabindex="<?= $this->get( 'tabindex' ); ?>"
162
-						href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, ['resource' => 'order'] + $params, [], $newConfig ) ); ?>"
163
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
164
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
161
+					<!-- a class="btn fa act-add" tabindex="<?= $this->get('tabindex'); ?>"
162
+						href="<?= $enc->attr($this->url($newTarget, $newCntl, $newAction, ['resource' => 'order'] + $params, [], $newConfig)); ?>"
163
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
164
+						aria-label="<?= $enc->attr($this->translate('admin', 'Add')); ?>">
165 165
 					</a -->
166 166
 
167 167
 					<?= $this->partial(
168
-						$this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ), [
169
-							'data' => $columns, 'fields' => $fields, 'group' => 'uo', 'tabindex' => $this->get( 'tabindex' ),
168
+						$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'), [
169
+							'data' => $columns, 'fields' => $fields, 'group' => 'uo', 'tabindex' => $this->get('tabindex'),
170 170
 						] );
171 171
 					?>
172 172
 				</th>
@@ -174,9 +174,9 @@  discard block
 block discarded – undo
174 174
 		</thead>
175 175
 		<tbody>
176 176
 			<?= $this->partial(
177
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
178
-					'fields' => $fields, 'group' => 'uo', 'tabindex' => $this->get( 'tabindex' ),
179
-					'filter' => $this->session( 'aimeos/admin/jqadm/customerorder/filter', [] ),
177
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
178
+					'fields' => $fields, 'group' => 'uo', 'tabindex' => $this->get('tabindex'),
179
+					'filter' => $this->session('aimeos/admin/jqadm/customerorder/filter', []),
180 180
 					'data' => [
181 181
 						'order.id' => ['op' => '==', 'type' => 'number'],
182 182
 						'order.type' => ['op' => '=~'],
@@ -193,94 +193,94 @@  discard block
 block discarded – undo
193 193
 				] );
194 194
 			?>
195 195
 
196
-			<?php foreach( $this->get( 'orderItems', [] ) as $id => $item ) : ?>
197
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'order', 'id' => $item->getBaseId()] + $params, [], $getConfig ) ); ?>
198
-				<tr class="list-item <?= $this->site()->readonly( $item->getSiteId() ); ?>">
199
-					<?php if( in_array( 'order.id', $fields ) ) : ?>
196
+			<?php foreach ($this->get('orderItems', []) as $id => $item) : ?>
197
+				<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['resource' => 'order', 'id' => $item->getBaseId()] + $params, [], $getConfig)); ?>
198
+				<tr class="list-item <?= $this->site()->readonly($item->getSiteId()); ?>">
199
+					<?php if (in_array('order.id', $fields)) : ?>
200 200
 						<td class="order-id">
201
-							<a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html( $item->getId() ); ?></a>
201
+							<a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html($item->getId()); ?></a>
202 202
 						</td>
203 203
 					<?php endif; ?>
204
-					<?php if( in_array( 'order.type', $fields ) ) : ?>
204
+					<?php if (in_array('order.type', $fields)) : ?>
205 205
 						<td class="order-type">
206
-							<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getType() ); ?></a>
206
+							<a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getType()); ?></a>
207 207
 						</td>
208 208
 					<?php endif; ?>
209
-					<?php if( in_array( 'order.statuspayment', $fields ) ) : ?>
209
+					<?php if (in_array('order.statuspayment', $fields)) : ?>
210 210
 						<td class="order-statuspayment">
211
-							<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $paymentStatusList[$item->getPaymentStatus()] ); ?></a>
211
+							<a class="items-field" href="<?= $url; ?>"><?= $enc->html($paymentStatusList[$item->getPaymentStatus()]); ?></a>
212 212
 						</td>
213 213
 					<?php endif; ?>
214
-					<?php if( in_array( 'order.datepayment', $fields ) ) : ?>
214
+					<?php if (in_array('order.datepayment', $fields)) : ?>
215 215
 						<td class="order-datepayment">
216
-							<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDatePayment() ); ?></a>
216
+							<a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDatePayment()); ?></a>
217 217
 						</td>
218 218
 					<?php endif; ?>
219
-					<?php if( in_array( 'order.statusdelivery', $fields ) ) : ?>
219
+					<?php if (in_array('order.statusdelivery', $fields)) : ?>
220 220
 						<td class="order-statusdelivery">
221
-							<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $deliveryStatusList[$item->getDeliveryStatus()] ); ?></a>
221
+							<a class="items-field" href="<?= $url; ?>"><?= $enc->html($deliveryStatusList[$item->getDeliveryStatus()]); ?></a>
222 222
 						</td>
223 223
 					<?php endif; ?>
224
-					<?php if( in_array( 'order.datedelivery', $fields ) ) : ?>
224
+					<?php if (in_array('order.datedelivery', $fields)) : ?>
225 225
 						<td class="order-datedelivery">
226
-							<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDateDelivery() ); ?></a>
226
+							<a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDateDelivery()); ?></a>
227 227
 						</td>
228 228
 					<?php endif; ?>
229
-					<?php if( in_array( 'order.relatedid', $fields ) ) : ?>
229
+					<?php if (in_array('order.relatedid', $fields)) : ?>
230 230
 						<td class="order-relatedid">
231
-							<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getRelatedId() ); ?></a>
231
+							<a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getRelatedId()); ?></a>
232 232
 						</td>
233 233
 					<?php endif; ?>
234
-					<?php if( in_array( 'order.ctime', $fields ) ) : ?>
234
+					<?php if (in_array('order.ctime', $fields)) : ?>
235 235
 						<td class="order-ctime">
236
-							<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a>
236
+							<a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a>
237 237
 						</td>
238 238
 					<?php endif; ?>
239
-					<?php if( in_array( 'order.mtime', $fields ) ) : ?>
239
+					<?php if (in_array('order.mtime', $fields)) : ?>
240 240
 						<td class="order-mtime">
241
-							<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a>
241
+							<a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a>
242 242
 						</td>
243 243
 					<?php endif; ?>
244
-					<?php if( in_array( 'order.editor', $fields ) ) : ?>
244
+					<?php if (in_array('order.editor', $fields)) : ?>
245 245
 						<td class="order-editor">
246
-							<a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a>
246
+							<a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getEditor()); ?></a>
247 247
 						</td>
248 248
 					<?php endif; ?>
249 249
 
250
-					<?php $baseItem = ( isset( $baseItems[$item->getBaseId()] ) ? $baseItems[$item->getBaseId()] : null ); ?>
250
+					<?php $baseItem = (isset($baseItems[$item->getBaseId()]) ? $baseItems[$item->getBaseId()] : null); ?>
251 251
 
252
-					<?php if( in_array( 'order.baseid', $fields ) ) : ?>
252
+					<?php if (in_array('order.baseid', $fields)) : ?>
253 253
 						<td class="order-baseid">
254 254
 							<a class="items-field" href="<?= $url; ?>">
255
-								<?= $enc->html( $item->getBaseId() ); ?>
256
-								<?php if( $baseItem ) : ?>
257
-									- <?= $enc->html( $baseItem->getPrice()->getValue() . '+' . $baseItem->getPrice()->getCosts() . ' ' . $baseItem->getPrice()->getCurrencyId() ); ?>
255
+								<?= $enc->html($item->getBaseId()); ?>
256
+								<?php if ($baseItem) : ?>
257
+									- <?= $enc->html($baseItem->getPrice()->getValue() . '+' . $baseItem->getPrice()->getCosts() . ' ' . $baseItem->getPrice()->getCurrencyId()); ?>
258 258
 								<?php endif; ?>
259 259
 							</a>
260 260
 						</td>
261 261
 					<?php endif; ?>
262 262
 
263 263
 					<td class="actions">
264
-						<a class="btn act-view fa" tabindex="<?= $this->get( 'tabindex' ); ?>" target="_blank"
265
-							href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'order', 'id' => $item->getBaseId()] + $params, [], $getConfig ) ); ?>"
266
-							title="<?= $enc->attr( $this->translate( 'admin', 'View details') ); ?>"></a>
264
+						<a class="btn act-view fa" tabindex="<?= $this->get('tabindex'); ?>" target="_blank"
265
+							href="<?= $enc->attr($this->url($getTarget, $getCntl, $getAction, ['resource' => 'order', 'id' => $item->getBaseId()] + $params, [], $getConfig)); ?>"
266
+							title="<?= $enc->attr($this->translate('admin', 'View details')); ?>"></a>
267 267
 					</td>
268 268
 				</tr>
269 269
 			<?php endforeach; ?>
270 270
 		</tbody>
271 271
 	</table>
272 272
 
273
-	<?php if( $this->get( 'orderItems', [] ) === [] ) : ?>
274
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
273
+	<?php if ($this->get('orderItems', []) === []) : ?>
274
+		<div class="noitems"><?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?></div>
275 275
 	<?php endif; ?>
276 276
 
277 277
 	<?= $this->partial(
278
-			$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
279
-			['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'orderTotal' ),
278
+			$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
279
+			['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('orderTotal'),
280 280
 			'group' => 'uo', 'action' => 'get', 'fragment' => 'order',
281
-			'page' =>$this->session( 'aimeos/admin/jqadm/customerorder/page', [] )]
281
+			'page' =>$this->session('aimeos/admin/jqadm/customerorder/page', [])]
282 282
 		);
283 283
 	?>
284 284
 
285 285
 </div>
286
-<?= $this->get( 'orderBody' ); ?>
286
+<?= $this->get('orderBody'); ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/customer/list-standard.php 1 patch
Spacing   +142 added lines, -142 removed lines patch added patch discarded remove patch
@@ -8,30 +8,30 @@  discard block
 block discarded – undo
8 8
 $enc = $this->encoder();
9 9
 
10 10
 
11
-$target = $this->config( 'admin/jqadm/url/search/target' );
12
-$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
13
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
14
-$config = $this->config( 'admin/jqadm/url/search/config', [] );
11
+$target = $this->config('admin/jqadm/url/search/target');
12
+$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
13
+$action = $this->config('admin/jqadm/url/search/action', 'search');
14
+$config = $this->config('admin/jqadm/url/search/config', []);
15 15
 
16
-$newTarget = $this->config( 'admin/jqadm/url/create/target' );
17
-$newCntl = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
18
-$newAction = $this->config( 'admin/jqadm/url/create/action', 'create' );
19
-$newConfig = $this->config( 'admin/jqadm/url/create/config', [] );
16
+$newTarget = $this->config('admin/jqadm/url/create/target');
17
+$newCntl = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
18
+$newAction = $this->config('admin/jqadm/url/create/action', 'create');
19
+$newConfig = $this->config('admin/jqadm/url/create/config', []);
20 20
 
21
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
22
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
23
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
24
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
21
+$getTarget = $this->config('admin/jqadm/url/get/target');
22
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
23
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
24
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
25 25
 
26
-$copyTarget = $this->config( 'admin/jqadm/url/copy/target' );
27
-$copyCntl = $this->config( 'admin/jqadm/url/copy/controller', 'Jqadm' );
28
-$copyAction = $this->config( 'admin/jqadm/url/copy/action', 'copy' );
29
-$copyConfig = $this->config( 'admin/jqadm/url/copy/config', [] );
26
+$copyTarget = $this->config('admin/jqadm/url/copy/target');
27
+$copyCntl = $this->config('admin/jqadm/url/copy/controller', 'Jqadm');
28
+$copyAction = $this->config('admin/jqadm/url/copy/action', 'copy');
29
+$copyConfig = $this->config('admin/jqadm/url/copy/config', []);
30 30
 
31
-$delTarget = $this->config( 'admin/jqadm/url/delete/target' );
32
-$delCntl = $this->config( 'admin/jqadm/url/delete/controller', 'Jqadm' );
33
-$delAction = $this->config( 'admin/jqadm/url/delete/action', 'delete' );
34
-$delConfig = $this->config( 'admin/jqadm/url/delete/config', [] );
31
+$delTarget = $this->config('admin/jqadm/url/delete/target');
32
+$delCntl = $this->config('admin/jqadm/url/delete/controller', 'Jqadm');
33
+$delAction = $this->config('admin/jqadm/url/delete/action', 'delete');
34
+$delConfig = $this->config('admin/jqadm/url/delete/config', []);
35 35
 
36 36
 
37 37
 /** admin/jqadm/customer/fields
@@ -49,62 +49,62 @@  discard block
 block discarded – undo
49 49
  * @category Developer
50 50
  */
51 51
 $default = ['customer.code', 'customer.lastname', 'customer.postal', 'customer.city'];
52
-$default = $this->config( 'admin/jqadm/customer/fields', $default );
53
-$fields = $this->session( 'aimeos/admin/jqadm/customer/fields', $default );
52
+$default = $this->config('admin/jqadm/customer/fields', $default);
53
+$fields = $this->session('aimeos/admin/jqadm/customer/fields', $default);
54 54
 
55
-$searchParams = $params = $this->get( 'pageParams', [] );
55
+$searchParams = $params = $this->get('pageParams', []);
56 56
 $searchParams['page']['start'] = 0;
57 57
 
58 58
 $langList = [];
59
-foreach( $this->get( 'pageLanguages', [] ) as $langId => $langItem ) {
60
-	$langList[$langId] = $this->translate( 'language', $langId );
59
+foreach ($this->get('pageLanguages', []) as $langId => $langItem) {
60
+	$langList[$langId] = $this->translate('language', $langId);
61 61
 }
62 62
 
63 63
 $columnList = [
64
-	'customer.id' => $this->translate( 'admin', 'ID' ),
65
-	'customer.status' => $this->translate( 'admin', 'Status' ),
66
-	'customer.code' => $this->translate( 'admin', 'Code' ),
67
-	'customer.label' => $this->translate( 'admin', 'Label' ),
68
-	'customer.salutation' => $this->translate( 'admin', 'Salutation' ),
69
-	'customer.company' => $this->translate( 'admin', 'Company' ),
70
-	'customer.vatid' => $this->translate( 'admin', 'VAT ID' ),
71
-	'customer.title' => $this->translate( 'admin', 'Title' ),
72
-	'customer.firstname' => $this->translate( 'admin', 'First name' ),
73
-	'customer.lastname' => $this->translate( 'admin', 'Last name' ),
74
-	'customer.address1' => $this->translate( 'admin', 'Address 1' ),
75
-	'customer.address2' => $this->translate( 'admin', 'Address 2' ),
76
-	'customer.address3' => $this->translate( 'admin', 'Address 3' ),
77
-	'customer.postal' => $this->translate( 'admin', 'Postal' ),
78
-	'customer.city' => $this->translate( 'admin', 'City' ),
79
-	'customer.state' => $this->translate( 'admin', 'State' ),
80
-	'customer.languageid' => $this->translate( 'admin', 'Language ID' ),
81
-	'customer.countryid' => $this->translate( 'admin', 'Country ID' ),
82
-	'customer.telephone' => $this->translate( 'admin', 'State' ),
83
-	'customer.telefax' => $this->translate( 'admin', 'Facsimile' ),
84
-	'customer.email' => $this->translate( 'admin', 'Email' ),
85
-	'customer.website' => $this->translate( 'admin', 'Web site' ),
86
-	'customer.birthday' => $this->translate( 'admin', 'Birthday' ),
87
-	'customer.ctime' => $this->translate( 'admin', 'Created' ),
88
-	'customer.mtime' => $this->translate( 'admin', 'Modified' ),
89
-	'customer.editor' => $this->translate( 'admin', 'Editor' ),
64
+	'customer.id' => $this->translate('admin', 'ID'),
65
+	'customer.status' => $this->translate('admin', 'Status'),
66
+	'customer.code' => $this->translate('admin', 'Code'),
67
+	'customer.label' => $this->translate('admin', 'Label'),
68
+	'customer.salutation' => $this->translate('admin', 'Salutation'),
69
+	'customer.company' => $this->translate('admin', 'Company'),
70
+	'customer.vatid' => $this->translate('admin', 'VAT ID'),
71
+	'customer.title' => $this->translate('admin', 'Title'),
72
+	'customer.firstname' => $this->translate('admin', 'First name'),
73
+	'customer.lastname' => $this->translate('admin', 'Last name'),
74
+	'customer.address1' => $this->translate('admin', 'Address 1'),
75
+	'customer.address2' => $this->translate('admin', 'Address 2'),
76
+	'customer.address3' => $this->translate('admin', 'Address 3'),
77
+	'customer.postal' => $this->translate('admin', 'Postal'),
78
+	'customer.city' => $this->translate('admin', 'City'),
79
+	'customer.state' => $this->translate('admin', 'State'),
80
+	'customer.languageid' => $this->translate('admin', 'Language ID'),
81
+	'customer.countryid' => $this->translate('admin', 'Country ID'),
82
+	'customer.telephone' => $this->translate('admin', 'State'),
83
+	'customer.telefax' => $this->translate('admin', 'Facsimile'),
84
+	'customer.email' => $this->translate('admin', 'Email'),
85
+	'customer.website' => $this->translate('admin', 'Web site'),
86
+	'customer.birthday' => $this->translate('admin', 'Birthday'),
87
+	'customer.ctime' => $this->translate('admin', 'Created'),
88
+	'customer.mtime' => $this->translate('admin', 'Modified'),
89
+	'customer.editor' => $this->translate('admin', 'Editor'),
90 90
 ];
91 91
 
92 92
 
93 93
 ?>
94
-<?php $this->block()->start( 'jqadm_content' ); ?>
94
+<?php $this->block()->start('jqadm_content'); ?>
95 95
 
96 96
 <nav class="main-navbar">
97 97
 
98 98
 	<span class="navbar-brand">
99
-		<?= $enc->html( $this->translate( 'admin', 'Customer' ) ); ?>
100
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
99
+		<?= $enc->html($this->translate('admin', 'Customer')); ?>
100
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
101 101
 	</span>
102 102
 
103 103
 	<?= $this->partial(
104
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
105
-			'filter' => $this->session( 'aimeos/admin/jqadm/customer/filter', [] ),
106
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
107
-			'filterOperators' => $this->get( 'filterOperators', [] ),
104
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
105
+			'filter' => $this->session('aimeos/admin/jqadm/customer/filter', []),
106
+			'filterAttributes' => $this->get('filterAttributes', []),
107
+			'filterOperators' => $this->get('filterOperators', []),
108 108
 			'params' => $params,
109 109
 		]
110 110
 	); ?>
@@ -112,13 +112,13 @@  discard block
 block discarded – undo
112 112
 
113 113
 
114 114
 <?= $this->partial(
115
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
116
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
117
-		'page' => $this->session( 'aimeos/admin/jqadm/customer/page', [] )]
115
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
116
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
117
+		'page' => $this->session('aimeos/admin/jqadm/customer/page', [])]
118 118
 	);
119 119
 ?>
120 120
 
121
-<form class="list list-customer" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
121
+<form class="list list-customer" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
122 122
 	<?= $this->csrf()->formfield(); ?>
123 123
 
124 124
 	<table class="list-items table table-hover table-striped">
@@ -126,20 +126,20 @@  discard block
 block discarded – undo
126 126
 			<tr>
127 127
 
128 128
 				<?= $this->partial(
129
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
130
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/customer/sort' )]
129
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
130
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/customer/sort')]
131 131
 					);
132 132
 				?>
133 133
 
134 134
 				<th class="actions">
135 135
 					<a class="btn fa act-add" tabindex="1"
136
-						href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>"
137
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
138
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
136
+						href="<?= $enc->attr($this->url($newTarget, $newCntl, $newAction, $params, [], $newConfig)); ?>"
137
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
138
+						aria-label="<?= $enc->attr($this->translate('admin', 'Add')); ?>">
139 139
 					</a>
140 140
 
141 141
 					<?= $this->partial(
142
-							$this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard' ),
142
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
143 143
 							['fields' => $fields, 'data' => $columnList]
144 144
 						);
145 145
 					?>
@@ -149,15 +149,15 @@  discard block
 block discarded – undo
149 149
 		<tbody>
150 150
 
151 151
 			<?= $this->partial(
152
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
153
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/customer/filter', [] ),
152
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
153
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/customer/filter', []),
154 154
 					'data' => [
155 155
 						'customer.id' => ['op' => '=='],
156 156
 						'customer.status' => ['op' => '==', 'type' => 'select', 'val' => [
157
-							'1' => $this->translate( 'mshop/code', 'status:1' ),
158
-							'0' => $this->translate( 'mshop/code', 'status:0' ),
159
-							'-1' => $this->translate( 'mshop/code', 'status:-1' ),
160
-							'-2' => $this->translate( 'mshop/code', 'status:-2' ),
157
+							'1' => $this->translate('mshop/code', 'status:1'),
158
+							'0' => $this->translate('mshop/code', 'status:0'),
159
+							'-1' => $this->translate('mshop/code', 'status:-1'),
160
+							'-2' => $this->translate('mshop/code', 'status:-2'),
161 161
 						]],
162 162
 						'customer.code' => [],
163 163
 						'customer.label' => [],
@@ -189,99 +189,99 @@  discard block
 block discarded – undo
189 189
 				] );
190 190
 			?>
191 191
 
192
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
192
+			<?php foreach ($this->get('items', []) as $id => $item) : ?>
193 193
 				<?php $address = $item->getPaymentAddress(); ?>
194
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig ) ); ?>
195
-				<tr class="<?= $this->site()->readonly( $item->getSiteId() ); ?>">
196
-					<?php if( in_array( 'customer.id', $fields ) ) : ?>
197
-						<td class="customer-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getId() ); ?></a></td>
194
+				<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig)); ?>
195
+				<tr class="<?= $this->site()->readonly($item->getSiteId()); ?>">
196
+					<?php if (in_array('customer.id', $fields)) : ?>
197
+						<td class="customer-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
198 198
 					<?php endif; ?>
199
-					<?php if( in_array( 'customer.status', $fields ) ) : ?>
200
-						<td class="customer-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
199
+					<?php if (in_array('customer.status', $fields)) : ?>
200
+						<td class="customer-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
201 201
 					<?php endif; ?>
202
-					<?php if( in_array( 'customer.code', $fields ) ) : ?>
203
-						<td class="customer-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html( $item->getCode() ); ?></a></td>
202
+					<?php if (in_array('customer.code', $fields)) : ?>
203
+						<td class="customer-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html($item->getCode()); ?></a></td>
204 204
 					<?php endif; ?>
205
-					<?php if( in_array( 'customer.label', $fields ) ) : ?>
206
-						<td class="customer-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
205
+					<?php if (in_array('customer.label', $fields)) : ?>
206
+						<td class="customer-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
207 207
 					<?php endif; ?>
208
-					<?php if( in_array( 'customer.salutation', $fields ) ) : ?>
209
-						<td class="customer-salutation"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getSalutation() ); ?></a></td>
208
+					<?php if (in_array('customer.salutation', $fields)) : ?>
209
+						<td class="customer-salutation"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getSalutation()); ?></a></td>
210 210
 					<?php endif; ?>
211
-					<?php if( in_array( 'customer.company', $fields ) ) : ?>
212
-						<td class="customer-company"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getCompany() ); ?></a></td>
211
+					<?php if (in_array('customer.company', $fields)) : ?>
212
+						<td class="customer-company"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getCompany()); ?></a></td>
213 213
 					<?php endif; ?>
214
-					<?php if( in_array( 'customer.vatid', $fields ) ) : ?>
215
-						<td class="customer-vatid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getVatID() ); ?></a></td>
214
+					<?php if (in_array('customer.vatid', $fields)) : ?>
215
+						<td class="customer-vatid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getVatID()); ?></a></td>
216 216
 					<?php endif; ?>
217
-					<?php if( in_array( 'customer.title', $fields ) ) : ?>
218
-						<td class="customer-title"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getTitle() ); ?></a></td>
217
+					<?php if (in_array('customer.title', $fields)) : ?>
218
+						<td class="customer-title"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getTitle()); ?></a></td>
219 219
 					<?php endif; ?>
220
-					<?php if( in_array( 'customer.firstname', $fields ) ) : ?>
221
-						<td class="customer-firstname"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getFirstname() ); ?></a></td>
220
+					<?php if (in_array('customer.firstname', $fields)) : ?>
221
+						<td class="customer-firstname"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getFirstname()); ?></a></td>
222 222
 					<?php endif; ?>
223
-					<?php if( in_array( 'customer.lastname', $fields ) ) : ?>
224
-						<td class="customer-lastname"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getLastname() ); ?></a></td>
223
+					<?php if (in_array('customer.lastname', $fields)) : ?>
224
+						<td class="customer-lastname"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getLastname()); ?></a></td>
225 225
 					<?php endif; ?>
226
-					<?php if( in_array( 'customer.address1', $fields ) ) : ?>
227
-						<td class="customer-address1"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getAddress1() ); ?></a></td>
226
+					<?php if (in_array('customer.address1', $fields)) : ?>
227
+						<td class="customer-address1"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getAddress1()); ?></a></td>
228 228
 					<?php endif; ?>
229
-					<?php if( in_array( 'customer.address2', $fields ) ) : ?>
230
-						<td class="customer-address2"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getAddress2() ); ?></a></td>
229
+					<?php if (in_array('customer.address2', $fields)) : ?>
230
+						<td class="customer-address2"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getAddress2()); ?></a></td>
231 231
 					<?php endif; ?>
232
-					<?php if( in_array( 'customer.address3', $fields ) ) : ?>
233
-						<td class="customer-address3"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getAddress3() ); ?></a></td>
232
+					<?php if (in_array('customer.address3', $fields)) : ?>
233
+						<td class="customer-address3"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getAddress3()); ?></a></td>
234 234
 					<?php endif; ?>
235
-					<?php if( in_array( 'customer.postal', $fields ) ) : ?>
236
-						<td class="customer-postal"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getPostal() ); ?></a></td>
235
+					<?php if (in_array('customer.postal', $fields)) : ?>
236
+						<td class="customer-postal"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getPostal()); ?></a></td>
237 237
 					<?php endif; ?>
238
-					<?php if( in_array( 'customer.city', $fields ) ) : ?>
239
-						<td class="customer-city"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getCity() ); ?></a></td>
238
+					<?php if (in_array('customer.city', $fields)) : ?>
239
+						<td class="customer-city"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getCity()); ?></a></td>
240 240
 					<?php endif; ?>
241
-					<?php if( in_array( 'customer.state', $fields ) ) : ?>
242
-						<td class="customer-state"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getState() ); ?></a></td>
241
+					<?php if (in_array('customer.state', $fields)) : ?>
242
+						<td class="customer-state"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getState()); ?></a></td>
243 243
 					<?php endif; ?>
244
-					<?php if( in_array( 'customer.languageid', $fields ) ) : ?>
245
-						<td class="customer-languageid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getLanguageId() ); ?></a></td>
244
+					<?php if (in_array('customer.languageid', $fields)) : ?>
245
+						<td class="customer-languageid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getLanguageId()); ?></a></td>
246 246
 					<?php endif; ?>
247
-					<?php if( in_array( 'customer.countryid', $fields ) ) : ?>
248
-						<td class="customer-countryid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getCountryId() ); ?></a></td>
247
+					<?php if (in_array('customer.countryid', $fields)) : ?>
248
+						<td class="customer-countryid"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getCountryId()); ?></a></td>
249 249
 					<?php endif; ?>
250
-					<?php if( in_array( 'customer.telephone', $fields ) ) : ?>
251
-						<td class="customer-telephone"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getTelephone() ); ?></a></td>
250
+					<?php if (in_array('customer.telephone', $fields)) : ?>
251
+						<td class="customer-telephone"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getTelephone()); ?></a></td>
252 252
 					<?php endif; ?>
253
-					<?php if( in_array( 'customer.telefax', $fields ) ) : ?>
254
-						<td class="customer-telefax"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getTelefax() ); ?></a></td>
253
+					<?php if (in_array('customer.telefax', $fields)) : ?>
254
+						<td class="customer-telefax"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getTelefax()); ?></a></td>
255 255
 					<?php endif; ?>
256
-					<?php if( in_array( 'customer.email', $fields ) ) : ?>
257
-						<td class="customer-email"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getEmail() ); ?></a></td>
256
+					<?php if (in_array('customer.email', $fields)) : ?>
257
+						<td class="customer-email"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getEmail()); ?></a></td>
258 258
 					<?php endif; ?>
259
-					<?php if( in_array( 'customer.website', $fields ) ) : ?>
260
-						<td class="customer-website"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $address->getWebsite() ); ?></a></td>
259
+					<?php if (in_array('customer.website', $fields)) : ?>
260
+						<td class="customer-website"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($address->getWebsite()); ?></a></td>
261 261
 					<?php endif; ?>
262
-					<?php if( in_array( 'customer.birthday', $fields ) ) : ?>
263
-						<td class="customer-birthday"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getBirthday() ); ?></a></td>
262
+					<?php if (in_array('customer.birthday', $fields)) : ?>
263
+						<td class="customer-birthday"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getBirthday()); ?></a></td>
264 264
 					<?php endif; ?>
265
-					<?php if( in_array( 'customer.ctime', $fields ) ) : ?>
266
-						<td class="customer-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
265
+					<?php if (in_array('customer.ctime', $fields)) : ?>
266
+						<td class="customer-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
267 267
 					<?php endif; ?>
268
-					<?php if( in_array( 'customer.mtime', $fields ) ) : ?>
269
-						<td class="customer-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
268
+					<?php if (in_array('customer.mtime', $fields)) : ?>
269
+						<td class="customer-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
270 270
 					<?php endif; ?>
271
-					<?php if( in_array( 'customer.editor', $fields ) ) : ?>
272
-						<td class="customer-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
271
+					<?php if (in_array('customer.editor', $fields)) : ?>
272
+						<td class="customer-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getEditor()); ?></a></td>
273 273
 					<?php endif; ?>
274 274
 
275 275
 					<td class="actions">
276 276
 						<a class="btn act-copy fa" tabindex="1"
277
-							href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>"
278
-							title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>"
279
-							aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a>
280
-						<?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?>
277
+							href="<?= $enc->attr($this->url($copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig)); ?>"
278
+							title="<?= $enc->attr($this->translate('admin', 'Copy this entry')); ?>"
279
+							aria-label="<?= $enc->attr($this->translate('admin', 'Copy')); ?>"></a>
280
+						<?php if (!$this->site()->readonly($item->getSiteId())) : ?>
281 281
 							<a class="btn act-delete fa" tabindex="1"
282
-								href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'customer', 'id' => $id] + $params, [], $delConfig ) ); ?>"
283
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
284
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
282
+								href="<?= $enc->attr($this->url($delTarget, $delCntl, $delAction, ['resource' => 'customer', 'id' => $id] + $params, [], $delConfig)); ?>"
283
+								title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
284
+								aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>"></a>
285 285
 						<?php endif; ?>
286 286
 					</td>
287 287
 				</tr>
@@ -289,18 +289,18 @@  discard block
 block discarded – undo
289 289
 		</tbody>
290 290
 	</table>
291 291
 
292
-	<?php if( $this->get( 'items', [] ) === [] ) : ?>
293
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
292
+	<?php if ($this->get('items', []) === []) : ?>
293
+		<div class="noitems"><?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?></div>
294 294
 	<?php endif; ?>
295 295
 </form>
296 296
 
297 297
 <?= $this->partial(
298
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
299
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
300
-		'page' => $this->session( 'aimeos/admin/jqadm/customer/page', [] )]
298
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
299
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
300
+		'page' => $this->session('aimeos/admin/jqadm/customer/page', [])]
301 301
 	);
302 302
 ?>
303 303
 
304 304
 <?php $this->block()->stop(); ?>
305 305
 
306
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
306
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/catalog/item-standard.php 1 patch
Spacing   +112 added lines, -112 removed lines patch added patch discarded remove patch
@@ -5,39 +5,39 @@  discard block
 block discarded – undo
5 5
  * @copyright Aimeos (aimeos.org), 2017-2018
6 6
  */
7 7
 
8
-$selected = function( $key, $code ) {
9
-	return ( $key == $code ? 'selected="selected"' : '' );
8
+$selected = function($key, $code) {
9
+	return ($key == $code ? 'selected="selected"' : '');
10 10
 };
11 11
 
12 12
 
13 13
 $enc = $this->encoder();
14 14
 
15
-$target = $this->config( 'admin/jqadm/url/save/target' );
16
-$cntl = $this->config( 'admin/jqadm/url/save/controller', 'Jqadm' );
17
-$action = $this->config( 'admin/jqadm/url/save/action', 'save' );
18
-$config = $this->config( 'admin/jqadm/url/save/config', [] );
15
+$target = $this->config('admin/jqadm/url/save/target');
16
+$cntl = $this->config('admin/jqadm/url/save/controller', 'Jqadm');
17
+$action = $this->config('admin/jqadm/url/save/action', 'save');
18
+$config = $this->config('admin/jqadm/url/save/config', []);
19 19
 
20
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
21
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
22
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
23
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
20
+$getTarget = $this->config('admin/jqadm/url/get/target');
21
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
22
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
23
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
24 24
 
25
-$listTarget = $this->config( 'admin/jqadm/url/search/target' );
26
-$listCntl = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
27
-$listAction = $this->config( 'admin/jqadm/url/search/action', 'search' );
28
-$listConfig = $this->config( 'admin/jqadm/url/search/config', [] );
25
+$listTarget = $this->config('admin/jqadm/url/search/target');
26
+$listCntl = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
27
+$listAction = $this->config('admin/jqadm/url/search/action', 'search');
28
+$listConfig = $this->config('admin/jqadm/url/search/config', []);
29 29
 
30
-$newTarget = $this->config( 'admin/jqadm/url/create/target' );
31
-$newCntl = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
32
-$newAction = $this->config( 'admin/jqadm/url/create/action', 'create' );
33
-$newConfig = $this->config( 'admin/jqadm/url/create/config', [] );
30
+$newTarget = $this->config('admin/jqadm/url/create/target');
31
+$newCntl = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
32
+$newAction = $this->config('admin/jqadm/url/create/action', 'create');
33
+$newConfig = $this->config('admin/jqadm/url/create/config', []);
34 34
 
35
-$jsonTarget = $this->config( 'admin/jsonadm/url/target' );
36
-$jsonCntl = $this->config( 'admin/jsonadm/url/controller', 'Jsonadm' );
37
-$jsonAction = $this->config( 'admin/jsonadm/url/action', 'get' );
38
-$jsonConfig = $this->config( 'admin/jsonadm/url/config', [] );
35
+$jsonTarget = $this->config('admin/jsonadm/url/target');
36
+$jsonCntl = $this->config('admin/jsonadm/url/controller', 'Jsonadm');
37
+$jsonAction = $this->config('admin/jsonadm/url/action', 'get');
38
+$jsonConfig = $this->config('admin/jsonadm/url/config', []);
39 39
 
40
-$params = $this->get( 'pageParams', [] );
40
+$params = $this->get('pageParams', []);
41 41
 
42 42
 
43 43
 /** admin/jqadm/catalog/item/config/suggest
@@ -51,42 +51,42 @@  discard block
 block discarded – undo
51 51
  * @category Developer
52 52
  * @see admin/jqadm/product/item/config/suggest
53 53
  */
54
-$cfgSuggest = $this->config( 'admin/jqadm/catalog/item/config/suggest', ['css-class'] );
54
+$cfgSuggest = $this->config('admin/jqadm/catalog/item/config/suggest', ['css-class']);
55 55
 
56 56
 
57 57
 ?>
58
-<?php $this->block()->start( 'jqadm_content' ); ?>
58
+<?php $this->block()->start('jqadm_content'); ?>
59 59
 
60 60
 <form class="item item-catalog item-tree form-horizontal" method="POST" enctype="multipart/form-data"
61
-	action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>"
62
-	data-rootid="<?= $enc->attr( $this->get( 'itemRootId' ) ); ?>"
63
-	data-geturl="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'catalog', 'id' => '_ID_'] + $params, [], $getConfig ) ); ?>"
64
-	data-createurl="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, ['resource' => 'catalog', 'id' => '_ID_'] + $params, [], $newConfig ) ); ?>"
65
-	data-jsonurl="<?= $enc->attr( $this->url( $jsonTarget, $jsonCntl, $jsonAction, ['resource' => 'catalog'], [], $jsonConfig ) ); ?>"
66
-	data-idname="<?= $this->formparam( 'id' ); ?>" >
67
-
68
-	<input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'catalog.id' ) ) ); ?>"
69
-		value="<?= $enc->attr( $this->get( 'itemData/catalog.id' ) ); ?>" />
70
-	<input id="item-parentid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'catalog.parentid' ) ) ); ?>"
71
-		value="<?= $enc->attr( $this->get( 'itemData/catalog.parentid', $this->param( 'id', $this->get( 'itemRootId' ) ) ) ); ?>" />
72
-	<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
61
+	action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>"
62
+	data-rootid="<?= $enc->attr($this->get('itemRootId')); ?>"
63
+	data-geturl="<?= $enc->attr($this->url($getTarget, $getCntl, $getAction, ['resource' => 'catalog', 'id' => '_ID_'] + $params, [], $getConfig)); ?>"
64
+	data-createurl="<?= $enc->attr($this->url($newTarget, $newCntl, $newAction, ['resource' => 'catalog', 'id' => '_ID_'] + $params, [], $newConfig)); ?>"
65
+	data-jsonurl="<?= $enc->attr($this->url($jsonTarget, $jsonCntl, $jsonAction, ['resource' => 'catalog'], [], $jsonConfig)); ?>"
66
+	data-idname="<?= $this->formparam('id'); ?>" >
67
+
68
+	<input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'catalog.id'))); ?>"
69
+		value="<?= $enc->attr($this->get('itemData/catalog.id')); ?>" />
70
+	<input id="item-parentid" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'catalog.parentid'))); ?>"
71
+		value="<?= $enc->attr($this->get('itemData/catalog.parentid', $this->param('id', $this->get('itemRootId')))); ?>" />
72
+	<input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" />
73 73
 	<?= $this->csrf()->formfield(); ?>
74 74
 
75 75
 	<nav class="main-navbar">
76 76
 		<span class="navbar-brand">
77
-			<?= $enc->html( $this->translate( 'admin', 'Catalog' ) ); ?>:
78
-			<?php if( $this->get( 'itemData/catalog.id' ) ) : ?>
79
-				<?= $enc->html( $this->get( 'itemData/catalog.id' ) ); ?> -
77
+			<?= $enc->html($this->translate('admin', 'Catalog')); ?>:
78
+			<?php if ($this->get('itemData/catalog.id')) : ?>
79
+				<?= $enc->html($this->get('itemData/catalog.id')); ?> -
80 80
 			<?php endif; ?>
81
-			<?= $enc->html( $this->get( 'itemData/catalog.label', $this->translate( 'admin', 'New' ) ) ); ?>
82
-			<?php if( $this->get( 'itemData/catalog.siteid' ) ) : ?>
83
-				<span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/catalog.siteid' ) ) ); ?>)</span>
81
+			<?= $enc->html($this->get('itemData/catalog.label', $this->translate('admin', 'New'))); ?>
82
+			<?php if ($this->get('itemData/catalog.siteid')) : ?>
83
+				<span class="navbar-secondary">(<?= $enc->html($this->site()->match($this->get('itemData/catalog.siteid'))); ?>)</span>
84 84
 			<?php endif; ?>
85 85
 		</span>
86 86
 
87 87
 		<div class="item-actions">
88
-			<?php if( isset( $this->itemData ) ) : ?>
89
-				<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
88
+			<?php if (isset($this->itemData)) : ?>
89
+				<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
90 90
 			<?php else : ?>
91 91
 				<span class="placeholder">&nbsp;</span>
92 92
 			<?php endif; ?>
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 					<span class="btn btn-secondary fa expand-all" tabindex="1"></span>
102 102
 					<span class="btn btn-secondary fa collapse-all" tabindex="1"></span>
103 103
 				</div>
104
-				<input type="text" class="form-control search-input" tabindex="1" placeholder="<?= $enc->attr( $this->translate( 'admin', 'Find category' ) ); ?>">
104
+				<input type="text" class="form-control search-input" tabindex="1" placeholder="<?= $enc->attr($this->translate('admin', 'Find category')); ?>">
105 105
 				<div class="input-group-append">
106 106
 					<span class="btn btn-secondary fa act-delete " tabindex="1"></span>
107 107
 					<span class="btn btn-primary fa act-add" tabindex="1"></span>
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 			</div>
112 112
 		</div>
113 113
 
114
-		<?php if( isset( $this->itemData ) ) : ?>
114
+		<?php if (isset($this->itemData)) : ?>
115 115
 
116 116
 			<div class="col-lg-9 catalog-content">
117 117
 				<div class="row">
@@ -121,14 +121,14 @@  discard block
 block discarded – undo
121 121
 
122 122
 							<li class="nav-item basic">
123 123
 								<a class="nav-link active" href="#basic" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic" tabindex="1">
124
-									<?= $enc->html( $this->translate( 'admin', 'Basic' ) ); ?>
124
+									<?= $enc->html($this->translate('admin', 'Basic')); ?>
125 125
 								</a>
126 126
 							</li>
127 127
 
128
-							<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?>
129
-								<li class="nav-item <?= $enc->attr( $subpart ); ?>">
130
-									<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>">
131
-										<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
128
+							<?php foreach (array_values($this->get('itemSubparts', [])) as $idx => $subpart) : ?>
129
+								<li class="nav-item <?= $enc->attr($subpart); ?>">
130
+									<a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
131
+										<?= $enc->html($this->translate('admin', $subpart)); ?>
132 132
 									</a>
133 133
 								</li>
134 134
 							<?php endforeach; ?>
@@ -137,16 +137,16 @@  discard block
 block discarded – undo
137 137
 
138 138
 						<div class="item-meta text-muted">
139 139
 							<small>
140
-								<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
141
-								<span class="meta-value"><?= $enc->html( $this->get( 'itemData/catalog.mtime' ) ); ?></span>
140
+								<?= $enc->html($this->translate('admin', 'Modified')); ?>:
141
+								<span class="meta-value"><?= $enc->html($this->get('itemData/catalog.mtime')); ?></span>
142 142
 							</small>
143 143
 							<small>
144
-								<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
145
-								<span class="meta-value"><?= $enc->html( $this->get( 'itemData/catalog.ctime' ) ); ?></span>
144
+								<?= $enc->html($this->translate('admin', 'Created')); ?>:
145
+								<span class="meta-value"><?= $enc->html($this->get('itemData/catalog.ctime')); ?></span>
146 146
 							</small>
147 147
 							<small>
148
-								<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
149
-								<span class="meta-value"><?= $enc->html( $this->get( 'itemData/catalog.editor' ) ); ?></span>
148
+								<?= $enc->html($this->translate('admin', 'Editor')); ?>:
149
+								<span class="meta-value"><?= $enc->html($this->get('itemData/catalog.editor')); ?></span>
150 150
 							</small>
151 151
 						</div>
152 152
 					</div>
@@ -155,89 +155,89 @@  discard block
 block discarded – undo
155 155
 
156 156
 						<div id="basic" class="row item-basic tab-pane fade show active" role="tabpanel" aria-labelledby="basic">
157 157
 
158
-							<div class="col-xl-6 content-block <?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?>">
158
+							<div class="col-xl-6 content-block <?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?>">
159 159
 								<div class="form-group row mandatory">
160
-									<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
160
+									<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
161 161
 									<div class="col-sm-8">
162 162
 										<select class="form-control custom-select item-status" required="required" tabindex="1"
163
-											name="<?= $enc->attr( $this->formparam( array( 'item', 'catalog.status' ) ) ); ?>"
164
-											<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> >
163
+											name="<?= $enc->attr($this->formparam(array('item', 'catalog.status'))); ?>"
164
+											<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> >
165 165
 											<option value="">
166
-												<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
166
+												<?= $enc->html($this->translate('admin', 'Please select')); ?>
167 167
 											</option>
168
-											<option value="1" <?= $selected( $this->get( 'itemData/catalog.status', 1 ), 1 ); ?> >
169
-												<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
168
+											<option value="1" <?= $selected($this->get('itemData/catalog.status', 1), 1); ?> >
169
+												<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
170 170
 											</option>
171
-											<option value="0" <?= $selected( $this->get( 'itemData/catalog.status', 1 ), 0 ); ?> >
172
-												<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
171
+											<option value="0" <?= $selected($this->get('itemData/catalog.status', 1), 0); ?> >
172
+												<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
173 173
 											</option>
174
-											<option value="-1" <?= $selected( $this->get( 'itemData/catalog.status', 1 ), -1 ); ?> >
175
-												<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
174
+											<option value="-1" <?= $selected($this->get('itemData/catalog.status', 1), -1); ?> >
175
+												<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
176 176
 											</option>
177
-											<option value="-2" <?= $selected( $this->get( 'itemData/catalog.status', 1 ), -2 ); ?> >
178
-												<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
177
+											<option value="-2" <?= $selected($this->get('itemData/catalog.status', 1), -2); ?> >
178
+												<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
179 179
 											</option>
180 180
 										</select>
181 181
 									</div>
182 182
 								</div>
183 183
 								<div class="form-group row mandatory">
184
-									<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Code' ) ); ?></label>
184
+									<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Code')); ?></label>
185 185
 									<div class="col-sm-8">
186 186
 										<input class="form-control item-code" type="text" required="required" tabindex="1"
187
-											name="<?= $enc->attr( $this->formparam( array( 'item', 'catalog.code' ) ) ); ?>"
188
-											placeholder="<?= $enc->attr( $this->translate( 'admin', 'Unique category code (required)' ) ); ?>"
189
-											value="<?= $enc->attr( $this->get( 'itemData/catalog.code' ) ); ?>"
190
-											<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> />
187
+											name="<?= $enc->attr($this->formparam(array('item', 'catalog.code'))); ?>"
188
+											placeholder="<?= $enc->attr($this->translate('admin', 'Unique category code (required)')); ?>"
189
+											value="<?= $enc->attr($this->get('itemData/catalog.code')); ?>"
190
+											<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> />
191 191
 									</div>
192 192
 									<div class="col-sm-12 form-text text-muted help-text">
193
-										<?= $enc->html( $this->translate( 'admin', 'Unique category code, either from external system or self-invented' ) ); ?>
193
+										<?= $enc->html($this->translate('admin', 'Unique category code, either from external system or self-invented')); ?>
194 194
 									</div>
195 195
 								</div>
196 196
 								<div class="form-group row mandatory">
197
-									<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
197
+									<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label>
198 198
 									<div class="col-sm-8">
199 199
 										<input class="form-control item-label" type="text" required="required" tabindex="1"
200
-											name="<?= $this->formparam( array( 'item', 'catalog.label' ) ); ?>"
201
-											placeholder="<?= $enc->attr( $this->translate( 'admin', 'Internal name (required)' ) ); ?>"
202
-											value="<?= $enc->attr( $this->get( 'itemData/catalog.label' ) ); ?>"
203
-											<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> />
200
+											name="<?= $this->formparam(array('item', 'catalog.label')); ?>"
201
+											placeholder="<?= $enc->attr($this->translate('admin', 'Internal name (required)')); ?>"
202
+											value="<?= $enc->attr($this->get('itemData/catalog.label')); ?>"
203
+											<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> />
204 204
 									</div>
205 205
 									<div class="col-sm-12 form-text text-muted help-text">
206
-										<?= $enc->html( $this->translate( 'admin', 'Internal category name, will be used on the web site if no name for the language is available' ) ); ?>
206
+										<?= $enc->html($this->translate('admin', 'Internal category name, will be used on the web site if no name for the language is available')); ?>
207 207
 									</div>
208 208
 								</div>
209 209
 								<div class="form-group row optional warning">
210
-									<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'URL target' ) ); ?></label>
210
+									<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'URL target')); ?></label>
211 211
 									<div class="col-sm-8">
212 212
 										<input class="form-control item-target" type="text" tabindex="1"
213
-											name="<?= $enc->attr( $this->formparam( array( 'item', 'catalog.target' ) ) ); ?>"
214
-											placeholder="<?= $enc->attr( $this->translate( 'admin', 'Route or page ID (optional)' ) ); ?>"
215
-											value="<?= $enc->attr( $this->get( 'itemData/catalog.target' ) ); ?>"
216
-											<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> />
213
+											name="<?= $enc->attr($this->formparam(array('item', 'catalog.target'))); ?>"
214
+											placeholder="<?= $enc->attr($this->translate('admin', 'Route or page ID (optional)')); ?>"
215
+											value="<?= $enc->attr($this->get('itemData/catalog.target')); ?>"
216
+											<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> />
217 217
 									</div>
218 218
 									<div class="col-sm-12 form-text text-muted help-text">
219
-										<?= $enc->html( $this->translate( 'admin', 'Route name or page ID of the category page if this category should shown on a different page' ) ); ?>
219
+										<?= $enc->html($this->translate('admin', 'Route name or page ID of the category page if this category should shown on a different page')); ?>
220 220
 									</div>
221 221
 								</div>
222 222
 							</div><!--
223 223
 
224
-							--><div class="col-xl-6 content-block <?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?>">
225
-								<table class="item-config table table-striped" data-keys="<?= $enc->attr( json_encode( $cfgSuggest ) ); ?>">
224
+							--><div class="col-xl-6 content-block <?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?>">
225
+								<table class="item-config table table-striped" data-keys="<?= $enc->attr(json_encode($cfgSuggest)); ?>">
226 226
 									<thead>
227 227
 										<tr>
228 228
 											<th>
229
-												<span class="help"><?= $enc->html( $this->translate( 'admin', 'Option' ) ); ?></span>
229
+												<span class="help"><?= $enc->html($this->translate('admin', 'Option')); ?></span>
230 230
 												<div class="form-text text-muted help-text">
231
-													<?= $enc->html( $this->translate( 'admin', 'Category specific configuration options, will be available as key/value pairs in the templates' ) ); ?>
231
+													<?= $enc->html($this->translate('admin', 'Category specific configuration options, will be available as key/value pairs in the templates')); ?>
232 232
 												</div>
233 233
 											</th>
234 234
 											<th>
235
-												<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
235
+												<?= $enc->html($this->translate('admin', 'Value')); ?>
236 236
 											</th>
237 237
 											<th class="actions">
238
-												<?php if( !$this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ) ) : ?>
238
+												<?php if (!$this->site()->readonly($this->get('itemData/catalog.siteid'))) : ?>
239 239
 													<div class="btn act-add fa" tabindex="1"
240
-														title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>">
240
+														title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>">
241 241
 													</div>
242 242
 												<?php endif; ?>
243 243
 											</th>
@@ -245,24 +245,24 @@  discard block
 block discarded – undo
245 245
 									</thead>
246 246
 									<tbody>
247 247
 
248
-										<?php foreach( (array) $this->get( 'itemData/config/key', [] ) as $idx => $key ) : ?>
248
+										<?php foreach ((array) $this->get('itemData/config/key', []) as $idx => $key) : ?>
249 249
 											<tr class="config-item">
250 250
 												<td>
251 251
 													<input type="text" class="config-key form-control" tabindex="1"
252
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'key', '' ) ) ); ?>"
253
-														value="<?= $enc->attr( $this->get( 'itemData/config/key/' . $idx, $key ) ); ?>"
254
-														<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> />
252
+														name="<?= $enc->attr($this->formparam(array('item', 'config', 'key', ''))); ?>"
253
+														value="<?= $enc->attr($this->get('itemData/config/key/' . $idx, $key)); ?>"
254
+														<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> />
255 255
 												</td>
256 256
 												<td>
257 257
 													<input type="text" class="config-value form-control" tabindex="1"
258
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>"
259
-														value="<?= $enc->attr( $this->get( 'itemData/config/val/' . $idx ) ); ?>"
260
-														<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> />
258
+														name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>"
259
+														value="<?= $enc->attr($this->get('itemData/config/val/' . $idx)); ?>"
260
+														<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> />
261 261
 												</td>
262 262
 												<td class="actions">
263
-													<?php if( !$this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ) ) : ?>
263
+													<?php if (!$this->site()->readonly($this->get('itemData/catalog.siteid'))) : ?>
264 264
 														<div class="btn act-delete fa" tabindex="1"
265
-															title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
265
+															title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
266 266
 														</div>
267 267
 													<?php endif; ?>
268 268
 												</td>
@@ -272,16 +272,16 @@  discard block
 block discarded – undo
272 272
 										<tr class="prototype">
273 273
 											<td>
274 274
 												<input type="text" class="config-key form-control" tabindex="1" disabled="disabled"
275
-													name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'key', '' ) ) ); ?>" />
275
+													name="<?= $enc->attr($this->formparam(array('item', 'config', 'key', ''))); ?>" />
276 276
 											</td>
277 277
 											<td>
278 278
 												<input type="text" class="config-value form-control" tabindex="1" disabled="disabled"
279
-													name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" />
279
+													name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" />
280 280
 											</td>
281 281
 											<td class="actions">
282
-												<?php if( !$this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ) ) : ?>
282
+												<?php if (!$this->site()->readonly($this->get('itemData/catalog.siteid'))) : ?>
283 283
 													<div class="btn act-delete fa" tabindex="1"
284
-														title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
284
+														title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
285 285
 													</div>
286 286
 												<?php endif; ?>
287 287
 											</td>
@@ -292,12 +292,12 @@  discard block
 block discarded – undo
292 292
 
293 293
 						</div>
294 294
 
295
-						<?= $this->get( 'itemBody' ); ?>
295
+						<?= $this->get('itemBody'); ?>
296 296
 
297 297
 					</div>
298 298
 
299 299
 					<div class="item-actions">
300
-						<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
300
+						<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
301 301
 					</div>
302 302
 				</div>
303 303
 
@@ -311,4 +311,4 @@  discard block
 block discarded – undo
311 311
 <?php $this->block()->stop(); ?>
312 312
 
313 313
 
314
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
314
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>
Please login to merge, or discard this patch.