Skip to content

Commit

Permalink
Improve Terms and Conditions edit view (CFM-501)
Browse files Browse the repository at this point in the history
  • Loading branch information
arlen committed Mar 13, 2026
1 parent 9a296a0 commit 62cfcb5
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/resources/locales/en_US/field.po
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,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<br/>(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"
Expand All @@ -1015,7 +1015,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<br/>(this or Mostly Static Page must be specified)"

msgid "Types.case_insensitive"
msgstr "Case Insensitive"
Expand Down
3 changes: 3 additions & 0 deletions app/resources/locales/en_US/operation.po
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,9 @@ msgstr "Login"
msgid "logout"
msgstr "Logout"

msgid "manage.a"
msgstr "Manage {0}"

msgid "next"
msgstr "Next"

Expand Down
15 changes: 14 additions & 1 deletion app/templates/TermsAndConditions/fields.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
6 changes: 6 additions & 0 deletions app/webroot/css/co-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
5 changes: 5 additions & 0 deletions app/webroot/css/co-responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 62cfcb5

Please sign in to comment.