LP#1626157 server admin ui

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/common.module.ts b/Open-ILS/src/eg2/src/app/common.module.ts
index 6f072aa..3844c07 100644 (file)
--- a/Open-ILS/src/eg2/src/app/common.module.ts
+++ b/Open-ILS/src/eg2/src/app/common.module.ts
@@ -3,6 +3,7 @@
  */ 
 import {CommonModule, DatePipe, CurrencyPipe} from '@angular/common';
 import {NgModule, ModuleWithProviders} from '@angular/core';
+import {RouterModule} from '@angular/router';
 import {FormsModule} from '@angular/forms';
 import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
@@ -26,10 +27,12 @@ import {EgPrintComponent} from '@eg/share/print/print.component';
   imports: [
     CommonModule,
     FormsModule,
+    RouterModule,
     NgbModule
   ],
   exports: [
     CommonModule,
+    RouterModule,
     NgbModule,
     FormsModule,
     EgPrintComponent

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html
index 96313b8..0fa942d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html
@@ -20,7 +20,7 @@
     <eg-link-table-link i18n-label label="Best-Hold Selection Sort Order"  
       url="/eg/staff/admin/server/config/best_hold_order"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Billing Types"  
-      url="./staff/admin/server/config/billing_type"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/billing_type"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Call Number Prefixes"  
       url="/eg/staff/admin/server/config/acn_prefix"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Call Number Suffixes"  
@@ -48,7 +48,7 @@
     <eg-link-table-link i18n-label label="Global Flags"  
       url="/eg/staff/admin/server/config/global_flag"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Hard Due Date Changes"  
-      url="./staff/admin/server/config/hard_due_date"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/hard_due_date"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Hold Matchpoint Weights"  
       url="/eg/staff/admin/server/config/hold_matrix_weights"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Import Match Sets"  

diff --git a/Open-ILS/src/eg2/src/app/staff/share/link-table/link-table.component.html b/Open-ILS/src/eg2/src/app/staff/share/link-table/link-table.component.html
index 3a375d2..8001f46 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/link-table/link-table.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/link-table/link-table.component.html
@@ -3,7 +3,8 @@
     *ngFor="let row of rowBuckets; let rowIdx = index">
   <div class="flex-1 p-2" *ngFor="let col of colList">
     <ng-container *ngIf="row[col]">
-      <a [href]="row[col].url" class="with-material-icon">
+      <a [href]="row[col].url" [routerLink]="row[col].routerLink"
+        class="with-material-icon">
         <span class="material-icons">edit</span>
         <span>{{row[col].label}}</span>
       </a>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/link-table/link-table.component.ts b/Open-ILS/src/eg2/src/app/staff/share/link-table/link-table.component.ts
index 1fc1fc9..f106b50 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/link-table/link-table.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/link-table/link-table.component.ts
@@ -2,7 +2,8 @@ import {Component, Input, OnInit, AfterViewInit, Host} from '@angular/core';
 
 interface LinkTableLink {
     label: string,
-    url: string
+    url?: string,
+    routerLink?: string
 }
 
 @Component({
@@ -55,13 +56,15 @@ export class EgLinkTableComponent implements AfterViewInit {
 export class EgLinkTableLinkComponent implements OnInit {
     @Input() label: string;
     @Input() url: string;
+    @Input() routerLink: string;
 
     constructor(@Host() private linkTable: EgLinkTableComponent) {}
 
     ngOnInit() {
         this.linkTable.links.push({
             label : this.label,
-            url: this.url
+            url: this.url,
+            routerLink: this.routerLink
         });
     }
 }