Skip to content

Commit

Permalink
update properties for explore map button
Browse files Browse the repository at this point in the history
  • Loading branch information
raprasad committed Feb 22, 2016
1 parent a88164e commit ccad6ee
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/main/java/Bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ file.spss-porExtraLabels.title=Upload an additional text file with extra variabl
file.spss-porExtraLabels.selectToAddBtn=Select File to Add
file.ingestFailed=Tabular Data Ingest Failed
file.mapData=Map Data
file.mapData.viewMap=Explore
file.mapData.viewMap=Explore Map
file.mapData.unpublished.header=Data Not Published
file.mapData.unpublished.message=In order to map your data with WorldMap, your data must be published. Please publish this dataset, then retry the Map Data feature.
file.downloadBtn.format.all=All File Formats + Information
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/Bundle_zh_CN.properties
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ file.advancedOptions=\u9ad8\u7ea7\u9009\u9879
file.ingestFailed=\u8868\u683c\u6570\u636e\u6444\u53d6\u5931\u8d25
file.reMapData=\u91cd\u65b0\u6620\u5c04\u6570\u636e
file.mapData=\u5730\u56fe\u6570\u636e
file.mapData.viewMap=Explore
file.mapData.viewMap=Explore Map
file.downloadBtn.format.all=\u6240\u6709\u7684\u6587\u4ef6\u683c\u5f0f+\u4fe1\u606f
file.downloadBtn.format.tab=\u5236\u8868\u7b26\u5206\u5272\u6587\u4ef6
file.downloadBtn.format.original=\u539f\u59cb\u6587\u4ef6\u683c\u5f0f\uff08{0}\uff09
Expand Down
8 changes: 4 additions & 4 deletions src/main/webapp/filesFragment.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
<!-- Explore Dropdown: When TwoRavens **AND** WorldMap Explore options are available -->
<div class="btn-group" jsf:rendered="#{DatasetPage.canSeeTwoRavensExploreButton(fileMetadata) and DatasetPage.canUserSeeExploreWorldMapButton(fileMetadata)}">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span class="caret"/>
<span class="glyphicon glyphicon-equalizer"/> <span class="glyphicon glyphicon-map-marker"/> #{bundle.explore} <span class="caret"/>
</button>
<ul class="dropdown-menu multi-level pull-right text-left" role="menu">

Expand All @@ -312,20 +312,20 @@
styleClass="#{fileMetadata.dataFile.ingestInProgress ? 'disabled' : ''}"
disabled="#{fileMetadata.dataFile.ingestInProgress ? 'disabled' : ''}"
actionListener="#{DatasetPage.exploreOutputLink(fileMetadata, 'explore')}" target="_blank">
#{bundle.explore} with TwoRavens
<span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} with TwoRavens
</h:commandLink>
<p:commandLink rendered="#{ DatasetPage.downloadPopupRequired}"
action="#{DatasetPage.initGuestbookResponse(fileMetadata, 'explore')}"
update="@form"
oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
#{bundle.explore}
<span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} with TwoRavens
</p:commandLink>
</li>
<li><!-- WorldMap Explore -->
<h:outputLink rendered="#{DatasetPage.canUserSeeExploreWorldMapButton(fileMetadata)}"
styleClass="#{fileMetadata.dataFile.ingestInProgress ? 'disabled' : ''}"
value="#{ DatasetPage.getMapLayerMetadata(fileMetadata.dataFile).getLayerLink() }" target="_blank">
#{bundle['file.mapData.viewMap']} Map
<span class="glyphicon glyphicon-map-marker"/> #{bundle['file.mapData.viewMap']}
</h:outputLink>
</li>
</ul>
Expand Down

0 comments on commit ccad6ee

Please sign in to comment.