aimeos / ai-admin-jqadm

admin/jqadm/src/Admin/JQAdm/Common/Decorator/Base.php

Indentation +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
 	 * Creates a new resource
 	 *
 	 * @return string|null admin output to display or null for redirecting to the list
-	*/
+	 */
 	public function create()
 	{
 		return $this->client->create();
@@ -85,7 +85,7 @@ 
 	 * Deletes a resource
 	 *
 	 * @return string|null admin output to display or null for redirecting to the list
-	*/
+	 */
 	public function delete()
 	{
 		return $this->client->delete();
@@ -96,7 +96,7 @@ 
 	 * Returns a single resource
 	 *
 	 * @return string|null admin output to display or null for redirecting to the list
-	*/
+	 */
 	public function get()
 	{
 		return $this->client->get();
@@ -107,7 +107,7 @@ 
 	 * Saves the data
 	 *
 	 * @return string|null admin output to display or null for redirecting to the list
-	*/
+	 */
 	public function save()
 	{
 		return $this->client->save();
@@ -118,7 +118,7 @@ 
 	 * Returns a list of resource according to the conditions
 	 *
 	 * @return string admin output to display
-	*/
+	 */
 	public function search()
 	{
 		return $this->client->search();

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

Braces +5 added lines, -2 removed lines

@@ -35,8 +35,11 @@
 			<?= $enc->html( $this->get( 'itemData/locale.id' ) ); ?> -
 			<?php if( $this->get( 'itemData/locale.currencyid' ) ) : ?>
 				<?= $enc->html( $this->get( 'itemData/locale.languageid' ) . '/' . $this->get( 'itemData/locale.currencyid' ) ); ?>
-			<?php else : ?>
-				<?= $enc->html( $this->translate( 'admin', 'New' ) ); ?>
+			<?php else {
+	: ?>
+				<?= $enc->html( $this->translate( 'admin', 'New' ) );
+}
+?>
 			<?php endif; ?>
 			<span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/locale.siteid' ) ) ); ?>)</span>
 		</span>

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 
 				<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?>
 					<li class="nav-item <?= $enc->attr( $subpart ); ?>">
-						<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>">
+						<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
 							<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
 						</a>
 					</li>

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

Braces +5 added lines, -2 removed lines

@@ -133,8 +133,11 @@
 										</option>
 									<?php endforeach; ?>
 								</select>
-							<?php else : ?>
-								<?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' ); ?>
+							<?php else {
+	: ?>
+								<?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' );
+}
+?>
 								<input class="item-languageid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); ?>" value="<?= $enc->attr( $language ); ?>" />
 							<?php endif; ?>
 						</div>

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 
 				<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?>
 					<li class="nav-item <?= $enc->attr( $subpart ); ?>">
-						<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>">
+						<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
 							<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
 						</a>
 					</li>

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

Braces +5 added lines, -2 removed lines

@@ -374,8 +374,11 @@
 									aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>">
 									<?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?>
 								</a>
-							<?php else : ?>
-								<?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>)
+							<?php else {
+	: ?>
+								<?= $enc->html( $refId );
+}
+?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>)
 							<?php endif; ?>
 						</td>
 					<?php endif; ?>

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
 
 				<th class="actions">
 					<a class="btn fa act-add" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>"
 						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
 					</a>
 
@@ -220,7 +220,7 @@ 
 										</th>
 										<th class="actions">
 											<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>">
 											</div>
 										</th>
 									</tr>
@@ -237,7 +237,7 @@ 
 										</td>
 										<td class="actions">
 											<div class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>">
 											</div>
 										</td>
 									</tr>
@@ -248,7 +248,7 @@ 
 				</td>
 				<td class="actions">
 					<a class="btn fa act-close" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Close') ); ?>"
+						title="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>"
 						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>">
 					</a>
 				</td>
@@ -319,7 +319,7 @@ 
 									<tr class="config-map-row prototype-map">
 										<td class="config-map-actions">
 											<div class="btn act-delete fa" tabindex="1"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>">
 											</div>
 										</td>
 										<td class="config-map-row-key">
@@ -332,12 +332,12 @@ 
 									<tr class="config-map-actions">
 										<td class="config-map-action-add">
 											<div class="btn act-add fa" tabindex="1"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry' ) ); ?>">
 											</div>
 										</td>
 										<td class="config-map-action-update" colspan="2">
 											<div class="btn btn-primary act-update" tabindex="1">
-												<?= $enc->attr( $this->translate( 'admin', 'OK') ); ?>
+												<?= $enc->attr( $this->translate( 'admin', 'OK' ) ); ?>
 											</div>
 										</td>
 									</tr>
@@ -372,7 +372,7 @@ 
 							<?php if( $refItem ) : ?>
 								<a class="btn act-view fa item-refid" tabindex="<?= $this->get( 'tabindex' ); ?>" target="_blank"
 									href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'product', 'id' => $refId] + $params, [], $getConfig ) ); ?>"
-									title="<?= $enc->attr( $this->translate( 'admin', 'Show entry') ); ?>"
+									title="<?= $enc->attr( $this->translate( 'admin', 'Show entry' ) ); ?>"
 									aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>">
 									<?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?>
 								</a>
@@ -388,11 +388,11 @@ 
 
 						<?php if( !$this->site()->readonly( $siteId ) ) : ?>
 							<a class="btn act-edit fa" tabindex="<?= $this->get( 'tabindex' ); ?>" href="#"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry') ); ?>"
+								title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry' ) ); ?>"
 								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Edit' ) ); ?>"></a>
 							<a class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
 								href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'customer/lists', 'id' => $listId] + $params, [], $delConfig ) ); ?>"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"
 								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
 						<?php endif; ?>
 					</td>

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

Braces +5 added lines, -2 removed lines

@@ -374,8 +374,11 @@
 									aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>">
 									<?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?>
 								</a>
-							<?php else : ?>
-								<?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>)
+							<?php else {
+	: ?>
+								<?= $enc->html( $refId );
+}
+?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>)
 							<?php endif; ?>
 						</td>
 					<?php endif; ?>

Spacing +13 added lines, -13 removed lines

@@ -57,7 +57,7 @@ 
 	<?= $this->partial(
 			$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
 			['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'productTotal' ),
-			'group' => 'cp', 'action' => ( $this->param( 'id') ? 'get' : 'search' ), 'fragment' => 'product',
+			'group' => 'cp', 'action' => ( $this->param( 'id' ) ? 'get' : 'search' ), 'fragment' => 'product',
 			'page' => $this->session( 'aimeos/admin/jqadm/catalogproduct/page', [] )]
 		);
 	?>
@@ -68,7 +68,7 @@ 
 				<?= $this->partial(
 					$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ), [
 						'fields' => $fields, 'params' => $params, 'tabindex' => $this->get( 'tabindex' ),
-						'group' => 'cp', 'action' => ( $this->param( 'id') ? 'get' : 'search' ), 'fragment' => 'product',
+						'group' => 'cp', 'action' => ( $this->param( 'id' ) ? 'get' : 'search' ), 'fragment' => 'product',
 						'sort' => $this->session( 'aimeos/admin/jqadm/catalogproduct/sort' ),
 						'data' => [
 							'catalog.lists.position' => $this->translate( 'admin', 'Position' ),
@@ -84,7 +84,7 @@ 
 
 				<th class="actions">
 					<a class="btn fa act-add" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>"
 						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
 					</a>
 
@@ -218,7 +218,7 @@ 
 										</th>
 										<th class="actions">
 											<div class="btn act-add fa" tabindex="1"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>">
 											</div>
 										</th>
 									</tr>
@@ -235,7 +235,7 @@ 
 										</td>
 										<td class="actions">
 											<div class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>">
 											</div>
 										</td>
 									</tr>
@@ -246,7 +246,7 @@ 
 				</td>
 				<td class="actions">
 					<a class="btn fa act-close" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Close') ); ?>"
+						title="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>"
 						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>">
 					</a>
 				</td>
@@ -317,7 +317,7 @@ 
 									<tr class="config-map-row prototype-map">
 										<td class="config-map-actions">
 											<div class="btn act-delete fa" tabindex="1"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>">
 											</div>
 										</td>
 										<td class="config-map-row-key">
@@ -330,12 +330,12 @@ 
 									<tr class="config-map-actions">
 										<td class="config-map-action-add">
 											<div class="btn act-add fa" tabindex="1"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry' ) ); ?>">
 											</div>
 										</td>
 										<td class="config-map-action-update" colspan="2">
 											<div class="btn btn-primary act-update" tabindex="1">
-												<?= $enc->attr( $this->translate( 'admin', 'OK') ); ?>
+												<?= $enc->attr( $this->translate( 'admin', 'OK' ) ); ?>
 											</div>
 										</td>
 									</tr>
@@ -370,7 +370,7 @@ 
 							<?php if( $refItem ) : ?>
 								<a class="btn act-view fa item-refid" tabindex="<?= $this->get( 'tabindex' ); ?>" target="_blank"
 									href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'product', 'id' => $refId] + $params, [], $getConfig ) ); ?>"
-									title="<?= $enc->attr( $this->translate( 'admin', 'Show entry') ); ?>"
+									title="<?= $enc->attr( $this->translate( 'admin', 'Show entry' ) ); ?>"
 									aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>">
 									<?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?>
 								</a>
@@ -386,11 +386,11 @@ 
 
 						<?php if( !$this->site()->readonly( $siteId ) ) : ?>
 							<a class="btn act-edit fa" tabindex="<?= $this->get( 'tabindex' ); ?>" href="#"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry') ); ?>"
+								title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry' ) ); ?>"
 								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Edit' ) ); ?>"></a>
 							<a class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
 								href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'catalog/lists', 'id' => $listId] + $params, [], $delConfig ) ); ?>"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"
 								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
 						<?php endif; ?>
 					</td>
@@ -407,7 +407,7 @@ 
 	<?= $this->partial(
 			$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
 			['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'productTotal' ),
-			'group' => 'cp', 'action' => ( $this->param( 'id') ? 'get' : 'search' ), 'fragment' => 'product',
+			'group' => 'cp', 'action' => ( $this->param( 'id' ) ? 'get' : 'search' ), 'fragment' => 'product',
 			'page' => $this->session( 'aimeos/admin/jqadm/catalogproduct/page', [] )]
 		);
 	?>

admin/jqadm/templates/common/partials/listhead-standard.php

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
 	$controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
 	$action = $this->config( 'admin/jqadm/url/get/action', 'get' );
 	$config = $this->config( 'admin/jqadm/url/get/config', [] );
-}
-else
+} else
 {
 	$target = $this->config( 'admin/jqadm/url/search/target' );
 	$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );

admin/jqadm/templates/common/page-standard.php

Indentation -1 removed lines

@@ -161,7 +161,6 @@
  *
  * You can add, remove or reorder the links in the navigation bar by
  * setting a new list of client resource names.
-
  * In the configuration files of extensions, you should only add entries using
  * one of these lines:
  *

Braces +15 added lines, -6 removed lines

@@ -262,8 +262,11 @@ 
 							<?php foreach( $this->pageSiteList as $siteItem ) : ?>
 								<?php if( $siteItem->getId() === $this->pageSiteTree->getId() ) : ?>
 									<?php $siteFcn( $this->pageSiteTree ); ?>
-								<?php else : ?>
-									<?php $siteFcn( $siteItem ); ?>
+								<?php else {
+	: ?>
+									<?php $siteFcn( $siteItem );
+}
+?>
 								<?php endif; ?>
 							<?php endforeach; ?>
 						</ul>
@@ -295,9 +298,12 @@ 
 							</li>
 
 						<?php endif; ?>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?>
-							<?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?>
+							<?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' );
+}
+?>
 
 							<li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>">
 								<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>"
@@ -344,10 +350,13 @@ 
 							</li>
 
 						<?php endif; ?>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?>
 
-							<?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?>
+							<?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' );
+}
+?>
 							<li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>">
 								<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>"
 									title="<?= $enc->attr( sprintf( $title, $this->translate( 'admin', $navitem ), $key ) ); ?>"

Spacing +2 added lines, -2 removed lines

@@ -284,7 +284,7 @@ 
 
 									<?php foreach( $navitem as $subresource ) : ?>
 										<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $subresource . '/groups', [] ) ) ) : ?>
-											<li class="<?= str_replace( '/', '-', $subresource); ?>">
+											<li class="<?= str_replace( '/', '-', $subresource ); ?>">
 												<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config ) ); ?>">
 													<span class="name"><?= $enc->html( $this->translate( 'admin', $subresource ) ); ?></span>
 												</a>
@@ -332,7 +332,7 @@ 
 
 									<?php foreach( $navitem as $subresource ) : ?>
 										<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $subresource . '/groups', [] ) ) ) : ?>
-											<li class="<?= str_replace( '/', '-', $subresource); ?>">
+											<li class="<?= str_replace( '/', '-', $subresource ); ?>">
 												<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config ) ); ?>">
 													<span class="name"><?= $enc->html( $this->translate( 'admin', $subresource ) ); ?></span>
 												</a>

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

Braces +5 added lines, -2 removed lines

@@ -374,8 +374,11 @@
 									aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>">
 									<?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?>
 								</a>
-							<?php else : ?>
-								<?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>)
+							<?php else {
+	: ?>
+								<?= $enc->html( $refId );
+}
+?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>)
 							<?php endif; ?>
 						</td>
 					<?php endif; ?>

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
 
 				<th class="actions">
 					<a class="btn fa act-add" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>"
 						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
 					</a>
 
@@ -220,7 +220,7 @@ 
 										</th>
 										<th class="actions">
 											<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>">
 											</div>
 										</th>
 									</tr>
@@ -237,7 +237,7 @@ 
 										</td>
 										<td class="actions">
 											<div class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>">
 											</div>
 										</td>
 									</tr>
@@ -248,7 +248,7 @@ 
 				</td>
 				<td class="actions">
 					<a class="btn fa act-close" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Close') ); ?>"
+						title="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>"
 						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>">
 					</a>
 				</td>
@@ -319,7 +319,7 @@ 
 									<tr class="config-map-row prototype-map">
 										<td class="config-map-actions">
 											<div class="btn act-delete fa" tabindex="1"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>">
 											</div>
 										</td>
 										<td class="config-map-row-key">
@@ -332,12 +332,12 @@ 
 									<tr class="config-map-actions">
 										<td class="config-map-action-add">
 											<div class="btn act-add fa" tabindex="1"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry') ); ?>">
+												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry' ) ); ?>">
 											</div>
 										</td>
 										<td class="config-map-action-update" colspan="2">
 											<div class="btn btn-primary act-update" tabindex="1">
-												<?= $enc->attr( $this->translate( 'admin', 'OK') ); ?>
+												<?= $enc->attr( $this->translate( 'admin', 'OK' ) ); ?>
 											</div>
 										</td>
 									</tr>
@@ -372,7 +372,7 @@ 
 							<?php if( $refItem ) : ?>
 								<a class="btn act-view fa item-refid" tabindex="<?= $this->get( 'tabindex' ); ?>" target="_blank"
 									href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'product', 'id' => $refId] + $params, [], $getConfig ) ); ?>"
-									title="<?= $enc->attr( $this->translate( 'admin', 'Show entry') ); ?>"
+									title="<?= $enc->attr( $this->translate( 'admin', 'Show entry' ) ); ?>"
 									aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>">
 									<?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?>
 								</a>
@@ -388,11 +388,11 @@ 
 
 						<?php if( !$this->site()->readonly( $siteId ) ) : ?>
 							<a class="btn act-edit fa" tabindex="<?= $this->get( 'tabindex' ); ?>" href="#"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry') ); ?>"
+								title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry' ) ); ?>"
 								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Edit' ) ); ?>"></a>
 							<a class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
 								href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'supplier/lists', 'id' => $listId] + $params, [], $delConfig ) ); ?>"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"
 								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
 						<?php endif; ?>
 					</td>

admin/jqadm/src/Admin/JQAdm/Product/Characteristic/Property/Standard.php

Braces +1 added lines, -2 removed lines

@@ -305,8 +305,7 @@
 			{
 				$propItem = $propItems[$entry['product.property.id']];
 				unset( $propItems[$entry['product.property.id']] );
-			}
-			else
+			} else
 			{
 				$propItem = $manager->createItem();
 			}

Spacing +1 added lines, -1 removed lines

@@ -281,7 +281,7 @@
 
 		$search = $manager->createSearch( true )->setSlice( 0, 10000 );
 		$search->setConditions( $search->compare( '!=', 'product.property.type.code', $excludes ) );
-		$search->setSortations( [$search->sort( '+', 'product.property.type.position')] );
+		$search->setSortations( [$search->sort( '+', 'product.property.type.position' )] );
 
 		return $this->map( $manager->searchItems( $search ) );
 	}