Additional responsive cleanup of action btns, citation, metrics, summ…

…ary on dataset pg [ref #6684]
IQSS · Mar 25, 2020 · 959748d · 959748d
1 parent 9d5699d
commit 959748d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 35 deletions.
diff --git a/src/main/webapp/dataset-citation.xhtml b/src/main/webapp/dataset-citation.xhtml
@@ -10,7 +10,6 @@
     <div class="citation-block">
         <div class="col-xs-12 #{DatasetPage.workingVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
             <div class="row">
-                <!-- TO-DO, REVIEW USE OF vcenter CLASS IN CITATION VS THUMBNAIL -->
                 <!-- TO-DO, REVIEW INCLUSION OF THUMBNAIL IN WIDGET VIEW -->
                 <div class="col-xs-2 center-block preview-icon-block" style="padding:0;">
                     <!-- TO-DO, FIX THUMBNAIL SIZE, MIN-HEIGHT HACK TO FIX RESPONSIVE ORDER HACK -->
@@ -46,7 +45,6 @@
                         </div>
                     </div>
                 </div>
-                <!-- TO-DO, REVIEW USE OF vcenter CLASS IN CITATION VS THUMBNAIL -->
                 <div class="col-xs-12 col-sm-4 col-md-3 citation-download" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
                     <div class="btn-group">
                         <button type="button" style="padding:0;" class="btn btn-link dropdown-toggle downloadCitation" data-toggle="dropdown">
@@ -74,7 +72,6 @@
                 <!-- BOOTSTRAP 3 CLEARFIX SPACER -->
                 <div class="clearfix visible-xs" style="line-height:.5;">&#160;</div>
                 <!-- END: BOOTSTRAP 3 CLEARFIX SPACER -->
-                <!-- TO-DO, REVIEW USE OF vcenter CLASS IN CITATION VS THUMBNAIL -->
                 <div class="col-xs-12 col-sm-8 col-md-7 small text-muted citation-standards"
                      style="line-height:2.1;"
                      jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -87,11 +87,11 @@
 
                             <div id="datasetVersionBlock" class="row">
                                 <div class="col-xs-12">
-                                    <div id="title-block" class="row margin-bottom-half" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.title.value}">
+                                    <div class="row">
 
                                         <!-- REMOVED THUMBNAIL -->
 
-                                        <div class="col-xs-12 vcenter">
+                                        <div id="title-block" class="col-xs-12 margin-bottom-half" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.title.value}">
                                             <span id="title" style="font-size:36px !important;line-height:1.1;">#{DatasetPage.datasetVersionUI.title.value}</span>
                                             <div id="title-label-block" class="margin-top-half">
                                                 <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-default" rendered="#{DatasetPage.workingVersion.draft}"/>
@@ -121,7 +121,7 @@
                                             <!-- END: CITATION BLOCK -->
                                         </div>
 
-                                        <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right">
+                                        <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom">
                                             <!-- ActionButtonBlock -->
                                             <div id="actionButtonBlock" jsf:rendered="#{!widgetWrapper.widgetView}">
 
@@ -433,7 +433,7 @@
                                             <!-- END: ActionButtonBlock -->
                                         </div>
 
-                                        <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right" 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="#{true}">
                                             <!-- Metrics -->
                                             <div id="metrics-block" style="border:0;" jsf:rendered="#{!(settingsWrapper.rsyncDownload or DatasetPage.workingVersion.deaccessioned)}">
                                                 <div id="metrics-headingXXX">
@@ -447,7 +447,7 @@
                                                             data-trigger="focus" data-html="true" data-content="#{bundle['metrics.dataset.tip.makedatacount']}"></a>
                                                     </ui:fragment>
                                                 </div>
-                                                <div id="metrics-body" style="border-width:1px 0 0 0;">
+                                                <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']}">
@@ -504,7 +504,7 @@
                                         <!-- END: DEACCESSION REASON -->
 
                                         <!-- BEGIN: DATASET SUMMARY -->
-                                        <div id="dataset-summary-metadata" class="col-xs-12 col-sm-12 col-md-8 col-lg-9 metadata-container margin-bottom"
+                                        <div style="padding:0;" id="dataset-summary-metadata" class="col-xs-12 col-sm-12 col-md-8 col-lg-9 metadata-container margin-bottom"
                                              jsf:rendered="#{!widgetWrapper.widgetView and !DatasetPage.workingVersion.deaccessioned and 
                                                              (!empty DatasetPage.datasetVersionUI.descriptionDisplay
                                                              or !empty DatasetPage.datasetVersionUI.keywordDisplay

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
@@ -367,7 +367,7 @@ table.ui-selectmanycheckbox.metadata-blocks-select label.ui-state-disabled {back
 div.ui-state-focus span.ui-chkbox-icon {outline: -webkit-focus-ring-color auto 5px;}
 
 /* Buttons */
-#actionButtonBlock {margin-bottom:1em; margin-top:0;}
+#actionButtonBlock {/*margin-bottom:1em; margin-top:0;*/}
 #dataverse-info-dropdown {padding:.5em 1em .25em 1em; overflow:hidden; width:400px;}
 #dataverse-info-dropdown .dataverse-info-logo-icon {width:40px; float:left; margin-right:12px;}
 #dataverse-info-dropdown .dataverse-info-logo-icon .icon-dataverse {font-size:40px; line-height:40px;}
@@ -433,10 +433,7 @@ a[id$='advsearchlink'] {margin-left:1em;}
 #dv-main {}
 #dv-main.nofacets {width:100%;float:none;}
 
-/*
- * Off Canvas
- * --------------------------------------------------
- */
+/* Off Canvas */
 @media screen and (max-width: 767px) {
   .row-offcanvas {
     position: relative;
@@ -577,13 +574,11 @@ div.popupSubTabParent > div.ui-tabs-panels > div.ui-tabs-panel.ui-widget-content
 div.ui-tabs-panels .ui-tabs .ui-tabs-nav.ui-widget-header li {border:0;}
 div.ui-tabs-panels .ui-tabs.ui-tabs-top .ui-tabs-nav.ui-widget-header {border-bottom:0;}
 
-/* -------- ADVANCED -------- */
-
 /* -------- PERMISSIONS -------- */
 div[id$='roleDisplay'] span.label, div[id$='roleDetails'] span.label {display:inline-block; margin-bottom:4px;}
 
 /* -------- METRICS -------- */
-#metrics-block {margin-bottom:20px;}
+#metrics-block {/*margin-bottom:20px;*/}
 
 /* -- OLD LAYOUT -- */
 #metrics-block {border:1px solid #eee; padding:0;}
@@ -631,28 +626,17 @@ div.alert-info.bg-citation, div.alert-danger.bg-danger {/*padding-top:4px; paddi
 .citation, .citation-download, .citation-standards {/*padding:.5em;*/}
 .citation span.glyphicon-question-sign {margin-left:.5em; margin-bottom:2px; vertical-align: middle;}
 
-/*MOVED*/
-/*TO-DO, REVIEW USE OF vcenter CLASS IN CITATION VS THUMBNAIL*/
-/*div.citation-block div.vcenter.title-preview-icon-block {display:inline-block; vertical-align:middle; float:none; padding:0;}*/
 div.citation-block div.preview-icon-block {/*width:48px;*/}
 div.citation-block div.preview-icon-block img {/*margin:6px 0;*/}
 div.citation-block div.preview-icon-block span[class^='icon'] {font-size:7.5em; line-height:1.1; color:#428BCA;}
 
-/*COMMENTED OUT FOR THUMBNAILS*/
-/*TO-DO, REVIEW USE OF vcenter CLASS IN CITATION VS THUMBNAIL*/
-.citation-block .vcenter {/*display: inline-block; vertical-align: middle; float: none;*/}
-.waiver-CC0-inline {display:inline-block; margin-left:1em;}
-
 div.panel-body div.form-group:last-child, div.panel-body div.form-group:last-child label {margin-bottom:0 !important;}
-div.panel-body.read-terms{max-height:220px; overflow-y:scroll; width:100%; background-color:#eeeeee;}
 
 /* Buttons */
 .button-block.form-top {border-top: 1px solid #dddddd; padding:1em 0;}
 span[id$='editDataSet'] .ui-button-text {white-space: nowrap;}
 #replicationDataButton {margin-top:5px;}
 
-#deaccession-reason-block {}
-
 div.form-group .glyphicon.glyphicon-asterisk {font-size:.5em; vertical-align:text-top;}
 #datasetForm .form-group, #templateForm .form-group {overflow: hidden;}
 div.form-col-container div.form-col-container {padding-left:0;}
@@ -723,15 +707,14 @@ div.panel-heading.text-info[data-toggle="collapse"] {color: #31708F;}
 
 .btn-sm.ui-button {padding: 5px 10px;}
 
-#dragdropMsg {padding:20px;font-size:1.3em;color:#808080;text-align:center;}
-
 div.popover.thumb-preview.fade.top.in, div.popover.thumb-preview.fade.bottom.in {max-width: none;}
 div.popover.thumb-preview.fade.top.in div.popover-content, div.popover.thumb-preview.fade.bottom.in div.popover-content {text-align:center; vertical-align: middle; display:table-cell; width:428px; height:418px;}
 a.popoverHTML {display:inline-block;}
 
+/* TERMS */
+.waiver-CC0-inline {display:inline-block; margin-left:1em;}
 
-div[id$="versionsTable"] th.col-select-width * {display:none;}
-
+/* FILES */
 div[id$="filesTable"].ui-datatable.ui-widget div.ui-datatable-tablewrapper {overflow:visible;}
 div[id$="filesTable"].ui-datatable.ui-widget {margin-bottom:20px;}
 div[id$="filesTable"].ui-datatable.ui-widget table {table-layout: fixed;}
@@ -830,7 +813,17 @@ div[id$="filesTable"] .ui-paginator .ui-paginator-pages .ui-state-active {
 div[id$="filesTree"] span.ui-treenode-label span[class^='icon'] {margin-left: -2px;}
 
 span.ingest-warning {display:inline-block; font-size:24px; line-height:1; vertical-align: middle;}
-span.ingest-warning span.glyphicon {top:3px} 
+span.ingest-warning span.glyphicon {top:3px}
+
+/* DOWNLOAD POPUP */
+div.panel-body.read-terms{max-height:220px; overflow-y:scroll; width:100%; background-color:#eeeeee;}
+
+/* UPLOAD FILES */
+#dragdropMsg {padding:20px;font-size:1.3em;color:#808080;text-align:center;}
+.dropin-btn-status.ui-icon {background: url("https://www.dropbox.com/static/images/widgets/dbx-saver-status.png") no-repeat;}
+
+/* VERSIONS */
+div[id$="versionsTable"] th.col-select-width * {display:none;}
 
 #version-details-block > div {width:35%; padding:4px 10px; border: 1px solid #DDDDDD;}
 #version-details-block > div:first-of-type {width:30%; border:0;}
@@ -847,8 +840,6 @@ div.dvnDifferanceTable div.ui-datatable-tablewrapper table td.versionDetails {wi
 
 div.dvnDifferanceTable .diffDetailBlock {display:block;}
 
-.dropin-btn-status.ui-icon {background: url("https://www.dropbox.com/static/images/widgets/dbx-saver-status.png") no-repeat;}
-
 /* MANAGE TABLE + DROPDOWN BUTTON */
 div.manageTable.ui-datatable div.ui-datatable-tablewrapper, div.manageTable.ui-datatable td.col-manage-action {overflow:visible;}
 div[id$="filesTable"].ui-datatable thead th.col-file-action, div[id$="filesTable"].ui-datatable tbody td.col-file-action {overflow:visible !important;}