Skip to content

Commit

Permalink
Fixed issues with tooltips
Browse files Browse the repository at this point in the history
Former-commit-id: ddebc4c6be8ac2cbdf94f9c9e43bdf601a723e76
  • Loading branch information
rmathis committed Aug 16, 2022
1 parent dfafbf1 commit c722fbc
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion backend/src/main/resources/external.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"properties": {
"name": {
"title": "label.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name",
"type": "string",
"widget": {
"id": "string",
Expand Down
5 changes: 3 additions & 2 deletions backend/src/main/resources/i18n/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ label.contact=Contact
label.mdui=MDUI Information
label.service-provider-sso-descriptor=Service Provider Sso Descriptor
label.service-enabled=Service Enabled
label.filter-name=A name given to this filter to identify it within the Shibboleth IDP UI (used for display purposes only).
label.filter-name=Filter Name
label.filter-enabled=Filter Enabled
label.filter-target=FilterTarget
label.filter-type=Filter Type
Expand Down Expand Up @@ -666,6 +666,7 @@ tooltip.ignore-auth-method=Reject any AuthnReuests from this SP that contain an
tooltip.omit-not-before-condition=Whether to include a NotBefore attribute in assertions.
tooltip.responder-id=Identifier of the selected SAML IdP entity.
tooltip.instruction=Information icon
tooltip.x509-certificates=Add an X509 Certificate, a digital certificate that uses the widely accepted international X509 public key infrastructure (PKI) standard to verify that a public key belongs to the service identity contained within the certificate.
tooltip.attribute-release-table=Attribute release table - select the attributes you want to release (default unchecked)
tooltip.metadata-filter-name=Metadata Filter Name
tooltip.metadata-filter-type=The precise behavior of any <MetadataFilter> element is controlled by the xsi:type attribute.
Expand Down Expand Up @@ -709,7 +710,7 @@ tooltip.refresh-delay-factor=A factor applied to the initially determined refres
tooltip.resolve-via-predicates-only=Flag indicating whether resolution may be performed solely by applying predicates to the entire metadata collection, when an entityID input criterion is not supplied.
tooltip.expiration-warning-threshold=For each attempted metadata refresh (whether or not fresh metadata is obtained), if requireValidMetadata is true, and there is a validUntil XML attribute on the document root element, and the difference between validUntil and the current time is less than expirationWarningThreshold, the system logs a warning about the impending expiration.

tooltip.filter-name=Filter Name
tooltip.filter-name=A name given to this filter to identify it within the Shibboleth IDP UI (used for display purposes only).
tooltip.enable-filter=If checkbox is clicked, the metadata filter is enabled for integration with the IdP.
tooltip.enable-service=A boolean value representing whether or not this metadata should be enabled within the Shibboleth IDP UI.
tooltip.search-by=Indicates the type of search to be performed.
Expand Down
1 change: 1 addition & 0 deletions backend/src/main/resources/metadata-sources-ui-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
},
"x509Certificates": {
"title": "label.x509-certificates",
"description": "tooltip.x509-certificates",
"type": "array",
"items": {
"$ref": "#/definitions/Certificate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"properties": {
"name": {
"title": "label.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name",
"type": "string",
"widget": {
"id": "string",
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/form/component/InfoIcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function InfoIcon ({ value = '', placement='auto', ...props }) {
</Popover>
)}
aria-label={translate('tooltip.instruction')}>
<Button variant="text">
<Button variant="text" className="info-icon">
<span className="sr-only">Description</span>
<FontAwesomeIcon className="text-primary" icon={faInfoCircle} size="lg" {...props} />
</Button>
Expand Down
4 changes: 4 additions & 0 deletions ui/src/theme/project/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ $custom-control-spacer-x: 1rem;
background: none;
}

.btn.btn-text.info-icon {
color: $brand-primary;
}

.btn.btn-link {
&:focus {
outline: 5px auto -webkit-focus-ring-color;
Expand Down

0 comments on commit c722fbc

Please sign in to comment.