From 8504c2e230493d60466244d53482c9af9a8fbc94 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Mon, 15 Jun 2026 18:40:23 -0400
Subject: [PATCH 1/2] Improve UI/UX for Terms and Conditions Review (CFM-501)

---
 .../AgreementCollectors/dispatch.inc          |  30 +++-
 .../templates/element/agreeDialog.php         |   4 +-
 .../TermsAndConditionsController.php          |  69 +++++++--
 .../Model/Table/TermsAndConditionsTable.php   |  12 +-
 app/templates/TermsAndConditions/review.php   | 132 ++++++------------
 app/templates/element/javascript.php          |   4 +-
 app/webroot/css/co-base.css                   |  12 ++
 7 files changed, 148 insertions(+), 115 deletions(-)

diff --git a/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc b/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc
index 159fe00ee..b6c97e09d 100644
--- a/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc
+++ b/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc
@@ -1,6 +1,7 @@
 <?php
 /**
- * COmanage Registry T&C Agreement Colectors Petition Fields
+ * COmanage Registry T&C Agreement Collectors Petition Fields
+ * This file is also used during core T&C Review 
  *
  * Portions licensed to the University Corporation for Advanced Internet
  * Development, Inc. ("UCAID") under one or more contributor license agreements.
@@ -51,15 +52,29 @@ print $this->Form->create(null, [
 <table>
   <tr>
     <th><?= __d('controller','TermsAndConditions',[99]) ?></th>
+    <?php if(!empty($vv_tandc_statuses)): // we are in CO-level T&C review ?>
+      <th><?= __d('field', 'status'); ?></th>
+      <th><?= __d('field', 'changelog.actor_identifier'); ?></th>
+      <th><?= __d('field', 'timestamp.tz', [$vv_tz->getName()]); ?></th>
+    <?php endif; ?>
     <th class="center"><?= __d('operation','review')  ?></th>
     <th><?= __d('operation','agreement') ?></th>
   </tr>
   
-  <?php foreach($vv_tandc as $tc): ?>
+  <?php foreach($vv_tandc as $i => $tc): ?>
     <tr class="<?= !empty($tc->url) ? 'tc-url' : 'tc-msp' ?>">
       <td>
         <?= $tc['description'] ?>
       </td>
+      <?php if(!empty($vv_tandc_statuses)): // we are in CO-level T&C review ?>
+        <td><?= __d('enumeration', 'TAndCStatusEnum.'.$vv_tandc_statuses[$i]['status']); ?></td>
+        <td><?= $vv_tandc_statuses[$i]['agreement']->identifier ?? "" ?></td>
+        <td><?=
+            !empty($vv_tandc_statuses[$i]['agreement']->created)
+              ? $this->Time->nice($vv_tandc_statuses[$i]['agreement']->created, $vv_tz)
+              : "";
+          ?></td>
+      <?php endif; ?>
       <td class="center">
         <button 
           data-tc-id="tc<?= $tc['id'] ?>"
@@ -85,12 +100,18 @@ print $this->Form->create(null, [
           <?= 
             $this->Form->checkbox(
               'tc'.$tc['id'], 
-              ['id' => 'tc'.$tc['id'], 'class' => 'form-check-input tc-agree-checkbox']
+              [
+                'id' => 'tc'.$tc['id'], 
+                'class' => 'form-check-input tc-agree-checkbox',
+                'checked' => !empty($vv_tandc_statuses) && $vv_tandc_statuses[$i]['status'] == 'Y' ? true : false,
+              ]
             ) . 
             $this->Form->label(
               'tc'.$tc['id'], 
               __d('operation','agree'),
-              ['class' => 'form-check-label']
+              [
+                'class' => 'form-check-label'
+              ]
             ) 
           ?>
         </div>
@@ -100,7 +121,6 @@ print $this->Form->create(null, [
   
 </table>
 
-
 <script>
   // Iterate over our T&Cs to see if they're all checked.
   function checkAgreements(mode) {
diff --git a/app/plugins/TermsAgreer/templates/element/agreeDialog.php b/app/plugins/TermsAgreer/templates/element/agreeDialog.php
index 0d710126d..49b25c244 100644
--- a/app/plugins/TermsAgreer/templates/element/agreeDialog.php
+++ b/app/plugins/TermsAgreer/templates/element/agreeDialog.php
@@ -57,9 +57,9 @@
         <button type="button" class="btn-close nospin" data-bs-dismiss="modal" aria-label="<?= __d('operation', 'close'); ?>"></button>
       </div>
       <div class="modal-body">
-        <h1 class="tc-agree-dialog-title"><?= $vv_tc->mostly_static_page->title ?></h1>
+        <h1 class="tc-agree-dialog-title"><?= $vv_tc->mostly_static_page->title ?? '' ?></h1>
         <div class="tc-content">
-          <?= $htmlSanitizer->sanitize($vv_tc->mostly_static_page->body) ?>
+          <?= $htmlSanitizer->sanitize($vv_tc->mostly_static_page->body ?? '') ?>
         </div>
       </div>
       <div class="modal-footer">
diff --git a/app/src/Controller/TermsAndConditionsController.php b/app/src/Controller/TermsAndConditionsController.php
index c7f49501b..19bcaaf41 100644
--- a/app/src/Controller/TermsAndConditionsController.php
+++ b/app/src/Controller/TermsAndConditionsController.php
@@ -35,6 +35,8 @@
 use Cake\Utility\Hash;
 use \App\Lib\Enum\ProvisioningContextEnum;
 use \App\Lib\Enum\TAndCStatusEnum;
+use TermsAgreer\TermsAgreerPlugin;
+use TermsAgreer\Lib\Enum\TAndCEnrollmentModeEnum;
 
 class TermsAndConditionsController extends StandardController {
   public array $paginate = [
@@ -146,8 +148,8 @@ public function review() {
     // Before we get started, see if a return parameter was requested, and if so if it is permitted.
     // If so, we'll override any current return URL. We check the return URL here rather than when
     // we're done because URLs stored by AppController are not subject to the allow list check.
-
-    $returnUrl = $this->request->getQuery('return');
+    $request = $this->getRequest();
+    $returnUrl = $request->getQuery('return');
 
     if(!empty($returnUrl)) {
       $returnUrl = base64_decode($returnUrl);
@@ -160,7 +162,7 @@ public function review() {
           if(preg_match($u, $returnUrl)) {
             // The requested URL is permitted, so store it in the session, potentially overriding
             // the original return URL
-            $this->request->getSession()->write('TAndC.return', $returnUrl);
+            $request->getSession()->write('TAndC.return', $returnUrl);
             break;
           }
         }
@@ -181,23 +183,66 @@ public function review() {
 
     $status = $this->TermsAndConditions->status((int)$personId);
 
-    // If there is nothing left to do, redirect to the original request
-    $done = true;
+    if($request->is('post')) {
+      // Walk the set of $status['tandc']s and look for an agreement in the POST data.
+      $data = $request->getData();
+
+      $ok = true;
+
+      foreach($status as $s) {
+        // The post data is keyed on the string "tc" appended to the T&C id,
+        // and the expected value is "1".
+
+        $key = "tc".$s['tandc']->id;
+
+        if(!isset($data[$key]) || $data[$key] != "1") {
+          $ok = false;
 
-    foreach($status as $s) {
-      if($s['status'] != TAndCStatusEnum::Agreed) {
-        $done = false;
-        break;
+          $this->Flash->error(__d('terms_agreer','error.TAndCAgreement.missing', [$s['tandc']->description, $tc->id]));
+        } 
       }
-    }
 
-    if($done) {
-      return $this->redirect($this->request->getSession()->read('TAndC.return'));
+      if($ok) {
+        foreach($status as $s) {
+          $this->log("TCiD: " . $s['tandc']->id);
+          try {
+            $this->TermsAndConditions->TAndCAgreements->record(
+              termsAndConditionsId: (int)$s['tandc']->id,
+              personId: $personId,
+              actorPersonId: $personId,
+              identifier: $this->getRequest()->getSession()->read('Auth.external.user')
+            );
+
+            // Request provisioning on success
+
+            $this->llog('trace', "Requesting provisioning after T&C Agreement for Person " . $personId);
+
+            $People = TableRegistry::getTableLocator()->get('People');
+
+            $People->requestProvisioning(
+              id: (int)$personId,
+              context: ProvisioningContextEnum::Automatic
+            );
+          } catch(\Exception $e) {
+            $this->Flash->error($e->getMessage());
+            return $this->generateRedirect(null);
+          }
+        }
+        
+        // Set the flash message
+        $this->Flash->success(__d('result', 'TermsAndConditions.recorded'));
+        
+        // redirect to the original request
+        return $this->redirect($request->getSession()->read('TAndC.return'));
+      }
     }
 
     $this->set('vv_tandc_statuses', $status);
     $this->set('vv_person_id', (int)$personId);
     
+    // The default mode for CO and platform wide T&Cs is "Explicit Consent" 
+    $this->set('vv_tandc_mode', TAndCEnrollmentModeEnum::ExplicitConsent);
+    
     $this->set('vv_title', __d('controller', 'TermsAndConditions', 99));
   }
 
diff --git a/app/src/Model/Table/TermsAndConditionsTable.php b/app/src/Model/Table/TermsAndConditionsTable.php
index c5e334a11..9f6a8ec2a 100644
--- a/app/src/Model/Table/TermsAndConditionsTable.php
+++ b/app/src/Model/Table/TermsAndConditionsTable.php
@@ -78,6 +78,7 @@ public function initialize(array $config): void {
     $this->setAllowLookupPrimaryLink(['agree', 'proxy', 'revoke']);
     $this->setAllowLookupRelatedPrimaryLink(['status' => ['person_id']]);
     $this->setAllowUnkeyedPrimaryLink(['review']);
+    $this->setAllowEmptyPrimaryLink(['review']);
 
     $this->setIndexContains([
       'MostlyStaticPages'
@@ -181,15 +182,16 @@ public function status(int $personId): array {
     // any outdated T&C, we'll pull those separately, below.
 
     $tandc = $this->find()
+                  ->contain('MostlyStaticPages')
                   ->where([
-                    'co_id' => $person->co_id,
-                    'status' => SuspendableStatusEnum::Active,
+                    'TermsAndConditions.co_id' => $person->co_id,
+                    'TermsAndConditions.status' => SuspendableStatusEnum::Active,
                     'OR' => [
-                      'cou_id IS NULL',
-                      'cou_id IN' => array_values($couIds)
+                      'TermsAndConditions.cou_id IS NULL',
+                      'TermsAndConditions.cou_id IN' => array_values($couIds)
                     ]
                   ])
-                  ->order('ordr ASC')
+                  ->orderBy(['TermsAndConditions.ordr' => 'ASC'])
                   ->all();
     
     if(!empty($tandc)) {
diff --git a/app/templates/TermsAndConditions/review.php b/app/templates/TermsAndConditions/review.php
index 49e5c255d..1fa254c15 100644
--- a/app/templates/TermsAndConditions/review.php
+++ b/app/templates/TermsAndConditions/review.php
@@ -1,32 +1,33 @@
 <?php
-/**
- * COmanage Registry Terms and Conditions Review View
- *
- * Portions licensed to the University Corporation for Advanced Internet
- * Development, Inc. ("UCAID") under one or more contributor license agreements.
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * UCAID licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @link          https://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v5.3.0
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
+  /**
+   * COmanage Registry Terms and Conditions Review View
+   *
+   * Portions licensed to the University Corporation for Advanced Internet
+   * Development, Inc. ("UCAID") under one or more contributor license agreements.
+   * See the NOTICE file distributed with this work for additional information
+   * regarding copyright ownership.
+   *
+   * UCAID licenses this file to you under the Apache License, Version 2.0
+   * (the "License"); you may not use this file except in compliance with the
+   * License. You may obtain a copy of the License at:
+   *
+   * http://www.apache.org/licenses/LICENSE-2.0
+   *
+   * Unless required by applicable law or agreed to in writing, software
+   * distributed under the License is distributed on an "AS IS" BASIS,
+   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   * See the License for the specific language governing permissions and
+   * limitations under the License.
+   *
+   * @link          https://www.internet2.edu/comanage COmanage Project
+   * @package       registry
+   * @since         COmanage Registry v5.3.0
+   * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+   */
+
+  use App\Lib\Enum\TAndCStatusEnum;
+  use App\Lib\Util\StringUtilities;
 
-use App\Lib\Enum\TAndCStatusEnum;
-use App\Lib\Util\StringUtilities;
 ?>
 
 <div class="page-title-container">
@@ -35,68 +36,21 @@
   </div>
 </div>
 
-<?= $this->element('flash') // Flash messages ?>
-
-<!-- Our view is similar to index.php and status.php -->
+<?= $this->element('flash') // Flash messages  ?>
+  
+<?= $this->Form->create(null); // We don't need an object for this form ?>
 <div class="table-container">
-  <table id="termsandconditionsstatus-table" class="index-table list-mode with-actions">
-    <thead>
-      <tr>
-        <th class="with-field-actions"><?= __d('controller', 'TermsAndConditions', [1]); ?></th>
-        <th><?= __d('field', 'status'); ?></th>
-        <th><?= __d('field', 'changelog.actor_identifier'); ?></th>
-        <th><?= __d('field', 'timestamp.tz', [$vv_tz->getName()]); ?></th>
-      </tr>
-    </thead>
-
-    </tbody>
-      <?php foreach($vv_tandc_statuses as $t): ?>
-      <tr>
-        <td class="with-field-actions">
-          <div class="field-actions-container">
-            <div class="field-actions">
-          <?php
-            // Build the row actions
-            $action_args = array();
-            $action_args['vv_attr_id'] =  $t['tandc']->id;
-            $action_args['vv_actions'] = [];
-
-            if($t['status'] != TAndCStatusEnum::Agreed) {
-              // T&C that are not current can be agreed to
-
-              $action_args['vv_actions'][] = [
-                'order' => $this->Menu->getMenuOrder('Default'),
-                'icon' => 'signature',
-                'url' => [
-                  'controller' => 'terms_and_conditions',
-                  'action' => 'agree',
-                  $t['tandc']->id
-                ],
-                'label' => __d('operation', 'agree'),
-                'confirm' => [
-                  'dg_body_txt' => __d('operation', 'TermsAndConditions.agree.confirm'),
-                  'dg_confirm_btn' => __d('operation', 'confirm')
-                ]
-              ];
-            }
+  <?php
+    // extract the T&Cs for handoff to the TermsAgreer dispatch template
+    $vv_tandc = [];
+    foreach($vv_tandc_statuses as $t) {
+      $vv_tandc[] = $t['tandc'];
+    }
+    include ROOT . DS . 'plugins' . DS . 'TermsAgreer' . DS . 'templates' . DS . 'AgreementCollectors' . DS . 'dispatch.inc';
+  ?>
+</div>
 
-            if(!empty($action_args['vv_actions'])) {
-              print $this->element('menuAction', $action_args);
-            }
-          ?>
-          </div>
-            <?= $t['tandc']->description; ?>
-          </div>
-        </td>
-        <td><?= __d('enumeration', 'TAndCStatusEnum.'.$t['status']); ?></td>
-        <td><?= $t['agreement']->identifier ?? "" ?></td>
-        <td><?= 
-          !empty($t['agreement']->created) 
-          ? $this->Time->nice($t['agreement']->created, $vv_tz)
-          : ""; 
-        ?></td>
-      </tr>
-      <?php endforeach; ?>
-    </tbody>
-  </table>
+<div id="tandc-review-submit" class="submit">
+  <input type="submit" value="<?= __d('command','continue') ?>" class="spin submit-button btn btn-primary">
 </div>
+<?= $this->Form->end(); ?>
\ No newline at end of file
diff --git a/app/templates/element/javascript.php b/app/templates/element/javascript.php
index fa80a4b2d..7c5afe4e8 100644
--- a/app/templates/element/javascript.php
+++ b/app/templates/element/javascript.php
@@ -339,8 +339,8 @@
       }
     });
 
-    // Add a .nospin class to all on-page cake error and warning links
-    $(".cake-error a").addClass('nospin');
+    // Add a .nospin class to all on-page cake error and warning links (and debugging accordions)
+    $(".cake-error a, a.cake-debug-collapse").addClass('nospin');
     
     // Add loading animation when a form is submitted, when any item with a "spin" class is clicked,
     // or on any anchor tag lacking the .nospin class. We do not automatically add this to buttons
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index fac2378c7..7fba46c0e 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -2480,6 +2480,18 @@ body.termsandconditions ul.form-list li.fields-url {
 .tc-agree-dialog .modal-body h6 {
   margin-bottom: 0.5em;
 }
+/* Terms and Conditions Review hides most interface elements.
+   XXX If we find there is a general need to hide navigation elements outside of
+       enrollment flows and T&Cs, we'll do this more generically */
+body.termsandconditions.review #top-bar,
+body.termsandconditions.review #breadcrumbs,
+body.termsandconditions.review #navigation-drawer {
+  display: none;
+}
+body.termsandconditions.review #tandc-review-submit {
+  text-align: right;
+  margin: 1.5em 0 0;
+}
 /* MOSTLY STATIC PAGES */
 body.pages.logged-out #top-bar,
 body.pages.logged-out #breadcrumbs {

From 18cf14795bb269d6dc950faa4c415567c5689a45 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 18 Jun 2026 17:58:02 -0400
Subject: [PATCH 2/2] Move common code and language strings from TermsAgreer
 plugin to core (CFM-501)

---
 .../resources/locales/en_US/terms_agreer.po   |   9 -
 .../AgreementCollectors/dispatch.inc          | 187 +---------------
 app/resources/locales/en_US/information.po    |   9 +
 app/templates/TermsAndConditions/review.php   |   5 +-
 app/templates/TermsAndConditions/tandcs.inc   | 210 ++++++++++++++++++
 .../element/tandcAgreeDialog.php}             |   2 +-
 6 files changed, 225 insertions(+), 197 deletions(-)
 create mode 100644 app/templates/TermsAndConditions/tandcs.inc
 rename app/{plugins/TermsAgreer/templates/element/agreeDialog.php => templates/element/tandcAgreeDialog.php} (97%)

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 b2c8b8cda..35da383df 100644
--- a/app/plugins/TermsAgreer/resources/locales/en_US/terms_agreer.po
+++ b/app/plugins/TermsAgreer/resources/locales/en_US/terms_agreer.po
@@ -43,15 +43,6 @@ 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 \"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/templates/AgreementCollectors/dispatch.inc b/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc
index b6c97e09d..594b74e61 100644
--- a/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc
+++ b/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc
@@ -26,188 +26,5 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-declare(strict_types = 1);
-
-use \TermsAgreer\Lib\Enum\TAndCEnrollmentModeEnum;
-
-print $this->element('flash', []);
-
-// Make the Form fields editable
-$this->Field->enableFormEditMode();
-?>
-
-<p><?= __d('terms_agreer', 'information.AgreementCollectors.review') ?></p>
-
-<?php
-
-// Begin the form
-print $this->Form->create(null, [
-  'id'   => 'agreement-form',
-  'type' => 'post'
-]);
-
-
-?>
-  
-<table>
-  <tr>
-    <th><?= __d('controller','TermsAndConditions',[99]) ?></th>
-    <?php if(!empty($vv_tandc_statuses)): // we are in CO-level T&C review ?>
-      <th><?= __d('field', 'status'); ?></th>
-      <th><?= __d('field', 'changelog.actor_identifier'); ?></th>
-      <th><?= __d('field', 'timestamp.tz', [$vv_tz->getName()]); ?></th>
-    <?php endif; ?>
-    <th class="center"><?= __d('operation','review')  ?></th>
-    <th><?= __d('operation','agreement') ?></th>
-  </tr>
-  
-  <?php foreach($vv_tandc as $i => $tc): ?>
-    <tr class="<?= !empty($tc->url) ? 'tc-url' : 'tc-msp' ?>">
-      <td>
-        <?= $tc['description'] ?>
-      </td>
-      <?php if(!empty($vv_tandc_statuses)): // we are in CO-level T&C review ?>
-        <td><?= __d('enumeration', 'TAndCStatusEnum.'.$vv_tandc_statuses[$i]['status']); ?></td>
-        <td><?= $vv_tandc_statuses[$i]['agreement']->identifier ?? "" ?></td>
-        <td><?=
-            !empty($vv_tandc_statuses[$i]['agreement']->created)
-              ? $this->Time->nice($vv_tandc_statuses[$i]['agreement']->created, $vv_tz)
-              : "";
-          ?></td>
-      <?php endif; ?>
-      <td class="center">
-        <button 
-          data-tc-id="tc<?= $tc['id'] ?>"
-          class="btn btn-primary btn-sm tc-review-button" 
-          type="button">
-          <?= __d('operation','review') ?>
-        </button>
-        <?php if(!empty($tc->url)): // We have a URL based T&C ?>
-          <button
-            data-tc-id="tc<?= $tc['id'] ?>"
-            id="tc<?= $tc['id'] ?>-window-launcher"
-            class="tc-window-launcher invisible"
-            data-tc-url="<?= $tc->url ?>"
-            type="button">
-            <?= __d('operation','review') . ' tc' . $tc['id'] ?>
-          </button>
-        <?php else: // We have a Mostly Static Page based T&C ?>
-          <?= $this->element('TermsAgreer.agreeDialog', ['vv_tc' => $tc]); ?>
-        <?php endif; ?>
-      </td>
-      <td>
-        <div class="form-check tc-agree">
-          <?= 
-            $this->Form->checkbox(
-              'tc'.$tc['id'], 
-              [
-                'id' => 'tc'.$tc['id'], 
-                'class' => 'form-check-input tc-agree-checkbox',
-                'checked' => !empty($vv_tandc_statuses) && $vv_tandc_statuses[$i]['status'] == 'Y' ? true : false,
-              ]
-            ) . 
-            $this->Form->label(
-              'tc'.$tc['id'], 
-              __d('operation','agree'),
-              [
-                'class' => 'form-check-label'
-              ]
-            ) 
-          ?>
-        </div>
-      </td>
-    </tr>
-  <?php endforeach; ?>
-  
-</table>
-
-<script>
-  // Iterate over our T&Cs to see if they're all checked.
-  function checkAgreements(mode) {
-    let allAgreed = true;
-    $('.tc-agree-checkbox').each(function() {
-      if(!$(this).prop('checked')) {
-        allAgreed = false;
-        if(mode == 'EC') {
-          // We're in Explicit Consent mode, so disable 
-          // the current checkbox; its T&C must be reviewed.
-          $(this).prop('disabled', true);
-        }
-      }
-    });
-    
-    // Enable / disable the "Continue" button.
-    if(allAgreed) {
-      $('.submit input[type="submit"]').prop('disabled', false);
-    } else {
-      $('.submit input[type="submit"]').prop('disabled', true);
-    }
-  }
-
-  // On page load: check agreement states and attach event handlers.
-  $(function() {
-    // Explicit Consent mode ("EC") will disable "I Agree" checkboxes until review.
-    const tcmode = '<?= $vv_tandc_mode ?>';
-    
-    // Run on first load.
-    checkAgreements(tcmode);
-    
-    // Handle "Review" button for URL-based terms and conditions.
-    $('tr.tc-url button.tc-review-button').click(function(e) {
-      e.preventDefault();
-      jsConfirmGeneric(
-        '<?= __d('terms_agreer', 'information.AgreementCollectors.external') ?>', 
-        '', 
-        $(this).attr('data-tc-id')+'-window-launcher', 
-        '<?= __d('operation','continue') ?>', 
-        '<?= __d('operation','cancel') ?>',
-        '<?= __d('terms_agreer','information.AgreementCollectors.review.tc') ?>'
-      );
-    });
-
-    // Launch the external window for URL-based terms and conditions
-    $('tr.tc-url button.tc-window-launcher').click(function(e) {
-      e.preventDefault();
-      
-      // Calculate window size based on screen size so that we 
-      // can handle mobile and to center the window.
-      const winWidth = window.outerWidth / 1.5;
-      const winHeight = window.outerHeight / 1.5;
-      const left = window.screenLeft + ((window.outerWidth - winWidth) / 2);
-      const top = window.screenTop + ((window.outerHeight - winHeight) / 2);
-      
-      // Launch the T&C window with the external URL
-      let tandcExternalWindow = window.open(
-        $(this).attr('data-tc-url'),
-        'tandcExternalWindow',
-        'width=' + winWidth + ',height=' + winHeight + ',left=' + left + ',top=' + top + 
-        ',resizable=yes,scrollbars=yes,toolbar=no,menubar=no,location=no,status=no'
-      );
-      
-      // Enable the T&C checkbox
-      $('#'+$(this).attr('data-tc-id')).prop('disabled', false);
-    });
-
-    // Handle "Review" button for Mostly Static Page-based terms and conditions.
-    // Clicking this will reveal the T&C agree dialog.
-    $('tr.tc-msp button.tc-review-button').click(function(e) {
-      e.preventDefault();
-      $('#'+$(this).attr('data-tc-id')+'-agree-dialog').modal('show');
-    });
-
-    // Handle "Agree" button click from MSP Dialog
-    $('.tc-agree-button').click(function(e) {
-      // Enable and check the T&C checkbox
-      $('#'+$(this).attr('data-tc-id'))
-        .prop('checked', true)
-        .prop('disabled', false)
-        .trigger('change');
-    });
-
-    // Check agreements when a checkbox is clicked. 
-    // If all are checked, we'll enable "Continue".
-    $('.tc-agree-checkbox').change(function() {
-      checkAgreements(tcmode);
-    });
-  });
-</script>
\ No newline at end of file
+// This dispatch uses the same user interface as the core TermsAndConditions/tandcs.inc template. 
+include ROOT . DS . 'templates' . DS . 'TermsAndConditions' . DS . 'tandcs.inc';
\ No newline at end of file
diff --git a/app/resources/locales/en_US/information.po b/app/resources/locales/en_US/information.po
index 6f75d1a43..f9350f928 100644
--- a/app/resources/locales/en_US/information.po
+++ b/app/resources/locales/en_US/information.po
@@ -183,6 +183,15 @@ msgstr "Report for "
 msgid "table.list"
 msgstr "{0} List"
 
+msgid "tandc.review"
+msgstr "You must review and agree to these Terms and Conditions before continuing."
+
+msgid "tandc.review.dialog.title"
+msgstr "Review Terms & Conditions"
+
+msgid "tandc.review.external"
+msgstr "These Terms and Conditions will be loaded in an external browser window. After review, you must return to this window and click \"Agree\" to continue."
+
 msgid "ug.tasks.post"
 msgstr "Executing post-database tasks for version {0}"
 
diff --git a/app/templates/TermsAndConditions/review.php b/app/templates/TermsAndConditions/review.php
index 1fa254c15..4ec9296a0 100644
--- a/app/templates/TermsAndConditions/review.php
+++ b/app/templates/TermsAndConditions/review.php
@@ -41,12 +41,13 @@
 <?= $this->Form->create(null); // We don't need an object for this form ?>
 <div class="table-container">
   <?php
-    // extract the T&Cs for handoff to the TermsAgreer dispatch template
+    // extract the T&Cs for handoff to the tandcs.inc template
     $vv_tandc = [];
     foreach($vv_tandc_statuses as $t) {
       $vv_tandc[] = $t['tandc'];
     }
-    include ROOT . DS . 'plugins' . DS . 'TermsAgreer' . DS . 'templates' . DS . 'AgreementCollectors' . DS . 'dispatch.inc';
+    // The following template is also used the by the TermsAgreer enrollment flow plugin
+    include ROOT . DS . 'templates' . DS . 'TermsAndConditions' . DS . 'tandcs.inc';
   ?>
 </div>
 
diff --git a/app/templates/TermsAndConditions/tandcs.inc b/app/templates/TermsAndConditions/tandcs.inc
new file mode 100644
index 000000000..ed9bc8dfc
--- /dev/null
+++ b/app/templates/TermsAndConditions/tandcs.inc
@@ -0,0 +1,210 @@
+<?php
+  /**
+   * COmanage Registry T&C Review Form
+   *
+   * Portions licensed to the University Corporation for Advanced Internet
+   * Development, Inc. ("UCAID") under one or more contributor license agreements.
+   * See the NOTICE file distributed with this work for additional information
+   * regarding copyright ownership.
+   *
+   * UCAID licenses this file to you under the Apache License, Version 2.0
+   * (the "License"); you may not use this file except in compliance with the
+   * License. You may obtain a copy of the License at:
+   *
+   * http://www.apache.org/licenses/LICENSE-2.0
+   *
+   * Unless required by applicable law or agreed to in writing, software
+   * distributed under the License is distributed on an "AS IS" BASIS,
+   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   * See the License for the specific language governing permissions and
+   * limitations under the License.
+   *
+   * @link          https://www.internet2.edu/comanage COmanage Project
+   * @package       registry
+   * @since         COmanage Registry v5.3.0
+   * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+   */
+
+  declare(strict_types = 1);
+
+  print $this->element('flash', []);
+
+  // Make the Form fields editable
+  $this->Field->enableFormEditMode();
+?>
+
+<p><?= __d('information', 'tandc.review') ?></p>
+
+<?php
+
+  // Begin the form
+  print $this->Form->create(null, [
+    'id'   => 'agreement-form',
+    'type' => 'post'
+  ]);
+
+
+?>
+
+<table>
+  <tr>
+    <th><?= __d('controller','TermsAndConditions',[99]) ?></th>
+    <?php if(!empty($vv_tandc_statuses)): // we are in CO-level T&C review ?>
+      <th><?= __d('field', 'status'); ?></th>
+      <th><?= __d('field', 'changelog.actor_identifier'); ?></th>
+      <th><?= __d('field', 'timestamp.tz', [$vv_tz->getName()]); ?></th>
+    <?php endif; ?>
+    <th class="center"><?= __d('operation','review')  ?></th>
+    <th><?= __d('operation','agreement') ?></th>
+  </tr>
+
+  <?php foreach($vv_tandc as $i => $tc): ?>
+    <tr class="<?= !empty($tc->url) ? 'tc-url' : 'tc-msp' ?>">
+      <td>
+        <?= $tc['description'] ?>
+      </td>
+      <?php if(!empty($vv_tandc_statuses)): // we are in CO-level T&C review ?>
+        <td><?= __d('enumeration', 'TAndCStatusEnum.'.$vv_tandc_statuses[$i]['status']); ?></td>
+        <td><?= $vv_tandc_statuses[$i]['agreement']->identifier ?? "" ?></td>
+        <td><?=
+            !empty($vv_tandc_statuses[$i]['agreement']->created)
+              ? $this->Time->nice($vv_tandc_statuses[$i]['agreement']->created, $vv_tz)
+              : "";
+          ?></td>
+      <?php endif; ?>
+      <td class="center">
+        <button
+          data-tc-id="tc<?= $tc['id'] ?>"
+          class="btn btn-primary btn-sm tc-review-button"
+          type="button">
+          <?= __d('operation','review') ?>
+        </button>
+        <?php if(!empty($tc->url)): // We have a URL based T&C ?>
+          <button
+            data-tc-id="tc<?= $tc['id'] ?>"
+            id="tc<?= $tc['id'] ?>-window-launcher"
+            class="tc-window-launcher invisible"
+            data-tc-url="<?= $tc->url ?>"
+            type="button">
+            <?= __d('operation','review') . ' tc' . $tc['id'] ?>
+          </button>
+        <?php else: // We have a Mostly Static Page based T&C ?>
+          <?= $this->element('tandcAgreeDialog', ['vv_tc' => $tc]); ?>
+        <?php endif; ?>
+      </td>
+      <td>
+        <div class="form-check tc-agree">
+          <?=
+            $this->Form->checkbox(
+              'tc'.$tc['id'],
+              [
+                'id' => 'tc'.$tc['id'],
+                'class' => 'form-check-input tc-agree-checkbox',
+                'checked' => !empty($vv_tandc_statuses) && $vv_tandc_statuses[$i]['status'] == 'Y' ? true : false,
+              ]
+            ) .
+            $this->Form->label(
+              'tc'.$tc['id'],
+              __d('operation','agree'),
+              [
+                'class' => 'form-check-label'
+              ]
+            )
+          ?>
+        </div>
+      </td>
+    </tr>
+  <?php endforeach; ?>
+
+</table>
+
+<script>
+  // Iterate over our T&Cs to see if they're all checked.
+  function checkAgreements(mode) {
+    let allAgreed = true;
+    $('.tc-agree-checkbox').each(function() {
+      if(!$(this).prop('checked')) {
+        allAgreed = false;
+        if(mode == 'EC') {
+          // We're in Explicit Consent mode, so disable 
+          // the current checkbox; its T&C must be reviewed.
+          $(this).prop('disabled', true);
+        }
+      }
+    });
+
+    // Enable / disable the "Continue" button.
+    if(allAgreed) {
+      $('.submit input[type="submit"]').prop('disabled', false);
+    } else {
+      $('.submit input[type="submit"]').prop('disabled', true);
+    }
+  }
+
+  // On page load: check agreement states and attach event handlers.
+  $(function() {
+    // Explicit Consent mode ("EC") will disable "I Agree" checkboxes until review.
+    const tcmode = '<?= $vv_tandc_mode ?>';
+
+    // Run on first load.
+    checkAgreements(tcmode);
+
+    // Handle "Review" button for URL-based terms and conditions.
+    $('tr.tc-url button.tc-review-button').click(function(e) {
+      e.preventDefault();
+      jsConfirmGeneric(
+        '<?= __d('information', 'tandc.review.external') ?>',
+        '',
+        $(this).attr('data-tc-id')+'-window-launcher',
+        '<?= __d('operation','continue') ?>',
+        '<?= __d('operation','cancel') ?>',
+        '<?= __d('information','tandc.review.dialog.title') ?>'
+      );
+    });
+
+    // Launch the external window for URL-based terms and conditions
+    $('tr.tc-url button.tc-window-launcher').click(function(e) {
+      e.preventDefault();
+
+      // Calculate window size based on screen size so that we 
+      // can handle mobile and to center the window.
+      const winWidth = window.outerWidth / 1.5;
+      const winHeight = window.outerHeight / 1.5;
+      const left = window.screenLeft + ((window.outerWidth - winWidth) / 2);
+      const top = window.screenTop + ((window.outerHeight - winHeight) / 2);
+
+      // Launch the T&C window with the external URL
+      let tandcExternalWindow = window.open(
+        $(this).attr('data-tc-url'),
+        'tandcExternalWindow',
+        'width=' + winWidth + ',height=' + winHeight + ',left=' + left + ',top=' + top +
+        ',resizable=yes,scrollbars=yes,toolbar=no,menubar=no,location=no,status=no'
+      );
+
+      // Enable the T&C checkbox
+      $('#'+$(this).attr('data-tc-id')).prop('disabled', false);
+    });
+
+    // Handle "Review" button for Mostly Static Page-based terms and conditions.
+    // Clicking this will reveal the T&C agree dialog.
+    $('tr.tc-msp button.tc-review-button').click(function(e) {
+      e.preventDefault();
+      $('#'+$(this).attr('data-tc-id')+'-agree-dialog').modal('show');
+    });
+
+    // Handle "Agree" button click from MSP Dialog
+    $('.tc-agree-button').click(function(e) {
+      // Enable and check the T&C checkbox
+      $('#'+$(this).attr('data-tc-id'))
+        .prop('checked', true)
+        .prop('disabled', false)
+        .trigger('change');
+    });
+
+    // Check agreements when a checkbox is clicked. 
+    // If all are checked, we'll enable "Continue".
+    $('.tc-agree-checkbox').change(function() {
+      checkAgreements(tcmode);
+    });
+  });
+</script>
\ No newline at end of file
diff --git a/app/plugins/TermsAgreer/templates/element/agreeDialog.php b/app/templates/element/tandcAgreeDialog.php
similarity index 97%
rename from app/plugins/TermsAgreer/templates/element/agreeDialog.php
rename to app/templates/element/tandcAgreeDialog.php
index 49b25c244..63e384a90 100644
--- a/app/plugins/TermsAgreer/templates/element/agreeDialog.php
+++ b/app/templates/element/tandcAgreeDialog.php
@@ -52,7 +52,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h2 class="modal-title" id="tc<?= $vv_tc->id ?>-dialog-title">
-          <?= __d('terms_agreer','information.AgreementCollectors.review.tc') ?>
+          <?= __d('information','tandc.review.dialog.title') ?>
         </h2>
         <button type="button" class="btn-close nospin" data-bs-dismiss="modal" aria-label="<?= __d('operation', 'close'); ?>"></button>
       </div>