From b21f057a1dc5a72866584e1c432649cb4d85d0fd Mon Sep 17 00:00:00 2001
From: tejaswivinod <tejaswivinod@gmail.com>
Date: Sat, 9 Feb 2019 12:16:13 -0500
Subject: [PATCH 1/4] Change to appropriate tags to hide and select/unselect
 components in group

---
 resources/views/subscribe/manage.blade.php | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/resources/views/subscribe/manage.blade.php b/resources/views/subscribe/manage.blade.php
index 472d0fe1..754a6663 100644
--- a/resources/views/subscribe/manage.blade.php
+++ b/resources/views/subscribe/manage.blade.php
@@ -20,22 +20,24 @@
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
             @if($componentGroups->isNotEmpty() || $ungroupedComponents->isNotEmpty())
             @foreach($componentGroups as $componentGroup)
-            <div class="list-group components">
+            <ul class="list-group components">
                 @if($componentGroup->enabled_components->count() > 0)
-                <div 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>
+                    <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>
-                </div>
-                @foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component)
-                @include('partials.component_input', compact($component))
-                @endforeach
                 @endif
-            </div>
+            </ul>
             @endforeach
 
             @if($ungroupedComponents->isNotEmpty())

From d0221bad3127ec0adfab0e4f742376452977d16c Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Mon, 18 Feb 2019 22:02:54 +0000
Subject: [PATCH 2/4] Remove badly added components class

---
 resources/views/subscribe/manage.blade.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/views/subscribe/manage.blade.php b/resources/views/subscribe/manage.blade.php
index 754a6663..f0578c6b 100644
--- a/resources/views/subscribe/manage.blade.php
+++ b/resources/views/subscribe/manage.blade.php
@@ -20,8 +20,7 @@
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
             @if($componentGroups->isNotEmpty() || $ungroupedComponents->isNotEmpty())
             @foreach($componentGroups as $componentGroup)
-            <ul class="list-group components">
-                @if($componentGroup->enabled_components->count() > 0)
+            <ul class="list-group">
                     <li class="list-group-item group-name">
                         <i class="{{ $componentGroup->collapse_class_with_subscriptions($subscriptions) }} group-toggle"></i>
                         <strong>{{ $componentGroup->name }}</strong>

From 13e8b398928cae2b01fe9c3eb5fd07258d27fb95 Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Mon, 18 Feb 2019 22:03:01 +0000
Subject: [PATCH 3/4] Improve count call

---
 resources/views/subscribe/manage.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/subscribe/manage.blade.php b/resources/views/subscribe/manage.blade.php
index f0578c6b..f4ae904f 100644
--- a/resources/views/subscribe/manage.blade.php
+++ b/resources/views/subscribe/manage.blade.php
@@ -21,6 +21,7 @@
             @if($componentGroups->isNotEmpty() || $ungroupedComponents->isNotEmpty())
             @foreach($componentGroups as $componentGroup)
             <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>

From 8d1bdf2a84db380ec40f7bca0eaff82627da6c68 Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Mon, 18 Feb 2019 22:06:32 +0000
Subject: [PATCH 4/4] More UX and UI fixes

---
 resources/assets/js/cachet.js              | 12 +++++-------
 resources/views/subscribe/manage.blade.php |  7 ++++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/resources/assets/js/cachet.js b/resources/assets/js/cachet.js
index f17e0d22..37871349 100644
--- a/resources/assets/js/cachet.js
+++ b/resources/assets/js/cachet.js
@@ -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;
     });
diff --git a/resources/views/subscribe/manage.blade.php b/resources/views/subscribe/manage.blade.php
index f4ae904f..1e14808c 100644
--- a/resources/views/subscribe/manage.blade.php
+++ b/resources/views/subscribe/manage.blade.php
@@ -41,9 +41,14 @@
             @endforeach
 
             @if($ungroupedComponents->isNotEmpty())
-            <ul class="list-group components">
+            <ul class="list-group">
                 <div class="list-group-item group-name">
                     <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($ungroupedComponents as $component)
                 @include('partials.component_input', compact($component))