Clean up of styling for file pg when deaccessioned. [ref #2465]

IQSS · Oct 25, 2016 · 012adbf · 012adbf
1 parent 752f5a6
commit 012adbf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -179,7 +179,7 @@
                                 <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"/>
                             </div>
                             <div id="citation-block" class="col-xs-12">
-                                 <div class="col-xs-12  #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
+                                 <div class="col-xs-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
                                     <div class="row">
                                         <div id="citation" class="#{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'col-xs-12' : 'col-xs-7 col-md-8'}">
                                             <span id="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
@@ -188,7 +188,7 @@
                                             <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
                                             <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
                                         </div>
-                                        <div id="citation-download" class="col-sm-5 col-md-4 text-right" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
+                                        <div id="citation-download" class="col-sm-5 col-md-4 text-right" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
                                             <div class="dropdown">
                                                 <button type="button" id="downloadCitation" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                                     <span class="glyphicon glyphicon-list"/> #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
@@ -217,12 +217,14 @@
                                     </div>
                                 </div>
                             </div>
-                            <div id="deaccession-reason-block" class="row bg-danger" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
-                                <p>#{FilePage.fileMetadata.datasetVersion.versionNote}</p>
-                                <ui:fragment rendered="#{!empty FilePage.fileMetadata.datasetVersion.archiveNote}">
-                                    <p>#{bundle['dataset.beAccessedAt']} <a href="#{FilePage.fileMetadata.datasetVersion.archiveNote}" target="_blank">#{FilePage.fileMetadata.datasetVersion.archiveNote}</a></p>
-                                </ui:fragment>
+                            <div id="deaccession-reason-block" class="col-xs-12" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                <div 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}">
+                                        <p>#{bundle['dataset.beAccessedAt']} <a href="#{FilePage.fileMetadata.datasetVersion.archiveNote}" target="_blank">#{FilePage.fileMetadata.datasetVersion.archiveNote}</a></p>
+                                    </ui:fragment>
+                                </div>
                             </div>
                             <div id="fileMetadataBlock" class="col-xs-12">
                                 <div class="text-muted">

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
@@ -741,6 +741,7 @@ div.manageTable.ui-datatable div.ui-datatable-tablewrapper, div.manageTable.ui-d
 #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;}
 #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;}