#3646 fix - Changes on form titles and other minor changes

rsanchez

2017-06-22 abc7b0292137399be332020d699b44e35600db86

#3646 fix - Changes on form titles and other minor changes

 securis/src/main/webapp/src/app/forms/application.form.html
..
..
@@ -3,24 +3,11 @@
3
3
 		<button md-icon-button (click)="goBack()" color="accent">
4
4
 			<md-icon>arrow_back</md-icon>
5
5
 		</button>
6
-		<span class="md-title" [innerText]="form_title"></span>
6
+		<span [innerText]="form_title"></span>
7
+		<span *ngIf="!isNew" style="margin-left:10px;">({{data.code}})</span>
7
8
 		<span flex></span>
8
9
 		<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
9
10
 	</md-toolbar>
10
-	<!--
11
-			code: 'CICS',
12
-  creation_timestamp: 1418384439000,
13
-  description: 'Wellbore integrity analysis software',
14
-  id: 1,
15
-  license_filename: 'config_server.lic',
16
-  name: 'CurisIntegrity',
17
-  metadata: 
18
-   [ { key: 'max_docs',
19
-       value: '250000',
20
-       readonly: true,
21
-       mandatory: true } ] 
22
-}
23
-		-->
24
11
 	<div class="margin" layout-align-gt-xs="center start" layout-fill="" layout-gt-xs="row">
25
12
 		<md-card flex="70">
26
13
 			<md-card-title>
 securis/src/main/webapp/src/app/forms/license.form.html
..
..
@@ -4,6 +4,7 @@
4
4
 			<md-icon>arrow_back</md-icon>
5
5
 		</button>
6
6
 		<span [innerText]="form_title"></span>
7
+		<span style="margin-left:10px;">({{data.code}})</span>
7
8
 		<span flex></span>
8
9
 		<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
9
10
 		<md-toolbar-row class="inner-padding" *ngIf="!!pack" >
 securis/src/main/webapp/src/app/forms/licensetype.form.html
..
..
@@ -3,24 +3,11 @@
3
3
 		<button md-icon-button (click)="goBack()" color="accent">
4
4
 			<md-icon>arrow_back</md-icon>
5
5
 		</button>
6
-		<span class="md-title" [innerText]="form_title"></span>
6
+		<span [innerText]="form_title"></span>
7
+		<span *ngIf="!isNew" style="margin-left:10px;">({{data.code}})</span>
7
8
 		<span flex></span>
8
9
 		<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
9
10
 	</md-toolbar>
10
-	<!--
11
-			code: 'CICS',
12
-  creation_timestamp: 1418384439000,
13
-  description: 'Wellbore integrity analysis software',
14
-  id: 1,
15
-  license_filename: 'config_server.lic',
16
-  name: 'CurisIntegrity',
17
-  metadata: 
18
-   [ { key: 'max_docs',
19
-       value: '250000',
20
-       readonly: true,
21
-       mandatory: true } ] 
22
-}
23
-		-->
24
11
 	<div class="margin" layout-align-gt-xs="center start" layout-fill="" layout-gt-xs="row">
25
12
 		<md-card flex="70">
26
13
 			<md-card-title>
 securis/src/main/webapp/src/app/forms/organization.form.html
..
..
@@ -4,6 +4,7 @@
4
4
 			<md-icon>arrow_back</md-icon>
5
5
 		</button>
6
6
 		<span [innerText]="form_title"></span>
7
+		<span *ngIf="!isNew" style="margin-left:10px;">({{data.code}})</span>
7
8
 		<span flex></span>
8
9
 		<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
9
10
 	</md-toolbar>
 securis/src/main/webapp/src/app/forms/pack.form.html
..
..
@@ -3,7 +3,8 @@
3
3
 		<button md-icon-button (click)="goBack()" color="accent">
4
4
 			<md-icon>arrow_back</md-icon>
5
5
 		</button>
6
-		<span class="md-title" [innerText]="form_title"></span>
6
+		<span [innerText]="form_title"></span>
7
+		<span *ngIf="!isNew" style="margin-left:10px;">({{data.code}})</span>
7
8
 		<span flex></span>
8
9
 		<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
9
10
 	</md-toolbar>
..
..
@@ -51,7 +52,7 @@
51
52
 									<input mdInput type="date" [ngModel]="data.init_valid_date | date:'yyyy-MM-dd'" 
52
53
 										   (ngModelChange)="data.init_valid_date = $event" name="init_valid_date" required />
53
54
 									<md-placeholder>
54
-										<span i18n="field.end_valid_date"></span>
55
+										<span i18n="field.init_valid_date"></span>
55
56
 									</md-placeholder>
56
57
 								</md-input-container>
57
58
 								<error-checker [fieldName]="getFieldName('init_valid_date')" [formField]="form.controls.init_valid_date"></error-checker>
..
..
@@ -138,7 +139,7 @@
138
139
 					<button *ngIf="canBeDeleted()" md-raised-button color="warn" (click)="delete(data.id)">Delete</button>
139
140
 					<span flex></span>
140
141
 
141
-					<button md-icon-button [mdMenuTriggerFor]="packMenu" aria-label="Pack menu">
142
+					<button *ngIf="!isNew" md-icon-button [mdMenuTriggerFor]="packMenu" aria-label="Pack menu">
142
143
 						<md-icon>more_vert</md-icon>
143
144
 					</button>
144
145
 					<md-menu #packMenu="mdMenu">
 securis/src/main/webapp/src/app/forms/user.form.html
..
..
@@ -4,6 +4,7 @@
4
4
 			<md-icon>arrow_back</md-icon>
5
5
 		</button>
6
6
 		<span class="md-title" [innerText]="form_title"></span>
7
+		<span *ngIf="!isNew" style="margin-left:10px;">({{data.username}})</span>
7
8
 		<span flex></span>
8
9
 		<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
9
10
 	</md-toolbar>