eliminate buggy non-dropdown version of WorldMap explore button #3657

We were seeing "WorldMap" under the dropdown "Explore" button (good!) and a non-dropdown "Explore" button was appearing next to it (bad!). We are now making all these explore tools consistent. They are always available via the dropdown "Explore" button. No more clicking an "Explore" button and wondering which tool will launch.
IQSS · Jan 26, 2018 · c6c0c87 · c6c0c87
1 parent d15831c
commit c6c0c87
Showing 1 changed file with 1 addition and 22 deletions.
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
@@ -47,7 +47,7 @@
         </div>
     </ui:fragment>
 
-    <!--DROPDOWN EXPLORE BUTTON (NOT A SINGLE EXPLORE BUTTON): Multiple tools-->
+    <!--"Explore" button (dropdown of tools)-->
     <!--exploreTools is set as a ui:param by the file and dataset pages-->
     <!--Note that "WorldMap Explore" is not an explore tool (external tool)-->
     <div class="btn-group" jsf:rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools or (worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
@@ -96,27 +96,6 @@
             </li>                       
         </ul>
     </div>
-
-    <!--SINGLE EXPLORE BUTTON: WorldMap only-->
-    <ui:fragment rendered="#{worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata) and empty exploreTools}">
-        <!-- WorldMap Explore button ONLY ... not TwoRavens -->
-        <h:commandLink pt:role="button" rendered="#{!downloadPopupRequired}"
-                       type="button" 
-                       styleClass="btn btn-default #{(fileMetadata.dataFile.ingestInProgress) ? 'disabled' : ''}" 
-                       disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                       title="Explore" action="#{fileDownloadService.startWorldMapDownloadLink(guestbookResponse, fileMetadata )}" target="_blank">
-            <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
-        </h:commandLink>
-        <p:commandLink rendered="#{downloadPopupRequired}"
-                       type="button" styleClass="btn btn-default"
-                       process="@this"
-                       action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'worldMap' )}"
-                       update="@widgetVar(downloadPopup)"
-                       disabled="#{fileMetadata.dataFile.ingestInProgress  or lockedFromDownload}"
-                       oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-            <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
-        </p:commandLink>
-    </ui:fragment>
 
     <!-- Compute Button *File pg only*: -->
     <h:outputLink value="#{FilePage.computeUrl}" type="button" class="btn btn-default" target="_blank" rendered="#{isFilePg and FilePage.showComputeButton() and fileDownloadHelper.canDownloadFile(fileMetadata)}">