backport changes from IQSS#8322

QualitativeDataRepository · Dec 22, 2021 · 1661edc · 1661edc
1 parent 70927ea
commit 1661edc
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 14 deletions.
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
@@ -44,6 +44,7 @@
                     <f:viewAction action="#{DataverseUserPage.init}" />
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(dataverseServiceBean.findRootDataverse(), (DataverseUserPage.editMode == 'CREATE' ? bundle['user.createBtn'] : bundle.account))}"/>
                 </f:metadata>
+                <h1>#{pageTitle}</h1>
                 <h:form id="dataverseUserForm">
 
                     <p:focus context="dataverseUserForm"/>

diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
@@ -335,7 +335,8 @@
                                      selection="#{EditDatafilesPage.selectedFiles}" 
                                      var="fileMetadata" 
                                      widgetVar="filesTable"
-                                     emptyMessage="#{datasetPage || EditDatafilesPage.showFileUploadFragment() ? bundle['file.noUploadedFiles.tip'] : bundle['file.noSelectedFiles.tip']}">
+                                     emptyMessage="#{datasetPage || EditDatafilesPage.showFileUploadFragment() ? bundle['file.noUploadedFiles.tip'] : bundle['file.noSelectedFiles.tip']}"
+                                     ariaRowLabel="#{bundle['file.select.action']} #{fileMetadata.label}">
                             <f:facet name="header">
                                 <div jsf:id="filesHeaderBlock" class="row">
                                     <div id="filesHeaderCount" class="col-xs-6 text-left">
@@ -346,9 +347,12 @@
                                     </div>
                                 </div>
                             </f:facet>
-                            <p:column selectionMode="multiple" class="col-select-width text-center" style="width:40px !important;"/>
+                            <p:column selectionMode="multiple" class="col-select-width text-center" style="width:40px !important;" ariaHeaderText="#{bundle['file.select.tooltip']}"/>
                             <p:column class="col-file-metadata">
-                                <div id="fileInfoInclude-filesTable" class="col-sm-12 row">
+                                <f:facet name="header">
+                                    <h:outputText styleClass="sr-only" value="#{bundle['file.tableheader.info']}"/>
+                                </f:facet>
+                                <div id="fileInfoInclude-filesTable-#{fileMetadata.label}" class="col-sm-12 row">
                                     <div class="pull-left col-file-thumb">
                                         <div class="thumbnail-block text-center">
                                             <!-- Thumbnail Preview -->

diff --git a/src/main/webapp/file-edit-popup-fragment.xhtml b/src/main/webapp/file-edit-popup-fragment.xhtml
@@ -33,7 +33,7 @@
         </p>
         <div class="form-horizontal">
             <div class="form-group">
-                <label for="termsAccessInput" class="col-sm-3 control-label">
+                <label for="datasetForm:termsAccessInput" class="col-sm-3 control-label">
                     #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
@@ -83,11 +83,11 @@
                     </div>
                     <div class="col-lg-9">
                         <div>
-                            <p class="help-block">
+                            <label class="help-block" for="datasetForm:fileEmbargoDate_input">
                                 #{bundle['file.editEmbargoDialog.newDate']} <span
                                     class="glyphicon glyphicon-asterisk text-danger"
                                     jsf:rendered="#{!bean.removeEmbargo}" />
-                            </p>
+                            </label>
                             <p:datePicker id="fileEmbargoDate"
                                 value="#{bean.selectionEmbargo.dateAvailable}"
                                 locale="#{dataverseSession.localeCode}"

diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
@@ -25,7 +25,7 @@
     -->            
     </ui:remove>
 
-    <p:outputPanel id="fileInfoInclude-filesTable" styleClass="media">
+    <p:outputPanel id="fileInfoInclude-filesTable-#{fileMetadata.label}" styleClass="media">
         <div class="media-left col-file-thumb" style="padding-top:4px;">
             <div class="media-object thumbnail-block text-center">
                 <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(fileMetadata.dataFile)} file-thumbnail-icon text-muted" jsf:rendered="#{!fileDownloadHelper.canDownloadFile(fileMetadata) or !dataFileServiceBean.isThumbnailAvailable(fileMetadata.dataFile)}"/>

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
@@ -381,7 +381,6 @@
         <p:column selectionMode="multiple" class="text-center" ariaHeaderText="#{bundle['file.select.tooltip']}"/>
         <p:column class="col-file-metadata">
             <f:facet name="header">
-                <f:passThroughAttribute name="aria-label" value="#{bundle['file.count.label']}"/>
                 <div jsf:id="filesHeaderCount">
                     <!-- Files Count -->
                     <h:outputFormat value="#{DatasetPage.fileMetadatasSearch.size() == 1 ? bundle['file.count.one'] : bundle['file.count']}" styleClass="highlightBold" rendered="#{DatasetPage.fileMetadatasSearch.size() gt 0}">
@@ -512,7 +511,7 @@
 
                     <!-- TO-DO FIX RSYNC LOGIC !fileMetadata.dataFile.filePackage or
                                                     fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload -->
-                <ui:fragment rendered="#{DatasetPage.isShowPreviewButton(fileMetadata.dataFile.id) and fileDownloadHelper.isPreviewAllowed(fileMetadata)}">
+                <ui:fragment rendered="#{DatasetPage.isShowPreviewButton(fileMetadata.dataFile.id) and fileDownloadHelper.canDownloadFile(fileMetadata)}">
                     <a class="btn-preview btn btn-link bootstrap-button-tooltip" title="#{DatasetPage.getPreviewToolsForDataFile(fileMetadata.dataFile.id).get(0).getDisplayNameLang()}"
                         href="#{widgetWrapper.wrapURL('/file.xhtml?'.concat(!empty fileMetadata.dataFile.globalIdString ? 'persistentId=' : 'fileId=').concat(!empty fileMetadata.dataFile.globalIdString ? fileMetadata.dataFile.globalIdString : fileMetadata.dataFile.id).concat('&amp;version=').concat(fileMetadata.datasetVersion.friendlyVersionNumber).concat('#tabs'))}">
                         <span class="glyphicon glyphicon-eye-open"/><span class="sr-only">#{bundle.preview} "#{empty(fileMetadata.directoryLabel) ? "":fileMetadata.directoryLabel.concat("/")}#{fileMetadata.label}"</span>

diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
@@ -40,7 +40,7 @@
 
                     <div class="col-md-12">
                         <div class="col-md-6 col-md-offset-3">
-                            <h2><span class="glyphicon glyphicon-log-in" /> #{bundle.login}</h2>
+                            <h1><span class="glyphicon glyphicon-log-in" /> #{bundle.login}</h1>
 
                             <div id="builtinProvider" jsf:rendered="#{LoginPage.authProvider.id == 'builtin'}">
                                 <h:form id="loginForm" styleClass="form-horizontal">
@@ -61,14 +61,14 @@
                                             </div>
                                         </ui:fragment>
                                     </ui:remove>
-                                    <ui:repeat id="credentialsContainer" value="#{LoginPage.filledCredentials}" var="fc">
+                                    <ui:repeat id="credentialsContainer" value="#{LoginPage.filledCredentials}" var="fc" varStatus="fcCount">
                                         <div class="form-group text-left">
-                                            <label class="col-sm-4 control-label" for="credValue">
+                                            <label class="col-sm-4 control-label" for="loginForm:credentialsContainer:#{fcCount.index}:#{fc.credential.secret ? 'sC':'c'}redValue">
                                                 #{bundle[fc.credential.key]}
                                             </label>
                                             <div class="col-sm-8">
                                                 <h:inputText rendered="#{not fc.credential.secret}" value="#{fc.value}" id="credValue" styleClass="form-control"/>
-                                                <p:message rendered="#{not fc.credential.secret}" for="credValue" display="text"/>
+                                                <p:message rendered="#{not fc.credential.secret}" for="loginForm:credentialsContainer:1:sCredValue" display="text"/>
 						<h:inputSecret rendered="#{fc.credential.secret}" value="#{fc.value}" id="sCredValue" styleClass="form-control" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
                                                 <p:message rendered="#{fc.credential.secret}" for="sCredValue" display="text"/>
                                             </div>

diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml
@@ -30,7 +30,7 @@
                         </tt>
                     </div>
                 </ui:fragment>
-
+                <h1>#{pageTitle}</h1>
                 <ui:fragment rendered="#{empty PasswordResetPage.token}">
                     <div jsf:rendered="#{empty PasswordResetPage.emailAddress}">
                         <div class="alert alert-info">

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
@@ -1458,3 +1458,6 @@ span.label-default { background-color: #757575 }
 .dropdown-header {color:#666;}
 .help-block {color:#666;}
 .alert-success {color:#376D38}
+
+.login-container h1 { font-size:30px; }
+#embargoInputs label { font-weight: normal; }