Merge pull request #410 from JulienTant/fix/blade-markup

Use blade directive in Core module views
AsgardCms · Oct 11, 2017 · 13d5416 · 13d5416
2 parents 94a979c + 7af59fb
commit 13d5416
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Modules/Core/Resources/views/fields/select-locales.blade.php b/Modules/Core/Resources/views/fields/select-locales.blade.php
@@ -1,11 +1,11 @@
 <div class="form-group">
     <label for="{{ $settingName }}">{{ trans($moduleInfo['description']) }}</label>
     <select multiple class="locales" name="{{ $settingName }}[]" id="{{ $settingName }}">
-        <?php foreach ($locales as $id => $locale): ?>
+        @foreach ($locales as $id => $locale)
         <option value="{{ $id }}" {{ isset($dbSettings[$settingName]) && isset(array_flip(json_decode($dbSettings[$settingName]->plainValue))[$id]) ? 'selected' : '' }}>
             {{ array_get($locale, 'name') }}
         </option>
-        <?php endforeach; ?>
+        @endforeach
     </select>
 </div>
 <script>

diff --git a/Modules/Core/Resources/views/fields/select-theme.blade.php b/Modules/Core/Resources/views/fields/select-theme.blade.php
@@ -1,10 +1,10 @@
 <div class="form-group">
     <label for="{{ $settingName }}">{{ trans($moduleInfo['description']) }}</label>
     <select class="form-control" name="{{ $settingName }}" id="{{ $settingName }}">
-        <?php foreach ($themes as $name => $theme): ?>
+        @foreach ($themes as $name => $theme)
             <option value="{{ $name }}" {{ isset($dbSettings[$settingName]) && $dbSettings[$settingName]->plainValue == $name ? 'selected' : '' }}>
                 {{ $theme->getName() }}
             </option>
-        <?php endforeach; ?>
+        @endforeach
     </select>
 </div>
diff --git a/Modules/Core/Resources/views/partials/delete-modal.blade.php b/Modules/Core/Resources/views/partials/delete-modal.blade.php
@@ -7,11 +7,11 @@
             </div>
             <div class="modal-body">
                 <div class="default-message">
-                    <?php if (isset($message)): ?>
+                    @isset($message)
                         {!! $message !!}
-                    <?php else: ?>
+                    @else
                         {{ trans('core::core.modal.confirmation-message') }}
-                    <?php endif; ?>
+                    @endisset
                 </div>
                 <div class="custom-message"></div>
             </div>