From 927237ddc5d36ea5ff6f59a48465890d607ba8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Kilchenmann?= Date: Wed, 30 Jun 2021 09:57:44 +0200 Subject: [PATCH] docs(ontology): update docs and show hint in ontology-form (DSP-1139) (#476) --- docs/user-guide/project.md | 8 +++++++- .../ontology-form/ontology-form.component.html | 1 + .../ontology/ontology-form/ontology-form.component.ts | 10 ++++++++++ src/assets/style/_elements.scss | 11 +++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/docs/user-guide/project.md b/docs/user-guide/project.md index 984cd357b2..f386893780 100644 --- a/docs/user-guide/project.md +++ b/docs/user-guide/project.md @@ -66,7 +66,13 @@ Go to your project, select the tab `Data model` and click on button `New data mo > - shouldn't begin with a number > - shouldn't begin with the letter v and a number > - spaces or special characters are not allowed -> - the term "ontology" is not allowed +> - may not contain these reserved words: +> - knora +> - ontology +> - salsah +> - shared +> - simple +> - standoff > - the unique name can't be changed afterwards The label is a combination of project's shortname and the unique name. You can replace with any other string. diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.html b/src/app/project/ontology/ontology-form/ontology-form.component.html index 57832f4527..340c06b1f8 100644 --- a/src/app/project/ontology/ontology-form/ontology-form.component.html +++ b/src/app/project/ontology/ontology-form/ontology-form.component.html @@ -4,6 +4,7 @@ + help {{ formErrors.name }} diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.ts b/src/app/project/ontology/ontology-form/ontology-form.component.ts index 3b17464e1e..cf60c4c4c6 100644 --- a/src/app/project/ontology/ontology-form/ontology-form.component.ts +++ b/src/app/project/ontology/ontology-form/ontology-form.component.ts @@ -86,6 +86,16 @@ export class OntologyFormComponent implements OnInit { } }; + ontologyNameInfo = ` + The unique name + - must be at least 3 characters long + - shouldn't begin with a number + - shouldn't begin with the letter v and a number + - spaces or special characters are not allowed + - may not contain these reserved words: knora, ontology, salsah, shared, simple or standoff + - can't be changed afterwards + `; + error = false; constructor( diff --git a/src/assets/style/_elements.scss b/src/assets/style/_elements.scss index 77f61b0be2..8ce7d79a38 100644 --- a/src/assets/style/_elements.scss +++ b/src/assets/style/_elements.scss @@ -609,6 +609,17 @@ $gc-small: $form-width - $gc-large - 4; // -------------------------------------- +// +// tooltip configuration + +.multi-line-tooltip { + white-space: pre-line; + line-height: 1.5; + font-size: 12px; +} + +// -------------------------------------- + // // nested mat-menu switch arrow to the left in case the menu position is on the right hand side .switch-nested-menu {