diff --git a/doc/sphinx-guides/source/style/patterns.rst b/doc/sphinx-guides/source/style/patterns.rst index 781de3d40fb..377fb4e3495 100644 --- a/doc/sphinx-guides/source/style/patterns.rst +++ b/doc/sphinx-guides/source/style/patterns.rst @@ -378,7 +378,7 @@ For action buttons on a page, we include an icon and text label. Action buttons Form Buttons ------------ -Form buttons typically appear at the bottom of a form, aligned to the left. They do not have icons, just text labels. +Form buttons typically appear at the bottom of a form, aligned to the left. They do not have icons, just text labels. The primary button is styled differently. .. raw:: html @@ -388,7 +388,7 @@ Form buttons typically appear at the bottom of a form, aligned to the left. They - @@ -399,7 +399,7 @@ Form buttons typically appear at the bottom of a form, aligned to the left. They
- +
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java index 225bb64f2bf..27af3973401 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java @@ -1931,7 +1931,8 @@ private String init(boolean initFull) { } if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.PublicInstall, false)){ - JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.message.publicInstall")); + JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.message.label.fileAccess"), + BundleUtil.getStringFromBundle("dataset.message.publicInstall")); } resetVersionUI(); @@ -1943,7 +1944,8 @@ private String init(boolean initFull) { try { privateUrl = commandEngine.submit(new GetPrivateUrlCommand(dvRequestService.getDataverseRequest(), dataset)); if (privateUrl != null) { - JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl)))); + JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.header"), + BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl)))); } } catch (CommandException ex) { // No big deal. The user simply doesn't have access to create or delete a Private URL. @@ -1951,7 +1953,8 @@ private String init(boolean initFull) { if (session.getUser() instanceof PrivateUrlUser) { PrivateUrlUser privateUrlUser = (PrivateUrlUser) session.getUser(); if (dataset != null && dataset.getId().equals(privateUrlUser.getDatasetId())) { - JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageReviewer")); + JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.privateurl.header"), + BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageReviewer")); } } @@ -3259,9 +3262,7 @@ public String save() { // Validate Set constraintViolations = workingVersion.validate(); if (!constraintViolations.isEmpty()) { - //JsfHelper.addFlashMessage(BundleUtil.getStringFromBundle("dataset.message.validationError")); - JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError")); - //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Validation Error", "See below for details.")); + FacesContext.getCurrentInstance().validationFailed(); return ""; } @@ -4824,7 +4825,8 @@ public void createPrivateUrl() { try { PrivateUrl createdPrivateUrl = commandEngine.submit(new CreatePrivateUrlCommand(dvRequestService.getDataverseRequest(), dataset)); privateUrl = createdPrivateUrl; - JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl)))); + JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.header"), + BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl)))); privateUrlWasJustCreated = true; } catch (CommandException ex) { String msg = BundleUtil.getStringFromBundle("dataset.privateurl.noPermToCreate", PrivateUrlUtil.getRequiredPermissions(ex)); diff --git a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java index d2637df040e..450374d6e66 100644 --- a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java @@ -24,6 +24,7 @@ import javax.inject.Named; import edu.harvard.iq.dataverse.validation.PasswordValidatorServiceBean; +import java.util.Arrays; import java.util.Date; import java.util.List; import javax.faces.component.UIComponent; @@ -127,7 +128,8 @@ public String sendPasswordResetLink() { */ logger.log(Level.INFO, "Couldn''t find single account using {0}", emailAddress); } - FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("passwdVal.passwdReset.resetInitiated"), "")); + FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("passwdVal.passwdReset.resetInitiated"), + BundleUtil.getStringFromBundle("passwdReset.successSubmit.tip", Arrays.asList(emailAddress)))); } catch (PasswordResetException ex) { /** * @todo do we really need a special exception for this?? diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties index 21a609f9f3b..8bc15189841 100755 --- a/src/main/java/propertyFiles/Bundle.properties +++ b/src/main/java/propertyFiles/Bundle.properties @@ -237,27 +237,44 @@ user.newPassword=New Password authenticationProvidersAvailable.tip={0}There are no active authentication providers{1}If you are a system administrator, please enable one using the API.{2}If you are not a system administrator, please contact the one for your institution. passwdVal.passwdReq.title=Your password must contain: -passwdVal.passwdReq.goodStrength =passwords of at least {0} characters are exempt from all other requirements -passwdVal.passwdReq.lengthReq =At least {0} characters -passwdVal.passwdReq.characteristicsReq =At least 1 character from {0} of the following types: -passwdVal.passwdReq.notInclude =It may not include: -passwdVal.passwdReq.consecutiveDigits =More than {0} numbers in a row -passwdVal.passwdReq.dictionaryWords =Dictionary words -passwdVal.passwdReq.unknownPasswordRule =Unknown, contact your administrator +passwdVal.passwdReq.goodStrength=passwords of at least {0} characters are exempt from all other requirements +passwdVal.passwdReq.lengthReq=At least {0} characters +passwdVal.passwdReq.characteristicsReq=At least 1 character from {0} of the following types: +passwdVal.passwdReq.notInclude=It may not include: +passwdVal.passwdReq.consecutiveDigits=More than {0} numbers in a row +passwdVal.passwdReq.dictionaryWords=Dictionary words +passwdVal.passwdReq.unknownPasswordRule=Unknown, contact your administrator #printf syntax used to pass to passay library -passwdVal.expireRule.errorCode =EXPIRED -passwdVal.expireRule.errorMsg =The password is over %1$s days old and has expired. -passwdVal.goodStrengthRule.errorMsg =Note: passwords are always valid with a %1$s or more character length regardless. -passwdVal.goodStrengthRule.errorCode =NO_GOODSTRENGTH -passwdVal.passwdReset.resetLinkTitle =Password Reset Link -passwdVal.passwdReset.resetLinkDesc =Your password reset link is not valid +passwdVal.expireRule.errorCode=EXPIRED +passwdVal.expireRule.errorMsg=The password is over %1$s days old and has expired. +passwdVal.goodStrengthRule.errorMsg=Note: passwords are always valid with a %1$s or more character length regardless. +passwdVal.goodStrengthRule.errorCode=NO_GOODSTRENGTH +passwdVal.passwdReset.resetLinkTitle=Password Reset Link +passwdVal.passwdReset.resetLinkDesc=Your password reset link is not valid passwdVal.passwdReset.resetInitiated=Password Reset Initiated -passwdVal.passwdReset.valBlankLog =new password is blank -passwdVal.passwdReset.valFacesError =Password Error -passwdVal.passwdReset.valFacesErrorDesc =Please enter a new password for your account. -passwdVal.passwdValBean.warnDictionaryRead =Dictionary was set, but none was read in. -passwdVal.passwdValBean.warnDictionaryObj =PwDictionaries not set and no default password file found: -passwdVal.passwdValBean.warnSetStrength =The PwGoodStrength {0} value competes with the PwMinLength value of {1} and is added to {2} +passwdVal.passwdReset.valBlankLog=new password is blank +passwdVal.passwdReset.valFacesError=Password Error +passwdVal.passwdReset.valFacesErrorDesc=Please enter a new password for your account. +passwdVal.passwdValBean.warnDictionaryRead=Dictionary was set, but none was read in. +passwdVal.passwdValBean.warnDictionaryObj=PwDictionaries not set and no default password file found: +passwdVal.passwdValBean.warnSetStrength=The PwGoodStrength {0} value competes with the PwMinLength value of {1} and is added to {2} + +# passwordreset.xhtml +pageTitle.passwdReset.pre=Account Password Reset +passwdReset.token=token : +passwdReset.userLookedUp=user looked up : +passwdReset.emailSubmitted=email submitted : +passwdReset.details={0} Password Reset{1} - To initiate the password reset process, please provide your email address. +passwdReset.submitRequest=Submit Password Request +passwdReset.successSubmit.tip=If this email is associated with an account, then an email will be sent with further instructions to {0}. +passwdReset.debug=DEBUG +passwdReset.resetUrl=The reset URL is +passwdReset.noEmail.tip=No email was actually sent because a user could not be found using the provided email address {0} but we don't mention this because we don't malicious users to use the form to determine if there is an account associated with an email address. +passwdReset.illegalLink.tip=Your password reset link is not valid. If you need to reset your password, {0}click here{1} in order to request that your password to be reset again. +passwdReset.newPasswd.details={0} Reset Password{1} \u2013 Our password requirements have changed. Please pick a strong password that matches the criteria below. +passwdReset.newPasswd=New Password +passwdReset.rePasswd=Retype Password +passwdReset.resetBtn=Reset Password #loginpage.xhtml login.System=Login System @@ -569,7 +586,6 @@ dashboard.list_users.removeAll.message.failure=Failed to remove roles for user { dashboard.list_users.toggleSuperuser=Edit Superuser Status dashboard.list_users.toggleSuperuser.confirmationText.add=Are you sure you want to enable superuser status for user {0}? dashboard.list_users.toggleSuperuser.confirmationText.remove=Are you sure you want to disable superuser status for user {0}? -dashboard.list_users.toggleSuperuser.confirm=Continue dashboard.list_users.api.auth.invalid_apikey=The API key is invalid. dashboard.list_users.api.auth.not_superuser=Forbidden. You must be a superuser. @@ -649,23 +665,6 @@ notification.email.info.unavailable=Unavailable notification.email.apiTokenGenerated=Hello {0} {1},\n\nAPI Token has been generated. Please keep it secure as you would do with a password. notification.email.apiTokenGenerated.subject=API Token was generated -# passwordreset.xhtml -pageTitle.passwdReset.pre=Account Password Reset -passwdReset.token=token : -passwdReset.userLookedUp=user looked up : -passwdReset.emailSubmitted=email submitted : -passwdReset.details={0} Password Reset{1} - To initiate the password reset process, please provide your email address. -passwdReset.submitRequest=Submit Password Request -passwdReset.successSubmit.tip=If this email is associated with an account, then an email will be sent with further instructions to {0}. -passwdReset.debug=DEBUG -passwdReset.resetUrl=The reset URL is -passwdReset.noEmail.tip=No email was actually sent because a user could not be found using the provided email address {0} but we don't mention this because we don't malicious users to use the form to determine if there is an account associated with an email address. -passwdReset.illegalLink.tip=Your password reset link is not valid. If you need to reset your password, {0}click here{1} in order to request that your password to be reset again. -passwdReset.newPasswd.details={0} Reset Password{1} \u2013 Our password requirements have changed. Please pick a strong password that matches the criteria below. -passwdReset.newPasswd=New Password -passwdReset.rePasswd=Retype Password -passwdReset.resetBtn=Reset Password - # dataverse.xhtml dataverse.title=The project, department, university, professor, or journal this dataverse will contain data for. dataverse.enterName=Enter name... @@ -811,6 +810,7 @@ dataverse.results.dialog.addDataGuest.login.title=Log into your Dataverse Accoun dataverse.results.types.dataverses=Dataverses dataverse.results.types.datasets=Datasets dataverse.results.types.files=Files +dataverse.results.btn.filterResults=Filter Results # Bundle file editors, please note that "dataverse.results.empty.zero" is used in a unit test dataverse.results.empty.zero=There are no dataverses, datasets, or files that match your search. Please try a new search by using other or broader terms. You can also check out the search guide for tips. # Bundle file editors, please note that "dataverse.results.empty.hidden" is used in a unit test @@ -1227,8 +1227,7 @@ dataset.submit.failure.isReleased=Latest version of dataset is already released. dataset.submit.failure.inReview=You cannot submit this dataset for review because it is already in review. dataset.rejectMessage=Return this dataset to contributor for modification. dataset.rejectWatermark=Please enter a reason for returning this dataset to its author(s). -dataset.reject.enterReason=Reason for return to author is required -dataset.reject.enterReason.header=Required entry +dataset.reject.enterReason.error=Reason for return to author is required. dataset.reject.success=This dataset has been sent back to the contributor. dataset.reject.failure=Dataset Submission Return Failed - {0} dataset.reject.datasetNull=Cannot return the dataset to the author(s) because it is null. @@ -1329,7 +1328,6 @@ dataset.message.bulkFileDeleteSuccess=The selected files have been deleted. datasetVersion.message.deleteSuccess=This dataset draft has been deleted. datasetVersion.message.deaccessionSuccess=The selected version(s) have been deaccessioned. dataset.message.deaccessionSuccess=This dataset has been deaccessioned. -dataset.message.validationError=Validation Error - Required fields were missed or there was a validation error. Please scroll down to see details. dataset.message.publishFailure=The dataset could not be published. dataset.message.metadataFailure=The metadata could not be updated. dataset.message.filesFailure=The files could not be updated. @@ -1339,7 +1337,8 @@ dataset.message.deleteFailure=This dataset draft could not be deleted. dataset.message.deaccessionFailure=This dataset could not be deaccessioned. dataset.message.createFailure=The dataset could not be created. dataset.message.termsFailure=The dataset terms could not be updated. -dataset.message.publicInstall=File Access - Files are stored on a publicly accessible storage server. +dataset.message.label.fileAccess=File Access +dataset.message.publicInstall=Files are stored on a publicly accessible storage server. dataset.metadata.publicationDate=Publication Date dataset.metadata.publicationDate.tip=The publication date of a dataset. dataset.metadata.publicationYear=Publication Year @@ -1372,8 +1371,8 @@ dataset.noValidSelectedFilesForDownload=The restricted file(s) selected may not dataset.mixedSelectedFilesForDownload=The restricted file(s) selected may not be downloaded because you have not been granted access. dataset.downloadUnrestricted=Click Continue to download the files you have access to download. dataset.requestAccessToRestrictedFiles=You may request access to the restricted file(s) by clicking the Request Access button. -dataset.privateurl.infoMessageAuthor=Unpublished Dataset Private URL - Privately share this dataset before it is published: {0} -dataset.privateurl.infoMessageReviewer=Unpublished Dataset Private URL - This unpublished dataset is being privately shared. You will not be able to access it when logged into your Dataverse account. +dataset.privateurl.infoMessageAuthor=Privately share this dataset before it is published: {0} +dataset.privateurl.infoMessageReviewer=This unpublished dataset is being privately shared. You will not be able to access it when logged into your Dataverse account. dataset.privateurl.header=Unpublished Dataset Private URL dataset.privateurl.tip=Use a Private URL to allow those without Dataverse accounts to access your unpublished dataset. For more information about the Private URL feature, please refer to the User Guide. dataset.privateurl.absent=Private URL has not been created. @@ -1643,20 +1642,10 @@ file.deaccessionDialog.leaveURL.watermark=Optional dataset site, http://... file.deaccessionDialog.deaccession.tip=Are you sure you want to deaccession? The selected version(s) will no longer be viewable by the public. file.deaccessionDialog.deaccessionDataset.tip=Are you sure you want to deaccession this dataset? It will no longer be viewable by the public. file.deaccessionDialog.dialog.selectVersion.error=Please select version(s) for deaccessioning. -file.deaccessionDialog.dialog.selectVersion.tip=Please select version(s) for deaccessioning. -file.deaccessionDialog.dialog.selectVersion.header=Please Select Version(s) -file.deaccessionDialog.dialog.reason.tip=Please select reason for deaccessioning. file.deaccessionDialog.dialog.reason.error=Please select reason for deaccessioning. -file.deaccessionDialog.dialog.reason.header=Please Select Reason -file.deaccessionDialog.dialog.url.tip=Please enter valid forwarding URL. file.deaccessionDialog.dialog.url.error=Please enter valid forwarding URL. -file.deaccessionDialog.dialog.url.header=Invalid URL -file.deaccessionDialog.dialog.textForReason.tip=Please enter text for reason for deaccessioning. -file.deaccessionDialog.dialog.textForReason.header=Enter additional information file.deaccessionDialog.dialog.textForReason.error=Please enter text for reason for deaccessioning. -file.deaccessionDialog.dialog.limitChar.tip=Text for reason for deaccessioning may be no longer than 1000 characters. file.deaccessionDialog.dialog.limitChar.error=Text for reason for deaccessioning may be no longer than {0} characters. -file.deaccessionDialog.dialog.limitChar.header=Limit 1000 characters file.viewDiffDialog.header=Version Differences Details file.viewDiffDialog.dialog.warning=Please select two versions to view the differences. file.viewDiffDialog.notAvailable=N/A @@ -2133,7 +2122,7 @@ permission.roleNotAbleToBeAssigned=The role was not able to be assigned. #ManageGroupsPage.java dataverse.manageGroups.create.success=Successfully created group {0}. Refresh to update your page. -dataverse.manageGroups.save.success=Successfully saved group {0} +dataverse.manageGroups.save.success=Successfully saved group {0}. dataverse.manageGroups.delete=The group has been deleted. dataverse.manageGroups.nodelete=The explicit group cannot be deleted. dataverse.manageGroups.create.fail=Group Creation failed. diff --git a/src/main/webapp/404.xhtml b/src/main/webapp/404.xhtml index 97a61759d31..24384426785 100644 --- a/src/main/webapp/404.xhtml +++ b/src/main/webapp/404.xhtml @@ -31,13 +31,20 @@ -
+
- - - #{bundle.find} - + +
+
+ + + + +
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index ff617a9fad0..41a82a71952 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -162,6 +162,10 @@ svg image/svg+xml + + webmanifest + application/manifest+json + diff --git a/src/main/webapp/contactFormFragment.xhtml b/src/main/webapp/contactFormFragment.xhtml index 33565e21e8f..04300983572 100644 --- a/src/main/webapp/contactFormFragment.xhtml +++ b/src/main/webapp/contactFormFragment.xhtml @@ -8,6 +8,7 @@ +
@@ -70,11 +71,11 @@
- + - -
diff --git a/src/main/webapp/dashboard-datamove.xhtml b/src/main/webapp/dashboard-datamove.xhtml index 869c1e6130d..aa6a7a93a5c 100644 --- a/src/main/webapp/dashboard-datamove.xhtml +++ b/src/main/webapp/dashboard-datamove.xhtml @@ -24,6 +24,7 @@ +
#{bundle['dashboard.card.datamove.selectdataset.header']}
@@ -116,7 +117,7 @@
- - - + + @@ -135,12 +136,13 @@

#{bundle['dashboard.card.datamove.confirm.dialog']}

- - + update="@form,:messagePanel" partialSubmit="true"/> +
diff --git a/src/main/webapp/dashboard-users.xhtml b/src/main/webapp/dashboard-users.xhtml index d424da75680..7a824435bf7 100644 --- a/src/main/webapp/dashboard-users.xhtml +++ b/src/main/webapp/dashboard-users.xhtml @@ -24,6 +24,7 @@ +
@@ -70,8 +71,7 @@ + styleClass="btn btn-default"> +

@@ -99,15 +100,17 @@

- - + +
- +

#{DashboardUsersPage.confirmRemoveRolesMessage}

- - + +
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml index fe30d68cedb..8b83998af30 100644 --- a/src/main/webapp/dataset-license-terms.xhtml +++ b/src/main/webapp/dataset-license-terms.xhtml @@ -10,7 +10,7 @@
- #{bundle['file.dataFilesTab.terms.editTermsBtn']} @@ -69,159 +69,152 @@
- - - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
@@ -231,7 +224,7 @@ or !empty termsOfUseAndAccess.dataAccessPlace or !empty termsOfUseAndAccess.originalArchive or !empty termsOfUseAndAccess.availabilityStatus or !empty termsOfUseAndAccess.contactForAccess or !empty termsOfUseAndAccess.sizeOfCollection - or !empty termsOfUseAndAccess.studyCompletion)}" > + or !empty termsOfUseAndAccess.studyCompletion)}">
  @@ -304,140 +297,132 @@
- - - - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
@@ -477,7 +462,7 @@

#{DatasetPage.dataset.guestbook.name}

- @@ -485,7 +470,6 @@
-

#{bundle['file.dataFilesTab.terms.list.guestbook.select.tip']}

@@ -498,19 +482,20 @@ - - +

- +

- @@ -586,7 +571,7 @@
-
diff --git a/src/main/webapp/dataset-versions.xhtml b/src/main/webapp/dataset-versions.xhtml index 492e9c17dc3..0d716b0d2a9 100644 --- a/src/main/webapp/dataset-versions.xhtml +++ b/src/main/webapp/dataset-versions.xhtml @@ -34,10 +34,10 @@ update=":#{p:resolveClientId('datasetForm:tabView:versionsTable', view)}" actionListener="#{DatasetPage.postLoadSetVersionTabList()}" />
- +
@@ -56,7 +58,9 @@ data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable.title']}">
- +
@@ -65,7 +69,7 @@ -
- - + +
- +

- #{bundle['dataset.thumbnailsAndWidget.removeThumbnail.tip']} + #{bundle['dataset.thumbnailsAndWidget.removeThumbnail.tip']}

- - + update="@form"/> +
@@ -110,14 +116,12 @@
- - -
- diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index 21eab7e2206..9bb29fc8957 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -139,28 +139,28 @@ and DatasetPage.canUpdateDataset() and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset))}"> - #{bundle['dataset.publish.btn']} - #{bundle['dataset.publish.btn']} - #{bundle['dataset.publish.btn']} - #{bundle['dataset.publish.btn']} - - #{bundle['dataset.rejectBtn']} - + #{bundle['dataset.rejectBtn']} + - - - + #{bundle['link']} @@ -325,7 +325,7 @@
-
@@ -454,6 +454,7 @@ +
-
+
- + - + @@ -1009,64 +1025,79 @@
- +
+ header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDownload" modal="true">

#{bundle['dataset.noSelectedFilesForDownload']}

- +
+ header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForRequestAccess" modal="true">

#{bundle['dataset.noSelectedFilesForRequestAccess']}

- +
+ header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDelete" modal="true">

#{bundle['dataset.noSelectedFilesForDelete']}

- +
+ header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForRestrict" modal="true">

#{bundle['dataset.noSelectedFilesForRestrict']}

- +
+ header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForUnRestrict" modal="true">

#{bundle['dataset.noSelectedFilesForUnRestrict']}

- +
+ header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForEditMetadata" modal="true">

#{bundle['dataset.noSelectedFilesForMetadataEdit']}

- +
+ header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForEditTags" modal="true">

#{bundle['dataset.noSelectedFilesForMetadataEdit']}

- +
@@ -1078,6 +1109,7 @@ +

#{bundle['file.editTagsDialog.tip']}

@@ -1124,10 +1156,8 @@ - + onkeypress="if (event.keyCode == 13) {return false;}"/> +
@@ -1163,11 +1193,11 @@
- +
- +

  @@ -1177,21 +1207,17 @@

- +
- - - - - - - + + + + - @@ -1212,7 +1238,6 @@ - @@ -1220,9 +1245,7 @@ - -
@@ -1231,7 +1254,8 @@
- + +

@@ -1278,13 +1302,13 @@

- - -
@@ -1295,9 +1319,9 @@
- + - +
@@ -1316,12 +1340,15 @@ - + +
- +
@@ -1346,13 +1373,13 @@
- - - - - - - + + +
@@ -1362,14 +1389,16 @@ #{bundle['dataset.submitMessage']}

- - + +
- +

#{bundle['dataset.publish.tip']}

@@ -1377,13 +1406,15 @@
- - + +
- +

@@ -1401,13 +1432,16 @@ #{bundle['dataset.publishBoth.tip']}

- - + +
- + +

#{bundle['dataset.republish.tip']}

@@ -1432,14 +1466,19 @@

- - - + + +
- +

@@ -1451,12 +1490,13 @@

- +
- +

@@ -1473,52 +1513,44 @@

- +
- +

#{bundle['dataset.rejectMessage']}

- + +

- +

- +
- - - - - + +
- - - - + + diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml index 3c407a473bc..a4da5fdc950 100644 --- a/src/main/webapp/dataverseuser.xhtml +++ b/src/main/webapp/dataverseuser.xhtml @@ -481,7 +481,8 @@
+ #{ApiTokenPage.checkForApiToken() ? bundle['apitoken.regenerateBtn'] : bundle['apitoken.generateBtn']} +
@@ -649,10 +650,10 @@
- + - +
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml index a2db4bff7e9..62d3600af23 100644 --- a/src/main/webapp/editFilesFragment.xhtml +++ b/src/main/webapp/editFilesFragment.xhtml @@ -515,36 +515,41 @@ - +

#{EditDatafilesPage.warningMessageForPopUp}

- - +
- + header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDeleteFragment" modal="true">

#{bundle['dataset.noSelectedFilesForDelete']}

- +
- - +

#{bundle['file.deleteFileDialog.tip']}

#{bundle['file.deleteFileDialog.failed.tip']}
- - + +
+
- -
- +
+
- - -
- -
-
- -
- -
- - -
- +
+
-
- - - + +
+
@@ -764,11 +759,13 @@
- -
+ + +
+
- - + +
@@ -794,14 +791,16 @@

- - + +
+

#{bundle['file.editTagsDialog.tip']}

-
@@ -882,7 +879,7 @@
- +
- diff --git a/src/main/webapp/explicitGroup-new-dialog.xhtml b/src/main/webapp/explicitGroup-new-dialog.xhtml index a061e29ebd6..1a55d96c1a5 100644 --- a/src/main/webapp/explicitGroup-new-dialog.xhtml +++ b/src/main/webapp/explicitGroup-new-dialog.xhtml @@ -5,6 +5,7 @@ xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs"> +
@@ -83,14 +84,16 @@
- - - + +
diff --git a/src/main/webapp/file-configure-dropdown-fragment.xhtml b/src/main/webapp/file-configure-dropdown-fragment.xhtml index 9a5bd19506e..b26f04d0314 100644 --- a/src/main/webapp/file-configure-dropdown-fragment.xhtml +++ b/src/main/webapp/file-configure-dropdown-fragment.xhtml @@ -40,7 +40,7 @@ - +

#{bundle['file.mapData.unpublished.message']}

diff --git a/src/main/webapp/file-configure-popup-fragment.xhtml b/src/main/webapp/file-configure-popup-fragment.xhtml index 232b8d2dbb2..8a065637f1f 100644 --- a/src/main/webapp/file-configure-popup-fragment.xhtml +++ b/src/main/webapp/file-configure-popup-fragment.xhtml @@ -13,12 +13,13 @@

- - - + +
\ No newline at end of file diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml index 5375764515f..0b22d5fbcc8 100644 --- a/src/main/webapp/file-download-button-fragment.xhtml +++ b/src/main/webapp/file-download-button-fragment.xhtml @@ -105,17 +105,17 @@ - + #{bundle['file.compute']} - + #{bundle['file.compute']} @@ -127,7 +127,7 @@ @@ -151,7 +151,7 @@ - #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']} - - - #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']} - - #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']} diff --git a/src/main/webapp/file-download-popup-fragment.xhtml b/src/main/webapp/file-download-popup-fragment.xhtml index b514e9a56dc..7f9c2c51d78 100644 --- a/src/main/webapp/file-download-popup-fragment.xhtml +++ b/src/main/webapp/file-download-popup-fragment.xhtml @@ -10,6 +10,7 @@ +

#{bundle['file.downloadDialog.tip']}

@@ -147,41 +148,37 @@
- + update="guestbookUIFragment"> - - + + update="guestbookUIFragment @form"> - - - #{bundle['acceptTerms']} - - + + + + - - #{bundle['acceptTerms']} - - - - - - #{bundle['acceptTerms']} - - - + + + + + +
\ No newline at end of file diff --git a/src/main/webapp/file-request-access-popup-fragment.xhtml b/src/main/webapp/file-request-access-popup-fragment.xhtml index 573b22fee8b..f9e3154978d 100644 --- a/src/main/webapp/file-request-access-popup-fragment.xhtml +++ b/src/main/webapp/file-request-access-popup-fragment.xhtml @@ -41,11 +41,12 @@
- - #{bundle['acceptTerms']} - - + +
diff --git a/src/main/webapp/file-versions.xhtml b/src/main/webapp/file-versions.xhtml index ce46cb4c434..43a84d5dd2b 100644 --- a/src/main/webapp/file-versions.xhtml +++ b/src/main/webapp/file-versions.xhtml @@ -33,11 +33,11 @@ Details are for a later version -->
- #{bundle['file.dataFilesTab.versions.viewDiffBtn']} -
- diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml index 26e0f766117..40eb7683b60 100644 --- a/src/main/webapp/file.xhtml +++ b/src/main/webapp/file.xhtml @@ -63,10 +63,10 @@

#{bundle['dataset.share.datasetShare.tip']}

-
+
-
@@ -103,8 +103,7 @@
+ and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}"> @@ -395,15 +394,14 @@
- +
-
- +

#{bundle['file.deleteFileDialog.immediate']}

#{bundle['file.deleteFileDialog.failed.tip']}
- - + +
@@ -584,8 +584,8 @@ - + @@ -597,7 +597,7 @@ - +

  @@ -607,53 +607,58 @@

- +
- -

- #{bundle['file.restrictions.description']} -

- -

- #{bundle['file.restrictions.worldmap.warning']} -

- -
-
- -
- -
-
-
- -
- -
+ +

+ #{bundle['file.restrictions.description']} +

+ +

+ #{bundle['file.restrictions.worldmap.warning']} +

+ +
+
+ +
+
-
- - +
+ +
+ +
- +
+
+ + +

#{bundle['file.replaced.warning.draft.warningMessage']}

- +
#{bundle['file.alreadyDeleted.previous.warningMessage']}

- +
- +

#{bundle['file.compute.fileAccessDenied']}

- +
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml index a74ef7ddbbf..24ab6092350 100644 --- a/src/main/webapp/filesFragment.xhtml +++ b/src/main/webapp/filesFragment.xhtml @@ -507,7 +507,7 @@ and DatasetPage.workingVersion.fileMetadatas.size() > 1) and DatasetPage.downloadButtonAvailable and !DatasetPage.isHasTabular()}"> @@ -515,7 +515,7 @@ @@ -564,13 +564,13 @@
#{bundle['file.requestAccess']} #{bundle['file.requestAccess']} diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml index 8af7416e75f..7528e4057c3 100644 --- a/src/main/webapp/guestbook.xhtml +++ b/src/main/webapp/guestbook.xhtml @@ -27,6 +27,7 @@ + @@ -184,16 +185,14 @@
-
- - +
- diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml index a7d0bec027b..bc5b853e374 100644 --- a/src/main/webapp/harvestclients.xhtml +++ b/src/main/webapp/harvestclients.xhtml @@ -85,7 +85,7 @@
- @@ -115,14 +115,14 @@
- - -

- - + +
@@ -177,8 +177,8 @@ + -

@@ -281,7 +281,7 @@
- #{bundle.next} -
@@ -360,16 +358,14 @@
- #{bundle.previous} - #{bundle.next} -
@@ -456,23 +452,21 @@
- #{bundle.previous} - #{bundle.next} -
@@ -530,8 +524,7 @@
- #{bundle.previous} - - - +
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml index 12c539b12b5..9e74d4cfa3f 100644 --- a/src/main/webapp/harvestsets.xhtml +++ b/src/main/webapp/harvestsets.xhtml @@ -49,12 +49,12 @@ - +
- @@ -108,7 +108,7 @@
- @@ -147,14 +147,14 @@
- - -

- - + +
@@ -242,18 +242,15 @@
- #{bundle.next} -
@@ -296,15 +293,14 @@
- #{bundle.previous} - - - +
diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml index 254cd452e06..fbe569efc03 100644 --- a/src/main/webapp/loginpage.xhtml +++ b/src/main/webapp/loginpage.xhtml @@ -69,7 +69,7 @@ - +
@@ -92,7 +92,7 @@
- +
diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml index adf5eebc4c8..ae229e0caee 100644 --- a/src/main/webapp/manage-groups.xhtml +++ b/src/main/webapp/manage-groups.xhtml @@ -22,7 +22,7 @@
- #{bundle['dataverse.manageGroups.createBtn']} @@ -68,14 +68,14 @@
- -
- +

#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.tip']}

- - + +
+

- @@ -98,38 +98,38 @@

- - + + oncomplete="bind_bsui_components();"/>
- - - -
- +

#{bundle['dataset.manageGuestbooks.tab.action.btn.delete.dialog.tip']}

- - + +
@@ -220,7 +222,9 @@
- +
diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml index dbbfd31daee..781634a8238 100644 --- a/src/main/webapp/manage-templates.xhtml +++ b/src/main/webapp/manage-templates.xhtml @@ -33,7 +33,7 @@
- @@ -83,33 +83,33 @@
- - + + oncomplete="bind_bsui_components();">
- - + oncomplete="bind_bsui_components();">
@@ -129,21 +129,22 @@
- + oncomplete="PF('deleteConfirmation').show();bind_bsui_components();">
- +

-   +  

@@ -158,8 +159,10 @@

- - + +
@@ -184,7 +187,9 @@
- +
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml index 8656ac33ced..a15ade0b0df 100755 --- a/src/main/webapp/metadataFragment.xhtml +++ b/src/main/webapp/metadataFragment.xhtml @@ -124,7 +124,7 @@ we wrap them in a ui:repeat that iterates on a single list. Note: dummyVar is never used-->
- +
@@ -134,14 +134,14 @@
- - - - +
- +
@@ -204,7 +203,7 @@
- @@ -223,14 +222,14 @@
- - +

@@ -58,7 +59,6 @@
-
@@ -70,8 +70,8 @@
- +
diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml index 53fda7e0d8c..63271ec0206 100644 --- a/src/main/webapp/oauth2/firstLogin.xhtml +++ b/src/main/webapp/oauth2/firstLogin.xhtml @@ -31,6 +31,7 @@ #{OAuth2FirstLoginPage.createFromWhereTip}

+
+
@@ -52,8 +53,8 @@
- - + +
@@ -106,7 +107,8 @@
- + +
- - - + +
@@ -129,8 +130,8 @@ #{bundle['passwdReset.rePasswd']}
- - + +
@@ -139,7 +140,7 @@
- +
diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml index 5023f14d50a..bb584faf811 100644 --- a/src/main/webapp/permissions-manage-files.xhtml +++ b/src/main/webapp/permissions-manage-files.xhtml @@ -41,7 +41,7 @@
- @@ -69,7 +69,7 @@ - @@ -78,7 +78,7 @@
- #{bundle['dataverse.permissionsFiles.assignDialog.grantBtn']} - - @@ -121,11 +121,11 @@ - - + #{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn']} @@ -180,7 +180,8 @@ - @@ -189,7 +190,7 @@ - #{bundle['dataverse.permissionsFiles.files.assignBtn']} @@ -200,7 +201,7 @@
- +

@@ -231,16 +232,19 @@

- - +
- + +
@@ -316,40 +320,44 @@
- - - - +
- +

- #{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn.confirmation']} + #{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn.confirmation']}

- - +
diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml index b912f457ae1..f75a5471f93 100644 --- a/src/main/webapp/permissions-manage.xhtml +++ b/src/main/webapp/permissions-manage.xhtml @@ -41,7 +41,7 @@
- @@ -102,7 +102,7 @@
- @@ -131,7 +131,7 @@ - @@ -159,7 +159,7 @@
- +
- - +
@@ -217,7 +220,7 @@ - +

#{bundle['dataverse.permissions.usersOrGroups.removeBtn.confirmation']}

@@ -225,7 +228,9 @@ - +
diff --git a/src/main/webapp/provenance-popups-fragment.xhtml b/src/main/webapp/provenance-popups-fragment.xhtml index dc19b5e90de..c7caa1b2ded 100644 --- a/src/main/webapp/provenance-popups-fragment.xhtml +++ b/src/main/webapp/provenance-popups-fragment.xhtml @@ -135,9 +135,8 @@
- - - + +
@@ -174,7 +173,9 @@
- +
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css index 0811758c9e2..60fb6f52189 100644 --- a/src/main/webapp/resources/css/structure.css +++ b/src/main/webapp/resources/css/structure.css @@ -882,6 +882,11 @@ div.ui-widget-overlay {background:#ccc; opacity:.6;} .ui-confirm-dialog-severity {margin-top:3px;} .ui-widget-content a.btn-default {color:#333;} .input-group-btn > .btn, .input-group-btn > .btn-group {border-top-left-radius: 0;border-bottom-left-radius: 0;margin-left: -1px;font-size:14px;} +.btn-default.ui-state-hover:hover, .btn-default.ui-state-hover {color:#333;background-color:#e6e6e6;border-color:#adadad;background-image:none;} +.ui-button.btn-link, .ui-button.btn-link.active, .ui-button.btn-link:active, .ui-button.btn-link[disabled], fieldset[disabled] .ui-button.btn-link {padding:0; border:0; border-color:transparent; border-radius:0; background-color:transparent; background-image:none; box-shadow: none; color: #337ab7;} +.ui-button.btn-link, .ui-button.btn-link:hover, .ui-button.btn-link:focus, .ui-button.btn-link:active {border-color: transparent;} +.ui-button.btn-link:hover, .ui-button.btn-link:focus {color: #23527c; text-decoration: underline !important; background-color: transparent;} +.ui-button.btn-link[disabled]:hover, fieldset[disabled] .ui-button.btn-link:hover, .ui-button.btn-link[disabled]:focus, fieldset[disabled] .ui-button.btn-link:focus {color: #777;text-decoration: none;} .ui-widget-header .form-group {font-weight:normal;} /* .ui-messages-info-detail, .ui-messages-warn-detail, .ui-messages-error-detail, .ui-messages-fatal-detail, .ui-message-info-detail, .ui-message-warn-detail, .ui-message-error-detail, .ui-message-fatal-detail { margin-left: 0px; diff --git a/src/main/webapp/roles-assign.xhtml b/src/main/webapp/roles-assign.xhtml index 078c8be747d..f05009cf13c 100644 --- a/src/main/webapp/roles-assign.xhtml +++ b/src/main/webapp/roles-assign.xhtml @@ -6,6 +6,7 @@ xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs"> +
@@ -50,7 +51,7 @@ #{bundle['dataverse.permissions.usersOrGroups.tabHeader.role']}
-
+
-
+

#{bundle['dataverse.permissions.usersOrGroups.assignDialog.role.description']}

@@ -75,8 +76,8 @@

- - + + @@ -90,13 +91,15 @@

- - - + +
@@ -111,7 +114,9 @@ - +
diff --git a/src/main/webapp/roles-edit.xhtml b/src/main/webapp/roles-edit.xhtml index 4f02e163ae6..a59d53bcdae 100644 --- a/src/main/webapp/roles-edit.xhtml +++ b/src/main/webapp/roles-edit.xhtml @@ -6,47 +6,44 @@ +
-
-