From c20fa9d5c4b8f7dcf4cd7312c5ebcdf04c1a44e2 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 9 Jul 2019 11:46:02 -0400
Subject: [PATCH] LP1830432 Org family renders checkboxes horizontally

Consistent with the original layout of the org-select + checkboxes,
render the org family selector with checkboxes stacked vertically
along the right of the selector instead of below it.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
---
 .../org-family-select.component.html          | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html b/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
index b9bdf0281c..5ffaf5a03d 100644
--- a/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
+++ b/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
@@ -1,26 +1,31 @@
-<div class="input-group">
-  <div class="input-group-prepend">
-    <span class="input-group-text">{{labelText}}</span>
+<form class="form-inline" [formGroup]="familySelectors">
+  <div class="input-group">
+    <div class="input-group-prepend">
+      <span class="input-group-text">{{labelText}}</span>
+    </div>
+    <eg-org-select [domId]="domId"
+      (onChange)="orgOnChange($event)"
+      [limitPerms]="limitPerms"
+      [initialOrgId]="selectedOrgId">
+    </eg-org-select>
   </div>
-  <eg-org-select [domId]="domId"
-    (onChange)="orgOnChange($event)"
-    [limitPerms]="limitPerms"
-    [initialOrgId]="selectedOrgId">
-  </eg-org-select>
-</div>
-<form class="pl-2" [formGroup]="familySelectors">
-  <div class="form-check" *ngIf="!hideAncestorSelector">
-    <input type="checkbox"
-      formControlName="includeAncestors"
-      (blur)="propagateTouch()"
-      class="form-check-input" id="{{domId}}-include-ancestors">
-    <label class="form-check-label" for="{{domId}}-include-ancestors" i18n>+ Ancestors</label>
-  </div>
-  <div class="form-check" *ngIf="!hideDescendantSelector">
-    <input type="checkbox"
-      formControlName="includeDescendants"
-      (blur)="propagateTouch()"
-      class="form-check-input" id="{{domId}}-include-descendants">
-    <label class="form-check-label" for="{{domId}}-include-descendants" i18n>+ Descendants</label>
+
+  <!-- stack the checkboxes -->
+  <div class="ml-2 d-flex flex-column align-items-start">
+    <div class="form-check" *ngIf="!hideAncestorSelector">
+      <input type="checkbox"
+        formControlName="includeAncestors"
+        (blur)="propagateTouch()"
+        class="form-check-input" id="{{domId}}-include-ancestors">
+      <label class="form-check-label" for="{{domId}}-include-ancestors" i18n>+ Ancestors</label>
+    </div>
+    <div class="form-check" *ngIf="!hideDescendantSelector">
+      <input type="checkbox"
+        formControlName="includeDescendants"
+        (blur)="propagateTouch()"
+        class="form-check-input" id="{{domId}}-include-descendants">
+      <label class="form-check-label" for="{{domId}}-include-descendants" i18n>+ Descendants</label>
+    </div>
   </div>
 </form>
+
-- 
2.43.2