Commit 59354aa6 authored by Maxime Chaillet's avatar Maxime Chaillet
Browse files

Merge branch 'issue59' into 'master'

use datahub instead of kolla, center beamline table between vertical bars, use…

Closes #59

See merge request icat/doi-landing-page!66
parents 01238d73 af7ed4bf
...@@ -187,7 +187,7 @@ span.doiBadge a { ...@@ -187,7 +187,7 @@ span.doiBadge a {
border-left-color: #cfd1d2; border-left-color: #cfd1d2;
border-left-width: 4px; border-left-width: 4px;
border-left-style: solid; border-left-style: solid;
padding-left:10px; padding-left:15px;
} }
.scroll-box { .scroll-box {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
{@eq key=data.resourceType value=constants.ES_RESOURCE_TYPE} {@eq key=data.resourceType value=constants.ES_RESOURCE_TYPE}
<form action="https://icat.esrf.fr/#/browse/facility/ESRF/proposal/{data.proposalName}/investigation/{data.investigationId}/dataset" target="_blank"> <form action="https://icat.esrf.fr/#/browse/facility/ESRF/proposal/{data.proposalName}/investigation/{data.investigationId}/dataset" target="_blank">
{:else} {:else}
<form action="http://160.103.246.26:5000/public/{data.doi}" target="_blank"> <form action="https://datahub.esrf.fr/public/{data.doi}" target="_blank" method="post">
{/eq} {/eq}
<button type="submit" class="btn btn-primary btn-lg btn-block"> Access data </button> <button type="submit" class="btn btn-primary btn-lg btn-block"> Access data </button>
</form> </form>
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
{! Presentation of the metadata for the DOI which are from dataset collections !} {! Presentation of the metadata for the DOI which are from dataset collections !}
{@eq key=data.resourceType value=constants.DC_RESOURCE_TYPE} {@eq key=data.resourceType value=constants.DC_RESOURCE_TYPE}
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-md-12 col-xl-8"> <div class="col-md-12 col-xl-8">
{@abstract abstract=data.abstract} {/abstract} {@abstract abstract=data.abstract} {/abstract}
...@@ -87,12 +86,12 @@ ...@@ -87,12 +86,12 @@
</div> </div>
<div class="col-sm-6 col-xl-2"> <div class="col-sm-6 col-xl-2">
<div class="myBorder-left"> <div class="myBorder-left" style="margin-right:-15px">
{@proposalBeamlineTable mergedProposalBeamlines=data.mergedProposalBeamlines} {/proposalBeamlineTable} {@proposalBeamlineTable mergedProposalBeamlines=data.mergedProposalBeamlines} {/proposalBeamlineTable}
</div> </div>
</div> </div>
<div class="col-sm-6 col-xl-2"> <div class="col-sm-6 col-xl-2" >
<div class="myBorder-left"> <div class="myBorder-left">
<label> Publication year </label> <label> Publication year </label>
{?data.mintingYear} {?data.mintingYear}
...@@ -103,6 +102,4 @@ ...@@ -103,6 +102,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{/eq} {/eq}
\ 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