diff --git a/README.md b/README.md index 89063db7f5..7ffd559488 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ > **_NOTE:_** The current DSP-APP version presents the **admin view** only. -This app is a simple user interface for the Data and Service Center for the Humanities DaSCH, which uses the DSP-API/Knora server application in the backend. It's a system for annotation and linkage of resources in arts and humanities. +This app is a simple user interface for the Data and Service Center for the Humanities DaSCH, which uses the DSP-API server application in the backend. It's a system for annotation and linkage of resources in arts and humanities. DSP-APP implements [DSP-JS-LIB](https://www.npmjs.com/package/@dasch-swiss/dsp-js) to connect with [DSP-API](https://docs.dasch.swiss/developers/knora/api-reference/). DSP (DaSCH Service Platform) is a software framework for storing, sharing, and working with primary resources and data in the humanities. diff --git a/docs/how-to-use/data.md b/docs/how-to-use/data.md index 57804f65bb..493a874dc5 100644 --- a/docs/how-to-use/data.md +++ b/docs/how-to-use/data.md @@ -31,7 +31,7 @@ DSP-APP offers the possibility to the user to search in 3 different ways: **full ### Full text search -Full text search performs queries including one or more terms or phrases, and returns data that matches search conditions. By default, the search is performed in all projects stored in Knora. However, it is possible to filter by project using the menu "Filter by project" on the left side of the search bar. +Full text search performs queries including one or more terms or phrases, and returns data that matches search conditions. By default, the search is performed in all projects stored in DSP. However, it is possible to filter by project using the menu "Filter by project" on the left side of the search bar. ![Filter your full text search by specific project](../assets/images/search-fulltext-filterByProject.png)*https://app2.dasch.swiss - Search 1: Full text search* @@ -70,13 +70,12 @@ The expert search can be more powerful than the advanced search, but requires kn ![Expert search is a text area in which you can create Gravsearch queries.](../assets/images/search-expert.png)*https://app2.dasch.swiss/search/expert - Search 3: Expert search is a text area in which you can create Gravsearch queries. Here is the default example you can find in the app.* -To learn Gravsearch, go to the Knora documentation [→ Gravsearch](https://docs.knora.org/paradox/03-apis/api-v2/query-language.html) +To learn Gravsearch, go to the DSP-API documentation [→ Gravsearch](https://docs-api.dasch.swiss/03-apis/api-v2/query-language/) --- ## Search results - ### Simple list The results of the search are displayed in an organised list with a small preview. You can select one result at a time to get more information. diff --git a/docs/how-to-use/index.md b/docs/how-to-use/index.md index e101e2e88e..4c43202cf4 100644 --- a/docs/how-to-use/index.md +++ b/docs/how-to-use/index.md @@ -1,6 +1,6 @@ # User Guide -This is the documentation for the generic Knora Web Application of the Data and Service Center for the Humanities DaSCH. You can reach the app on **[app2.dasch.swiss](https://app2.dasch.swiss)**. +This is the documentation for the generic DSP Web Application of the Data and Service Center for the Humanities DaSCH. You can reach the app on **[app2.dasch.swiss](https://app2.dasch.swiss)**. --- diff --git a/docs/how-to-use/system.md b/docs/how-to-use/system.md index a2cf06f206..bbcb0e19a8 100644 --- a/docs/how-to-use/system.md +++ b/docs/how-to-use/system.md @@ -2,7 +2,7 @@ ⚠ Only for System administrator -System administrators can get an overview of all projects and all users stored in Knora. +System administrators can get an overview of all projects and all users stored in DSP. ![Get access to the system admin part from the user menu](../assets/images/system-user-menu.png)*System administration part is accessible from the user menu in the header.* @@ -10,7 +10,7 @@ System administrators can get an overview of all projects and all users stored i ## All projects -System admin gets the list of all activated projects as well as archived projects. It is possible to create a new research project, the required information must be filled in. +System admin gets the list of all activated projects as well as archived projects. It is possible to create a new research project, the required information must be filled in. For each project, the system admin has the possibility to edit the project information and archive the project. ![Overview of all projects](../assets/images/system-all-projects.png)*Overview of all activated projects, the list of archived projects is displayed below.* @@ -19,8 +19,8 @@ For each project, the system admin has the possibility to edit the project infor ## All users -System admin gets the list of all activated and suspended users registered in Knora. -New users can be created from this page only (button "Create new"). +System admin gets the list of all activated and suspended users registered in DSP. +New users can be created from this page only (button "Create new"). ![Overview of all users](../assets/images/system-all-users.png)*Overview of all users where the system admin has access to several actions.* @@ -39,4 +39,3 @@ For each user, the system admin has access to several actions: ![System admin can add a user as a member user of a project](../assets/images/system-manage-project-membership.png) - *Suspend user*: the user is deactivated and has no more access to DSP-APP. The system admin can reactivate it at any time. - diff --git a/e2e/src/help.e2e-spec.ts b/e2e/src/help.e2e-spec.ts index b75c803f8d..92394c0702 100644 --- a/e2e/src/help.e2e-spec.ts +++ b/e2e/src/help.e2e-spec.ts @@ -52,7 +52,7 @@ describe('help page', () => { }); }); - it('should route to knora-app release note page', async () => { + it('should route to dsp-app release note page', async () => { await browser.waitForAngularEnabled(false); page.navigateTo(); await browser.waitForAngularEnabled(true); diff --git a/src/app/main/header/header.component.scss b/src/app/main/header/header.component.scss index 3e4f520fe1..5d4b944fc0 100644 --- a/src/app/main/header/header.component.scss +++ b/src/app/main/header/header.component.scss @@ -9,8 +9,10 @@ .home-button { display: inline-block; .mat-icon { - height: 40px; - margin: 0 6px 6px 0; + margin: 6px 6px 6px 0; + min-width: 40px; + height: auto; + max-height: 40px; &.small { width: 40px; diff --git a/src/app/main/header/header.component.ts b/src/app/main/header/header.component.ts index 38ab976867..00a720d6cc 100644 --- a/src/app/main/header/header.component.ts +++ b/src/app/main/header/header.component.ts @@ -41,16 +41,6 @@ export class HeaderComponent implements OnInit, OnDestroy { private _componentCommsService: ComponentCommunicationEventService) { // create tool icons to use them in mat-icons - // knora-app icon with text - this._matIconRegistry.addSvgIcon( - 'dsp_app_banner', - this._domSanitizer.bypassSecurityTrustResourceUrl('/assets/images/knora-app-banner.svg') - ); - // knora-app icon (for smaller screens) - this._matIconRegistry.addSvgIcon( - 'dsp_app_icon', - this._domSanitizer.bypassSecurityTrustResourceUrl('/assets/images/knora-app-icon.svg') - ); this._matIconRegistry.addSvgIcon( 'dasch_icon_black', this._domSanitizer.bypassSecurityTrustResourceUrl('/assets/images/dasch-icon-black.svg') diff --git a/src/app/main/help/help.component.ts b/src/app/main/help/help.component.ts index e96d32af83..03f6ce9813 100644 --- a/src/app/main/help/help.component.ts +++ b/src/app/main/help/help.component.ts @@ -1,6 +1,4 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MatIconRegistry } from '@angular/material/icon'; -import { DomSanitizer } from '@angular/platform-browser'; import { ApiResponseData, ApiResponseError, HealthResponse, KnoraApiConnection } from '@dasch-swiss/dsp-js'; import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui'; import { ErrorHandlerService } from '../error/error-handler.service'; @@ -92,19 +90,7 @@ export class HelpComponent implements OnInit { constructor( @Inject(DspApiConnectionToken) private _dspApiConnection: KnoraApiConnection, - private _errorHandler: ErrorHandlerService, - private _domSanitizer: DomSanitizer, - private _matIconRegistry: MatIconRegistry) { - - // create tool icons to use them in mat-icons - this._matIconRegistry.addSvgIcon( - 'knora_app_icon', - this._domSanitizer.bypassSecurityTrustResourceUrl('/assets/images/knora-app-icon.svg') - ); - this._matIconRegistry.addSvgIcon( - 'knora_icon', - this._domSanitizer.bypassSecurityTrustResourceUrl('/assets/images/knora-icon.svg') - ); + private _errorHandler: ErrorHandlerService) { } ngOnInit() { diff --git a/src/app/main/main.component.html b/src/app/main/main.component.html index 807171e580..bad545bd8a 100644 --- a/src/app/main/main.component.html +++ b/src/app/main/main.component.html @@ -16,7 +16,6 @@
-

bring everything together and simplify your research

This is the generic web application of the Data and Service Center for the Humanities diff --git a/src/app/project/ontology/resource-class-info/resource-class-info.component.ts b/src/app/project/ontology/resource-class-info/resource-class-info.component.ts index 9de2e4082f..682728e7ed 100644 --- a/src/app/project/ontology/resource-class-info/resource-class-info.component.ts +++ b/src/app/project/ontology/resource-class-info/resource-class-info.component.ts @@ -50,7 +50,7 @@ export class ResourceClassInfoComponent implements OnInit { /** * translates iri from "sub class of" array - * - display label from default resource classes (as part of Knora System Project) + * - display label from default resource classes (as part of DSP System Project) * - in case the class is a subclass of another class in the same ontology: display this class label * - in none of those cases display the name from the class IRI * diff --git a/src/app/project/ontology/resource-class-property-form/resource-class-property-form.component.html b/src/app/project/ontology/resource-class-property-form/resource-class-property-form.component.html index 47ce3568e3..4bdfea7ce9 100644 --- a/src/app/project/ontology/resource-class-property-form/resource-class-property-form.component.html +++ b/src/app/project/ontology/resource-class-property-form/resource-class-property-form.component.html @@ -15,7 +15,7 @@ - + diff --git a/src/app/system/projects/projects.component.ts b/src/app/system/projects/projects.component.ts index 0edcd1fec4..0ae7a5f5ad 100644 --- a/src/app/system/projects/projects.component.ts +++ b/src/app/system/projects/projects.component.ts @@ -65,7 +65,7 @@ export class ProjectsComponent implements OnInit { if (this.username) { this._titleService.setTitle('Your projects'); } else { - this._titleService.setTitle('All projects from Knora'); + this._titleService.setTitle('All projects from DSP'); } } diff --git a/src/app/system/users/users.component.ts b/src/app/system/users/users.component.ts index 5e3d4b01f9..8fef81ba53 100644 --- a/src/app/system/users/users.component.ts +++ b/src/app/system/users/users.component.ts @@ -29,7 +29,7 @@ export class UsersComponent implements OnInit { private _titleService: Title ) { // set the page title - this._titleService.setTitle('All users in Knora'); + this._titleService.setTitle('All users in DSP'); } ngOnInit() { diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 6bc7c7ce1b..856645f3d9 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -3,7 +3,7 @@ "dashboardComponent": { "firstParagraph": "Willkommen bei DSP-APP – einer web-basierten virtuellen Forschungsumgebung, die Forschern in den Humanities bei der Arbeit mit digitalen Daten unterstützt. DSP-APP erlaubt die Annotation und die Verknüpfung mit beliebigen Quellen, seien es digitale Texte, bewegte oder unbewegte Bilder oder Ton.", "secondParagraph": "DSP-APP ist eine (generische) Benutzerschnittstelle um auf Daten von einem Haupt-Repository zuzugreifen, das hier beschrieben ist: ", - "projectsIntro": "Öffentliche Projekte in Knora" + "projectsIntro": "Öffentliche Projekte in DSP" }, "frameworkForListings": { "list": { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 9db6fc45b0..b3d9a3fa3f 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -3,7 +3,7 @@ "dashboardComponent": { "firstParagraph": "Welcome to DSP-APP — a web-based virtual research environment that helps researchers in the humanities to deal with digital data. It allows the annotation and linkage of arbitrary sources such as digital texts, still and moving images, and sound.", "secondParagraph": "DSP-APP is one (generic) user interface to handle the data from the main repository called ", - "projectsIntro": "Public projects in Knora" + "projectsIntro": "Public projects in DSP" }, "list": { "title": { diff --git a/src/assets/images/akka-icon.svg b/src/assets/images/akka-icon.svg deleted file mode 100644 index f1a7d14d7b..0000000000 --- a/src/assets/images/akka-icon.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/dasch-icon-black.svg b/src/assets/images/dasch-icon-black.svg index db88889159..462fc40ba2 100644 --- a/src/assets/images/dasch-icon-black.svg +++ b/src/assets/images/dasch-icon-black.svg @@ -1,8 +1,34 @@ - - - - - - - - \ No newline at end of file + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/assets/images/dasch-icon-purple.svg b/src/assets/images/dasch-icon-purple.svg index 64eae26209..9a0a2cc618 100644 --- a/src/assets/images/dasch-icon-purple.svg +++ b/src/assets/images/dasch-icon-purple.svg @@ -1,8 +1,34 @@ - - - - - - - - \ No newline at end of file + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/assets/images/dasch-icon-white.svg b/src/assets/images/dasch-icon-white.svg index d0d0857a99..12ef7de7f2 100644 --- a/src/assets/images/dasch-icon-white.svg +++ b/src/assets/images/dasch-icon-white.svg @@ -1,8 +1,34 @@ - - - - - - - - \ No newline at end of file + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/assets/images/knora-app-banner.svg b/src/assets/images/knora-app-banner.svg deleted file mode 100644 index 0f4db83c3b..0000000000 --- a/src/assets/images/knora-app-banner.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/knora-app-icon.svg b/src/assets/images/knora-app-icon.svg deleted file mode 100644 index 9c12502fbb..0000000000 --- a/src/assets/images/knora-app-icon.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/favicon.ico b/src/favicon.ico index 829fd31e2c..0d9a7751eb 100644 Binary files a/src/favicon.ico and b/src/favicon.ico differ