From 4e2802b696b4c0edcde0f889c289fc8770fdb73c Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 25 Mar 2020 17:04:05 -0400
Subject: [PATCH] Intial commit for responsive btns on file pg [ref #6684]

---
 src/main/webapp/dataset-citation.xhtml      |   2 +-
 src/main/webapp/dataset.xhtml               |  11 +-
 src/main/webapp/file.xhtml                  | 439 +++++++++++---------
 src/main/webapp/resources/css/structure.css |   8 +-
 4 files changed, 255 insertions(+), 205 deletions(-)

diff --git a/src/main/webapp/dataset-citation.xhtml b/src/main/webapp/dataset-citation.xhtml
index fcbbc89c9bf..caad8698c4a 100644
--- a/src/main/webapp/dataset-citation.xhtml
+++ b/src/main/webapp/dataset-citation.xhtml
@@ -32,7 +32,7 @@
                 </div>
                 <div class="col-xs-10 citation">
                     <div class="row">
-                        <div class="col-xs-12 margin-bottom" style="word-wrap:break-word;">
+                        <div class="col-xs-12 #{DatasetPage.workingVersion.deaccessioned ? '' : 'margin-bottom'}" style="word-wrap:break-word;">
                             <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
                                 <h:outputText value="#{DatasetPage.displayCitation}" escape="false"/>
                             </span>
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 2e14cb273bb..92d65cdd4b7 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -107,7 +107,6 @@
                                         </div>
                                     </div>
                                     
-                                    
                                     <!-- START: NEW RESPONSIVE ABOVE FOLD BLOCK -->
                                     <div class="row">
                                         
@@ -412,7 +411,7 @@
 
                                                 <!-- Contact/Share Button Group -->
                                                 <div class="btn-group btn-group-justified">
-                                                    <p:commandLink style="font-size:12px !important;" styleClass="text-buttonXXX btn btn-default btn-xs bootstrap-button-tooltipXXX" title="#{bundle['dataset.email.datasetContactBtn']}"
+                                                    <p:commandLink style="font-size:12px !important;" styleClass="btn btn-default btn-xs" title="#{bundle['dataset.email.datasetContactBtn']}"
                                                                    update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
                                                         <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
                                                         <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
@@ -420,7 +419,7 @@
                                                         <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DatasetPage.dataset}"/>
                                                         #{bundle['contact.contact']} OWNER
                                                     </p:commandLink>
-                                                    <p:commandLink style="font-size:12px !important;" styleClass="text-buttonXXX btn btn-default btn-xs bootstrap-button-tooltipXXX" rendered="#{!DatasetPage.workingVersion.deaccessioned}"
+                                                    <p:commandLink style="font-size:12px !important;" styleClass="btn btn-default btn-xs" rendered="#{!DatasetPage.workingVersion.deaccessioned}"
                                                                    title="#{bundle['dataset.share.datasetShare']}"
                                                                    oncomplete="PF('shareDialog').show();sharrre();">
                                                         #{bundle['share']}
@@ -433,9 +432,11 @@
                                             <!-- END: ActionButtonBlock -->
                                         </div>
                                         
-                                        <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom" style="margin-top:6px;" jsf:rendered="#{true}">
+                                        <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom" 
+                                             style="margin-top:6px;"
+                                             jsf:rendered="#{!(settingsWrapper.rsyncDownload or DatasetPage.workingVersion.deaccessioned)}">
                                             <!-- Metrics -->
-                                            <div id="metrics-block" style="border:0;" jsf:rendered="#{!(settingsWrapper.rsyncDownload or DatasetPage.workingVersion.deaccessioned)}">
+                                            <div id="metrics-block" style="border:0;">
                                                 <div id="metrics-headingXXX">
                                                     #{bundle['metrics.dataset.title']}
                                                     <ui:fragment rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 03188e86ca1..7b641241e7f 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -35,158 +35,30 @@
                     <!-- Top Button/Citation Blocks -->
                     <div class="row">
                         <div class="col-xs-12">
-                            <div id="actionButtonBlock" class="col-xs-12 button-block">
-                                <div class="row">
-                                    <!-- ActionButtonBlock -->
-                                    <div class="col-xs-12 text-right padding-none">
-                                        <!-- Contact/Share Button Group -->
-                                        <div class="btn-group" id="datasetButtonBar" role="group" jsf:rendered="#{!widgetWrapper.widgetView}">
-                                            <p:commandLink class="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
-                                                           update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{FilePage.fileMetadata.dataFile}"/>
-                                                <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
-                                            </p:commandLink>
-                                            <p:commandLink styleClass="text-button btn-share bootstrap-button-tooltip" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}"
-                                                           title="#{bundle['dataset.share.datasetShare']}"
-                                                           oncomplete="PF('shareDialog').show();sharrre();">
-                                                <span class="glyphicon glyphicon-share"/> #{bundle['share']}
-                                            </p:commandLink>
-                                        </div>
-                                        <!-- END: Contact/Share Button Group -->
-                                        <!-- Map/Edit Button Block -->
-                                        <div class="button-container btn-group" jsf:rendered="#{!widgetWrapper.widgetView}">
-                                            <!-- Map Data/Set Up Button Block -->
-                                            <ui:fragment rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset() 
-                                                                     and (FilePage.getConfigureTools().size() > 0
-                                                                     or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">		
-                                                <ui:include src="file-configure-dropdown-fragment.xhtml">
-                                                    <ui:param name="configureTools" value="#{FilePage.getConfigureTools()}"/>
-                                                    <ui:param name="fileId" value="#{FilePage.fileMetadata.dataFile.id}"/>
-                                                    <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>		
-                                                    <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>		
-                                                </ui:include>		
-                                            </ui:fragment>
-                                            <!-- END: Map Data/Set Up Button Block -->
-                                            <!-- Edit Button Group -->
-                                            <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
-                                                                     and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset) 
-                                                                     and (dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
-                                                <p:commandLink styleClass="btn btn-default btn-access" onclick="PF('fileAlreadyReplacedPrevious').show()">
-                                                    <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']}
-                                                </p:commandLink>
-                                            </div>
-                                            <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
-                                                                     and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
-                                                                     and !FilePage.lockedFromEdits
-                                                                     and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
-                                                <button type="button" id="editFile" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
-                                                    <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
-                                                </button>
-                                                <ul class="dropdown-menu pull-right text-left" role="menu">
-                                                    <ui:fragment rendered="#{systemConfig.provCollectionEnabled}">
-                                                    <!--  Should be FilePage.isLockedFromEdits() ? -->
-                                                        <li class="#{DatasetPage.lockedFromEdits  ? 'disabled' : ''}">
-                                                            <p:commandLink id="fileProvenanceButton"
-                                                                       update="editProvenancePopup"
-                                                                       oncomplete="PF('editProvenancePopup').show();bind_bsui_components();">
-                                                                       <f:actionListener binding="#{provPopupFragmentBean.updatePopupState(fileMetadata, true)}" /> <!--clearProvenanceUpdates() -->
-                                                                        #{bundle['file.provenance']} 
-                                                            </p:commandLink>
-                                                        </li> 
-                                                    </ui:fragment>
-                                                    <li>
-                                                        <h:outputLink value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE&#38;version=#{FilePage.version}">
-                                                            <h:outputText id="editFile-Multi-Link" value="#{bundle['file.dataFilesTab.metadata.header']}"/>
-                                                        </h:outputLink>
-                                                    </li>
-                                                    <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
-                                                        <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and !FilePage.fileMetadata.restricted}">
-                                                            <li>
-                                                                <p:commandLink onclick="PF('accessPopup').show()">
-                                                                    <h:outputText value="#{bundle['file.restrict']}"/>
-                                                                </p:commandLink>
-                                                            </li>
-                                                        </ui:fragment>
-                                                        <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and FilePage.fileMetadata.restricted}">
-                                                            <li>
-                                                                <p:commandLink update="@form" actionListener="#{FilePage.restrictFile(false)}">
-                                                                    <h:outputText value="#{bundle['file.unrestrict']}"/>
-                                                                </p:commandLink>
-                                                            </li>
-                                                        </ui:fragment>     
-                                                    </ui:fragment>
-                                                    <ui:fragment rendered="#{FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == false and !FilePage.fileMetadata.dataFile.filePackage}">                                        
-                                                    <li><!-- start: replace file link -->
-                                                        <h:outputLink value="/editdatafiles.xhtml?mode=SINGLE_REPLACE&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;fid=#{FilePage.fileMetadata.dataFile.id}&#38;version=#{FilePage.version}">
-                                                             <h:outputText value="#{bundle['file.replace']}"/>
-                                                        </h:outputLink>
-                                                    <!-- end replace file link --></li>
-                                                    </ui:fragment>
-                                                    <ui:fragment rendered="#{ !FilePage.fileMetadata.dataFile.filePackage and ((FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == true) or (!FilePage.fileMetadata.dataFile.released and FilePage.fileMetadata.datasetVersion.dataset.released)) }">                                        
-                                                    <li><!-- start: already replaced replace file link -->
-                                                        <p:commandLink title="#{bundle['file.delete']}" onclick="PF('fileAlreadyReplacedDraft').show();">
-                                                            <h:outputText value="#{bundle['file.replace']}"/>
-                                                        </p:commandLink>
-                                                    <!-- end replace file link --></li>
-                                                    </ui:fragment>  
-                                                    <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.released or !FilePage.fileMetadata.dataFile.filePackage}"> 
-                                                        <li>
-                                                            <p:commandLink title="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').show();">
-                                                                <h:outputText value= "#{bundle['file.delete']}"/>
-                                                            </p:commandLink>
-                                                        </li>
-                                                    </ui:fragment>
-                                                    <ui:fragment rendered="#{!widgetWrapper.widgetView and (worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">
-                                                    <li>
-                                                    </li>
-                                                    </ui:fragment>
-                                                </ul>
-                                            </div>
-                                            <!-- END: Edit Button Group -->
-                                        </div>
-                                        <!-- END: Map/Edit Button Block -->
-                                        <!-- Explore/Download/Request Button Block -->
-                                        <div class="button-container btn-group" jsf:rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or 
-                                                                                                    (FilePage.fileMetadata.datasetVersion.deaccessioned and FilePage.canUpdateDataset())) 
-                                                                                                     and (!FilePage.fileMetadata.dataFile.filePackage or
-                                                                                                           FilePage.fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}">
-                                            <ui:include src="file-download-button-fragment.xhtml">
-                                                <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>
-                                                <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>
-                                                <ui:param name="downloadPopupRequired" value="#{FilePage.downloadPopupRequired}"/>
-                                                <ui:param name="requestAccessPopupRequired" value="#{FilePage.requestAccessPopupRequired}"/>
-                                                <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
-                                                <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
-                                                <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
-                                                <ui:param name="isFilePg" value="true"/>
-                                                <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
-                                                <ui:param name="exploreTools" value="#{FilePage.exploreTools}"/>
-                                            </ui:include>
-                                        </div>
-                                        <!-- END: Explore/Download/Request Button Block -->
-                                    </div>
-                                    <!-- END: ActionButtonBlock -->
-                                </div>
-                            </div>
+                            
+                            <!-- REMOVED ACTION BTNS -->
+                            
                             <div id="fileVersionBlock" class="row">
-                                <div id="fileImageTitle" class="col-xs-12">
-                                    <div id="file-title-block" class="row margin-bottom-half">
-                                        <div class="col-xs-12">
-                                            <!-- Restricted File Icon -->
-                                            <span class="glyphicon glyphicon-lock text-danger" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}" />
-                                            <span class="icon-unlock text-success" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }" />
-
-                                            <!-- Title/Label -->
-                                            <h:outputText value="#{FilePage.fileMetadata.label}" styleClass="file-title-label"/>
-
+                                <div class="col-xs-12">
+                                    <div class="row">
+                                        <div id="file-title-block" class="col-xs-12 margin-bottom-half">
+                                            <span class="file-title-label" style="font-size:36px !important;line-height:1.1;">#{FilePage.fileMetadata.label}</span>
+                                            
+                                            <p class="help-block">
+                                                <h:outputFormat value="#{bundle['file.citation.notice']}" escape="false">
+                                                    <o:param value="#{FilePage.fileMetadata.datasetVersion.dataset.displayName}"/>
+                                                </h:outputFormat>
+                                            </p>
+                                            
                                             <div id="title-label-block" class="margin-top-half">
-                                                <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
-                                                <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>
-                                                <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"/>   
-                                                <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"/>
+                                                <!-- Restricted File Icon -->
+                                                <span style="margin-right:6px;" class="glyphicon glyphicon-lock text-danger" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}" />
+                                                <span style="margin-right:6px;" class="icon-unlock text-success" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }" />
+                                                <!-- DATASET Publication Status -->
+                                                <h:outputText style="margin-right:6px;" value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
+                                                <h:outputText style="margin-right:6px;" value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>
+                                                <h:outputText style="margin-right:6px;" value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"/>   
+                                                <h:outputText style="margin-right:6px;" value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"/>
                                                 <!-- DATASET VERSION NUMBER -->
                                                 <h:outputText styleClass="label label-default" rendered="#{FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
                                                               value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionNumber}.#{FilePage.fileMetadata.datasetVersion.minorVersionNumber}" /> 
@@ -195,18 +67,19 @@
                                             </div>
                                         </div>
                                     </div>
+                                    
+                                    <!-- START: NEW RESPONSIVE ABOVE FOLD BLOCK -->
                                     <div class="row">
-                                        <!-- CITATION BLOCK -->
-                                        <div class="#{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'col-sm-12' : 'col-sm-9'}">
-                                            <div class="row">
+                                        
+                                        <div class="col-xs-12 col-sm-12 col-md-8 col-lg-9">
+                                            <!-- CITATION BLOCK -->
+                                            <div>
                                                 <!-- FILE CITATION -->
-                                                <div class="col-sm-12">
-                                                    <h:outputFormat styleClass="h5" value="#{bundle['file.citation.datafile']}" escape="false" />
-                                                </div>
-                                                <div class="col-sm-12 citation-block">
-                                                    <div class="col-sm-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation bg-citation-file'}">
+                                                <h:outputFormat styleClass="h5" value="#{bundle['file.citation.datafile']}" escape="false" />
+                                                <div class="citation-block">
+                                                    <div class="col-xs-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation bg-citation-file'}">
                                                         <div class="row">
-                                                            <div class="col-sm-12 citation">
+                                                            <div class="col-xs-12 citation #{FilePage.fileMetadata.datasetVersion.deaccessioned ? '' : 'margin-bottom'}" style="word-wrap:break-word;">
                                                                 <span id="citation-select-2" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
                                                                     <h:outputText value="#{FilePage.fileMetadata.dataFile.isIdentifierRegistered() ? FilePage.fileMetadata.getDirectFileCitation(true) : FilePage.fileMetadata.getFileCitation(true)}" escape="false"/>
                                                                 </span>
@@ -215,10 +88,10 @@
                                                                 <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" 
                                                                       data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
                                                             </div>
-                                                            <div class="col-sm-6 citation-download vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                                                <div class="dropdown">
-                                                                    <button type="button" class="btn btn-default dropdown-toggle downloadCitation" data-toggle="dropdown">
-                                                                        <span class="glyphicon glyphicon-list"/> #{bundle['file.cite.file.downloadBtn']} <span class="caret"></span>
+                                                            <div class="col-xs-12 col-sm-4 col-md-3 citation-download" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                                <div class="btn-group">
+                                                                    <button type="button" style="padding:0;" class="btn btn-link dropdown-toggle downloadCitation" data-toggle="dropdown">
+                                                                         #{bundle['file.cite.file.downloadBtn']} <span class="caret"></span>
                                                                     </button>
                                                                     <ul class="dropdown-menu" role="menu">
                                                                         <li>
@@ -239,26 +112,25 @@
                                                                     </ul>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                            <!-- BOOTSTRAP 3 CLEARFIX SPACER -->
+                                                            <div class="clearfix visible-xs" style="line-height:.5;">&#160;</div>
+                                                            <!-- END: BOOTSTRAP 3 CLEARFIX SPACER -->
+                                                            <div class="col-xs-12 col-sm-8 col-md-7 small text-muted citation-standards"
+                                                                 style="line-height:2.1;"
+                                                                 jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
                                                                 <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
                                                             </div>
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <!-- END FILE CITATION -->
+                                                <!-- END: FILE CITATION -->
+
                                                 <!-- DATASET CITATION -->
-                                                <div class="col-sm-12">
-                                                    <p class="help-block">
-                                                        <h:outputFormat value="#{bundle['file.citation.notice']}" escape="false">
-                                                            <o:param value="#{FilePage.fileMetadata.datasetVersion.dataset.displayName}"/>
-                                                        </h:outputFormat>
-                                                    </p>
-                                                    <h:outputFormat styleClass="h5" value="#{bundle['file.citation.dataset']}" escape="false" />
-                                                </div>
-                                                <div class="col-sm-12 citation-block no-margin-bottom">
-                                                    <div class="col-sm-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
+                                                <h:outputFormat styleClass="h5" value="#{bundle['file.citation.dataset']}" escape="false" />
+                                                <div class="citation-block no-margin-bottom">
+                                                    <div class="col-xs-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
                                                         <div class="row">
-                                                            <div class="col-sm-12 citation">
+                                                            <div class="col-xs-12 citation #{FilePage.fileMetadata.datasetVersion.deaccessioned ? '' : 'margin-bottom'}" style="word-wrap:break-word;">
                                                                 <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
                                                                     <h:outputText value="#{FilePage.fileMetadata.datasetVersion.getCitation(true)}" escape="false"/>
                                                                 </span>
@@ -269,10 +141,10 @@
                                                                 <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}" 
                                                                       data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
                                                             </div>
-                                                            <div class="col-sm-6 citation-download vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                                                <div class="dropdown">
-                                                                    <button type="button" class="btn btn-default dropdown-toggle downloadCitation" data-toggle="dropdown">
-                                                                        <span class="glyphicon glyphicon-list"/> #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
+                                                            <div class="col-xs-12 col-sm-4 col-md-3 citation-download" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                                <div class="btn-group">
+                                                                    <button type="button" style="padding:0;" class="btn btn-link dropdown-toggle downloadCitation" data-toggle="dropdown">
+                                                                        #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
                                                                     </button>
                                                                     <ul class="dropdown-menu" role="menu">
                                                                         <li>
@@ -293,19 +165,188 @@
                                                                     </ul>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                            <!-- BOOTSTRAP 3 CLEARFIX SPACER -->
+                                                            <div class="clearfix visible-xs" style="line-height:.5;">&#160;</div>
+                                                            <!-- END: BOOTSTRAP 3 CLEARFIX SPACER -->
+                                                            <div class="col-xs-12 col-sm-8 col-md-7 small text-muted citation-standards" 
+                                                                 style="line-height:2.1;" 
+                                                                 jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
                                                                 <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
                                                             </div>
                                                         </div>
                                                     </div>
                                                 </div>
+                                                <!-- END: DATASET CITATION -->
+                                            </div>
+                                            <!-- END: CITATION BLOCK -->
+                                        </div>
+                                        
+                                        
+                                        <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom">
+                                            <!-- ActionButtonBlock -->
+                                            <div id="actionButtonBlock">
+                                                    
+                                                    <!-- DOWNLOAD/ACCESS DATASET -->
+                                                    <div class="btn-group btn-group-justified" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                        <div class="btn-group">
+                                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                                                ACCESS FILE <span class="caret"></span>
+                                                            </button>
+                                                            <ul class="dropdown-menu pull-right text-left">
+                                                                <li>
+                                                                    <!-- LINKS -->
+                                                                </li>
+                                                                <!-- EXPLORE -->
+                                                                <!-- TO-DO, FIX RENDER LOGIC, ANALYTICS EVENT TRACKING -->
+                                                                
+                                                                <!-- END: EXPLORE -->
+                                                                
+                                                                <!-- DOWNLOAD/REQUEST ACCESS... -->
+                                                            </ul>
+                                                        </div>
+                                                    </div>
+                                            
+                                                    <!-- Map/Edit Button Block -->
+                                                    <div class="button-container btn-group" jsf:rendered="#{!widgetWrapper.widgetView}">
+                                                        <!-- Map Data/Set Up Button Block -->
+                                                        <ui:fragment rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset() 
+                                                                                 and (FilePage.getConfigureTools().size() > 0
+                                                                                 or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">		
+                                                            <ui:include src="file-configure-dropdown-fragment.xhtml">
+                                                                <ui:param name="configureTools" value="#{FilePage.getConfigureTools()}"/>
+                                                                <ui:param name="fileId" value="#{FilePage.fileMetadata.dataFile.id}"/>
+                                                                <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>		
+                                                                <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>		
+                                                            </ui:include>		
+                                                        </ui:fragment>
+                                                        <!-- END: Map Data/Set Up Button Block -->
+                                                        <!-- Edit Button Group -->
+                                                        <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
+                                                                                 and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset) 
+                                                                                 and (dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
+                                                            <p:commandLink styleClass="btn btn-default btn-access" onclick="PF('fileAlreadyReplacedPrevious').show()">
+                                                                <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']}
+                                                            </p:commandLink>
+                                                        </div>
+                                                        <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
+                                                                                 and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
+                                                                                 and !FilePage.lockedFromEdits
+                                                                                 and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
+                                                            <button type="button" id="editFile" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
+                                                                <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
+                                                            </button>
+                                                            <ul class="dropdown-menu pull-right text-left" role="menu">
+                                                                <ui:fragment rendered="#{systemConfig.provCollectionEnabled}">
+                                                                <!--  Should be FilePage.isLockedFromEdits() ? -->
+                                                                    <li class="#{DatasetPage.lockedFromEdits  ? 'disabled' : ''}">
+                                                                        <p:commandLink id="fileProvenanceButton"
+                                                                                   update="editProvenancePopup"
+                                                                                   oncomplete="PF('editProvenancePopup').show();bind_bsui_components();">
+                                                                                   <f:actionListener binding="#{provPopupFragmentBean.updatePopupState(fileMetadata, true)}" /> <!--clearProvenanceUpdates() -->
+                                                                                    #{bundle['file.provenance']} 
+                                                                        </p:commandLink>
+                                                                    </li> 
+                                                                </ui:fragment>
+                                                                <li>
+                                                                    <h:outputLink value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE&#38;version=#{FilePage.version}">
+                                                                        <h:outputText id="editFile-Multi-Link" value="#{bundle['file.dataFilesTab.metadata.header']}"/>
+                                                                    </h:outputLink>
+                                                                </li>
+                                                                <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
+                                                                    <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and !FilePage.fileMetadata.restricted}">
+                                                                        <li>
+                                                                            <p:commandLink onclick="PF('accessPopup').show()">
+                                                                                <h:outputText value="#{bundle['file.restrict']}"/>
+                                                                            </p:commandLink>
+                                                                        </li>
+                                                                    </ui:fragment>
+                                                                    <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and FilePage.fileMetadata.restricted}">
+                                                                        <li>
+                                                                            <p:commandLink update="@form" actionListener="#{FilePage.restrictFile(false)}">
+                                                                                <h:outputText value="#{bundle['file.unrestrict']}"/>
+                                                                            </p:commandLink>
+                                                                        </li>
+                                                                    </ui:fragment>     
+                                                                </ui:fragment>
+                                                                <ui:fragment rendered="#{FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == false and !FilePage.fileMetadata.dataFile.filePackage}">                                        
+                                                                <li><!-- start: replace file link -->
+                                                                    <h:outputLink value="/editdatafiles.xhtml?mode=SINGLE_REPLACE&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;fid=#{FilePage.fileMetadata.dataFile.id}&#38;version=#{FilePage.version}">
+                                                                         <h:outputText value="#{bundle['file.replace']}"/>
+                                                                    </h:outputLink>
+                                                                <!-- end replace file link --></li>
+                                                                </ui:fragment>
+                                                                <ui:fragment rendered="#{ !FilePage.fileMetadata.dataFile.filePackage and ((FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == true) or (!FilePage.fileMetadata.dataFile.released and FilePage.fileMetadata.datasetVersion.dataset.released)) }">                                        
+                                                                <li><!-- start: already replaced replace file link -->
+                                                                    <p:commandLink title="#{bundle['file.delete']}" onclick="PF('fileAlreadyReplacedDraft').show();">
+                                                                        <h:outputText value="#{bundle['file.replace']}"/>
+                                                                    </p:commandLink>
+                                                                <!-- end replace file link --></li>
+                                                                </ui:fragment>  
+                                                                <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.released or !FilePage.fileMetadata.dataFile.filePackage}"> 
+                                                                    <li>
+                                                                        <p:commandLink title="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').show();">
+                                                                            <h:outputText value= "#{bundle['file.delete']}"/>
+                                                                        </p:commandLink>
+                                                                    </li>
+                                                                </ui:fragment>
+                                                                <ui:fragment rendered="#{!widgetWrapper.widgetView and (worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">
+                                                                <li>
+                                                                </li>
+                                                                </ui:fragment>
+                                                            </ul>
+                                                        </div>
+                                                        <!-- END: Edit Button Group -->
+                                                    </div>
+                                                    <!-- END: Map/Edit Button Block -->
+                                                    
+                                                    <!-- Explore/Download/Request Button Block -->
+                                                    <div class="button-container btn-group" jsf:rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or 
+                                                                                                                (FilePage.fileMetadata.datasetVersion.deaccessioned and FilePage.canUpdateDataset())) 
+                                                                                                                 and (!FilePage.fileMetadata.dataFile.filePackage or
+                                                                                                                       FilePage.fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}">
+                                                        <ui:include src="file-download-button-fragment.xhtml">
+                                                            <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>
+                                                            <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>
+                                                            <ui:param name="downloadPopupRequired" value="#{FilePage.downloadPopupRequired}"/>
+                                                            <ui:param name="requestAccessPopupRequired" value="#{FilePage.requestAccessPopupRequired}"/>
+                                                            <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
+                                                            <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
+                                                            <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
+                                                            <ui:param name="isFilePg" value="true"/>
+                                                            <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
+                                                            <ui:param name="exploreTools" value="#{FilePage.exploreTools}"/>
+                                                        </ui:include>
+                                                    </div>
+                                                    <!-- END: Explore/Download/Request Button Block -->
+                                                    
+                                                    <!-- Contact/Share Button Group -->
+                                                    <div class="btn-group btn-group-justified" jsf:rendered="#{!widgetWrapper.widgetView}">
+                                                        <p:commandLink class="btn btn-default btn-xs" title="#{bundle['dataset.email.datasetContactBtn']}"
+                                                                       update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{FilePage.fileMetadata.dataFile}"/>
+                                                            #{bundle['contact.contact']} OWNER
+                                                        </p:commandLink>
+                                                        <p:commandLink styleClass="btn btn-default btn-xs" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}"
+                                                                       title="#{bundle['dataset.share.datasetShare']}"
+                                                                       oncomplete="PF('shareDialog').show();sharrre();">
+                                                            #{bundle['share']}
+                                                        </p:commandLink>
+                                                    </div>
+                                                    <!-- END: Contact/Share Button Group -->
+                                                    
                                             </div>
+                                            <!-- END: ActionButtonBlock -->
                                         </div>
-                                        <!-- END DATASET CITATION -->
-                                        <!-- Metrics -->
-                                        <div class="col-sm-3">
-                                            <div id="metrics-block" jsf:rendered="#{!(widgetWrapper.widgetView or FilePage.fileMetadata.dataFile.filePackage or FilePage.fileMetadata.datasetVersion.deaccessioned)}">
-                                                <div id="metrics-heading">
+                                        
+                                        <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom" 
+                                             style="margin-top:6px;" 
+                                             jsf:rendered="#{!(widgetWrapper.widgetView or FilePage.fileMetadata.dataFile.filePackage or FilePage.fileMetadata.datasetVersion.deaccessioned)}">
+                                            <!-- Metrics -->
+                                            <div id="metrics-block" style="border:0;">
+                                                <div id="metrics-headingXXX">
                                                     #{bundle['metrics.file.title']}
                                                     <ui:fragment rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
                                                         <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
@@ -316,7 +357,7 @@
                                                             data-trigger="focus" data-html="true" data-content="#{bundle['metrics.file.tip.makedatacount']}"></a>
                                                     </ui:fragment>
                                                 </div>
-                                                <div id="metrics-body">
+                                                <div id="metrics-body" style="border-width:1px 0 0 0;padding-left:0;padding-right:0;">
                                                     <!-- Classic downloads -->
                                                     <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
                                                         <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
@@ -335,13 +376,18 @@
                                                     </div>
                                                 </div>
                                             </div>
+                                            <!-- END: Metrics -->
                                         </div>
-                                        <!-- END: Metrics -->
-                                    </div>
-                                    <!-- DEACCESSION REASON -->
-                                    <div class="row" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                        <div id="deaccession-reason-block" class="col-xs-12">
-                                            <div class="col-xs-12 bg-danger">
+                                        
+                                        
+                                        
+                                        <!-- DEACCESSION ONLY?? NO SUMMARY BLOCK?? RESPONSIVE ORDER HACK BOOTSTRAP 3 https://stackoverflow.com/a/24834574 -->
+                                        <div jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}" 
+                                             id="dataset-colorder-block" class="visible-md-block visible-lg-block col-md-8 col-lg-9"><!--Hack--></div>
+                                        <!-- END: RESPONSIVE ORDER HACK BOOTSTRAP 3 -->
+                                        <!-- DEACCESSION REASON -->
+                                        <div class="col-xs-12 col-sm-12 col-md-8 col-lg-9 margin-bottom" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                            <div id="deaccession-reason-block" class="col-xs-12 bg-danger">
                                                 <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
                                                 <p>#{FilePage.fileMetadata.datasetVersion.versionNote}</p>
                                                 <ui:fragment rendered="#{!empty FilePage.fileMetadata.datasetVersion.archiveNote}">
@@ -349,8 +395,13 @@
                                                 </ui:fragment>
                                             </div>
                                         </div>
+                                        <!-- END DEACCESSION REASON -->
+                                        
+                                        
+                                        
                                     </div>
-                                    <!-- END DEACCESSION REASON -->
+                                    <!-- END: NEW RESPONSIVE ABOVE FOLD BLOCK -->
+                                    
                                 </div>
                             </div>
                         </div>
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 4b973e3930a..2d32ecaa2dc 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -846,7 +846,6 @@ div[id$="filesTable"].ui-datatable thead th.col-file-action, div[id$="filesTable
 thead.ui-datatable-scrollable-theadclone {display:none}
 
 /* FILE */
-#fileImageTitle {margin-bottom: 12px;}
 #file-preview-icon-block > #border-block {/*border:1px solid #DDD;border-radius:4px; padding: 10px;*/}
 #file-preview-icon-block > #border-block > #preview-square {/*position: relative; overflow:hidden; padding-bottom:100%;*/}
 #file-preview-icon-block > #border-block > #preview-square > span.text-muted {font-size:6.5em; line-height:1 !important; /*text-align: center; position: absolute; width: 100%; height: 100%; margin:0;*/}
@@ -866,11 +865,10 @@ thead.ui-datatable-scrollable-theadclone {display:none}
         font-size: 17.5em;
     }
 }
-#fileImageTitle span.glyphicon-lock, #fileImageTitle span.icon-unlock {font-size:1.5em;}
-#fileImageTitle #file-title-block span.file-title-label {font-size:1.5em;font-weight:bold;margin-right:.5em;}
-#fileImageTitle #file-title-block span.label {margin-right:.5em;vertical-align: text-top;}
+
+#file-title-block span.file-title-label {font-size:1.5em;font-weight:bold;margin-right:.5em;}
+#file-title-block span.label {margin-right:.5em;vertical-align: text-top;}
 #fileCategoriesBlock span.label {margin-right: 0.5em;}
-#fileImageTitle #deaccession-reason-block.col-xs-12 {padding-left:15px;padding-right:15px;}
 
 /* BLOCK UI */
 .ui-blockui.ui-widget-overlay {background:#fff; opacity:.6;}