#2756 fix - chnaged API to allow activation by code and other UI changes

rsanchez

2015-09-24 94c288b4f8d353c44b64e40c0863c7fce6782293

 securis/src/main/webapp/licenses.html
..
..
@@ -56,7 +56,7 @@
56
56
 							ng-show="packForm.code.$invalid">
57
57
 							<span class="glyphicon glyphicon-warning-sign"></span> <span
58
58
 								ng-show="packForm.code.$error.maxlength"
59
-								ng-bind="maxlengthErrorMsg('Code', maxlength.code)"></span> <span
59
+								ng-bind="maxLengthErrorMsg('Code', maxlength.code)"></span> <span
60
60
 								ng-show="packForm.code.$error.required"
61
61
 								ng-bind="mandatoryFieldErrorMsg('Code')"></span>
62
62
 						</div>
..
..
@@ -103,7 +103,7 @@
103
103
 							ng-show="packForm.num_licenses.$invalid">
104
104
 							<span class="glyphicon glyphicon-warning-sign"></span> <span
105
105
 								ng-show="packForm.num_licenses.$error.maxlength"
106
-								ng-bind="maxlengthErrorMsg('Num. Licenses', maxlength.num_licenses)"></span>
106
+								ng-bind="maxLengthErrorMsg('Num. Licenses', maxlength.num_licenses)"></span>
107
107
 							<span ng-show="packForm.num_licenses.$error.required"
108
108
 								ng-bind="mandatoryFieldErrorMsg('Num. Licenses')"></span>
109
109
 						</div>
..
..
@@ -190,7 +190,7 @@
190
190
 						i18n>Period for renew (days)</label>
191
191
 					<div class="col-md-8">
192
192
 						<input type="number" id="renew_valid_period" name="renew_valid_period"
193
-						    min="1" class="form-control" ng-model="pack.renew_valid_period"
193
+						    min="0" class="form-control" ng-model="pack.renew_valid_period"
194
194
 							ng-required="true" />
195
195
 						<div class="alert inline-alert alert-warning"
196
196
 							ng-show="packForm.renew_valid_period.$invalid">
..
..
@@ -215,7 +215,7 @@
215
215
 							ng-show="packForm.comments.$invalid">
216
216
 							<span class="glyphicon glyphicon-warning-sign"></span> <span
217
217
 								ng-show="packForm.comments.$error.maxlength"
218
-								ng-bind="maxlengthErrorMsg('Comments', maxlength.comments)"></span>
218
+								ng-bind="maxLengthErrorMsg('Comments', maxlength.comments)"></span>
219
219
 							<span ng-show="packForm.comments.$error.required"
220
220
 								ng-bind="mandatoryFieldErrorMsg('comments')"></span>
221
221
 						</div>
..
..
@@ -415,9 +415,25 @@
415
415
 							ng-show="licenseForm.code.$invalid">
416
416
 							<span class="glyphicon glyphicon-warning-sign"></span> <span
417
417
 								ng-show="licenseForm.code.$error.maxlength"
418
-								ng-bind="maxlengthErrorMsg('Code', maxlength.code)"></span> <span
418
+								ng-bind="maxLengthErrorMsg('Code', maxlength.code)"></span> <span
419
419
 								ng-show="licenseForm.code.$error.required"
420
420
 								ng-bind="mandatoryFieldErrorMsg('Code')"></span>
421
+						</div>
422
+					</div>
423
+				</div>
424
+				<div class="form-group">
425
+					<label class="col-md-3 control-label" for="activation_code" i18n>Activation code</label>
426
+					<div class="col-md-8">
427
+						<input type="string" id="activation_code" name="activation_code" placeholder=""
428
+							class="form-control" ng-model="license.activation_code" readonly
429
+							ng-required="mandatory.activation_code" ng-maxlength="{{maxlength.activation_code}}" />
430
+						<div class="alert inline-alert alert-warning"
431
+							ng-show="licenseForm.activation_code.$invalid">
432
+							<span class="glyphicon glyphicon-warning-sign"></span> <span
433
+								ng-show="licenseForm.activation_code.$error.maxlength"
434
+								ng-bind="maxLengthErrorMsg('Activation code', maxlength.activation_code)"></span> <span
435
+								ng-show="licenseForm.activation_code.$error.required"
436
+								ng-bind="mandatoryFieldErrorMsg('Activation code')"></span>
421
437
 						</div>
422
438
 					</div>
423
439
 				</div>
..
..
@@ -442,12 +458,12 @@
442
458
 					<div class="col-md-8">
443
459
 						<input type="string" id="full_name" name="full_name"
444
460
 							placeholder="" class="form-control" ng-model="license.full_name"
445
-							ng-required="mandatory.full_name" />
461
+							ng-required="mandatory.full_name" ng-maxlength="{{maxlength.full_name}}"  />
446
462
 						<div class="alert inline-alert alert-warning"
447
463
 							ng-show="licenseForm.full_name.$invalid">
448
464
 							<span class="glyphicon glyphicon-warning-sign"></span> <span
449
465
 								ng-show="licenseForm.full_name.$error.maxlength"
450
-								ng-bind="maxlengthErrorMsg('User full name', maxlength.full_name)"></span>
466
+								ng-bind="maxLengthErrorMsg('User full name', maxlength.full_name)"></span>
451
467
 							<span ng-show="licenseForm.full_name.$error.required"
452
468
 								ng-bind="mandatoryFieldErrorMsg('User full name')"></span>
453
469
 						</div>
..
..
@@ -460,14 +476,14 @@
460
476
 					<div class="col-md-8">
461
477
 						<input type="email" id="email" name="email" placeholder=""
462
478
 							class="form-control" ng-model="license.email"
463
-							ng-required="mandatory.email" />
479
+							ng-required="mandatory.email" ng-maxlength="{{maxlength.email}}"   />
464
480
 						<div class="alert inline-alert alert-warning"
465
481
 							ng-show="licenseForm.email.$invalid">
466
482
 							<span class="glyphicon glyphicon-warning-sign"></span> <span
467
483
 								ng-show="licenseForm.email.$error.email"
468
484
 								ng-bind="'Please, write a valid email address'"></span> <span
469
485
 								ng-show="licenseForm.email.$error.maxlength"
470
-								ng-bind="maxlengthErrorMsg('User email', maxlength.email)"></span>
486
+								ng-bind="maxLengthErrorMsg('User email', maxlength.email)"></span>
471
487
 							<span ng-show="licenseForm.email.$error.required"
472
488
 								ng-bind="mandatoryFieldErrorMsg('User email')"></span>
473
489
 						</div>
..
..
@@ -490,7 +506,7 @@
490
506
 							<span class="glyphicon glyphicon-warning-sign">
491
507
 								<span
492
508
 									ng-show="licenseForm.request_data.$error.maxlength"
493
-									ng-bind="maxlengthErrorMsg('Request data', maxlength.request_data)"></span>
509
+									ng-bind="maxLengthErrorMsg('Request data', maxlength.request_data)"></span>
494
510
 								<span ng-show="licenseForm.request_data.$error.required"
495
511
 									ng-bind="mandatoryFieldErrorMsg('Request data')"></span>
496
512
 							</span> 
..
..
@@ -514,7 +530,7 @@
514
530
 							ng-show="licenseForm.comments.$invalid">
515
531
 							<span class="glyphicon glyphicon-warning-sign"></span> <span
516
532
 								ng-show="licenseForm.comments.$error.maxlength"
517
-								ng-bind="maxlengthErrorMsg('Comments', maxlength.comments)"></span>
533
+								ng-bind="maxLengthErrorMsg('Comments', maxlength.comments)"></span>
518
534
 							<span ng-show="licenseForm.comments.$error.required"
519
535
 								ng-bind="mandatoryFieldErrorMsg('comments')"></span>
520
536
 						</div>