@@ -35,8 +35,11 @@ |
||
| 35 | 35 | <?= $enc->html( $this->get( 'itemData/locale.id' ) ); ?> - |
| 36 | 36 | <?php if( $this->get( 'itemData/locale.currencyid' ) ) : ?> |
| 37 | 37 | <?= $enc->html( $this->get( 'itemData/locale.languageid' ) . '/' . $this->get( 'itemData/locale.currencyid' ) ); ?> |
| 38 | - <?php else : ?> |
|
| 39 | - <?= $enc->html( $this->translate( 'admin', 'New' ) ); ?> |
|
| 38 | + <?php else { |
|
| 39 | + : ?> |
|
| 40 | + <?= $enc->html( $this->translate( 'admin', 'New' ) ); |
|
| 41 | +} |
|
| 42 | +?> |
|
| 40 | 43 | <?php endif; ?> |
| 41 | 44 | <span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/locale.siteid' ) ) ); ?>)</span> |
| 42 | 45 | </span> |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | |
| 58 | 58 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
| 59 | 59 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
| 60 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
| 60 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
| 61 | 61 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
| 62 | 62 | </a> |
| 63 | 63 | </li> |
@@ -133,8 +133,11 @@ |
||
| 133 | 133 | </option> |
| 134 | 134 | <?php endforeach; ?> |
| 135 | 135 | </select> |
| 136 | - <?php else : ?> |
|
| 137 | - <?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' ); ?> |
|
| 136 | + <?php else { |
|
| 137 | + : ?> |
|
| 138 | + <?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' ); |
|
| 139 | +} |
|
| 140 | +?> |
|
| 138 | 141 | <input class="item-languageid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); ?>" value="<?= $enc->attr( $language ); ?>" /> |
| 139 | 142 | <?php endif; ?> |
| 140 | 143 | </div> |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | |
| 58 | 58 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
| 59 | 59 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
| 60 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
| 60 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
| 61 | 61 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
| 62 | 62 | </a> |
| 63 | 63 | </li> |
@@ -374,8 +374,11 @@ |
||
| 374 | 374 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>"> |
| 375 | 375 | <?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?> |
| 376 | 376 | </a> |
| 377 | - <?php else : ?> |
|
| 378 | - <?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) |
|
| 377 | + <?php else { |
|
| 378 | + : ?> |
|
| 379 | + <?= $enc->html( $refId ); |
|
| 380 | +} |
|
| 381 | +?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) |
|
| 379 | 382 | <?php endif; ?> |
| 380 | 383 | </td> |
| 381 | 384 | <?php endif; ?> |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | <th class="actions"> |
| 86 | 86 | <a class="btn fa act-add" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 87 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
| 87 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
| 88 | 88 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
| 89 | 89 | </a> |
| 90 | 90 | |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | </th> |
| 221 | 221 | <th class="actions"> |
| 222 | 222 | <div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 223 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"> |
|
| 223 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>"> |
|
| 224 | 224 | </div> |
| 225 | 225 | </th> |
| 226 | 226 | </tr> |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | </td> |
| 238 | 238 | <td class="actions"> |
| 239 | 239 | <div class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 240 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
| 240 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
| 241 | 241 | </div> |
| 242 | 242 | </td> |
| 243 | 243 | </tr> |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | </td> |
| 249 | 249 | <td class="actions"> |
| 250 | 250 | <a class="btn fa act-close" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 251 | - title="<?= $enc->attr( $this->translate( 'admin', 'Close') ); ?>" |
|
| 251 | + title="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>" |
|
| 252 | 252 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>"> |
| 253 | 253 | </a> |
| 254 | 254 | </td> |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | <tr class="config-map-row prototype-map"> |
| 320 | 320 | <td class="config-map-actions"> |
| 321 | 321 | <div class="btn act-delete fa" tabindex="1" |
| 322 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
| 322 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
| 323 | 323 | </div> |
| 324 | 324 | </td> |
| 325 | 325 | <td class="config-map-row-key"> |
@@ -332,12 +332,12 @@ discard block |
||
| 332 | 332 | <tr class="config-map-actions"> |
| 333 | 333 | <td class="config-map-action-add"> |
| 334 | 334 | <div class="btn act-add fa" tabindex="1" |
| 335 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry') ); ?>"> |
|
| 335 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry' ) ); ?>"> |
|
| 336 | 336 | </div> |
| 337 | 337 | </td> |
| 338 | 338 | <td class="config-map-action-update" colspan="2"> |
| 339 | 339 | <div class="btn btn-primary act-update" tabindex="1"> |
| 340 | - <?= $enc->attr( $this->translate( 'admin', 'OK') ); ?> |
|
| 340 | + <?= $enc->attr( $this->translate( 'admin', 'OK' ) ); ?> |
|
| 341 | 341 | </div> |
| 342 | 342 | </td> |
| 343 | 343 | </tr> |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | <?php if( $refItem ) : ?> |
| 373 | 373 | <a class="btn act-view fa item-refid" tabindex="<?= $this->get( 'tabindex' ); ?>" target="_blank" |
| 374 | 374 | href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'product', 'id' => $refId] + $params, [], $getConfig ) ); ?>" |
| 375 | - title="<?= $enc->attr( $this->translate( 'admin', 'Show entry') ); ?>" |
|
| 375 | + title="<?= $enc->attr( $this->translate( 'admin', 'Show entry' ) ); ?>" |
|
| 376 | 376 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>"> |
| 377 | 377 | <?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?> |
| 378 | 378 | </a> |
@@ -388,11 +388,11 @@ discard block |
||
| 388 | 388 | |
| 389 | 389 | <?php if( !$this->site()->readonly( $siteId ) ) : ?> |
| 390 | 390 | <a class="btn act-edit fa" tabindex="<?= $this->get( 'tabindex' ); ?>" href="#" |
| 391 | - title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry') ); ?>" |
|
| 391 | + title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry' ) ); ?>" |
|
| 392 | 392 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Edit' ) ); ?>"></a> |
| 393 | 393 | <a class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 394 | 394 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'customer/lists', 'id' => $listId] + $params, [], $delConfig ) ); ?>" |
| 395 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
| 395 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
| 396 | 396 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a> |
| 397 | 397 | <?php endif; ?> |
| 398 | 398 | </td> |
@@ -374,8 +374,11 @@ |
||
| 374 | 374 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>"> |
| 375 | 375 | <?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?> |
| 376 | 376 | </a> |
| 377 | - <?php else : ?> |
|
| 378 | - <?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) |
|
| 377 | + <?php else { |
|
| 378 | + : ?> |
|
| 379 | + <?= $enc->html( $refId ); |
|
| 380 | +} |
|
| 381 | +?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) |
|
| 379 | 382 | <?php endif; ?> |
| 380 | 383 | </td> |
| 381 | 384 | <?php endif; ?> |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | <?= $this->partial( |
| 58 | 58 | $this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ), |
| 59 | 59 | ['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'productTotal' ), |
| 60 | - 'group' => 'cp', 'action' => ( $this->param( 'id') ? 'get' : 'search' ), 'fragment' => 'product', |
|
| 60 | + 'group' => 'cp', 'action' => ( $this->param( 'id' ) ? 'get' : 'search' ), 'fragment' => 'product', |
|
| 61 | 61 | 'page' => $this->session( 'aimeos/admin/jqadm/catalogproduct/page', [] )] |
| 62 | 62 | ); |
| 63 | 63 | ?> |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | <?= $this->partial( |
| 69 | 69 | $this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ), [ |
| 70 | 70 | 'fields' => $fields, 'params' => $params, 'tabindex' => $this->get( 'tabindex' ), |
| 71 | - 'group' => 'cp', 'action' => ( $this->param( 'id') ? 'get' : 'search' ), 'fragment' => 'product', |
|
| 71 | + 'group' => 'cp', 'action' => ( $this->param( 'id' ) ? 'get' : 'search' ), 'fragment' => 'product', |
|
| 72 | 72 | 'sort' => $this->session( 'aimeos/admin/jqadm/catalogproduct/sort' ), |
| 73 | 73 | 'data' => [ |
| 74 | 74 | 'catalog.lists.position' => $this->translate( 'admin', 'Position' ), |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | <th class="actions"> |
| 86 | 86 | <a class="btn fa act-add" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 87 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
| 87 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
| 88 | 88 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
| 89 | 89 | </a> |
| 90 | 90 | |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | </th> |
| 219 | 219 | <th class="actions"> |
| 220 | 220 | <div class="btn act-add fa" tabindex="1" |
| 221 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"> |
|
| 221 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>"> |
|
| 222 | 222 | </div> |
| 223 | 223 | </th> |
| 224 | 224 | </tr> |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | </td> |
| 236 | 236 | <td class="actions"> |
| 237 | 237 | <div class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 238 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
| 238 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
| 239 | 239 | </div> |
| 240 | 240 | </td> |
| 241 | 241 | </tr> |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | </td> |
| 247 | 247 | <td class="actions"> |
| 248 | 248 | <a class="btn fa act-close" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 249 | - title="<?= $enc->attr( $this->translate( 'admin', 'Close') ); ?>" |
|
| 249 | + title="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>" |
|
| 250 | 250 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>"> |
| 251 | 251 | </a> |
| 252 | 252 | </td> |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | <tr class="config-map-row prototype-map"> |
| 318 | 318 | <td class="config-map-actions"> |
| 319 | 319 | <div class="btn act-delete fa" tabindex="1" |
| 320 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
| 320 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
| 321 | 321 | </div> |
| 322 | 322 | </td> |
| 323 | 323 | <td class="config-map-row-key"> |
@@ -330,12 +330,12 @@ discard block |
||
| 330 | 330 | <tr class="config-map-actions"> |
| 331 | 331 | <td class="config-map-action-add"> |
| 332 | 332 | <div class="btn act-add fa" tabindex="1" |
| 333 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry') ); ?>"> |
|
| 333 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry' ) ); ?>"> |
|
| 334 | 334 | </div> |
| 335 | 335 | </td> |
| 336 | 336 | <td class="config-map-action-update" colspan="2"> |
| 337 | 337 | <div class="btn btn-primary act-update" tabindex="1"> |
| 338 | - <?= $enc->attr( $this->translate( 'admin', 'OK') ); ?> |
|
| 338 | + <?= $enc->attr( $this->translate( 'admin', 'OK' ) ); ?> |
|
| 339 | 339 | </div> |
| 340 | 340 | </td> |
| 341 | 341 | </tr> |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | <?php if( $refItem ) : ?> |
| 371 | 371 | <a class="btn act-view fa item-refid" tabindex="<?= $this->get( 'tabindex' ); ?>" target="_blank" |
| 372 | 372 | href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'product', 'id' => $refId] + $params, [], $getConfig ) ); ?>" |
| 373 | - title="<?= $enc->attr( $this->translate( 'admin', 'Show entry') ); ?>" |
|
| 373 | + title="<?= $enc->attr( $this->translate( 'admin', 'Show entry' ) ); ?>" |
|
| 374 | 374 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>"> |
| 375 | 375 | <?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?> |
| 376 | 376 | </a> |
@@ -386,11 +386,11 @@ discard block |
||
| 386 | 386 | |
| 387 | 387 | <?php if( !$this->site()->readonly( $siteId ) ) : ?> |
| 388 | 388 | <a class="btn act-edit fa" tabindex="<?= $this->get( 'tabindex' ); ?>" href="#" |
| 389 | - title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry') ); ?>" |
|
| 389 | + title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry' ) ); ?>" |
|
| 390 | 390 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Edit' ) ); ?>"></a> |
| 391 | 391 | <a class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 392 | 392 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'catalog/lists', 'id' => $listId] + $params, [], $delConfig ) ); ?>" |
| 393 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
| 393 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
| 394 | 394 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a> |
| 395 | 395 | <?php endif; ?> |
| 396 | 396 | </td> |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | <?= $this->partial( |
| 408 | 408 | $this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ), |
| 409 | 409 | ['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'productTotal' ), |
| 410 | - 'group' => 'cp', 'action' => ( $this->param( 'id') ? 'get' : 'search' ), 'fragment' => 'product', |
|
| 410 | + 'group' => 'cp', 'action' => ( $this->param( 'id' ) ? 'get' : 'search' ), 'fragment' => 'product', |
|
| 411 | 411 | 'page' => $this->session( 'aimeos/admin/jqadm/catalogproduct/page', [] )] |
| 412 | 412 | ); |
| 413 | 413 | ?> |
@@ -39,8 +39,7 @@ |
||
| 39 | 39 | $controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' ); |
| 40 | 40 | $action = $this->config( 'admin/jqadm/url/get/action', 'get' ); |
| 41 | 41 | $config = $this->config( 'admin/jqadm/url/get/config', [] ); |
| 42 | -} |
|
| 43 | -else |
|
| 42 | +} else |
|
| 44 | 43 | { |
| 45 | 44 | $target = $this->config( 'admin/jqadm/url/search/target' ); |
| 46 | 45 | $controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' ); |
@@ -374,8 +374,11 @@ |
||
| 374 | 374 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>"> |
| 375 | 375 | <?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?> |
| 376 | 376 | </a> |
| 377 | - <?php else : ?> |
|
| 378 | - <?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) |
|
| 377 | + <?php else { |
|
| 378 | + : ?> |
|
| 379 | + <?= $enc->html( $refId ); |
|
| 380 | +} |
|
| 381 | +?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) |
|
| 379 | 382 | <?php endif; ?> |
| 380 | 383 | </td> |
| 381 | 384 | <?php endif; ?> |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | <th class="actions"> |
| 86 | 86 | <a class="btn fa act-add" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 87 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
| 87 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
| 88 | 88 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>"> |
| 89 | 89 | </a> |
| 90 | 90 | |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | </th> |
| 221 | 221 | <th class="actions"> |
| 222 | 222 | <div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 223 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"> |
|
| 223 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>"> |
|
| 224 | 224 | </div> |
| 225 | 225 | </th> |
| 226 | 226 | </tr> |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | </td> |
| 238 | 238 | <td class="actions"> |
| 239 | 239 | <div class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 240 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
| 240 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
| 241 | 241 | </div> |
| 242 | 242 | </td> |
| 243 | 243 | </tr> |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | </td> |
| 249 | 249 | <td class="actions"> |
| 250 | 250 | <a class="btn fa act-close" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 251 | - title="<?= $enc->attr( $this->translate( 'admin', 'Close') ); ?>" |
|
| 251 | + title="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>" |
|
| 252 | 252 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>"> |
| 253 | 253 | </a> |
| 254 | 254 | </td> |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | <tr class="config-map-row prototype-map"> |
| 320 | 320 | <td class="config-map-actions"> |
| 321 | 321 | <div class="btn act-delete fa" tabindex="1" |
| 322 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"> |
|
| 322 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>"> |
|
| 323 | 323 | </div> |
| 324 | 324 | </td> |
| 325 | 325 | <td class="config-map-row-key"> |
@@ -332,12 +332,12 @@ discard block |
||
| 332 | 332 | <tr class="config-map-actions"> |
| 333 | 333 | <td class="config-map-action-add"> |
| 334 | 334 | <div class="btn act-add fa" tabindex="1" |
| 335 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry') ); ?>"> |
|
| 335 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry' ) ); ?>"> |
|
| 336 | 336 | </div> |
| 337 | 337 | </td> |
| 338 | 338 | <td class="config-map-action-update" colspan="2"> |
| 339 | 339 | <div class="btn btn-primary act-update" tabindex="1"> |
| 340 | - <?= $enc->attr( $this->translate( 'admin', 'OK') ); ?> |
|
| 340 | + <?= $enc->attr( $this->translate( 'admin', 'OK' ) ); ?> |
|
| 341 | 341 | </div> |
| 342 | 342 | </td> |
| 343 | 343 | </tr> |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | <?php if( $refItem ) : ?> |
| 373 | 373 | <a class="btn act-view fa item-refid" tabindex="<?= $this->get( 'tabindex' ); ?>" target="_blank" |
| 374 | 374 | href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'product', 'id' => $refId] + $params, [], $getConfig ) ); ?>" |
| 375 | - title="<?= $enc->attr( $this->translate( 'admin', 'Show entry') ); ?>" |
|
| 375 | + title="<?= $enc->attr( $this->translate( 'admin', 'Show entry' ) ); ?>" |
|
| 376 | 376 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>"> |
| 377 | 377 | <?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?> |
| 378 | 378 | </a> |
@@ -388,11 +388,11 @@ discard block |
||
| 388 | 388 | |
| 389 | 389 | <?php if( !$this->site()->readonly( $siteId ) ) : ?> |
| 390 | 390 | <a class="btn act-edit fa" tabindex="<?= $this->get( 'tabindex' ); ?>" href="#" |
| 391 | - title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry') ); ?>" |
|
| 391 | + title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry' ) ); ?>" |
|
| 392 | 392 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Edit' ) ); ?>"></a> |
| 393 | 393 | <a class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 394 | 394 | href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'supplier/lists', 'id' => $listId] + $params, [], $delConfig ) ); ?>" |
| 395 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
| 395 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
| 396 | 396 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a> |
| 397 | 397 | <?php endif; ?> |
| 398 | 398 | </td> |
@@ -262,8 +262,11 @@ discard block |
||
| 262 | 262 | <?php foreach( $this->pageSiteList as $siteItem ) : ?> |
| 263 | 263 | <?php if( $siteItem->getId() === $this->pageSiteTree->getId() ) : ?> |
| 264 | 264 | <?php $siteFcn( $this->pageSiteTree ); ?> |
| 265 | - <?php else : ?> |
|
| 266 | - <?php $siteFcn( $siteItem ); ?> |
|
| 265 | + <?php else { |
|
| 266 | + : ?> |
|
| 267 | + <?php $siteFcn( $siteItem ); |
|
| 268 | +} |
|
| 269 | +?> |
|
| 267 | 270 | <?php endif; ?> |
| 268 | 271 | <?php endforeach; ?> |
| 269 | 272 | </ul> |
@@ -295,9 +298,12 @@ discard block |
||
| 295 | 298 | </li> |
| 296 | 299 | |
| 297 | 300 | <?php endif; ?> |
| 298 | - <?php else : ?> |
|
| 301 | + <?php else { |
|
| 302 | + : ?> |
|
| 299 | 303 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> |
| 300 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
| 304 | + <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); |
|
| 305 | +} |
|
| 306 | +?> |
|
| 301 | 307 | |
| 302 | 308 | <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> |
| 303 | 309 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" |
@@ -344,10 +350,13 @@ discard block |
||
| 344 | 350 | </li> |
| 345 | 351 | |
| 346 | 352 | <?php endif; ?> |
| 347 | - <?php else : ?> |
|
| 353 | + <?php else { |
|
| 354 | + : ?> |
|
| 348 | 355 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> |
| 349 | 356 | |
| 350 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
| 357 | + <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); |
|
| 358 | +} |
|
| 359 | +?> |
|
| 351 | 360 | <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> |
| 352 | 361 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" |
| 353 | 362 | title="<?= $enc->attr( sprintf( $title, $this->translate( 'admin', $navitem ), $key ) ); ?>" |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | |
| 285 | 285 | <?php foreach( $navitem as $subresource ) : ?> |
| 286 | 286 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $subresource . '/groups', [] ) ) ) : ?> |
| 287 | - <li class="<?= str_replace( '/', '-', $subresource); ?>"> |
|
| 287 | + <li class="<?= str_replace( '/', '-', $subresource ); ?>"> |
|
| 288 | 288 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config ) ); ?>"> |
| 289 | 289 | <span class="name"><?= $enc->html( $this->translate( 'admin', $subresource ) ); ?></span> |
| 290 | 290 | </a> |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | |
| 333 | 333 | <?php foreach( $navitem as $subresource ) : ?> |
| 334 | 334 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $subresource . '/groups', [] ) ) ) : ?> |
| 335 | - <li class="<?= str_replace( '/', '-', $subresource); ?>"> |
|
| 335 | + <li class="<?= str_replace( '/', '-', $subresource ); ?>"> |
|
| 336 | 336 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config ) ); ?>"> |
| 337 | 337 | <span class="name"><?= $enc->html( $this->translate( 'admin', $subresource ) ); ?></span> |
| 338 | 338 | </a> |
@@ -305,8 +305,7 @@ |
||
| 305 | 305 | { |
| 306 | 306 | $propItem = $propItems[$entry['product.property.id']]; |
| 307 | 307 | unset( $propItems[$entry['product.property.id']] ); |
| 308 | - } |
|
| 309 | - else |
|
| 308 | + } else |
|
| 310 | 309 | { |
| 311 | 310 | $propItem = $manager->createItem(); |
| 312 | 311 | } |
@@ -281,7 +281,7 @@ |
||
| 281 | 281 | |
| 282 | 282 | $search = $manager->createSearch( true )->setSlice( 0, 10000 ); |
| 283 | 283 | $search->setConditions( $search->compare( '!=', 'product.property.type.code', $excludes ) ); |
| 284 | - $search->setSortations( [$search->sort( '+', 'product.property.type.position')] ); |
|
| 284 | + $search->setSortations( [$search->sort( '+', 'product.property.type.position' )] ); |
|
| 285 | 285 | |
| 286 | 286 | return $this->map( $manager->searchItems( $search ) ); |
| 287 | 287 | } |
@@ -81,9 +81,12 @@ |
||
| 81 | 81 | </select> |
| 82 | 82 | </div> |
| 83 | 83 | </div> |
| 84 | - <?php else : ?> |
|
| 84 | + <?php else { |
|
| 85 | + : ?> |
|
| 85 | 86 | <input class="item-languageid" type="hidden" |
| 86 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) ); ?>'.replace('idx', idx)" |
|
| 87 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) ); |
|
| 88 | +} |
|
| 89 | +?>'.replace('idx', idx)" |
|
| 87 | 90 | value="<?= $enc->attr( key( $languages ) ); ?>" /> |
| 88 | 91 | <?php endif; ?> |
| 89 | 92 | <div class="form-group row optional"> |
@@ -31,19 +31,19 @@ discard block |
||
| 31 | 31 | v-bind:aria-controls="'item-address-group-data-' + idx" aria-expanded="false"> |
| 32 | 32 | <div class="card-tools-left"> |
| 33 | 33 | <div class="btn btn-card-header act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 34 | - title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide this entry') ); ?>"> |
|
| 34 | + title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide this entry' ) ); ?>"> |
|
| 35 | 35 | </div> |
| 36 | 36 | </div> |
| 37 | 37 | <span class="item-label header-label">{{ getLabel(idx, 'customer.address.') }}</span> |
| 38 | 38 | |
| 39 | 39 | <div class="card-tools-right"> |
| 40 | 40 | <div class="btn btn-card-header act-copy fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 41 | - title="<?= $enc->attr( $this->translate( 'admin', 'Duplicate entry (Ctrl+D)') ); ?>" |
|
| 41 | + title="<?= $enc->attr( $this->translate( 'admin', 'Duplicate entry (Ctrl+D)' ) ); ?>" |
|
| 42 | 42 | v-on:click.stop="duplicateItem(idx)"> |
| 43 | 43 | </div> |
| 44 | 44 | <div v-if="!checkSite('customer.address.siteid', idx)" |
| 45 | 45 | class="btn btn-card-header act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 46 | - title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>" |
|
| 46 | + title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry' ) ); ?>" |
|
| 47 | 47 | v-on:click="removeItem(idx)"> |
| 48 | 48 | </div> |
| 49 | 49 | </div> |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | |
| 338 | 338 | <div class="card-tools-more"> |
| 339 | 339 | <div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>" |
| 340 | - title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>" |
|
| 340 | + title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)' ) ); ?>" |
|
| 341 | 341 | v-on:click="addItem('customer.address.')" > |
| 342 | 342 | </div> |
| 343 | 343 | </div> |