Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use blade directive in Core module #410

Merged
merged 1 commit into from
Oct 11, 2017
Merged

Use blade directive in Core module #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Modules/Core/Resources/views/fields/select-locales.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions Modules/Core/Resources/views/fields/select-theme.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 3 additions & 3 deletions Modules/Core/Resources/views/partials/delete-modal.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down