Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit 1d2835c

Browse files
committed
styling
1 parent a33baec commit 1d2835c

File tree

7 files changed

+11
-17
lines changed

7 files changed

+11
-17
lines changed

src/Controllers/Admin/Traits/PageOps.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ protected function sT_uP_Validaiton($request, $id = null)
4343
}
4444

4545
foreach (app('simplemenu')->AppLocales() as $code) {
46-
$v = Validator::make($request->all(), [
47-
"url.$code" => "unique:pages,url->$code," . $id ?: '',
48-
], $customMessages);
46+
$v = Validator::make($request->all(), ["url.$code" => "unique:pages,url->$code," . $id ?: '']);
4947

5048
if ($v->fails()) {
5149
$validator->errors()->add('url', $customMessages['url.unique']);
@@ -58,9 +56,7 @@ protected function sT_uP_Validaiton($request, $id = null)
5856
}
5957

6058
foreach (app('simplemenu')->AppLocales() as $code) {
61-
$v = Validator::make($request->all(), [
62-
"title.$code" => "unique:pages,title->$code," . $id ?: '',
63-
], $customMessages);
59+
$v = Validator::make($request->all(), ["title.$code" => "unique:pages,title->$code," . $id ?: '']);
6460

6561
if ($v->fails()) {
6662
$validator->errors()->add('title', $customMessages['title.unique']);
@@ -89,7 +85,7 @@ protected function cleanEmptyTranslations($request)
8985
foreach ($result as $k => $v) {
9086
if (is_array($v)) {
9187
if (empty(array_filter($v))) {
92-
$result[$k] = '';
88+
$result[$k] = null;
9389
} else {
9490
$result[$k] = array_filter($v);
9591
}

src/SimpleMenuServiceProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ public function boot()
3333

3434
// migrations
3535
$this->publishes([
36-
__DIR__ . '/database/migrations/' => database_path('migrations'),
36+
__DIR__ . '/database/migrations' => database_path('migrations'),
3737
], 'migrations');
3838

3939
// seeds
4040
$this->publishes([
41-
__DIR__ . '/database/seeds/' => database_path('seeds'),
41+
__DIR__ . '/database/seeds' => database_path('seeds'),
4242
], 'seeds');
4343

4444
// resources

src/resources/views/admin/bulma/pages/create.blade.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<h3 class="title">
1010
<a href="{{ url()->previous() }}">{{ trans('SimpleMenu::messages.go_back') }}</a>
1111
</h3>
12-
<hr>
1312

1413
<page-comp inline-template select-first="{{ LaravelLocalization::getCurrentLocale() }}">
1514
<div>

src/resources/views/admin/bulma/pages/edit.blade.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class="button is-success is-pulled-right">
1414
@lang('SimpleMenu::messages.app_add_new')
1515
</a>
1616
</h3>
17-
<hr>
1817

1918
<page-comp inline-template select-first="{{ LaravelLocalization::getCurrentLocale() }}">
2019
<div>

src/resources/views/admin/bulma/pages/index.blade.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ class="button is-success is-pulled-right">
3838
{{ empty($page->title) ? collect($page->getTranslations('title'))->first() : $page->title }}
3939
@endif
4040
</td>
41-
<td>
42-
{{ $page->route_name }}
43-
</td>
41+
<td>{{ $page->route_name }}</td>
4442
<td>
4543
@foreach ($page->roles as $role)
4644
<span class="tag is-medium is-link">
@@ -67,7 +65,11 @@ class="button is-success is-pulled-right">
6765
<span class="tag is-medium is-warning">{{ $locale }}</span>
6866
@endforeach
6967
</td>
70-
<td><span class="tag is-medium is-primary">{{ $page->template }}</span></td>
68+
<td>
69+
@if ($page->template)
70+
<span class="tag is-medium is-primary">{{ $page->template }}</span>
71+
@endif
72+
</td>
7173
<td>
7274
<a href="{{ route($crud_prefix.'.pages.edit',[$page->id]) }}"
7375
class="button is-link is-inline-block">

src/resources/views/admin/bulma/users/create.blade.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<h3 class="title">
66
<a href="{{ url()->previous() }}">{{ trans('SimpleMenu::messages.go_back') }}</a>
77
</h3>
8-
<hr>
98

109
{{ Form::open(['method' => 'POST', 'route' => $crud_prefix.'.users.store']) }}
1110

src/resources/views/admin/bulma/users/edit.blade.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ class="button is-success is-pulled-right">
99
@lang('SimpleMenu::messages.app_add_new')
1010
</a>
1111
</h3>
12-
<hr>
1312

1413
{{ Form::model($user, ['method' => 'PUT', 'route' => [$crud_prefix.'.users.update', $user->id]]) }}
1514

0 commit comments

Comments
 (0)