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

Fixing indentation problems...

Browse Source
This commit is contained in:
Nick Peelman
2016-07-18 09:08:48 -04:00
parent 88e85d2dfb
commit e61d24f685
4 changed files with 47 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Presenters/ComponentGroupPresenter.php
+2 -2
View File
@@ -105,8 +105,8 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable
*/ */
public function has_subscriber($subscriptions) public function has_subscriber($subscriptions)
{ {
$enabled_components = $this->wrappedObject->enabled_components()->orderBy('order')->pluck('id')->toArray(); $enabled_components = $this->wrappedObject->enabled_components()->orderBy('order')->pluck('id')->toArray();
$intersected = array_intersect($enabled_components, $subscriptions); $intersected = array_intersect($enabled_components, $subscriptions);
return count($intersected) != 0; return count($intersected) != 0;
} }
resources/assets/js/app.js
+3 -7
View File
@@ -278,21 +278,17 @@ $(function() {
}); });
$('.select-group').on('click', function () { $('.select-group').on('click', function () {
var $this = $(this); var $parentGroup = $(this).closest('ul.list-group');
var $parentGroup = $this.closest('ul.list-group');
$parentGroup.find('input[type=checkbox]').prop('checked', true); $parentGroup.find('input[type=checkbox]').prop('checked', true);
$parentGroup.find('.group-items').removeClass('hide') $parentGroup.find('.group-items').removeClass('hide')
$parentGroup.find('.group-toggle').addClass('ion-ios-minus-outline').removeClass('ion-ios-plus-outline'); $parentGroup.find('.group-toggle').addClass('ion-ios-minus-outline').removeClass('ion-ios-plus-outline');
event.stopPropagation(); event.stopPropagation();
return false; return false;
}); });
$('.deselect-group').on('click', function () { $('.deselect-group').on('click', function () {
var $this = $(this); var $parentGroup = $(this).closest('ul.list-group');
var $parentGroup = $this.closest('ul.list-group');
$parentGroup.find('input[type=checkbox]').prop('checked', false); $parentGroup.find('input[type=checkbox]').prop('checked', false);
$parentGroup.find('.group-items').addClass('hide'); $parentGroup.find('.group-items').addClass('hide');
$parentGroup.find('.group-toggle').removeClass('ion-ios-minus-outline').addClass('ion-ios-plus-outline'); $parentGroup.find('.group-toggle').removeClass('ion-ios-minus-outline').addClass('ion-ios-plus-outline');
event.stopPropagation(); event.stopPropagation();
resources/views/partials/component_input.blade.php
+14 -15
View File
@@ -1,18 +1,17 @@
<li class="list-group-item {{ $component->group_id ? "sub-component" : "component" }}"> <li class="list-group-item {{ $component->group_id ? "sub-component" : "component" }}">
<div class="checkbox"> <div class="checkbox">
<label for="component-{{ $component->id }}"> <label for="component-{{ $component->id }}">
<input type="checkbox" <input type="checkbox"
id="component-{{ $component->id }}" id="component-{{ $component->id }}"
name="subscriptions[]" name="subscriptions[]"
value="{{ $component->id }}" value="{{ $component->id }}"
@if (in_array($component->id, $subscriptions) || $subscriber->global) @if (in_array($component->id, $subscriptions) || $subscriber->global)
checked="checked" checked="checked"
@endif> @endif />
{{ $component->name }} {{ $component->name }}
</label> </label>
</div> </div>
@if($component->description) @if($component->description)
<i class="ion ion-ios-help-outline help-icon" data-toggle="tooltip" data-title="{{ $component->description }}" data-container="body"></i> <i class="ion ion-ios-help-outline help-icon" data-toggle="tooltip" data-title="{{ $component->description }}" data-container="body"></i>
@endif @endif
</li> </li>
resources/views/partials/components_form.blade.php
+28 -28
View File
@@ -1,33 +1,33 @@
@if($component_groups->count() > 0) @if($component_groups->count() > 0)
@foreach($component_groups as $componentGroup) @foreach($component_groups as $componentGroup)
<ul class="list-group components"> <ul class="list-group components">
@if($componentGroup->enabled_components->count() > 0) @if($componentGroup->enabled_components->count() > 0)
<li class="list-group-item group-name"> <li class="list-group-item group-name">
<i class="{{ $componentGroup->collapse_class_with_subscriptions($subscriptions) }} group-toggle"></i> <i class="{{ $componentGroup->collapse_class_with_subscriptions($subscriptions) }} group-toggle"></i>
<strong>{{ $componentGroup->name }}</strong> <strong>{{ $componentGroup->name }}</strong>
<div class="pull-right text-muted small"> <div class="pull-right text-muted small">
<a href="#" class="select-group" id="select-all-{{$componentGroup->id}}">Select All</a> <a href="#" class="select-group" id="select-all-{{$componentGroup->id}}">Select All</a>
&nbsp;|&nbsp; &nbsp;|&nbsp;
<a href="#" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">Deselect All</a> <a href="#" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">Deselect All</a>
</div> </div>
</li> </li>
<div class="form-group group-items {{ $componentGroup->has_subscriber($subscriptions) ? null : "hide" }}"> <div class="form-group group-items {{ $componentGroup->has_subscriber($subscriptions) ? null : "hide" }}">
@foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component) @foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component)
@include('partials.component_input', compact($component)) @include('partials.component_input', compact($component))
@endforeach @endforeach
</div> </div>
@endif @endif
</ul> </ul>
@endforeach @endforeach
@endif @endif
@if($ungrouped_components->count() > 0) @if($ungrouped_components->count() > 0)
<ul class="list-group components"> <ul class="list-group components">
<li class="list-group-item group-name"> <li class="list-group-item group-name">
<strong>{{ trans('cachet.components.group.other') }}</strong> <strong>{{ trans('cachet.components.group.other') }}</strong>
</li> </li>
@foreach($ungrouped_components as $component) @foreach($ungrouped_components as $component)
@include('partials.component_input', compact($component)) @include('partials.component_input', compact($component))
@endforeach @endforeach
</ul> </ul>
@endif @endif