Skip to content

GitLab

Commit aa2723a3 authored by Laurent Heirendt's avatar Laurent Heirendt ✈
Browse files

Merge branch 'develop' into 'master' 

Regular merge of develop

See merge request !19
parents af86c782 72391d12
Pipeline #14605 passed with stage
in 1 minute and 15 seconds
Show whitespace changes
Inline Side-by-side
external/daisy/interface_conventions.md
View file @ aa2723a3
......@@ -12,7 +12,7 @@ A screenshot of the search page for Projects is given below.
Each search page is headed with _help text search facets on the left hand side and search results on the right hand side.
![Alt](./images/search_page.png)
![Alt](../img//search_page.png)
<center>Search Page for Projects</center>
By default, all entities - in our example, all projects- will be listed on the search page. The list can be filtered by either selecting one or more facet from the left hand side or by typing in a keyword into the search box. Currently DAISY search does not support partial matching; instead the entire keyword will be matched in a case insensitive manner.
......@@ -29,7 +29,7 @@ Depending on the permissions associated with your user type, you may see a **add
Information about a single entity is provided through a Details Page. As example page for a _Project_ named ``SYSCID'' is given below.
![Alt](./images/details_page.png)
![Alt](../img//details_page.png)
<center>Details page of a Project in DAISY</center>
You may end up on an Entity Details Page in two primary ways. (1) Through the ``DETAILS'' link of a search results in a search page (2) Through links on details pages of other (linked) entities in DAISY.
......@@ -49,20 +49,20 @@ If you have edit permissions for the entity, then at the top right corner of som
When you click the edit button on the Details Page of an entity, you will be taken to the Editor Page containing a form for entity update. An example is given below.
![Alt](./images/editor_form.png)
![Alt](../img//editor_form.png)
<center>Editor page of a Project</center>
Each field in the form will be listed with a **Name**, a **Value** and a **Help text**. Names of fields that are required to have a value will end with a red asterisk.
Editor forms can be saved by pressing the **SUBMIT** button found at the bottom of the page. Forms will be validated upon submission. If validation fails for one or more fields, these will be highlighted with inline validation _ERROR_ messages, illustrated below.
![Alt](./images/validation_error.png)
![Alt](../img//validation_error.png)
<center>Field validation error</center>
Upon successful save of a form, you will be returned to the entity details page. DAISY may give **SUCCESS** and/or **WARNING** messages upon form save; these will be displayed at the top of the page, as illustrated below.
![Alt](./images/page_messages.png)
![Alt](../img//page_messages.png)
<center>Message display in DAISY</center>
......
external/daisy/project_management.md
View file @ aa2723a3
......@@ -8,13 +8,13 @@
<mark>In order to create a new project</mark>:
1. Click Projects from the Menu Bar.<br />
![Alt](./images/project_menubar.png)
![Alt](../img//project_menubar.png)
2. Click the add button from the Project Search Page.<br />
![Alt](./images/add_button.png)
![Alt](../img//add_button.png)
3. You will see an empty Project Form. _Acronym, Title_ and _Local Custodians_ are mandatory fields, whereas others are optional. Provide values for fields. Please note that one of the Local Custodians must be a user with VIP Privileges. E.g. in the demo deployment _alice.white_ is a research principle investigator and is a VIP user.<br />
![Alt](./images/project_custodians.png)
![Alt](../img//project_custodians.png)
4. Click SUBMIT. Once you successfully save the form, you will be taken to the newly create project's details page, as seen below.<br />
![Alt](./images/project_created.png)
![Alt](../img//project_created.png)
<a name="PM2"></a>
......@@ -28,16 +28,16 @@ When you first create a _Project_ in DAISY, it will be isolated, with no links t
When a project is created, it will have no associated Datasets. On the project's details page this situation will be highlighted in the **Data of this project** detail box as follows:
![Alt](./images/project_add_dataset.png)
![Alt](../img//project_add_dataset.png)
<mark>In order to create a Dataset and automatically link it to the project</mark>:
1. Click the **Add** button pointed by the arrow in the **Data of this project** detail box.
2. You will see the **Dataset Creation Quick Form** as below. The _Project_ field will be auto-selected, in addition you need to provide _Local Custodians_ and a _Title_ for your dataset. Typically the local custodians would be the same as the project, but you are free to choose any user as the custodian. Remember that one of the custodians needs to be a VIP User. Provide the field values and press submit.\
![Alt](./images/project_add_dataset_form.png)
![Alt](../img//project_add_dataset_form.png)
3. Once the dataset is created, you will be taken to the **Dataset's Details Page**, seen below. You can continue working on the data set as described in [this part of the guide](#DM). If you want to go pack to the Project that owns this dataset, then you can click the project link in the dataset's overview box, highlighted below.<br />
![Alt](./images/project_add_dataset_result.png)
![Alt](../img//project_add_dataset_result.png)
<a name="PM22"></a>
### 3.2.2 Add Contract to Project
......@@ -52,15 +52,15 @@ A project's _Personnel_ refer to those persons that work on the project, we assu
1. Click the plus button on the **Personnel** details box, as seen below.<br />
![Alt](./images/project_ref_user.png)
![Alt](../img//project_ref_user.png)
2. You will be asked to select one user from a searchable list of existing users. Users will be listed with their name and surname. Make a selection and click SUBMIT. <br />
![Alt](./images/project_ref_user_search.png)
![Alt](../img//project_ref_user_search.png)
Personnel can be unlinked from a Project by clicking on the trash icon that will appear when hovering over items in the **Personnel detail box**, as seen below. Note that the personnel will not be deleted from the system, it will simply be unlinked.<br />
![Alt](./images/project_remove_user.png)
![Alt](../img//project_remove_user.png)
<a name="PM24"></a>
### 3.2.4 Manage Project Contacts
......@@ -69,17 +69,17 @@ A project's _Personnel_ refer to those persons that work on the project, we assu
A project's _Contacts_ refer to those persons that are associated with the Project, but that are not a user of the DAISY system. Under the _Definitions Management_ module, it is possible to manage _Contacts_ and search for them. The **Contacts** detail box on the _Project_ page also allows contact management, as follows;
1. Click the plus button on the **Contacts** details box. You will be given the options to either **Create a new contact** or **Reference an existing contact** as seen below.<br />
![Alt](./images/project_add_contact.png)
![Alt](../img//project_add_contact.png)
2. If you choose to reference, you will be asked to select one contact from a searchable list of existing contacts. Contacts will be listed with their name, surname and role as seen below. Make a selection and click SUBMIT.<br />
![Alt](./images/project_ref_contact.png)
![Alt](../img//project_ref_contact.png)
3. If you choose to create new, you will see the contact creation form. Once you fill in the details and click SUBMIT a new contact will be created and automatically linked to the project.<br />
![Alt](./images/project_add_contact_form.png)
![Alt](../img//project_add_contact_form.png)
Contacts can be unlinked from a Project by clicking on the trash icon that will appear when hovering over items in the **Contacts detail box**, as seen below. Note that the contact will not be deleted from the system, it will simply be unlinked.<br />
![Alt](./images/project_remove_contact.png)
![Alt](../img//project_remove_contact.png)
<a name="PM25"></a>
......@@ -91,13 +91,13 @@ You can attach documents to a project record in DAISY. Examples of documents are
Document management is done via the **Documents** detail box, as follows:
1. Click the plus button on the **Documents** detail box.<br />
![Alt](./images/project_add_document.png)
![Alt](../img//project_add_document.png)
2. You will see the _Document_ creation form. Either select _Content_, i.e. file to upload, or paste the document link (if in external system). You will be required to provide a brief description of the document in _Document Notes_. Also you will also be required to select a _Type_ for the document. <br />
![Alt](./images/project_add_document_form.png)
![Alt](../img//project_add_document_form.png)
3. Click SUBMIT and the new document will be listed as below. Documents can be deleted by clicking on the trash icon beside each document, also document information can be edited by clicking the pencil icon.<br />
![Alt](./images/project_remove_document.png)
![Alt](../img//project_remove_document.png)
......@@ -107,19 +107,19 @@ Document management is done via the **Documents** detail box, as follows:
A project's _Publications_ can be managed via the **Publications detail box**, as follows:
1. Click the plus button on the **Publications** detail box. You will be given the options to either **Create a new publication** or **Reference an existing publication** as seen below.<br />
![Alt](./images/project_add_publication.png)
![Alt](../img//project_add_publication.png)
2. If you choose to reference, you will be asked to select one publication from a searchable list of existing publications. Publications will be listed with their citation string. Make a selection and click SUBMIT.<br />
![Alt](./images/project_ref_publication.png)
![Alt](../img//project_ref_publication.png)
3. If you choose to create new, you will see the publication creation form asking you for the _Citation string_ and the _DOI_ for the paper. Once you fill in the details and click SUBMIT a new publication will be created and automatically linked to the project.<br />
![Alt](./images/project_add_publication_form.png)
![Alt](../img//project_add_publication_form.png)
Publications can be unlinked from a Project by clicking on the trash icon that will appear when hovering over items in the **Publications detail box**, as seen below. Note that the publication will not be deleted from the system, it will simply be unlinked.<br />
![Alt](./images/project_remove_publication.png)
![Alt](../img//project_remove_publication.png)
<br />
......
external/daisy/user_management.md
View file @ aa2723a3
......@@ -5,7 +5,7 @@
Upon successful installation of DAISY, going to the web address ```https://${IP_ADDRESS_OR_NAME_OF_DEPLOYMENT_SERVER}```
should display the login page.
![Alt](./images/login.png)
![Alt](../img//login.png)
<center>DAISY Login Page</center>
Based on the authentication configuration made for your deployment, you may login by:
......
external/exchange-channels/duma.md
View file @ aa2723a3
......@@ -24,14 +24,14 @@ The use of DUMA is mediated by LCSB's data stewards. If you require assistance i
In the following steps we provide instructions on how to use AsperaWEB web interface.
1. Once you receive your **access link** and **password** from the LCSB, visit the link using a standard web browser. Firefox 66.x (or higher) recommended, but others should also work. You will be prompted for your password (see below).<br/>
![Alt](duma_1.png "Title")
![Alt](../img/duma_1.png "Title")
2. When you visit a AsperaWEB access link for the very first time, you will be prompted to install or update **IBM Aspera Connect** client.
* click **Download** or **Download the App** buttons (see below). <br/>![Alt](duma_2.png "Title")
* click **Download** or **Download the App** buttons (see below). <br/>![Alt](../img/duma_2.png "Title")
* wait for the download to finish, the prompt should go to step 3. <br/>![Alt](duma_3.png "Title")
* wait for the download to finish, the prompt should go to step 3. <br/>![Alt](../img/duma_3.png "Title")
* open the installer just downloaded and start the installer. <br/>![Alt](duma_4.png "Title")
* open the installer just downloaded and start the installer. <br/>![Alt](../img/duma_4.png "Title")
* close the installer, the Aspera Connect should try to open - *depending on your Operating System you may be asked if you are sure to open it* -
......@@ -39,7 +39,7 @@ In the following steps we provide instructions on how to use AsperaWEB web inter
3. The **access link** page will display a **File Browser** section. Depending on the settings per access link, users can create or delete folders in the File Browser and upload and/or download data.<br/>
![Alt](duma_6.png "Title")
![Alt](../img/duma_6.png "Title")
4. Clicking **Upload** or **Download** will launch the **IBM Aspera Connect** client on your computer. You first will be asked whether you allow the client to connect to aspera.lcsb.uni.lu. Choose **Allow**.
......@@ -47,14 +47,14 @@ In the following steps we provide instructions on how to use AsperaWEB web inter
5. At any time you can launch **IBM Aspera Connect** to display the status of uploads to or downloads from your computer. <br/>
![Alt](duma_8.png "Title")
![Alt](../img/duma_8.png "Title")
6. All data are encrypted on server side and they stay encrypted also upon download. For decryption, you have to navigate into your **IBM Aspera Connect** window and click "**Unlock encrypted files**". <br/>
![Alt](duma_9.png "Title") <br/>
![Alt](../img/duma_9.png "Title") <br/>
You will be prompted for encryption passphrase which is present on the file browser. <br/>
![Alt](duma_10.png "Title") <br/>
![Alt](../img/duma_10.png "Title") <br/>
Encrypted files are by default kept on your disc after decryption. If you want to change this behaviour, navigate to Options->Settings and check "Delete encrypted files when finished" box.
......@@ -66,8 +66,8 @@ Encrypted files are by default kept on your disc after decryption. If you want t
Go to the help section of your access link
<br/> ![Alt](duma_help_link.png "Title") <br/><br/><br/>
<br/> ![Alt](../img/duma_help_link.png "Title") <br/><br/><br/>
And follow the steps in the **Using the command line** section.
<br/> ![Alt](duma_cli_tokens.png "Title") <br/><br/><br/>
\ No newline at end of file
<br/> ![Alt](../img/duma_cli_tokens.png "Title") <br/><br/><br/>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment