Commit 1d5bf0e9 authored by Maxime Chaillet's avatar Maxime Chaillet

Merge branch 'master' into 'change-welcome-page-title-text'

# Conflicts:
#   www/min/precompiled.templates.min.js
#   www/templates/welcome_tpl.js
parents eeb08d60 c56fa486
Pipeline #3959 passed with stages
in 46 seconds
......@@ -18,20 +18,28 @@ The grunFile.js has 2 tasks.
### How to develop
Below are the steps to follow after the implementation of a new functionnality or for debugging purpose. In this mode, we use the dev.html page instead of the index.html.
* Fork this project to your github space.
* Change the code to implement a new functionnality or fix issues.
* check js files, create the dev.html file from the dev.tpl.html template.
To test the changes locally on your computer:
* Prepare the project ( check js files, create the dev.html file from the dev.tpl.html template )
```
grunt dev
```
* copy the www folder (not all files are needed but it is easy) to apache folder
* Copy the www folder (not all files are needed but it is easy) to apache folder
```
sudo rm -fr /var/www/html && sudo cp -r www/. /var/www/html/
```
* access the doi landing page with the following address http://localhost/dev.html?DOI=prefix/suffix
* Open your browser and hit the starting page at the following address http://localhost/dev.html?DOI=prefix/suffix
Replace prefix and suffix with real values. Note that the stating page is dev.html. In production , the starting page will be index.html.
* Once you are satisfied with your work, prepare the project for production
```
grunt
```
* Submit a merge request on icat repository at https://gitlab.esrf.fr/icat/doi-landing-page
### How to prepare the docker container
* check js files, concatene them, minify them, handle other js dependancies
### How to prepare the docker container locally for testing purpose
* Make sure the porject is prepared for production (check js files, concatene them, minify them, handle other js dependancies)
```
grunt
```
......
This diff is collapsed.
......@@ -54,14 +54,13 @@
</div>
<div class="card-body padding10">
The Digital Object Identifier (<a href="http://www.esrf.eu/home/UsersAndScience/UserGuide/esrf-data-policy/doi.html">DOI</a>) is a code composed of digits and characters. It identifies data in a
unique and permanent way thereby allowing data to be referenced worldwide. The DOI has two parts, namely the DOI prefix
and the DOI suffix separated by a slash ("/"). The ESRF prefix is 10.15151 followed by a slash and the ESRF suffix.
unique and permanent way thereby allowing data to be referenced worldwide. The DOI has two parts, namely the DOI prefix and the DOI suffix separated by a slash ("/"). The ESRF prefix is 10.15151 followed by a slash and the ESRF suffix.
Currently the following suffix(es) are defined:
</p>
<pre>
ESRF-ES - for a session at the ESRF
</pre>
Refer to the <a href="http://www.esrf.eu/home/UsersAndScience/UserGuide/esrf-data-policy/doi/doi---concepts.html">DOI concepts</a> page for the definition of what a session is
Refer to the <a href="http://www.esrf.eu/home/UsersAndScience/UserGuide/esrf-data-policy/doi/doi---concepts.html">DOI concepts</a> page to find out what a session is.
</div>
</div>
</div>
......
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