\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.ts
index 0d5060d29..33f1bf6eb 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.ts
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.ts
@@ -1,14 +1,18 @@
import { Field } from '../../../models/Field';
import { FormGroup } from '@angular/forms';
-import { Component, Input } from '@angular/core';
-import {FieldBase} from '../field-base';
+import { Component, Input, ViewEncapsulation } from '@angular/core';
+import { FieldBase } from '../field-base';
@Component({
selector: 'df-checkbox',
- templateUrl: './dynamic-field-checkbox.html'
+ templateUrl: './dynamic-field-checkbox.html',
+ styleUrls: [
+ './dynamic-field-checkbox.css'
+ ],
+ encapsulation: ViewEncapsulation.None
})
-export class DynamicFieldCheckBoxComponent{
- @Input() field:Field;
- @Input() form:FormGroup;
-
+export class DynamicFieldCheckBoxComponent {
+ @Input() field: Field;
+ @Input() form: FormGroup;
+
}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html
index 45208ee16..a44884360 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html
@@ -1,6 +1,4 @@
-
-
{{field.extendedDescription}}
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.ts
index 902c56fb4..d18c78f35 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.ts
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.ts
@@ -1,17 +1,21 @@
import { FormGroup } from '@angular/forms';
import { Field } from '../../../models/Field';
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
import { FieldBase } from '../field-base';
@Component({
selector: 'df-dropdown',
- templateUrl: './dynamic-field-dropdown.html'
+ templateUrl: './dynamic-field-dropdown.html',
+ styleUrls: [
+ './dynamic-field-dropdown.css'
+ ],
+ encapsulation: ViewEncapsulation.None
})
-export class DynamicFieldDropdownComponent implements OnInit{
+export class DynamicFieldDropdownComponent implements OnInit {
@Input() field: Field;
@Input() form: FormGroup;
- ngOnInit(){
+ ngOnInit() {
}
}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.css b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.css
new file mode 100644
index 000000000..f7be5b613
--- /dev/null
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.css
@@ -0,0 +1,3 @@
+.radio-label {
+ margin-left: 10px;
+}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html
index d89f0b684..328e47ce4 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html
@@ -1,7 +1,6 @@
-
-
{{field.extendedDescription}}
-
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.ts
index fd3a4e1fc..c107b156d 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.ts
@@ -1,17 +1,21 @@
import { FormGroup } from '@angular/forms';
import { Field } from '../../../models/Field';
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
import { FieldBase } from '../field-base';
@Component({
selector: 'df-radiobox',
- templateUrl: './dynamic-field-radiobox.component.html'
+ templateUrl: './dynamic-field-radiobox.component.html',
+ styleUrls: [
+ './dynamic-field-radiobox.component.css'
+ ],
+ encapsulation: ViewEncapsulation.None
})
-export class DynamicFieldRadioBoxComponent implements OnInit{
+export class DynamicFieldRadioBoxComponent implements OnInit {
@Input() field: Field;
@Input() form: FormGroup;
- ngOnInit(){
+ ngOnInit() {
}
}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/field-radiobox.css b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/field-radiobox.css
deleted file mode 100644
index bf67b66d0..000000000
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/field-radiobox.css
+++ /dev/null
@@ -1 +0,0 @@
-@CHARSET "UTF-8";
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.css b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.css
new file mode 100644
index 000000000..ad1e6a6d6
--- /dev/null
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.css
@@ -0,0 +1,18 @@
+.full-width {
+ width: 100%;
+}
+
+.field-component {
+ border:1px solid grey;
+ border-radius: 2px;
+ padding: 10px;
+ margin-bottom: 10px;
+}
+
+.field-extended-desc {
+ color: lightslategray;
+}
+
+.content-left-margin {
+ margin-left: 10px;
+}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html
index 5e6a7e85b..b0f325df7 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html
@@ -1,50 +1,53 @@
-
+
+
{{path + ' ' + field.title}}
+
{{field.description}}
+
+ {{field.extendedDescription}}
+
-
-
-
-
-
{{field.extendedDescription}}
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
The field "{{field.label}}" is required
+
The field {{field.label}} must match a regular expression {{field.regex}}
+
The field {{field.label}} custom Validation
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
The field "{{field.label}}" is required
-
The field {{field.label}} must match a regular expression {{field.regex}}
-
The field {{field.label}} custom Validation
-
-
-