From abc7b0292137399be332020d699b44e35600db86 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 22 Jun 2017 17:04:49 +0000
Subject: [PATCH] #3646 fix - Changes on form titles and other minor changes
---
securis/src/main/webapp/src/app/forms/licensetype.form.html | 17 ++---------------
securis/src/main/webapp/src/app/forms/application.form.html | 17 ++---------------
securis/src/main/webapp/src/app/forms/user.form.html | 1 +
securis/src/main/webapp/src/app/forms/organization.form.html | 1 +
securis/src/main/webapp/src/app/forms/pack.form.html | 7 ++++---
securis/src/main/webapp/src/app/forms/license.form.html | 1 +
6 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/securis/src/main/webapp/src/app/forms/application.form.html b/securis/src/main/webapp/src/app/forms/application.form.html
index 6299a7c..42e4f8e 100644
--- a/securis/src/main/webapp/src/app/forms/application.form.html
+++ b/securis/src/main/webapp/src/app/forms/application.form.html
@@ -3,24 +3,11 @@
<button md-icon-button (click)="goBack()" color="accent">
<md-icon>arrow_back</md-icon>
</button>
- <span class="md-title" [innerText]="form_title"></span>
+ <span [innerText]="form_title"></span>
+ <span *ngIf="!isNew" style="margin-left:10px;">({{data.code}})</span>
<span flex></span>
<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
</md-toolbar>
- <!--
- code: 'CICS',
- creation_timestamp: 1418384439000,
- description: 'Wellbore integrity analysis software',
- id: 1,
- license_filename: 'config_server.lic',
- name: 'CurisIntegrity',
- metadata:
- [ { key: 'max_docs',
- value: '250000',
- readonly: true,
- mandatory: true } ]
-}
- -->
<div class="margin" layout-align-gt-xs="center start" layout-fill="" layout-gt-xs="row">
<md-card flex="70">
<md-card-title>
diff --git a/securis/src/main/webapp/src/app/forms/license.form.html b/securis/src/main/webapp/src/app/forms/license.form.html
index 9413a10..71686b3 100644
--- a/securis/src/main/webapp/src/app/forms/license.form.html
+++ b/securis/src/main/webapp/src/app/forms/license.form.html
@@ -4,6 +4,7 @@
<md-icon>arrow_back</md-icon>
</button>
<span [innerText]="form_title"></span>
+ <span style="margin-left:10px;">({{data.code}})</span>
<span flex></span>
<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
<md-toolbar-row class="inner-padding" *ngIf="!!pack" >
diff --git a/securis/src/main/webapp/src/app/forms/licensetype.form.html b/securis/src/main/webapp/src/app/forms/licensetype.form.html
index 1e64b6f..cd999e7 100644
--- a/securis/src/main/webapp/src/app/forms/licensetype.form.html
+++ b/securis/src/main/webapp/src/app/forms/licensetype.form.html
@@ -3,24 +3,11 @@
<button md-icon-button (click)="goBack()" color="accent">
<md-icon>arrow_back</md-icon>
</button>
- <span class="md-title" [innerText]="form_title"></span>
+ <span [innerText]="form_title"></span>
+ <span *ngIf="!isNew" style="margin-left:10px;">({{data.code}})</span>
<span flex></span>
<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
</md-toolbar>
- <!--
- code: 'CICS',
- creation_timestamp: 1418384439000,
- description: 'Wellbore integrity analysis software',
- id: 1,
- license_filename: 'config_server.lic',
- name: 'CurisIntegrity',
- metadata:
- [ { key: 'max_docs',
- value: '250000',
- readonly: true,
- mandatory: true } ]
-}
- -->
<div class="margin" layout-align-gt-xs="center start" layout-fill="" layout-gt-xs="row">
<md-card flex="70">
<md-card-title>
diff --git a/securis/src/main/webapp/src/app/forms/organization.form.html b/securis/src/main/webapp/src/app/forms/organization.form.html
index 41d02bc..6d2f889 100644
--- a/securis/src/main/webapp/src/app/forms/organization.form.html
+++ b/securis/src/main/webapp/src/app/forms/organization.form.html
@@ -4,6 +4,7 @@
<md-icon>arrow_back</md-icon>
</button>
<span [innerText]="form_title"></span>
+ <span *ngIf="!isNew" style="margin-left:10px;">({{data.code}})</span>
<span flex></span>
<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
</md-toolbar>
diff --git a/securis/src/main/webapp/src/app/forms/pack.form.html b/securis/src/main/webapp/src/app/forms/pack.form.html
index 42a4bbf..cbf7e19 100644
--- a/securis/src/main/webapp/src/app/forms/pack.form.html
+++ b/securis/src/main/webapp/src/app/forms/pack.form.html
@@ -3,7 +3,8 @@
<button md-icon-button (click)="goBack()" color="accent">
<md-icon>arrow_back</md-icon>
</button>
- <span class="md-title" [innerText]="form_title"></span>
+ <span [innerText]="form_title"></span>
+ <span *ngIf="!isNew" style="margin-left:10px;">({{data.code}})</span>
<span flex></span>
<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
</md-toolbar>
@@ -51,7 +52,7 @@
<input mdInput type="date" [ngModel]="data.init_valid_date | date:'yyyy-MM-dd'"
(ngModelChange)="data.init_valid_date = $event" name="init_valid_date" required />
<md-placeholder>
- <span i18n="field.end_valid_date"></span>
+ <span i18n="field.init_valid_date"></span>
</md-placeholder>
</md-input-container>
<error-checker [fieldName]="getFieldName('init_valid_date')" [formField]="form.controls.init_valid_date"></error-checker>
@@ -138,7 +139,7 @@
<button *ngIf="canBeDeleted()" md-raised-button color="warn" (click)="delete(data.id)">Delete</button>
<span flex></span>
- <button md-icon-button [mdMenuTriggerFor]="packMenu" aria-label="Pack menu">
+ <button *ngIf="!isNew" md-icon-button [mdMenuTriggerFor]="packMenu" aria-label="Pack menu">
<md-icon>more_vert</md-icon>
</button>
<md-menu #packMenu="mdMenu">
diff --git a/securis/src/main/webapp/src/app/forms/user.form.html b/securis/src/main/webapp/src/app/forms/user.form.html
index bdb1800..ac6bb23 100644
--- a/securis/src/main/webapp/src/app/forms/user.form.html
+++ b/securis/src/main/webapp/src/app/forms/user.form.html
@@ -4,6 +4,7 @@
<md-icon>arrow_back</md-icon>
</button>
<span class="md-title" [innerText]="form_title"></span>
+ <span *ngIf="!isNew" style="margin-left:10px;">({{data.username}})</span>
<span flex></span>
<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
</md-toolbar>
--
Gitblit v1.3.2