Commit cad3d3ba authored by Maxime Chaillet's avatar Maxime Chaillet

Merge branch 'issue72' into 'master'

Issue72

Closes #72

See merge request !86
parents 74b6f2b2 0b22dc4d
Pipeline #10578 passed with stages
in 1 minute and 21 seconds
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<title> ESRF - DOI </title> <title> ESRF - DOI </title>
<link rel="icon" href="/src/images/favicon.ico"> <link rel="icon" href="/src/images/favicon.ico">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> <!-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> -->
<!-- Using grunt-wiredep, the proper js files from bower components are included below --> <!-- Using grunt-wiredep, the proper js files from bower components are included below -->
<!-- bower:js --> <!-- bower:js -->
...@@ -78,7 +78,9 @@ ...@@ -78,7 +78,9 @@
<p><a style='font-weight:bold;' href="http://www.esrf.eu">European Synchrotron Radiation Facility</a></p> <p><a style='font-weight:bold;' href="http://www.esrf.eu">European Synchrotron Radiation Facility</a></p>
</div> </div>
<div class="col-12 col-md-2" > <div class="col-12 col-md-2" >
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a> <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
<img id="licenceImage" alt="Creative Commons License" style="border-width:0" src="/src/images/88x31.png" />
</a>
</div> </div>
<div class="col-12 col-md-5"> <div class="col-12 col-md-5">
<p class="float-right" style="font-size:12px;display:block;" > Access to data is governed by the <a href="http://www.esrf.eu/files/live/sites/www/files/about/organisation/ESRF%20data%20policy-web.pdf" target="_blank">ESRF data policy</a>.</p> <p class="float-right" style="font-size:12px;display:block;" > Access to data is governed by the <a href="http://www.esrf.eu/files/live/sites/www/files/about/organisation/ESRF%20data%20policy-web.pdf" target="_blank">ESRF data policy</a>.</p>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<title> ESRF - DOI </title> <title> ESRF - DOI </title>
<link rel="icon" href="/src/images/favicon.ico"> <link rel="icon" href="/src/images/favicon.ico">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> <!-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> -->
<!-- Using grunt-wiredep, the proper js files from bower components are included below --> <!-- Using grunt-wiredep, the proper js files from bower components are included below -->
<!-- bower:js --> <!-- bower:js -->
...@@ -59,7 +59,9 @@ ...@@ -59,7 +59,9 @@
<p><a style='font-weight:bold;' href="http://www.esrf.eu">European Synchrotron Radiation Facility</a></p> <p><a style='font-weight:bold;' href="http://www.esrf.eu">European Synchrotron Radiation Facility</a></p>
</div> </div>
<div class="col-12 col-md-2" > <div class="col-12 col-md-2" >
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a> <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
<img id="licenceImage" alt="Creative Commons License" style="border-width:0" src="/src/images/88x31.png" />
</a>
</div> </div>
<div class="col-12 col-md-5"> <div class="col-12 col-md-5">
<p class="float-right" style="font-size:12px;display:block;" > Access to data is governed by the <a href="http://www.esrf.eu/files/live/sites/www/files/about/organisation/ESRF%20data%20policy-web.pdf" target="_blank">ESRF data policy</a>.</p> <p class="float-right" style="font-size:12px;display:block;" > Access to data is governed by the <a href="http://www.esrf.eu/files/live/sites/www/files/about/organisation/ESRF%20data%20policy-web.pdf" target="_blank">ESRF data policy</a>.</p>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<title> ESRF - DOI </title> <title> ESRF - DOI </title>
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> <!-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> -->
<link rel="stylesheet" href="/min/output.min.css"> <link rel="stylesheet" href="/min/output.min.css">
<script src="/min/components.min.js"></script> <script src="/min/components.min.js"></script>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<div class="col-12 col-md-2"> <div class="col-12 col-md-2">
<p> <p>
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
<img id="licenceImage" alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /> <img id="licenceImage" alt="Creative Commons License" style="border-width:0" src="/src/images/88x31.png" />
</a> </a>
......
This diff is collapsed.
...@@ -50,13 +50,10 @@ DOIController.prototype.render = function (doi, data) { ...@@ -50,13 +50,10 @@ DOIController.prototype.render = function (doi, data) {
doiData.creators = jsonExtractor.getCreators(data); doiData.creators = jsonExtractor.getCreators(data);
doiData.publiclyAccessibleYear = jsonExtractor.getPubliclyAccessibleYear(data); doiData.publiclyAccessibleYear = jsonExtractor.getPubliclyAccessibleYear(data);
console.log(doiData.publiclyAccessibleYear );
doiData.abstract = jsonExtractor.getAbstract(data); doiData.abstract = jsonExtractor.getAbstract(data);
doiData.investigationId = jsonExtractor.getInvestigationId(data); doiData.investigationId = jsonExtractor.getInvestigationId(data);
doiData.resourceType = jsonExtractor.getResourceType(data); doiData.resourceType = jsonExtractor.getResourceType(data);
doiData.proposalType = jsonExtractor.getFieldFromSubject(data.subjects, "Proposal Type Description"); doiData.proposalType = jsonExtractor.getFieldFromSubject(data.subjects, "Proposal Type Description");
doiData.resourceTypeGeneral = jsonExtractor.getResourceTypeGeneral(data); doiData.resourceTypeGeneral = jsonExtractor.getResourceTypeGeneral(data);
......
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