| @@ -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> | 
| @@ -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; ?> | 
| @@ -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; ?> | 
| @@ -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; ?> | 
| @@ -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 ) ); ?>" | 
| @@ -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 | } | 
| @@ -87,9 +87,12 @@ | ||
| 87 | 87 | <div class="item-actions"> | 
| 88 | 88 | <?php if( isset( $this->itemData ) ) : ?> | 
| 89 | 89 | <?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?> | 
| 90 | - <?php else : ?> | |
| 90 | +			<?php else { | |
| 91 | + : ?> | |
| 91 | 92 | <span class="placeholder"> </span> | 
| 92 | - <?php endif; ?> | |
| 93 | + <?php endif; | |
| 94 | +} | |
| 95 | +?> | |
| 93 | 96 | </div> | 
| 94 | 97 | </nav> | 
| 95 | 98 | |
| @@ -291,8 +291,7 @@ | ||
| 291 | 291 |  				{ | 
| 292 | 292 | $propItem = $propItems[$entry['media.property.id']]; | 
| 293 | 293 | unset( $propItems[$entry['media.property.id']] ); | 
| 294 | - } | |
| 295 | - else | |
| 294 | + } else | |
| 296 | 295 |  				{ | 
| 297 | 296 | $propItem = $propManager->createItem(); | 
| 298 | 297 | } | 
| @@ -291,8 +291,7 @@ | ||
| 291 | 291 |  				{ | 
| 292 | 292 | $propItem = $propItems[$entry['media.property.id']]; | 
| 293 | 293 | unset( $propItems[$entry['media.property.id']] ); | 
| 294 | - } | |
| 295 | - else | |
| 294 | + } else | |
| 296 | 295 |  				{ | 
| 297 | 296 | $propItem = $propManager->createItem(); | 
| 298 | 297 | } |