Skip to content

Commit

Permalink
Improve Terms and Conditions status view (CFM-501)
Browse files Browse the repository at this point in the history
  • Loading branch information
arlen committed Feb 12, 2026
1 parent 0fdbe49 commit fcbda26
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/src/Controller/TermsAndConditionsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
2 changes: 1 addition & 1 deletion app/templates/Standard/add-edit-view.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 6 additions & 5 deletions app/templates/TermsAndConditions/status.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
<table id="termsandconditionsstatus-table" class="index-table list-mode with-actions">
<thead>
<tr>
<td class="actions"></td>
<th><?= __d('controller', 'TermsAndConditions', [1]); ?></th>
<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>
Expand All @@ -53,8 +52,9 @@
</tbody>
<?php foreach($vv_tandc_statuses as $t): ?>
<tr>
<td class="actions">
<div class="field-actions">
<td class="with-field-actions">
<div class="field-actions-container">
<div class="field-actions">
<?php
// Build the row actions
$action_args = array();
Expand Down Expand Up @@ -110,8 +110,9 @@
}
?>
</div>
<?= $t['tandc']->description; ?>
</div>
</td>
<td><?= $t['tandc']->description; ?></td>
<td><?= __d('enumeration', 'TAndCStatusEnum.'.$t['status']); ?></td>
<td><?= $t['agreement']->identifier ?? "" ?></td>
<td><?=
Expand Down
18 changes: 17 additions & 1 deletion app/templates/element/menuPanel.php
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@
<li>
<h3><?= __d('menu','co.configuration.title') ?></h3>
<p class="menu-panel-links-desc"><?= __d('menu','co.configuration.desc') ?></p>
<ul class="menu-panel-links-inner">
<ul class="menu-panel-links-inner col2">
<li>
<?php
$menuUrl = $this->Url->build(
Expand Down Expand Up @@ -539,6 +539,22 @@
<div class="menu-panel-link-text"><?= __d('controller','Servers', [2]) ?></div>
</a>
</li>
<li>
<?php
$menuUrl = $this->Url->build(
['plugin' => null,
'controller' => 'terms_and_conditions',
'action' => 'index',
'?' => [
'co_id' => $vv_cur_co->id
]]
);
?>
<a href="<?= $menuUrl ?>">
<div class="material-symbols-outlined" aria-hidden="true">policy</div>
<div class="menu-panel-link-text"><?= __d('controller', 'TermsAndConditions', [99]) ?></div>
</a>
</li>
<li>
<?php
$menuUrl = $this->Url->build(
Expand Down
1 change: 1 addition & 0 deletions app/webroot/css/co-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 3 additions & 0 deletions app/webroot/css/co-responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit fcbda26

Please sign in to comment.