From 4b2bc6c23345f37cbf68fd7a25e4cb140247c206 Mon Sep 17 00:00:00 2001 From: Reed Hyzer Date: Mon, 17 Aug 2026 13:17:04 -0400 Subject: [PATCH] GRP-7211: look for other html a tags which do not change the url (to a new place), and it does some ajax, try to change to html button --- .../admin/adminDaemonJobsViewLogsResults.jsp | 4 ++-- .../webapp/WEB-INF/grouperUi2/assetsJsp/header.jsp | 4 ++-- .../grouperUi2/attributeDef/attributeDefHeader.jsp | 6 +++--- .../attributeDefName/attributeDefNameView.jsp | 6 +++--- .../entityDataFields/dataFieldRowDictionary.jsp | 10 +++++----- .../grouperUi2/externalEntities/inviteExtraGroups.jsp | 2 +- .../webapp/WEB-INF/grouperUi2/group/groupContents.jsp | 4 ++-- .../webapp/WEB-INF/grouperUi2/group/groupHeader.jsp | 4 ++-- .../webapp/WEB-INF/grouperUi2/group/groupSummary.jsp | 2 +- .../grouperUi2/groupImport/groupImportExtraGroups.jsp | 2 +- .../WEB-INF/grouperUi2/index/indexGroupsImanage.jsp | 2 +- .../WEB-INF/grouperUi2/index/indexMyMemberships.jsp | 2 +- .../WEB-INF/grouperUi2/index/indexMyServices.jsp | 2 +- .../WEB-INF/grouperUi2/index/indexRecentlyUsed.jsp | 2 +- .../grouperUi2/mcp/mcpConfidentialClientResult.jsp | 10 +++++----- grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpInfo.jsp | 2 +- .../WEB-INF/grouperUi2/mcp/mcpToolLogsResults.jsp | 4 ++-- .../provisioning/provisioningFolderProvisioners.jsp | 4 ++-- .../provisioning/provisioningGroupProvisioners.jsp | 4 ++-- .../grouperUi2/scriptTester/scriptTesterScreen.jsp | 2 +- .../webapp/WEB-INF/grouperUi2/stem/stemHeader.jsp | 6 +++--- .../WEB-INF/grouperUi2/subject/subjectHeader.jsp | 4 ++-- 22 files changed, 44 insertions(+), 44 deletions(-) diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/admin/adminDaemonJobsViewLogsResults.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/admin/adminDaemonJobsViewLogsResults.jsp index 7ca404755afa..7954157d1a8a 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/admin/adminDaemonJobsViewLogsResults.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/admin/adminDaemonJobsViewLogsResults.jsp @@ -112,11 +112,11 @@ ${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.id} ${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.lastUpdated} ${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.host} - + ${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.parentJobId} - ${textContainer.text['adminDaemonJobsMoreActionsFailsafeApprove'] } + diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/assetsJsp/header.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/assetsJsp/header.jsp index ebc4833379a3..512517ad6d50 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/assetsJsp/header.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/assetsJsp/header.jsp @@ -1,6 +1,6 @@

- ${textContainer.text['grouperHideSidePanel']} - + +
\ No newline at end of file diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDef/attributeDefHeader.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDef/attributeDefHeader.jsp index 7c95b7168476..ebd7eeabda4c 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDef/attributeDefHeader.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDef/attributeDefHeader.jsp @@ -179,7 +179,7 @@ ${textContainer.text['attributeDefLabelIdPath']} - ${grouper:escapeHtml(grouperRequestContainer.attributeDefContainer.guiAttributeDef.attributeDef.name)} + ${grouper:escapeHtml(grouperRequestContainer.attributeDefContainer.guiAttributeDef.attributeDef.name)} ${textContainer.text['attributeDefLabelId']} @@ -218,8 +218,8 @@ -

${textContainer.text['guiMore']}

- +

+
<%@ include file="attributeDefMoreActionsButtonContents.jsp"%> diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDefName/attributeDefNameView.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDefName/attributeDefNameView.jsp index 3acb45682457..49c9a4d8aab7 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDefName/attributeDefNameView.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDefName/attributeDefNameView.jsp @@ -79,7 +79,7 @@ ${grouper:titleFromKeyAndText('viewAttributeDefNamePageTitle', grouperRequestCon ${textContainer.text['attributeDefNameIdPathLabel']} - ${grouper:escapeHtml(grouperRequestContainer.attributeDefNameContainer.guiAttributeDefName.attributeDefName.name)} + ${grouper:escapeHtml(grouperRequestContainer.attributeDefNameContainer.guiAttributeDefName.attributeDefName.name)}
${textContainer.text['attributeDefNameIdPathDescription'] } @@ -122,8 +122,8 @@ ${grouper:titleFromKeyAndText('viewAttributeDefNamePageTitle', grouperRequestCon
-

${textContainer.text['guiMore']}

- +

+ <%-- row fluid --%> diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/entityDataFields/dataFieldRowDictionary.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/entityDataFields/dataFieldRowDictionary.jsp index 66b6fd001235..8fbaa0ad6043 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/entityDataFields/dataFieldRowDictionary.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/entityDataFields/dataFieldRowDictionary.jsp @@ -155,7 +155,7 @@ ${grouper:title('miscAttestationDataFieldAndRowDictionaryLink')}
- ${textContainer.text['entityDataFieldRowDictionaryTableDocumentation']} +
@@ -195,10 +195,10 @@ ${grouper:title('miscAttestationDataFieldAndRowDictionaryLink')} - + <%-- Column 2: Description (truncated unless auto-expand) --%> @@ -211,7 +211,7 @@ ${grouper:title('miscAttestationDataFieldAndRowDictionaryLink')}
${guiDataFieldRowDictionary.description}
- + diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/externalEntities/inviteExtraGroups.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/externalEntities/inviteExtraGroups.jsp index 9a3a7ab20ab4..5a4ae662807e 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/externalEntities/inviteExtraGroups.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/externalEntities/inviteExtraGroups.jsp @@ -7,6 +7,6 @@
- ${guiGroup.linkWithIcon} + ${guiGroup.linkWithIcon} diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupContents.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupContents.jsp index 3b72227e80d4..5f422207d444 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupContents.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupContents.jsp @@ -49,7 +49,7 @@   - ${guiPITMembershipView.guiSubject.shortLinkWithIcon}
+ ${guiPITMembershipView.guiSubject.shortLinkWithIcon}
${guiPITMembershipView.getStartTimeLabel()} ${guiPITMembershipView.getEndTimeLabel()} @@ -84,7 +84,7 @@ - ${guiMembershipSubjectContainer.guiSubject.shortLinkWithIcon}
+ ${guiMembershipSubjectContainer.guiSubject.shortLinkWithIcon}
${guiMembershipContainer.getImmediateMembershipEnabledLabel()} diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupHeader.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupHeader.jsp index 53d23386f66d..6db29da02b27 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupHeader.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupHeader.jsp @@ -208,7 +208,7 @@ ${textContainer.text['groupLabelIdPath']} - ${grouper:escapeHtml(grouperRequestContainer.groupContainer.guiGroup.group.name)} + ${grouper:escapeHtml(grouperRequestContainer.groupContainer.guiGroup.group.name)} ${textContainer.text['groupLabelAlternateIdPath']} @@ -286,7 +286,7 @@ <%--

${textContainer.text['guiMore']}

--%> - + diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupSummary.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupSummary.jsp index 1891dbf8bc30..510a68fe29de 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupSummary.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupSummary.jsp @@ -222,7 +222,7 @@ - ${grouper:escapeHtml(grouperRequestContainer.groupContainer.guiGroup.group.name)} + ${grouper:escapeHtml(grouperRequestContainer.groupContainer.guiGroup.group.name)} diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/groupImport/groupImportExtraGroups.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/groupImport/groupImportExtraGroups.jsp index 6248187b586e..e549977dc8ac 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/groupImport/groupImportExtraGroups.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/groupImport/groupImportExtraGroups.jsp @@ -7,6 +7,6 @@
- ${guiGroup.linkWithIcon} + ${guiGroup.linkWithIcon} diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexGroupsImanage.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexGroupsImanage.jsp index c762c7ea54fa..c21bdd7e4eb8 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexGroupsImanage.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexGroupsImanage.jsp @@ -12,7 +12,7 @@ - ${textContainer.text['indexMyGroupsTitleLoad'] } +



diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyMemberships.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyMemberships.jsp index e2241cb41c2e..e73e210f2c94 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyMemberships.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyMemberships.jsp @@ -15,7 +15,7 @@ - ${textContainer.text['indexMyMembershipsMyMembershipsLoad'] } +



diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyServices.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyServices.jsp index 4954ab18d9cb..d105ca158697 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyServices.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyServices.jsp @@ -12,7 +12,7 @@ - ${textContainer.text['indexMyServicesSectionTitleLoad'] } +



diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexRecentlyUsed.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexRecentlyUsed.jsp index 45fcbfa24978..032f93570272 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexRecentlyUsed.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexRecentlyUsed.jsp @@ -38,7 +38,7 @@ - ${textContainer.text['indexRecentlyUsedRecentlyUsedLoad'] } +



diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpConfidentialClientResult.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpConfidentialClientResult.jsp index e68fc187057e..ef44b4906821 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpConfidentialClientResult.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpConfidentialClientResult.jsp @@ -8,35 +8,35 @@ ${textContainer.text['mcpInfoConfidentialClientIdLabel']} ${grouper:escapeHtml(grouperRequestContainer.mcpContainer.registeredClientId)} - + ${textContainer.text['mcpInfoConfidentialClientSecretLabel']} ${grouper:escapeHtml(grouperRequestContainer.mcpContainer.registeredClientSecret)} - + ${textContainer.text['mcpInfoConfidentialAuthorizationUrlLabel']} ${grouper:escapeHtml(grouperRequestContainer.mcpContainer.registeredAuthorizationUrl)} - + ${textContainer.text['mcpInfoConfidentialTokenUrlLabel']} ${grouper:escapeHtml(grouperRequestContainer.mcpContainer.registeredTokenUrl)} - + ${textContainer.text['mcpInfoConfidentialScopeLabel']} openid - + diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpInfo.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpInfo.jsp index 7fadd14fc8e7..8eb9cec47f9a 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpInfo.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpInfo.jsp @@ -30,7 +30,7 @@ ${textContainer.text['mcpInfoServerUrlLabel']} ${grouper:escapeHtml(grouperRequestContainer.mcpContainer.mcpServerUrl)}/mcp - +
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpToolLogsResults.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpToolLogsResults.jsp index 19794051db76..c39343be29ae 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpToolLogsResults.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpToolLogsResults.jsp @@ -36,8 +36,8 @@ ${grouper:escapeHtml(guiMcpToolLog.durationMs)} - - + + diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningFolderProvisioners.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningFolderProvisioners.jsp index 838d75e35b7a..a774554fa16c 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningFolderProvisioners.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningFolderProvisioners.jsp @@ -25,9 +25,9 @@ ${grouper:titleFromKeyAndText('stemProvisioningPageTitle', grouperRequestContain
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningGroupProvisioners.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningGroupProvisioners.jsp index 3796700fb4f2..41712de9b67e 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningGroupProvisioners.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningGroupProvisioners.jsp @@ -24,9 +24,9 @@ ${grouper:titleFromKeyAndText('groupProvisioningPageTitle', grouperRequestContai
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/scriptTester/scriptTesterScreen.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/scriptTester/scriptTesterScreen.jsp index 5a76bb7134d7..a6bb2dfd4927 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/scriptTester/scriptTesterScreen.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/scriptTester/scriptTesterScreen.jsp @@ -169,7 +169,7 @@ ${grouper:title('scriptTesterScreenPageTitle')}   -

${textContainer.text['showHideGshScript']}

+

diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemHeader.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemHeader.jsp index 6975f883a78d..2c1ecb001bd0 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemHeader.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemHeader.jsp @@ -212,7 +212,7 @@ ${textContainer.text['stemLabelIdPath'] } - ${grouper:escapeHtml(grouperRequestContainer.stemContainer.guiStem.stem.name)} + ${grouper:escapeHtml(grouperRequestContainer.stemContainer.guiStem.stem.name)} ${textContainer.text['stemLabelAlternateIdPath'] } @@ -251,8 +251,8 @@ -

${textContainer.text['guiMore']}

- +

+
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/subject/subjectHeader.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/subject/subjectHeader.jsp index 09f8b588975d..61950a67fb51 100644 --- a/grouper-ui/webapp/WEB-INF/grouperUi2/subject/subjectHeader.jsp +++ b/grouper-ui/webapp/WEB-INF/grouperUi2/subject/subjectHeader.jsp @@ -382,8 +382,8 @@
-

${textContainer.text['guiMore']}

- +

+
<%@ include file="subjectMoreActionsButtonContents.jsp"%>