diff --git a/dmp-frontend/src/app/app.component.css b/dmp-frontend/src/app/app.component.css
index 7c3bd07bf..31b04e3cf 100644
--- a/dmp-frontend/src/app/app.component.css
+++ b/dmp-frontend/src/app/app.component.css
@@ -1,160 +1,22 @@
-.hide{
- display:none;
-}
-
-.show {
- display:block;
-}
-
-.ng-valid[required], .ng-valid.required {
- border-left: 5px solid #42A948; /* green */
- }
-
- .ng-invalid:not(form) {
- border-left: 5px solid #a94442; /* red */
- }
-
-
-.navbar-center {
- position: absolute;
+.full-width {
width: 100%;
- left: 0;
- text-align: center;
- vertical-align: middle;
- margin:0 auto;
}
-.invisible {
- display:none;
-}
-
-.visible {
- display:block;
-}
-
-.cursor{
- cursor: pointer;
-}
-
-.navbar {
- -webkit-box-shadow: 0px 0px 12px 2px rgba(0,0,0,0.73);
- -moz-box-shadow: 0px 0px 12px 2px rgba(0,0,0,0.73);
- box-shadow: 0px 0px 12px 2px rgba(0,0,0,0.73);
- margin-bottom: 5px;
-}
-
-
-.navbar-title {
- /*
- width: 100%;
- position: absolute;
- left: 0;
- */
- margin:0 auto;
- text-align: center;
-}
-.navbar-toggle {
- z-index:3;
-}
-
-.arrange-horizontally > * {
- display: inline-block;
- /*text-align: center;*/
- white-space: nowrap
-}
-.arrange-vertically > * {
- display: block;
-}
-
-
-/* FOR THE SIDEBAR */
-
-.parent_div{
- height:100%;
- width:100%;
- float:left;
-}
-
-.child_div_left{
- height:100%;
- float:left;
-}
-
-.child_div_right{
- height:100%;
- float:right;
-}
-
-
-.sidenav {
-
- display:none;
-
- border-radius: 15px;
-
- z-index: 1;
- width: 0px;
- /*
- top: 0px;
+.full-height {
height: 100%;
- left: 0px;
- */
- overflow-x: hidden;
- background-color: #f8f8f8;
- transition: 0.5s;
- padding-top: 60px;
}
-.sidenav.expanded{
- width: 15%;
-
+html,
+body {
+ height: 100%;
+ width: 100%;
+}
+app-root {
display: block;
-
- border-style: solid;
- border-width: thin;
-
- border-radius: 15px;
- padding-top: 60px;
+ height: 100%;
}
-#appBody {
- width : 100%;
- transition: 0.5s;
-}
-#appBody.expanded{
- width: 85%;
-}
-
-
-
-.sidenav a {
- padding: 8px 8px 8px 32px;
- text-decoration: none;
- font-size: 25px;
- color: #818181;
- display: block;
- transition: 0.5s;
-}
-
-.sidenav a:hover {
- color: #000;
-}
-
-.sidenav .closebtn {
- position: absolute;
- top: 0;
- right: 25px;
- font-size: 36px;
- margin-left: 50px;
-}
-
-#main {
- transition: margin-left .5s;
- /*padding: 16px;*/
-}
-
-@media screen and (max-height: 450px) {
- .sidenav {padding-top: 15px;}
- .sidenav a {font-size: 18px;}
-}
+html {
+ overflow-y: hidden
+}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/app.component.html b/dmp-frontend/src/app/app.component.html
index 57546e87d..9af984168 100644
--- a/dmp-frontend/src/app/app.component.html
+++ b/dmp-frontend/src/app/app.component.html
@@ -85,26 +85,4 @@
-
-
+
+
+
{{field.description}}
+
+ {{field.extendedDescription}}
+
+
diff --git a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.css b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.css
index e19052935..a8e80f398 100644
--- a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.css
+++ b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.css
@@ -3,10 +3,10 @@
}
.fieldset-component {
- border:1px solid grey;
+ /* border:1px solid grey;
border-radius: 2px;
padding: 10px;
- margin-bottom: 10px;
+ margin-bottom: 10px; */
}
.fieldset-extended-desc {
@@ -14,5 +14,5 @@
}
.content-left-margin {
- margin-left: 10px;
+ /* margin-left: 10px; */
}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html
index b13e9ed85..a033f0711 100644
--- a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html
+++ b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html
@@ -1,12 +1,18 @@
-
-
{{compositeField.title}}
-
-
{{compositeField.description}}
-
- {{compositeField.extendedDescription}}
-
-
-
+
+
+
+
+
+
1" class="fieldset-component">
+
{{compositeField.title}}
+
+
{{compositeField.description}}
+
+ {{compositeField.extendedDescription}}
+
+
+
+
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.css b/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.css
index 7657b454e..2f19bc1c6 100644
--- a/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.css
+++ b/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.css
@@ -7,10 +7,10 @@
}
.group-component {
- border:1px solid grey;
+ /* border:1px solid grey;
border-radius: 2px;
padding: 10px;
- margin-bottom: 10px;
+ margin-bottom: 10px; */
}
.group-extended-desc {
@@ -18,5 +18,5 @@
}
.content-left-margin {
- margin-left: 10px;
+ /* margin-left: 10px; */
}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.html b/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.html
index c8f4256f9..fedb1603d 100644
--- a/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.html
+++ b/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.html
@@ -1,12 +1,12 @@
-
{{path + ' ' + group.title}}
+
-
{{group.description}}
+
-
diff --git a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html
index cc859b146..d7d33753e 100644
--- a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html
+++ b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html
@@ -1,22 +1,32 @@
-
-
-
-
{{path}} {{section.title}}
-
-
-
-
-
{{section.description}}
-
{{section.extendedDescription}}
-
-
-
+
+
+
-
-
-
+
+
+
+
{{section.description}}
+
{{section.extendedDescription}}
+
+
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.css b/dmp-frontend/src/app/form/dynamic-form.component.css
index a6a3e17b6..d2abf7208 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.css
+++ b/dmp-frontend/src/app/form/dynamic-form.component.css
@@ -1,34 +1,15 @@
-.full-width {
- width: 100%;
-}
-.ui-steps .ui-steps-item {
- width: 25%;
-}
-
-.ui-steps.steps-custom {
- margin-bottom: 30px;
-}
-
-.ui-steps.steps-custom .ui-steps-item .ui-menuitem-link {
- height: 10px;
- padding: 0 1em;
-}
-
-.ui-steps.steps-custom .ui-steps-item .ui-steps-number {
- background-color: #0081c2;
- color: #FFFFFF;
- display: inline-block;
- width: 36px;
- border-radius: 50%;
- margin-top: -14px;
- margin-bottom: 10px;
-}
-
-.ui-steps.steps-custom .ui-steps-item .ui-steps-title {
- color: #555555;
-}
.ng-sidebar {
width: 40%;
+}
+
+.toc-container {
+ background: #f9f9f9 none repeat scroll 0 0;
+ border: 1px solid #aaa;
+ display: table;
+ font-size: 95%;
+ margin-bottom: 1em;
+ padding: 20px;
+ width: auto;
}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.html b/dmp-frontend/src/app/form/dynamic-form.component.html
index c9508bebf..ad055ba48 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.html
+++ b/dmp-frontend/src/app/form/dynamic-form.component.html
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/tableOfContents/table-of-content-section/table-of-content-section.component.html b/dmp-frontend/src/app/form/tableOfContents/table-of-content-section/table-of-content-section.component.html
index 71747739b..758a6f56e 100644
--- a/dmp-frontend/src/app/form/tableOfContents/table-of-content-section/table-of-content-section.component.html
+++ b/dmp-frontend/src/app/form/tableOfContents/table-of-content-section/table-of-content-section.component.html
@@ -1,11 +1,15 @@
-
{{path+' '+model.title}}
+
{{path + ' ' + model.title}}
+
+
0">
+
+
+
1" [page]='page' [model]="fieldsetModel"
+ [index]="i" [path]="path+'.'+(i+1)">
+
+
-
-
diff --git a/dmp-frontend/src/index.html b/dmp-frontend/src/index.html
index e99d8e9c3..6ec9a46e2 100644
--- a/dmp-frontend/src/index.html
+++ b/dmp-frontend/src/index.html
@@ -51,6 +51,6 @@
-
+