Skip to content

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 #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hyzreed wants to merge 1 commit into
base: GROUPER_7_BRANCH
Choose a base branch
from
Open

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 #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions grouper-ui/webapp/WEB-INF/grouperUi2/admin/adminDaemonJobsViewLogsResults.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@
<td>${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.id}</td>
<td style="white-space: nowrap">${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.lastUpdated}</td>
<td style="white-space: nowrap">${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.host}</td>
<td style="white-space: nowrap"><span class="jobMessageContainer"><grouper:abbreviateTextarea text="${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.jobMessage}" showCharCount="30" cols="20" rows="3"/></span><c:if test="${not empty guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.jobMessage}"> <a href="#" onclick="grouperCopyJobMessage(this); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></c:if></td>
<td style="white-space: nowrap"><span class="jobMessageContainer"><grouper:abbreviateTextarea text="${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.jobMessage}" showCharCount="30" cols="20" rows="3"/></span><c:if test="${not empty guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.jobMessage}"> <button type="button" onclick="grouperCopyJobMessage(this); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></c:if></td>
<td style="white-space: nowrap">${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.parentJobId}</td>
<td style="white-space: nowrap">
<c:if test="${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.status == 'ERROR_FAILSAFE' && grouperRequestContainer.adminContainer.guiDaemonJobs.get(0).failsafeNeedsApproval}">
<a href="#" onclick="ajax('../app/UiV2Admin.daemonJobsSubmit?action=failsafeApprove&source=logs&jobName=${grouper:escapeUrl(grouperRequestContainer.adminContainer.guiDaemonJobs.get(0).jobName)}'); return false;">${textContainer.text['adminDaemonJobsMoreActionsFailsafeApprove'] }</a>
<button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="ajax('../app/UiV2Admin.daemonJobsSubmit?action=failsafeApprove&source=logs&jobName=${grouper:escapeUrl(grouperRequestContainer.adminContainer.guiDaemonJobs.get(0).jobName)}'); return false;">${textContainer.text['adminDaemonJobsMoreActionsFailsafeApprove'] }</button>
</c:if>
</td>

Expand Down
4 changes: 2 additions & 2 deletions grouper-ui/webapp/WEB-INF/grouperUi2/assetsJsp/header.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<header class="pull-left"><a href="?operation=UiV2Main.indexMain" onclick="return handleGuiV2LinkClick(event, 'operation=UiV2Main.indexMain');" aria-label="${textContainer.textEscapeXml['ariaLabelGrouperHome']}" title="${textContainer.text['institutionName']}"><img class="brand" src="../../${mediaMap['image.organisation-logo']}" alt="" style="padding-top: 5px; padding-bottom: 5px" /></a><br />
<c:if test="${mediaMap['uiV2.disable.hide-show.side.panel']=='false'}">
<a id="grouperHideSidePanelId" href="#" style="font-size: smaller; color: inherit" onclick="ajax('../app/UiV2Main.grouperHideSidePanel'); return false;">${textContainer.text['grouperHideSidePanel']}</a>
<a id="grouperShowSidePanelId" href="#" style="display: none; font-size: smaller; color: inherit" onclick="ajax('../app/UiV2Main.grouperShowSidePanel'); return false;">${textContainer.text['grouperShowSidePanel']}</a>
<button type="button" id="grouperHideSidePanelId" style="font-size: smaller; color: inherit;padding:0;border:0;background:none;font-family:inherit;line-height:inherit;vertical-align:baseline;" onclick="ajax('../app/UiV2Main.grouperHideSidePanel'); return false;">${textContainer.text['grouperHideSidePanel']}</button>
<button type="button" id="grouperShowSidePanelId" style="display: none; font-size: smaller; color: inherit;padding:0;border:0;background:none;font-family:inherit;line-height:inherit;vertical-align:baseline;" onclick="ajax('../app/UiV2Main.grouperShowSidePanel'); return false;">${textContainer.text['grouperShowSidePanel']}</button>
</c:if>
</header>
6 changes: 3 additions & 3 deletions grouper-ui/webapp/WEB-INF/grouperUi2/attributeDef/attributeDefHeader.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
</tr>
<tr>
<td><strong>${textContainer.text['attributeDefLabelIdPath']}</strong></td>
<td><span id="attributeDefIdPath">${grouper:escapeHtml(grouperRequestContainer.attributeDefContainer.guiAttributeDef.attributeDef.name)}</span> <a href="#" onclick="grouperCopyToClipboard('attributeDefIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></td>
<td><span id="attributeDefIdPath">${grouper:escapeHtml(grouperRequestContainer.attributeDefContainer.guiAttributeDef.attributeDef.name)}</span> <button type="button" onclick="grouperCopyToClipboard('attributeDefIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></td>
</tr>
<tr>
<td><strong>${textContainer.text['attributeDefLabelId']}</strong></td>
Expand Down Expand Up @@ -218,8 +218,8 @@
</tbody>
</table>
</div>
<p id="attributeDefDetailsMoreId"><a href="#" aria-label="${textContainer.text['ariaLabelGuiMoreAttributeDefDetails']}" id="moreButtonId" onclick="$('#attributeDefDetailsId').show('slow'); $('#attributeDefDetailsMoreId').hide(); $('#attributeDefDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></a></p>
<p id="attributeDefDetailsLessId" style="display: none"><a href="#" onclick="$('#attributeDefDetailsId').hide('slow'); $('#attributeDefDetailsLessId').hide(); $('#attributeDefDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></a></p>
<p id="attributeDefDetailsMoreId"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" aria-label="${textContainer.text['ariaLabelGuiMoreAttributeDefDetails']}" id="moreButtonId" onclick="$('#attributeDefDetailsId').show('slow'); $('#attributeDefDetailsMoreId').hide(); $('#attributeDefDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></button></p>
<p id="attributeDefDetailsLessId" style="display: none"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('#attributeDefDetailsId').hide('slow'); $('#attributeDefDetailsLessId').hide(); $('#attributeDefDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></button></p>
</div>
<div class="span2" id="attributeDefMoreActionsButtonContentsDivId">
<%@ include file="attributeDefMoreActionsButtonContents.jsp"%>
Expand Down
6 changes: 3 additions & 3 deletions grouper-ui/webapp/WEB-INF/grouperUi2/attributeDefName/attributeDefNameView.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ ${grouper:titleFromKeyAndText('viewAttributeDefNamePageTitle', grouperRequestCon
<tr class="attributeDefNameDetailsName" style="display: none;">
<td style="vertical-align: top; white-space: nowrap;"><strong>${textContainer.text['attributeDefNameIdPathLabel']}</strong></td>
<td>
<span id="attributeDefNameIdPath">${grouper:escapeHtml(grouperRequestContainer.attributeDefNameContainer.guiAttributeDefName.attributeDefName.name)}</span> <a href="#" onclick="grouperCopyToClipboard('attributeDefNameIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a>
<span id="attributeDefNameIdPath">${grouper:escapeHtml(grouperRequestContainer.attributeDefNameContainer.guiAttributeDefName.attributeDefName.name)}</span> <button type="button" onclick="grouperCopyToClipboard('attributeDefNameIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button>
<br /><span class="help-block description">${textContainer.text['attributeDefNameIdPathDescription'] }</span>
</td>
</tr>
Expand Down Expand Up @@ -122,8 +122,8 @@ ${grouper:titleFromKeyAndText('viewAttributeDefNamePageTitle', grouperRequestCon
</tbody>
</table>
</div>
<p id="attributeDefNameDetailsMoreId"><a href="#" aria-label="${textContainer.text['ariaLabelGuiMoreAttributeDefNameDetails']}" id="moreButtonId" onclick="$('.attributeDefNameDetailsName').show('slow'); $('#attributeDefNameDetailsMoreId').hide(); $('#attributeDefNameDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></a></p>
<p id="attributeDefNameDetailsLessId" style="display: none"><a href="#" onclick="$('.attributeDefNameDetailsName').hide('slow'); $('#attributeDefNameDetailsLessId').hide(); $('#attributeDefNameDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></a></p>
<p id="attributeDefNameDetailsMoreId"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" aria-label="${textContainer.text['ariaLabelGuiMoreAttributeDefNameDetails']}" id="moreButtonId" onclick="$('.attributeDefNameDetailsName').show('slow'); $('#attributeDefNameDetailsMoreId').hide(); $('#attributeDefNameDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></button></p>
<p id="attributeDefNameDetailsLessId" style="display: none"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('.attributeDefNameDetailsName').hide('slow'); $('#attributeDefNameDetailsLessId').hide(); $('#attributeDefNameDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></button></p>

</div>
</div> <%-- row fluid --%>
Expand Down
10 changes: 5 additions & 5 deletions grouper-ui/webapp/WEB-INF/grouperUi2/entityDataFields/dataFieldRowDictionary.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ ${grouper:title('miscAttestationDataFieldAndRowDictionaryLink')}

<c:if test="${!grouper:isBlank(guiDataFieldRowDictionaryTable.documentation)}">
<div class="control-group">
<a href="#" onclick="$('#documentation-${j}').toggle('slow'); return false;">${textContainer.text['entityDataFieldRowDictionaryTableDocumentation']}</a>
<button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('#documentation-${j}').toggle('slow'); return false;">${textContainer.text['entityDataFieldRowDictionaryTableDocumentation']}</button>
<span id="documentation-${j}" style="display: none;">${guiDataFieldRowDictionaryTable.documentation}</span>
</div>
</c:if>
Expand Down Expand Up @@ -195,10 +195,10 @@ ${grouper:title('miscAttestationDataFieldAndRowDictionaryLink')}
<i class="fa fa-pencil"></i>
</a>
</c:if>
<a href="#" onclick="dictionaryCopyPermalink('${grouper:escapeJavascript(guiDataFieldRowDictionary.dataFieldConfigId)}', '${grouper:escapeJavascript(guiDataFieldRowDictionary.dataRowConfigId)}'); return false;"
title="${textContainer.text['dataFieldDictionaryPermalinkTitle']}" style="margin-left: 3px;">
<button type="button" class="btn-link" onclick="dictionaryCopyPermalink('${grouper:escapeJavascript(guiDataFieldRowDictionary.dataFieldConfigId)}', '${grouper:escapeJavascript(guiDataFieldRowDictionary.dataRowConfigId)}'); return false;"
title="${textContainer.text['dataFieldDictionaryPermalinkTitle']}" style="margin-left: 3px;padding:0;border:0;background:none;vertical-align:baseline;">
<i class="fa fa-link"></i>
</a>
</button>
</td>

<%-- Column 2: Description (truncated unless auto-expand) --%>
Expand All @@ -211,7 +211,7 @@ ${grouper:title('miscAttestationDataFieldAndRowDictionaryLink')}
<div class="dict-desc-truncated" id="desc-${j}-${i}" style="max-height: 7.5em; overflow: hidden; position: relative;">
${guiDataFieldRowDictionary.description}
</div>
<a href="#" class="dict-desc-toggle" data-target="desc-${j}-${i}" onclick="dictionaryToggleDesc(this); return false;" style="display:none;">${textContainer.text['dataFieldDictionaryMoreLink']}</a>
<button type="button" class="dict-desc-toggle btn-link" data-target="desc-${j}-${i}" onclick="dictionaryToggleDesc(this); return false;" style="display:none;padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;">${textContainer.text['dataFieldDictionaryMoreLink']}</button>
</c:otherwise>
</c:choose>
</td>
Expand Down
2 changes: 1 addition & 1 deletion grouper-ui/webapp/WEB-INF/grouperUi2/externalEntities/inviteExtraGroups.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<br />

<input type="hidden" name="extraGroupId_${status.count-1}" value="${grouper:escapeHtml(guiGroup.group.id)}" />
${guiGroup.linkWithIcon} <a href="#" onclick="ajax('../app/UiV2ExternalEntities.inviteRemoveGroup?removeGroupId=${grouper:escapeUrl(guiGroup.group.id)}', {formIds: 'inviteFormId'}); return false;"><i class="fa fa-times" style="color: #aaaaaa"></i></a>
${guiGroup.linkWithIcon} <button type="button" class="btn-link" style="padding:0;border:0;background:none;vertical-align:baseline;" onclick="ajax('../app/UiV2ExternalEntities.inviteRemoveGroup?removeGroupId=${grouper:escapeUrl(guiGroup.group.id)}', {formIds: 'inviteFormId'}); return false;"><i class="fa fa-times" style="color: #aaaaaa"></i></button>

</c:forEach>
4 changes: 2 additions & 2 deletions grouper-ui/webapp/WEB-INF/grouperUi2/group/groupContents.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<tr>
<!-- ${guiPITMembershipView.getPITMembershipView().getId()} -->
<td>&nbsp;</td>
<td class="expand foo-clicker">${guiPITMembershipView.guiSubject.shortLinkWithIcon}<c:if test="${not empty guiPITMembershipView.guiSubject.subject.description}"> <a href="#" data-gr-copy-text="${grouperUtil.xmlEscape(guiPITMembershipView.guiSubject.subject.description)}" onclick="grouperCopyTextToClipboard(this); return false;" aria-label="${textContainer.textEscapeXml['groupViewCopyEntityDescriptionTooltip']}" title="${textContainer.text['groupViewCopyEntityDescriptionTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></c:if> <br/>
<td class="expand foo-clicker">${guiPITMembershipView.guiSubject.shortLinkWithIcon}<c:if test="${not empty guiPITMembershipView.guiSubject.subject.description}"> <button type="button" data-gr-copy-text="${grouperUtil.xmlEscape(guiPITMembershipView.guiSubject.subject.description)}" onclick="grouperCopyTextToClipboard(this); return false;" aria-label="${textContainer.textEscapeXml['groupViewCopyEntityDescriptionTooltip']}" title="${textContainer.text['groupViewCopyEntityDescriptionTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></c:if> <br/>
</td>
<td>${guiPITMembershipView.getStartTimeLabel()}</td>
<td>${guiPITMembershipView.getEndTimeLabel()}</td>
Expand Down Expand Up @@ -84,7 +84,7 @@
</label>
</c:if>
</td>
<td class="expand foo-clicker">${guiMembershipSubjectContainer.guiSubject.shortLinkWithIcon}<c:if test="${not empty guiMembershipSubjectContainer.guiSubject.subject.description}"> <a href="#" data-gr-copy-text="${grouperUtil.xmlEscape(guiMembershipSubjectContainer.guiSubject.subject.description)}" onclick="grouperCopyTextToClipboard(this); return false;" aria-label="${textContainer.textEscapeXml['groupViewCopyEntityDescriptionTooltip']}" title="${textContainer.text['groupViewCopyEntityDescriptionTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></c:if> <br/>
<td class="expand foo-clicker">${guiMembershipSubjectContainer.guiSubject.shortLinkWithIcon}<c:if test="${not empty guiMembershipSubjectContainer.guiSubject.subject.description}"> <button type="button" data-gr-copy-text="${grouperUtil.xmlEscape(guiMembershipSubjectContainer.guiSubject.subject.description)}" onclick="grouperCopyTextToClipboard(this); return false;" aria-label="${textContainer.textEscapeXml['groupViewCopyEntityDescriptionTooltip']}" title="${textContainer.text['groupViewCopyEntityDescriptionTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></c:if> <br/>
</td>
<c:if test="${grouperRequestContainer.groupContainer.showEnabledStatus}">
<td>${guiMembershipContainer.getImmediateMembershipEnabledLabel()}</td>
Expand Down
Loading