From b30b218743331242a9bdcc1cc42bac52e95c5c96 Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Tue, 31 Dec 2019 19:34:31 +0000
Subject: [PATCH] Angular Circ Limit Sets Followup

- Change local admin link to use routerLink
- Styling fixes
- Add i18n localization support to certain divs

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>

 Changes to be committed:
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html
---
 .../admin/local/admin-local-splash.component.html  |  2 +-
 .../linked-circ-limit-sets.component.html          | 34 ++++++++++------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
index 40212b2a4c..04e4499410 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
@@ -20,7 +20,7 @@
     <eg-link-table-link i18n-label label="Circulation Limit Sets" 
       routerLink="/staff/admin/local/config/circ_limit_set"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Circulation Policies" 
-      url="/eg2/en-US/staff/admin/local/config/circ_matrix_matchpoint"></eg-link-table-link>
+      routerLink="/staff/admin/local/config/circ_matrix_matchpoint"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Closed Dates Editor" 
       url="/eg/staff/admin/local/actor/closed_dates"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Course Reserves List"  
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html
index 1ca4821986..bd33b07204 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html
@@ -1,16 +1,16 @@
 <div *ngIf="showLinkLimitSets">
-    <div class="col-lg-15 modal-header bg-info d-flex justify-content-center"><h3 class="modal-title mt-3 mb-3">Linked Limit Sets</h3></div>
+    <div class="col-lg-15 bg-info d-flex justify-content-center"><h3 class="modal-title mt-3 mb-3" i18n>Linked Limit Sets</h3></div>
     <ng-container *ngIf="getObjectKeys().length > 0">
         <ng-container *ngFor="let key of getObjectKeys(); let i = index">
             <div *ngIf="!linkedSetList[i].isDeleted" class="col-lg-15 d-flex justify-content-center">
                 <div *ngIf="linkedSetList[i].created" class="col-lg-2 mt-3 mb-3 form-group form-check">
-                    <label for="name">Name</label>
+                    <label for="name" i18n>Name</label>
                     <div class="d-flex justify-content-center">
                         <span>{{limitSetNames[linkedSetList[i].linkedLimitSet.limit_set()]}}</span>
                     </div>
                 </div>
                 <div *ngIf="linkedSetList[i].created" class="col-lg-2 mt-3 mb-3 form-group form-check">
-                    <label for="{{fallthrough+i}}">Fallthrough</label>
+                    <label for="{{fallthrough+i}}" i18n>Fallthrough</label>
                     <div class="d-flex justify-content-center">
                         <input
                             class="form-check-input"
@@ -21,7 +21,7 @@
                     </div>
                 </div>
                 <div *ngIf="linkedSetList[i].created" class="col-lg-2 mt-3 mb-3 form-group form-check">
-                    <label for="{{active+i}}">Active</label>
+                    <label for="{{active+i}}" i18n>Active</label>
                     <div class="d-flex justify-content-center">
                         <input
                         class="form-check-input"
@@ -37,31 +37,29 @@
                         class="btn btn-warning"
                         ng-disabled="!linkedSet"
                         (click)="removeLinkedSet(i)"
-                        i18n-title title="Remove">Remove
+                        i18n-title title="Remove" i18n>Remove
                     </button>
                 </div>
             </div>
         </ng-container>
     </ng-container>
-    <div class="input-group mt-3">
-        <div class="input-group-prepends col-lg-9">
-            <div class="input-group-text  col-lg-4">
-                <label for="linkedLimitName" i18n>Circ Limit Set Name </label>
-            </div>
+    <div class="input-group mt-3 col-md-12">
+        <div class="input-group-prepend">
+            <div class="input-group-text" i18n>Circ Limit Set Name</div>
             <eg-combobox 
                 name="linkedLimitName"
                 idlClass="ccls" 
                 idlField="name" 
                 (onChange)="onChange($event)">
             </eg-combobox>
-            <div>
-                <button
-                    type="button"
-                    class="btn btn-info"
-                    (click)="addLinkedSet()"
-                    i18n-title title="Add">Add
-                </button>
-            </div>
+        </div>
+        <div class="input-group-append">
+            <button
+                type="button"
+                class="btn btn-info"
+                (click)="addLinkedSet()"
+                i18n-title title="Add" i18n>Add
+            </button>
         </div>
     </div>
 </div>
-- 
2.11.0