lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3464 from tejaswivinod/tejaswivinod-patch-2

Browse Source 
Change to appropriate tags to hide and select/unselect components in group
This commit is contained in:
James Brooks
2019-02-18 22:07:11 +00:00
committed by GitHub
parent e3cc10402f 8d1bdf2a84
commit 7e87636217
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resources/assets/js/cachet.js
View File

@@ -216,7 +216,9 @@ $(function () {
$('input[name=remove_banner]').val('1');
});
$('.group-name').on('click', function () {
$('.group-name').on('click', function (event) {
event.stopPropagation();
var $this = $(this);
$this.find('.group-toggle').toggleClass('ion-ios-minus-outline').toggleClass('ion-ios-plus-outline');
@@ -224,20 +226,16 @@ $(function () {
$this.next('.group-items').toggleClass('hide');
});
$('.select-group').on('click', function () {
$('.select-group').on('click', function (event) {
var $parentGroup = $(this).closest('ul.list-group');
$parentGroup.find('input[type=checkbox]').prop('checked', true);
$parentGroup.find('.group-items').removeClass('hide')
$parentGroup.find('.group-toggle').addClass('ion-ios-minus-outline').removeClass('ion-ios-plus-outline');
event.stopPropagation();
return false;
});
$('.deselect-group').on('click', function () {
$('.deselect-group').on('click', function (event) {
var $parentGroup = $(this).closest('ul.list-group');
$parentGroup.find('input[type=checkbox]').prop('checked', false);
$parentGroup.find('.group-items').addClass('hide');
$parentGroup.find('.group-toggle').removeClass('ion-ios-minus-outline').addClass('ion-ios-plus-outline');
event.stopPropagation();
return false;
});

39
resources/views/subscribe/manage.blade.php
View File

@@ -20,29 +20,36 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@if($componentGroups->isNotEmpty() || $ungroupedComponents->isNotEmpty())
@foreach($componentGroups as $componentGroup)
<div class="list-group components">
@if($componentGroup->enabled_components->count() > 0)
<ul class="list-group">
@if($componentGroup->enabled_components()->count() > 0)
<li class="list-group-item group-name">
<i class="{{ $componentGroup->collapse_class_with_subscriptions($subscriptions) }} group-toggle"></i>
<strong>{{ $componentGroup->name }}</strong>
<div class="pull-right text-muted small">
<a href="javascript: void(0);" class="select-group" id="select-all-{{$componentGroup->id}}">{{ trans('cachet.components.select_all') }}</a>
&nbsp;|&nbsp;
<a href="javascript: void(0);" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">{{ trans('cachet.components.deselect_all') }}</a>
</div>
</li>
<div class="form-group group-items {{ $componentGroup->has_subscriber($subscriptions) ? null : "hide" }}">
@foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component)
@include('partials.component_input', compact($component))
@endforeach
</div>
@endif
</ul>
@endforeach
@if($ungroupedComponents->isNotEmpty())
<ul class="list-group">
<div class="list-group-item group-name">
<i class="{{ $componentGroup->collapse_class_with_subscriptions($subscriptions) }} group-toggle"></i>
<strong>{{ $componentGroup->name }}</strong>
<strong>{{ trans('cachet.components.group.other') }}</strong>
<div class="pull-right text-muted small">
<a href="javascript: void(0);" class="select-group" id="select-all-{{$componentGroup->id}}">{{ trans('cachet.components.select_all') }}</a>
&nbsp;|&nbsp;
<a href="javascript: void(0);" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">{{ trans('cachet.components.deselect_all') }}</a>
</div>
</div>
@foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component)
@include('partials.component_input', compact($component))
@endforeach
@endif
</div>
@endforeach
@if($ungroupedComponents->isNotEmpty())
<ul class="list-group components">
<div class="list-group-item group-name">
<strong>{{ trans('cachet.components.group.other') }}</strong>
</div>
@foreach($ungroupedComponents as $component)
@include('partials.component_input', compact($component))
@endforeach