From fcbda269087f222592d697bc2e1d61a1cf4e9c83 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Thu, 12 Feb 2026 12:20:33 -0500 Subject: [PATCH 1/7] Improve Terms and Conditions status view (CFM-501) --- .../TermsAndConditionsController.php | 2 +- app/templates/Standard/add-edit-view.php | 2 +- app/templates/TermsAndConditions/status.php | 11 ++++++----- app/templates/element/menuPanel.php | 18 +++++++++++++++++- app/webroot/css/co-base.css | 1 + app/webroot/css/co-responsive.css | 3 +++ 6 files changed, 29 insertions(+), 8 deletions(-) diff --git a/app/src/Controller/TermsAndConditionsController.php b/app/src/Controller/TermsAndConditionsController.php index de1fe5ac0..8a47b76b9 100644 --- a/app/src/Controller/TermsAndConditionsController.php +++ b/app/src/Controller/TermsAndConditionsController.php @@ -148,6 +148,6 @@ public function status() { $this->set('vv_tandc_statuses', $this->TermsAndConditions->status((int)$personId)); $this->set('vv_person_id', (int)$personId); - $this->set('vv_title', __d('controller', 'TermsAndConditions')); + $this->set('vv_title', __d('controller', 'TermsAndConditions', 99)); } } \ No newline at end of file diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php index 21c1cbd13..895744215 100644 --- a/app/templates/Standard/add-edit-view.php +++ b/app/templates/Standard/add-edit-view.php @@ -272,7 +272,7 @@ /** MVEA Canvas output **/ if($vv_action != 'add' && !empty($mveas)) { - // Pass along the $mveas and any $addMenuLinks defined in templates/.../fields-nav.inc config. + // Pass along the $mveas and any $addMenuLinks defined in templates/.../fields.inc config. print $this->element('mveaCanvas', [ 'vv_mveas' => $mveas, diff --git a/app/templates/TermsAndConditions/status.php b/app/templates/TermsAndConditions/status.php index 7a624ef87..913ef833c 100644 --- a/app/templates/TermsAndConditions/status.php +++ b/app/templates/TermsAndConditions/status.php @@ -42,8 +42,7 @@ - - + @@ -53,8 +52,9 @@ - -
getName()]); ?>
-
+
+
+
+ description; ?> +
description; ?> identifier ?? "" ?>

-
    +
    • Url->build( @@ -539,6 +539,22 @@
      • +
    • + Url->build( + ['plugin' => null, + 'controller' => 'terms_and_conditions', + 'action' => 'index', + '?' => [ + 'co_id' => $vv_cur_co->id + ]] + ); + ?> + + +
      +       +
    • Url->build( diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index c07b7a294..157880f2d 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -2112,6 +2112,7 @@ body.start .submit { } /* DIALOG BOX */ #dialog .modal-header { + justify-content: space-between; background-color: var(--cmg-color-bg-004); border-bottom: none; } diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css index cc5aa9ad2..dcff0b7d4 100644 --- a/app/webroot/css/co-responsive.css +++ b/app/webroot/css/co-responsive.css @@ -344,6 +344,9 @@ #main-menu .menu-panel .config-platform-notice { margin: 10em 0 4em; } + .menu-panel ul.col2 { + columns: 2; + } /* PEOPLE PICKER */ #cm-people-picker { flex-direction: row; From 27983a76cd234a2e48238c036535e672c81a9425 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Thu, 12 Feb 2026 14:53:09 -0500 Subject: [PATCH 2/7] Improve Terms and Conditions edit view (CFM-501) --- app/resources/locales/en_US/field.po | 4 ++-- app/resources/locales/en_US/operation.po | 3 +++ app/templates/TermsAndConditions/fields.inc | 15 ++++++++++++++- app/webroot/css/co-base.css | 6 ++++++ app/webroot/css/co-responsive.css | 5 +++++ 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/resources/locales/en_US/field.po b/app/resources/locales/en_US/field.po index 386338c05..d1b57220f 100644 --- a/app/resources/locales/en_US/field.po +++ b/app/resources/locales/en_US/field.po @@ -1003,7 +1003,7 @@ msgid "TermsAndConditions.mostly_static_page_id" msgstr "T&C via Mostly Static Page" msgid "TermsAndConditions.mostly_static_page_id.desc" -msgstr "Content of Terms and Conditions, as defined in a Mostly Static Page (this or URL must be specified)" +msgstr "Content of Terms and Conditions, as defined in a Mostly Static Page
      (this or URL must be specified)" msgid "TermsAndConditions.cou_id.desc" msgstr "If set, these Terms and Conditions only apply to People with a Person Role in the specified COU" @@ -1012,7 +1012,7 @@ msgid "TermsAndConditions.url" msgstr "T&C via URL" msgid "TermsAndConditions.url.desc" -msgstr "URL to web page holding Terms and Conditions (this or Mostly Static Page must be specified)" +msgstr "URL to web page holding Terms and Conditions
      (this or Mostly Static Page must be specified)" msgid "Types.case_insensitive" msgstr "Case Insensitive" diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po index 810994840..e3e654228 100644 --- a/app/resources/locales/en_US/operation.po +++ b/app/resources/locales/en_US/operation.po @@ -258,6 +258,9 @@ msgstr "Login" msgid "logout" msgstr "Logout" +msgid "manage.a" +msgstr "Manage {0}" + msgid "next" msgstr "Next" diff --git a/app/templates/TermsAndConditions/fields.inc b/app/templates/TermsAndConditions/fields.inc index aa667a564..cbadbd763 100644 --- a/app/templates/TermsAndConditions/fields.inc +++ b/app/templates/TermsAndConditions/fields.inc @@ -28,8 +28,21 @@ $fields = [ 'description', 'status', + 'mostly_static_page_id' => [ + 'afterField' => + $this->Html->link( + __d('operation','manage.a',[__d('controller','MostlyStaticPages', 99)]), + [ + 'controller' => 'MostlyStaticPages', + 'action' => 'index', + '?' => [ + 'co_id' => $vv_cur_co->id + ] + ], + ['class' => 'manage-link'] + ) + ], 'url', - 'mostly_static_page_id', 'cou_id', 'agreement_duration', 'agree_to_updates', diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index 157880f2d..686b69cce 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -1639,6 +1639,12 @@ ul.form-list select { ul.form-list .not-set { padding: 4px 6px; } +ul.form-list .manage-link { + display: inline-block; + margin: 0.5em 0; + font-size: 0.9em; + font-style: italic; +} .form-select:disabled { background-color: var(--cmg-color-bg-009); } diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css index dcff0b7d4..0d06aa9c4 100644 --- a/app/webroot/css/co-responsive.css +++ b/app/webroot/css/co-responsive.css @@ -599,6 +599,11 @@ #changelog .accordion-body { overflow-x: unset; } + /* SPECIAL */ + .fields-mostly_static_page_id .field-info { + display: flex; + gap: 1em; + } /* FOOTER */ #co-footer { position: static; From 05e557b3b78ec7cfc91b018a3086bf52cc78c493 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Thu, 12 Feb 2026 17:51:19 -0500 Subject: [PATCH 3/7] Make it easier to visit a Mostly Static Page (CFM-501) --- app/resources/locales/en_US/operation.po | 3 +++ app/templates/MostlyStaticPages/columns.inc | 10 ++++++++++ app/templates/Standard/index.php | 13 ++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po index e3e654228..e42c7d582 100644 --- a/app/resources/locales/en_US/operation.po +++ b/app/resources/locales/en_US/operation.po @@ -387,6 +387,9 @@ msgstr "View" msgid "view.a" msgstr "View {0}" +msgid "visit.msp" +msgstr "Visit Page" + msgid "visit.link" msgstr "Visit link" diff --git a/app/templates/MostlyStaticPages/columns.inc b/app/templates/MostlyStaticPages/columns.inc index 86f962bac..533162acb 100644 --- a/app/templates/MostlyStaticPages/columns.inc +++ b/app/templates/MostlyStaticPages/columns.inc @@ -45,3 +45,13 @@ $indexColumns = [ 'sortable' => true ] ]; + +$rowActions = [ + [ + 'icon' => 'arrow_outward', + 'label' => __d('operation', 'visit.msp'), + 'url' => function($entity) { + return '/' . $entity->co_id . '/' . $entity->name; + } + ] +]; diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php index bb72c437c..bc86da373 100644 --- a/app/templates/Standard/index.php +++ b/app/templates/Standard/index.php @@ -284,12 +284,23 @@ $actionOrderDefault = $this->Menu->getMenuOrder('Default'); foreach ($rowActions as $a) { $ok = false; + $callbackUrl = ''; + if (!empty($a['controller']) && $a['controller'] != $tableName) { $relTableName = Inflector::camelize($a['controller']); if (isset($vv_permission_set[$entity->id][$relTableName][$a['action']])) { $ok = $vv_permission_set[$entity->id][$relTableName][$a['action']]; } + } elseif(!empty($a['url'])) { + if(is_callable($a['url'])) { + // We are constructing a URL in a callback function. + $callbackUrl = $a['url']($entity); + } else { + // We are setting a static URL override. + $callbackUrl = $a['url']; + } + $ok = true; } else { $ok = $vv_permission_set[$entity->id][$a['action']]; } @@ -306,7 +317,7 @@ $actionIcon = !empty($a['icon']) ? $a['icon'] : $this->Menu->getMenuIcon('Default'); $actionIconClass = !empty($a['iconClass']) ? $a['iconClass'] : ''; $actionClass = !empty($a['class']) ? $a['class'] : ''; - $actionUrl = ['action' => $a['action'], $entity->id]; + $actionUrl = !empty($callbackUrl) ? $callbackUrl : ['action' => $a['action'], $entity->id]; $actionLabel = !empty($a['label']) ? $a['label'] : __d('operation', $a['action']); if (!empty($a['controller']) && $a['controller'] != $tableName) { From 750d4ffe5795e2168a4ba4d6e0e93d810803b68b Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Thu, 12 Feb 2026 18:54:25 -0500 Subject: [PATCH 4/7] Link to T&C page from Terms and Conditions index view (CFM-501) --- app/resources/locales/en_US/operation.po | 3 +++ app/src/Model/Table/TermsAndConditionsTable.php | 5 +++++ app/templates/MostlyStaticPages/columns.inc | 2 +- app/templates/Standard/index.php | 13 ++++--------- app/templates/TermsAndConditions/columns.inc | 15 +++++++++++++++ 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po index e42c7d582..6fb8f252b 100644 --- a/app/resources/locales/en_US/operation.po +++ b/app/resources/locales/en_US/operation.po @@ -393,6 +393,9 @@ msgstr "Visit Page" msgid "visit.link" msgstr "Visit link" +msgid "visit.tandc" +msgstr "Visit Terms and Conditions URL" + msgid "view.PersonRoles.a" msgstr "View Role {0}" diff --git a/app/src/Model/Table/TermsAndConditionsTable.php b/app/src/Model/Table/TermsAndConditionsTable.php index a9627ec99..199d85224 100644 --- a/app/src/Model/Table/TermsAndConditionsTable.php +++ b/app/src/Model/Table/TermsAndConditionsTable.php @@ -45,6 +45,7 @@ class TermsAndConditionsTable extends Table { use \App\Lib\Traits\CoLinkTrait; use \App\Lib\Traits\PermissionsTrait; use \App\Lib\Traits\PrimaryLinkTrait; + use \App\Lib\Traits\QueryModificationTrait; use \App\Lib\Traits\TableMetaTrait; use \App\Lib\Traits\ValidationTrait; @@ -77,6 +78,10 @@ public function initialize(array $config): void { $this->setAllowLookupPrimaryLink(['proxy', 'revoke']); $this->setAllowLookupRelatedPrimaryLink(['status' => ['person_id']]); + $this->setIndexContains([ + 'MostlyStaticPages' + ]); + $this->setAutoViewVars([ 'cous' => [ 'type' => 'select', diff --git a/app/templates/MostlyStaticPages/columns.inc b/app/templates/MostlyStaticPages/columns.inc index 533162acb..8a0d55ca4 100644 --- a/app/templates/MostlyStaticPages/columns.inc +++ b/app/templates/MostlyStaticPages/columns.inc @@ -50,7 +50,7 @@ $rowActions = [ [ 'icon' => 'arrow_outward', 'label' => __d('operation', 'visit.msp'), - 'url' => function($entity) { + 'callbackUrl' => function($entity) { return '/' . $entity->co_id . '/' . $entity->name; } ] diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php index bc86da373..52b6264b6 100644 --- a/app/templates/Standard/index.php +++ b/app/templates/Standard/index.php @@ -292,15 +292,10 @@ if (isset($vv_permission_set[$entity->id][$relTableName][$a['action']])) { $ok = $vv_permission_set[$entity->id][$relTableName][$a['action']]; } - } elseif(!empty($a['url'])) { - if(is_callable($a['url'])) { - // We are constructing a URL in a callback function. - $callbackUrl = $a['url']($entity); - } else { - // We are setting a static URL override. - $callbackUrl = $a['url']; - } - $ok = true; + } elseif(!empty($a['callbackUrl']) && is_callable($a['callbackUrl'])) { + // We are constructing a URL in a callback function. + $callbackUrl = $a['callbackUrl']($entity); + $ok = true; // There is no action to test in this case. } else { $ok = $vv_permission_set[$entity->id][$a['action']]; } diff --git a/app/templates/TermsAndConditions/columns.inc b/app/templates/TermsAndConditions/columns.inc index bd0113d87..79dd0053b 100644 --- a/app/templates/TermsAndConditions/columns.inc +++ b/app/templates/TermsAndConditions/columns.inc @@ -43,4 +43,19 @@ $indexColumns = [ 'type' => 'fk', 'sortable' => true ] +]; + +$rowActions = [ + [ + 'icon' => 'arrow_outward', + 'label' => __d('operation', 'visit.tandc'), + 'callbackUrl' => function($entity) { + // There should always be either a Mostly Static Page or a URL to reference. + if(!empty($entity->mostly_static_page->name)) { + // The T&C is a mostly static page. Provide a link to it. + return '/' . $entity->co_id . '/' . $entity->mostly_static_page->name; + } + return $entity->url; + } + ] ]; \ No newline at end of file From 34f2f8a4c3de155aebec38a8b150e9d9028bd257 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Fri, 13 Feb 2026 17:26:20 -0500 Subject: [PATCH 5/7] Improve front-end Terms and Conditions in an Enrollment Flow Step (CFM-501) --- .../resources/locales/en_US/terms_agreer.po | 9 + .../AgreementCollectorsController.php | 7 +- .../AgreementCollectors/dispatch.inc | 169 +++++++++++++++--- .../templates/element/agreeDialog.php | 76 ++++++++ app/resources/locales/en_US/operation.po | 9 + app/webroot/css/co-base.css | 27 ++- app/webroot/js/comanage/comanage.js | 2 +- 7 files changed, 268 insertions(+), 31 deletions(-) create mode 100644 app/plugins/TermsAgreer/templates/element/agreeDialog.php diff --git a/app/plugins/TermsAgreer/resources/locales/en_US/terms_agreer.po b/app/plugins/TermsAgreer/resources/locales/en_US/terms_agreer.po index 76a5a61bc..247472cd5 100644 --- a/app/plugins/TermsAgreer/resources/locales/en_US/terms_agreer.po +++ b/app/plugins/TermsAgreer/resources/locales/en_US/terms_agreer.po @@ -37,12 +37,21 @@ msgstr "Ignore" msgid "enumeration.TAndCEnrollmentModeEnum.IC" msgstr "Implied Consent" +msgid "error.TAndCAgreementMissing" +msgstr "Did not receive agreement for \"{0}\" (T&C {1})" + msgid "field.AgreementCollectors.t_and_c_mode" msgstr "Terms and Conditions Mode" +msgid "information.AgreementCollectors.external" +msgstr "These Terms and Conditions will be loaded in an external browser window. After review, you must return to this window and click \"I Agree\" to continue." + msgid "information.AgreementCollectors.review" msgstr "You must review and agree to these Terms and Conditions before continuing." +msgid "information.AgreementCollectors.review.tc" +msgstr "Review Terms & Conditions" + msgid "result.AgreementCollectors.ignored" msgstr "Terms and Conditions collection disabled" diff --git a/app/plugins/TermsAgreer/src/Controller/AgreementCollectorsController.php b/app/plugins/TermsAgreer/src/Controller/AgreementCollectorsController.php index 751918faa..167b9088c 100644 --- a/app/plugins/TermsAgreer/src/Controller/AgreementCollectorsController.php +++ b/app/plugins/TermsAgreer/src/Controller/AgreementCollectorsController.php @@ -75,8 +75,8 @@ public function dispatch(string $id) { $TermsAndConditions = TableRegistry::getTableLocator()->get('TermsAndConditions'); $whereClause = [ - 'co_id' => $coId, - 'status' => SuspendableStatusEnum::Active + 'TermsAndConditions.co_id' => $coId, + 'TermsAndConditions.status' => SuspendableStatusEnum::Active ]; if(!empty($petition->cou_id)) { @@ -89,6 +89,7 @@ public function dispatch(string $id) { } $tandc = $TermsAndConditions->find() + ->contain(['MostlyStaticPages']) ->where($whereClause) ->order('ordr ASC') ->all(); @@ -118,7 +119,7 @@ public function dispatch(string $id) { if(!isset($data[$key]) || $data[$key] != "1") { $ok = false; - $this->Flash->error("Did not find agreement for T&C " . $tc->id); // XXX I18n + $this->Flash->error(__d('terms_agreer','error.TAndCAgreementMissing', [$tc->description, $tc->id])); } } diff --git a/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc b/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc index e5bdfeb61..159fe00ee 100644 --- a/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc +++ b/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc @@ -35,40 +35,159 @@ print $this->element('flash', []); $this->Field->enableFormEditMode(); ?> -

      +

      Form->create(null, [ 'id' => 'agreement-form', 'type' => 'post' ]); -print " - - - - - -"; -foreach($vv_tandc as $tc) { - print " - - - +?> + +
      Terms and ConditionsI Agree
      " . $tc['description'] . "" . $this->Form->checkbox("tc".$tc['id']) . "
      + + + + + + + + + + + - "; -} + + +
      + + + + url)): // We have a URL based T&C ?> + + + element('TermsAgreer.agreeDialog', ['vv_tc' => $tc]); ?> + + +
      + Form->checkbox( + 'tc'.$tc['id'], + ['id' => 'tc'.$tc['id'], 'class' => 'form-check-input tc-agree-checkbox'] + ) . + $this->Form->label( + 'tc'.$tc['id'], + __d('operation','agree'), + ['class' => 'form-check-label'] + ) + ?> +
      +
      + + + \ No newline at end of file diff --git a/app/plugins/TermsAgreer/templates/element/agreeDialog.php b/app/plugins/TermsAgreer/templates/element/agreeDialog.php new file mode 100644 index 000000000..0d710126d --- /dev/null +++ b/app/plugins/TermsAgreer/templates/element/agreeDialog.php @@ -0,0 +1,76 @@ + and