Intial commit for responsive btns on file pg [ref #6684]

IQSS · Mar 25, 2020 · 4e2802b · 4e2802b
1 parent 959748d
commit 4e2802b
Show file tree

Hide file tree

Showing 4 changed files with 255 additions and 205 deletions.
diff --git 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
@@ -107,7 +107,6 @@
                                         </div>
                                     </div>
 
-
                                     <!-- START: NEW RESPONSIVE ABOVE FOLD BLOCK -->
                                     <div class="row">
 
@@ -412,15 +411,15 @@
 
                                                 <!-- 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=""/>
                                                         <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
                                                         <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}">