FEATURE: conditionally publish views in module, fix confirm dialog for forms

This commit is contained in:
Michal Kváček
2017-08-25 11:40:34 +02:00
parent 8bae8a43f9
commit 6468c8f49c
4 changed files with 37 additions and 22 deletions
@@ -13,6 +13,7 @@ abstract class ServiceProvider extends LaravelServiceProvider
protected $defer = false; protected $defer = false;
protected $alias = false; protected $alias = false;
protected $path = false; protected $path = false;
protected $publishViews = true;
abstract protected function setModuleAlias(); abstract protected function setModuleAlias();
@@ -59,7 +60,7 @@ abstract class ServiceProvider extends LaravelServiceProvider
return $path . '/modules/' . $this->alias; return $path . '/modules/' . $this->alias;
}, \Config::get('view.paths')), [$sourcePath]), $this->alias); }, \Config::get('view.paths')), [$sourcePath]), $this->alias);
if (is_dir($sourcePath)) { if (is_dir($sourcePath) && $this->publishViews) {
$this->publishes([$sourcePath => $viewPath], 'module-views'); $this->publishes([$sourcePath => $viewPath], 'module-views');
} }
} }
+9 -1
View File
@@ -82,7 +82,6 @@ $ (function () {
}); });
}); });
function setSameHeights($container) { function setSameHeights($container) {
$container = $container || $ ('.sameheight-container'); $container = $container || $ ('.sameheight-container');
@@ -380,9 +379,18 @@ $ (document).ready (function () {
var confirmTitle = $ (this).data ('title'); var confirmTitle = $ (this).data ('title');
var confirmMessage = $ (this).data ('message'); var confirmMessage = $ (this).data ('message');
var tag = $ (this).prop ('tagName');
if (tag === 'A') {
var href = $ (this).attr ('href'); var href = $ (this).attr ('href');
$ ('#confirm-button').attr ('href', href); $ ('#confirm-button').attr ('href', href);
} else if (tag === 'BUTTON') {
var form = $(this).closest('form');
$ ('#confirm-button').click (function () {
form.submit();
})
}
if (confirmTitle) if (confirmTitle)
titleElement.text (confirmTitle); titleElement.text (confirmTitle);
@@ -24,13 +24,14 @@
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
}
&.striped { .striped {
& > div { & > div, & tr {
border-bottom: 1px solid $item-list-color-border; border-bottom: 1px solid $item-list-color-border;
} }
& > div:nth-child(2n + 1) { & > div:nth-child(2n + 1), & tr:nth-child(2n + 1) {
background-color: lighten($color-divider, 12%); background-color: lighten($color-divider, 12%);
@include media-down(sm) { @include media-down(sm) {
@@ -42,7 +43,6 @@
border-bottom: none; border-bottom: none;
} }
} }
}
/* ******************************************* /* *******************************************
* Item general styles * Item general styles
@@ -0,0 +1,6 @@
<form action="{{$action}}" method="post" class="d-inline">
{!! csrf_field() !!}
{!! method_field('DELETE') !!}
<button class="btn btn-danger confirm btn-sm rounded"><i class="fa fa-trash"></i></button>
</form>