@@ -135,9 +135,12 @@ discard block |
||
| 135 | 135 | <?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?> |
| 136 | 136 | </div> |
| 137 | 137 | </div> |
| 138 | - <?php else : ?> |
|
| 138 | + <?php else { |
|
| 139 | + : ?> |
|
| 139 | 140 | <input class="text-langid" type="hidden" |
| 140 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'seo', '_idx_', 'text.languageid' ) ) ); ?>'.replace('_idx_', idx)" |
|
| 141 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'seo', '_idx_', 'text.languageid' ) ) ); |
|
| 142 | +} |
|
| 143 | +?>'.replace('_idx_', idx)" |
|
| 141 | 144 | value="<?= $enc->attr( $languages->getCode()->first() ) ?>" /> |
| 142 | 145 | <?php endif; ?> |
| 143 | 146 | |
@@ -157,9 +160,12 @@ discard block |
||
| 157 | 160 | <?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?> |
| 158 | 161 | </div> |
| 159 | 162 | </div> |
| 160 | - <?php else : ?> |
|
| 163 | + <?php else { |
|
| 164 | + : ?> |
|
| 161 | 165 | <input class="item-type" type="hidden" |
| 162 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'seo', '_idx_', 'text.type' ) ) ); ?>'.replace('_idx_', idx)" |
|
| 166 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'seo', '_idx_', 'text.type' ) ) ); |
|
| 167 | +} |
|
| 168 | +?>'.replace('_idx_', idx)" |
|
| 163 | 169 | value="<?= $enc->attr( $textTypes->getCode()->first() ) ?>" /> |
| 164 | 170 | <?php endif; ?> |
| 165 | 171 | |
@@ -207,9 +213,12 @@ discard block |
||
| 207 | 213 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
| 208 | 214 | </div> |
| 209 | 215 | </div> |
| 210 | - <?php else : ?> |
|
| 216 | + <?php else { |
|
| 217 | + : ?> |
|
| 211 | 218 | <input class="listitem-type" type="hidden" |
| 212 | - v-bind:name="'<?= $enc->attr( $this->formparam( ['seo', '_idx_', 'cms.lists.type'] ) ); ?>'.replace('_idx_', idx)" |
|
| 219 | + v-bind:name="'<?= $enc->attr( $this->formparam( ['seo', '_idx_', 'cms.lists.type'] ) ); |
|
| 220 | +} |
|
| 221 | +?>'.replace('_idx_', idx)" |
|
| 213 | 222 | value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" /> |
| 214 | 223 | <?php endif; ?> |
| 215 | 224 | |
@@ -68,9 +68,12 @@ |
||
| 68 | 68 | <div class="item-actions"> |
| 69 | 69 | <?php if( isset( $this->itemData ) ) : ?> |
| 70 | 70 | <?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?> |
| 71 | - <?php else : ?> |
|
| 71 | + <?php else { |
|
| 72 | + : ?> |
|
| 72 | 73 | <span class="placeholder"> </span> |
| 73 | - <?php endif; ?> |
|
| 74 | + <?php endif; |
|
| 75 | +} |
|
| 76 | +?> |
|
| 74 | 77 | </div> |
| 75 | 78 | </nav> |
| 76 | 79 | |
@@ -112,9 +112,12 @@ discard block |
||
| 112 | 112 | <?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?> |
| 113 | 113 | </div> |
| 114 | 114 | </div> |
| 115 | - <?php else : ?> |
|
| 115 | + <?php else { |
|
| 116 | + : ?> |
|
| 116 | 117 | <input class="text-langid" type="hidden" |
| 117 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'content', '_idx_', 'text.languageid' ) ) ); ?>'.replace('_idx_', idx)" |
|
| 118 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'content', '_idx_', 'text.languageid' ) ) ); |
|
| 119 | +} |
|
| 120 | +?>'.replace('_idx_', idx)" |
|
| 118 | 121 | value="<?= $enc->attr( $languages->getCode()->first() ) ?>" /> |
| 119 | 122 | <?php endif; ?> |
| 120 | 123 | |
@@ -148,9 +151,12 @@ discard block |
||
| 148 | 151 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
| 149 | 152 | </div> |
| 150 | 153 | </div> |
| 151 | - <?php else : ?> |
|
| 154 | + <?php else { |
|
| 155 | + : ?> |
|
| 152 | 156 | <input class="listitem-type" type="hidden" |
| 153 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'content', '_idx_', 'cms.lists.type' ) ) ); ?>'.replace('_idx_', idx)" |
|
| 157 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'content', '_idx_', 'cms.lists.type' ) ) ); |
|
| 158 | +} |
|
| 159 | +?>'.replace('_idx_', idx)" |
|
| 154 | 160 | value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" /> |
| 155 | 161 | <?php endif; ?> |
| 156 | 162 | |
@@ -12,11 +12,11 @@ discard block |
||
| 12 | 12 | 'cms.lists.type' => 'default', 'cms.lists.position' => 0, |
| 13 | 13 | 'text.languageid' => 'en', 'text.type' => 'name', 'text.domain' => 'cms', |
| 14 | 14 | 'text.label' => 'Contact page', 'text.content' => 'Contact page' |
| 15 | - ],[ |
|
| 15 | + ], [ |
|
| 16 | 16 | 'cms.lists.type' => 'default', 'cms.lists.position' => 1, |
| 17 | 17 | 'text.languageid' => 'en', 'text.type' => 'meta-keywords', 'text.domain' => 'cms', |
| 18 | 18 | 'text.label' => 'contact', 'text.content' => 'contact, about us' |
| 19 | - ],[ |
|
| 19 | + ], [ |
|
| 20 | 20 | 'cms.lists.type' => 'default', 'cms.lists.position' => 1, |
| 21 | 21 | 'text.languageid' => 'en', 'text.type' => 'content', 'text.domain' => 'cms', |
| 22 | 22 | 'text.label' => 'Hello', 'text.content' => '<h1>Hello!</h1>' |
@@ -29,11 +29,11 @@ discard block |
||
| 29 | 29 | 'cms.lists.type' => 'default', 'cms.lists.position' => 0, |
| 30 | 30 | 'text.languageid' => 'de', 'text.type' => 'name', 'text.domain' => 'cms', |
| 31 | 31 | 'text.label' => 'Kontaktseite', 'text.content' => 'Kontaktseite' |
| 32 | - ],[ |
|
| 32 | + ], [ |
|
| 33 | 33 | 'cms.lists.type' => 'default', 'cms.lists.position' => 1, |
| 34 | 34 | 'text.languageid' => 'de', 'text.type' => 'meta-keywords', 'text.domain' => 'cms', |
| 35 | 35 | 'text.label' => 'kontakt', 'text.content' => 'kontakt, über uns' |
| 36 | - ],[ |
|
| 36 | + ], [ |
|
| 37 | 37 | 'cms.lists.type' => 'default', 'cms.lists.position' => 1, |
| 38 | 38 | 'text.languageid' => 'de', 'text.type' => 'content', 'text.domain' => 'cms', |
| 39 | 39 | 'text.label' => 'Hallo', 'text.content' => '<h1>Hallo!</h1>' |
@@ -122,9 +122,12 @@ discard block |
||
| 122 | 122 | <?= $enc->html( $this->translate( 'admin', 'Types for additional images like icons' ) ); ?> |
| 123 | 123 | </div> |
| 124 | 124 | </div> |
| 125 | - <?php else : ?> |
|
| 125 | + <?php else { |
|
| 126 | + : ?> |
|
| 126 | 127 | <input class="item-type" type="hidden" |
| 127 | - v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'media.type'] ) ); ?>'.replace('_idx_', idx)" |
|
| 128 | + v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'media.type'] ) ); |
|
| 129 | +} |
|
| 130 | +?>'.replace('_idx_', idx)" |
|
| 128 | 131 | value="<?= $enc->attr( $mediaTypes->getCode()->first() ) ?>" /> |
| 129 | 132 | <?php endif; ?> |
| 130 | 133 | |
@@ -187,9 +190,12 @@ discard block |
||
| 187 | 190 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
| 188 | 191 | </div> |
| 189 | 192 | </div> |
| 190 | - <?php else : ?> |
|
| 193 | + <?php else { |
|
| 194 | + : ?> |
|
| 191 | 195 | <input class="listitem-type" type="hidden" |
| 192 | - v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'cms.lists.type'] ) ); ?>'.replace('_idx_', idx)" |
|
| 196 | + v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'cms.lists.type'] ) ); |
|
| 197 | +} |
|
| 198 | +?>'.replace('_idx_', idx)" |
|
| 193 | 199 | value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" /> |
| 194 | 200 | <?php endif; ?> |
| 195 | 201 | <div class="form-group row optional"> |
@@ -280,7 +280,7 @@ |
||
| 280 | 280 | $media[] = [ |
| 281 | 281 | 'name' => $mediaItem->getLabel(), |
| 282 | 282 | 'src' => $view->content( $mediaItem->getPreview( true ) ), |
| 283 | - 'srcset' => join( ', ', $srcset), |
|
| 283 | + 'srcset' => join( ', ', $srcset ), |
|
| 284 | 284 | 'type' => 'imageset' // @todo: remove after GrapesJs update |
| 285 | 285 | ]; |
| 286 | 286 | } |
@@ -278,8 +278,7 @@ |
||
| 278 | 278 | { |
| 279 | 279 | $propItem = $propItems[$entry['media.property.id']]; |
| 280 | 280 | unset( $propItems[$entry['media.property.id']] ); |
| 281 | - } |
|
| 282 | - else |
|
| 281 | + } else |
|
| 283 | 282 | { |
| 284 | 283 | $propItem = $propManager->create(); |
| 285 | 284 | } |
@@ -37,8 +37,7 @@ discard block |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
| 40 | -$entryFcn = function( \Aimeos\MShop\Cms\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) |
|
| 41 | -{ |
|
| 40 | +$entryFcn = function( \Aimeos\MShop\Cms\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) { |
|
| 42 | 41 | $id = $item->getId(); |
| 43 | 42 | $type = $item->getResourceType(); |
| 44 | 43 | $params = array( 'resource' => $type, 'id' => $id ); |
@@ -126,8 +125,7 @@ discard block |
||
| 126 | 125 | foreach( $items as $item ) { |
| 127 | 126 | $data[] = $entryFcn( $item ); |
| 128 | 127 | } |
| 129 | - } |
|
| 130 | - else |
|
| 128 | + } else |
|
| 131 | 129 | { |
| 132 | 130 | $data = $entryFcn( $items ); |
| 133 | 131 | } |
@@ -168,8 +168,7 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 171 | - } |
|
| 172 | - else |
|
| 171 | + } else |
|
| 173 | 172 | { |
| 174 | 173 | $html = $this->modifyBody( $html, $uid ); |
| 175 | 174 | } |
@@ -239,8 +238,7 @@ discard block |
||
| 239 | 238 | { |
| 240 | 239 | $this->logException( $e ); |
| 241 | 240 | } |
| 242 | - } |
|
| 243 | - else |
|
| 241 | + } else |
|
| 244 | 242 | { |
| 245 | 243 | $html = $this->modifyHeader( $html, $uid ); |
| 246 | 244 | } |