Skip to content

Commit

Permalink
Changed text for Cite File button, added Last Updated label and Publi…
Browse files Browse the repository at this point in the history
…cation Date and Deposit Date values to metadata on file pg. [ref #2465]
  • Loading branch information
mheppler committed Oct 27, 2016
1 parent 93a00d8 commit 5133e01
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 3 deletions.
6 changes: 5 additions & 1 deletion src/main/java/Bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ dataset.cite.title.released=DRAFT VERSION will be replaced in the citation with
dataset.cite.title.draft=DRAFT VERSION will be replaced in the citation with the selected version once the dataset has been published.
dataset.cite.title.deassessioned=DEACCESSIONED VERSION has been added to the citation for this version since it is no longer available.
dataset.cite.standards.tip=Learn about <a href="http://best-practices.dataverse.org/data-citation/" title="Get Recognition: Data Citation - Dataverse Best Practices" target="_blank">Data Citation Standards</a>.
dataset.cite.downloadBtn=Cite Data
dataset.cite.downloadBtn=Cite Dataset
dataset.cite.downloadBtn.xml=EndNote XML
dataset.cite.downloadBtn.ris=RIS
dataset.cite.downloadBtn.bib=BibTeX
Expand Down Expand Up @@ -1396,16 +1396,20 @@ file.share.fileShare.tip=Share this file on your favorite social media networks.
file.share.fileShare.shareText=View this file.
file.title.label=Title
file.citation.label=Citation
file.cite.downloadBtn=Cite File
file.general.metadata.label=General Metadata
file.description.label=Description
file.tags.label=Tags
file.lastupdated.label=Last Updated

file.metadataTab.fileMetadata.header=File Metadata
file.metadataTab.fileMetadata.persistentid.label=Data File Persistent ID
file.metadataTab.fileMetadata.unf.label=UNF
file.metadataTab.fileMetadata.size.label=Size
file.metadataTab.fileMetadata.type.label=Type
file.metadataTab.fileMetadata.description.label=Description
file.metadataTab.fileMetadata.publicationDate.label=Publication Date
file.metadataTab.fileMetadata.depositDate.label=Deposit Date
file.metadataTab.fitsMetadata.header=FITS Metadata
file.metadataTab.provenance.header=File Provenance
file.metadataTab.provenance.body=File Provenance information coming in a later release...
Expand Down
32 changes: 30 additions & 2 deletions src/main/webapp/file.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
<div id="citation-download" class="col-sm-5 col-md-4 text-right" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
<div class="dropdown">
<button type="button" id="downloadCitation" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="glyphicon glyphicon-list"/> #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
<span class="glyphicon glyphicon-list"/> #{bundle['file.cite.downloadBtn']} <span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right text-left" role="menu">
<li>
Expand Down Expand Up @@ -231,7 +231,11 @@
<h:outputText id="fileTypeOutputRegular" value="#{FilePage.fileMetadata.dataFile.friendlyType}" rendered="#{!(FilePage.fileMetadata.dataFile.tabularData)}"/>
<h:outputText id="fileTypeOutputTabular" value="#{bundle['file.type.tabularData']}" rendered="#{FilePage.fileMetadata.dataFile.tabularData}"/>
<h:outputText id="fileSize" value=" - #{FilePage.fileMetadata.dataFile.friendlySize}" />
<h:outputText id="fileCreatePublishDate" value=" - #{FilePage.fileMetadata.fileDateToDisplay}" rendered="#{!(empty FilePage.fileMetadata.id)}"/>


<h:outputText id="fileCreatePublishDate" value=" - #{bundle['file.lastupdated.label']}: #{FilePage.fileMetadata.fileDateToDisplay}" rendered="#{!(empty FilePage.fileMetadata.id)}"/>


<div class="checksum-block" jsf:rendered="#{!FilePage.file.tabularData}">
<h:outputText id="file-checksum" value="#{FilePage.file.tabularData ? FilePage.file.originalChecksumType : FilePage.file.checksumType}: #{FilePage.file.checksumValue}"
rendered="#{!(empty FilePage.file.checksumValue)}"/>
Expand Down Expand Up @@ -295,6 +299,18 @@
<h:outputText value="#{FilePage.file.unf}"/>
</div>
</div>


<div class="form-group" jsf:rendered="#{!(false)}">
<label class="col-sm-3 control-label">
#{bundle['file.metadataTab.fileMetadata.publicationDate.label']}
</label>
<div class="col-sm-9">
<h:outputText value="#{FilePage.file.publicationDate}"/>
</div>
</div>


<div class="form-group" jsf:rendered="#{!(empty FilePage.file.friendlySize)}">
<label class="col-sm-3 control-label">
#{bundle['file.metadataTab.fileMetadata.size.label']}
Expand Down Expand Up @@ -335,6 +351,18 @@
<h:outputText value="#{FilePage.file.description}"/>
</div>
</div>


<div class="form-group" jsf:rendered="#{!(false)}">
<label class="col-sm-3 control-label">
#{bundle['file.metadataTab.fileMetadata.depositDate.label']}
</label>
<div class="col-sm-9">
<h:outputText value="#{FilePage.file.createDate}"/>
</div>
</div>


</div>
</div>
</div>
Expand Down

0 comments on commit 5133e01

Please sign in to comment.