UI clean up progress on the dataset pg and file landing pg. [ref #1665 …

…#2503 #2504 #2465]
IQSS · Sep 13, 2015 · 4e81c43 · 4e81c43
1 parent 24320b3
commit 4e81c43
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -38,7 +38,7 @@
                             <ul class="dropdown-menu pull-right text-left" role="menu">
                                 <li>
                                     <h:outputLink value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}">
-                                        <h:outputText id="editFile-Multi-Link" value="Metadata" style="display:block;font-weight:bold;"/>
+                                        <h:outputText id="editFile-Multi-Link" value="Metadata"/>
                                     </h:outputLink>
                                 </li>
                             </ul>
@@ -143,9 +143,9 @@
                             <h:outputText style="margin-right:.5em;vertical-align: text-top;" value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{true}"/>
                         </div>
                         <div id="citation-block">
-                             <div class="col-xs-12">
-                                <div class="row bg-citation">
-                                    <div id="citation" class="col-xs-12"
+                             <div class="">
+                                <div class="bg-citation">
+                                    <div id="citation" class=""
                                          onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
                                         <h:outputText value="#{FilePage.file.owner.citation}" escape="false"/>
                                         <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{true}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
@@ -154,13 +154,13 @@
                                     <!--<div id="citation-download" class="col-sm-4 col-md-3 text-right" jsf:rendered="">
                                     </div>-->
                                 </div>
-                                <div class="row bg-muted" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
-                                    <div id="citation-standards" class="col-xs-12 text-muted small"><h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/></div>
+                                <div class="bg-muted" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
+                                    <div id="citation-standards" class="text-muted small"><h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/></div>
                                 </div>
                             </div>
                         </div>
-                        <div>
-                            <div class="text-muted small">
+                        <div style="margin-top:1em;">
+                            <div class="text-muted">
                                 <h:outputText id="fileTypeOutputRegular" value="#{FilePage.fileMetadata.dataFile.friendlyType}" rendered="#{!(FilePage.fileMetadata.dataFile.tabularData)}"/>
                                 <h:outputText id="fileTypeOutputTabular" value="#{bundle['file.type.tabularData']}" rendered="#{FilePage.fileMetadata.dataFile.tabularData}"/>
                                 <h:outputText id="fileSize" value=" - #{FilePage.fileMetadata.dataFile.friendlySize}" />

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
@@ -67,13 +67,13 @@
                                         <h:outputText id="editFile-Multi-Link" value="Metadata"/>
                                     </h:outputLink>
                                 </li>
-                                <li>
+                                <li class="#{empty DatasetPage.selectedUnrestrictedFiles ? 'disabled' : ''}">
                                     <p:commandLink update="filesTable,:messagePanel" oncomplete="toggle_dropdown();" actionListener="#{DatasetPage.restrictSelectedFiles(true)}"
                                                    disabled="#{empty DatasetPage.selectedUnrestrictedFiles}">
                                         <h:outputText value="#{bundle['file.restrict']}"/>
                                     </p:commandLink>
                                 </li>
-                                <li>
+                                <li class="#{empty DatasetPage.selectedRestrictedFiles ? 'disabled' : ''}">
                                     <p:commandLink update="filesTable,:messagePanel" oncomplete="toggle_dropdown();" actionListener="#{DatasetPage.restrictSelectedFiles(false)}"
                                                    disabled="#{empty DatasetPage.selectedRestrictedFiles}">
                                         <h:outputText value="#{bundle['file.unrestrict']}"/>
@@ -219,7 +219,7 @@
                 <div style="width:36px;padding:4px 10px;float:left;">
                     <span class="bootstrap-button-tooltip" style="display:inline-block;" title="Select All">
                         <p:selectBooleanCheckbox value="#{DatasetPage.selectAllFiles}" style="margin:0 0 2px 0;">
-                                <p:ajax update="filesTable" listener="#{DatasetPage.toggleSelectedFiles}" />
+                            <p:ajax update="filesTable" listener="#{DatasetPage.toggleSelectedFiles}" oncomplete="bind_bsui_components();" />
                         </p:selectBooleanCheckbox>
                     </span>
                 </div>