diff --git a/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc b/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc index 8281f4cb..26fcceba 100644 --- a/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc +++ b/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc @@ -91,6 +91,7 @@ $action_args['vv_attr_id'] = $vv_user['username']; $action_args['vv_actions_type'] = 'mvea-add-menu'; $action_args['vv_actions_title'] = __d('operation', 'add.attribute'); $action_args['vv_actions_icon'] = 'add_circle'; +$action_args['vv_actions_icon_class'] = 'material-symbols-outlined'; $action_args['vv_actions_class'] = 'mvea-add-menu'; $actionOrderDefault = $this->Menu->getMenuOrder('Default'); foreach ($attributes as $attr => $hr_name) { diff --git a/app/resources/locales/en_US/error.po b/app/resources/locales/en_US/error.po index 3586723f..dfcad93d 100644 --- a/app/resources/locales/en_US/error.po +++ b/app/resources/locales/en_US/error.po @@ -54,8 +54,8 @@ msgstr "Username \"{0}\" not found in api_users table" msgid "auto.viewvar.type.unknown" msgstr "Unknown Auto View Var Type {0}" -msgid "copy.error" -msgstr "Could not copy." +msgid "copy.javascript.clipboard" +msgstr "Could not copy. (Note: This feature requires HTTPS.)" msgid "coid" msgstr "CO ID not found" diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po index f28b3fd7..687fda9f 100644 --- a/app/resources/locales/en_US/operation.po +++ b/app/resources/locales/en_US/operation.po @@ -117,6 +117,12 @@ msgstr "Continue" msgid "copy" msgstr "Copy" +msgid "copy.flowUrl" +msgstr "Copy Enrollment Flow URL" + +msgid "copy.url" +msgstr "Copy URL" + msgid "copy.value" msgstr "Copy value" diff --git a/app/src/View/Helper/VueHelper.php b/app/src/View/Helper/VueHelper.php index 55221857..ceef8a5a 100644 --- a/app/src/View/Helper/VueHelper.php +++ b/app/src/View/Helper/VueHelper.php @@ -47,7 +47,7 @@ class VueHelper extends Helper { 'SuspendableStatusEnum.S' ], 'error' => [ - 'copy.error' + 'copy.javascript.clipboard' ], 'field' => [ 'email', diff --git a/app/templates/EnrollmentFlows/fields-nav.inc b/app/templates/EnrollmentFlows/fields-nav.inc deleted file mode 100644 index 7e551480..00000000 --- a/app/templates/EnrollmentFlows/fields-nav.inc +++ /dev/null @@ -1,42 +0,0 @@ - 'play_arrow', - 'order' => 'Default', - 'label' => __d('operation', 'EnrollmentFlows.start'), - 'link' => [ - 'action' => 'start', - $vv_obj->id - ], - 'class' => '' -]; - -$subnav = [ - 'name' => 'enrollment_flow', - 'active' => 'properties' -]; \ No newline at end of file diff --git a/app/templates/element/subnavigation/navBar.php b/app/templates/element/subnavigation/navBar.php index 7f39ee92..6f4268e5 100644 --- a/app/templates/element/subnavigation/navBar.php +++ b/app/templates/element/subnavigation/navBar.php @@ -52,6 +52,7 @@ = $this->element('subnavigation/supertitle') ?> = $this->element('subnavigation/statusBadge') ?> + = $this->element('subnavigation/upperButtons') ?> diff --git a/app/templates/element/subnavigation/upperButtons.php b/app/templates/element/subnavigation/upperButtons.php new file mode 100644 index 00000000..7d6bb930 --- /dev/null +++ b/app/templates/element/subnavigation/upperButtons.php @@ -0,0 +1,58 @@ +id; +if($vv_controller != 'EnrollmentFlows') { + $enrollmentFlowId = $vv_primary_link_obj->id; +} + +$startButtonUrl = $this->Url->build( + ['controller' => 'enrollment_flows', + 'action' => 'start', + $enrollmentFlowId + ], + ['fullBase' => true] +); +?> +
\ No newline at end of file diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index 05012797..f782348d 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -26,7 +26,6 @@ /* HTML, BODY, HEADINGS, ANCHORS, FONTS */ @import url("fonts/opensans/stylesheet.css"); -@import url("fonts.material-symbols.material-symbols.css"); @import url("fonts/material-symbols/stylesheet.css"); html * { @@ -1781,6 +1780,15 @@ li[data-pc-section="emptymessage"] { color: var(--cmg-color-txt-soft); background-color: unset; } +/* ENROLLMENT FLOWS */ +.upper-buttons { + display: flex; + gap: 0.5em; + font-size: 0.9em; +} +.upper-buttons a { + padding: 0.5em 1em; +} /* ENROLLMENT FLOWS: ATTRIBUTE COLLECTOR */ body.attributecollectors main, body.basicattributecollectors main { diff --git a/app/webroot/js/comanage/components/common/copy-value-button.js b/app/webroot/js/comanage/components/common/copy-value-button.js index 9b88e101..be6277a8 100644 --- a/app/webroot/js/comanage/components/common/copy-value-button.js +++ b/app/webroot/js/comanage/components/common/copy-value-button.js @@ -54,7 +54,7 @@ export default { setTimeout(() => this.ariaLabel = this.txt['copy.value'], 2200); } catch($e) { // this will be rendered if browser is not on HTTPS - alert(this.txt["copy.error"] + "\n" + $e); + alert(this.txt["copy.javascript.clipboard"] + "\n" + $e); } } },