diff options
| author | Lester Caine <lester@lsces.co.uk> | 2026-05-26 14:51:08 +0100 |
|---|---|---|
| committer | Lester Caine <lester@lsces.co.uk> | 2026-05-26 14:51:08 +0100 |
| commit | c4c48710f929286d4b799bcb6fb02bc8c04383a4 (patch) | |
| tree | 54c70fb97bc8faaa4c5621dadb262b05f79d5350 /templates | |
| parent | 2866cb7d576ae8c59137d0c7dbb8e9baf0e6e3f1 (diff) | |
| download | liberty-c4c48710f929286d4b799bcb6fb02bc8c04383a4.tar.gz liberty-c4c48710f929286d4b799bcb6fb02bc8c04383a4.tar.bz2 liberty-c4c48710f929286d4b799bcb6fb02bc8c04383a4.zip | |
Add liberty_xref subsystem: package-agnostic typed cross-references
Replaces per-package xref tables with three shared liberty tables:
liberty_xref_group (tab groups), liberty_xref_item (source definitions),
liberty_xref (records). Column names: group→x_group (Firebird reserved word),
source→item, multi→multiple throughout PHP classes and templates.
- 5.0.1 upgrade creates the three tables + sequence + indexes for existing installs
- schema_inc.php updated so fresh installs also get the tables
- Admin UI: admin_xref_groups and admin_xref_sources pages with package filter
- LibertyContent::loadXrefList / getXrefGroupList / getXrefTypeList updated
- LibertyMime: skip attachment rendering during BIT_INSTALL
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/add_xref.tpl | 6 | ||||
| -rw-r--r-- | templates/admin_xref_groups.tpl | 9 | ||||
| -rw-r--r-- | templates/admin_xref_sources.tpl | 20 | ||||
| -rw-r--r-- | templates/edit_xref.tpl | 2 | ||||
| -rw-r--r-- | templates/list_xref.tpl | 2 |
5 files changed, 20 insertions, 19 deletions
diff --git a/templates/add_xref.tpl b/templates/add_xref.tpl index 3be770f..990c1d5 100644 --- a/templates/add_xref.tpl +++ b/templates/add_xref.tpl @@ -9,12 +9,12 @@ {form id="addXrefForm"} <input type="hidden" name="content_id" value="{$gContent->mContentId}" /> - <input type="hidden" name="xref_type" value="{$xref_type}" /> + <input type="hidden" name="group" value="{$group}" /> <div class="form-group"> - {formlabel label="Type" for="source"} + {formlabel label="Type" for="item"} {forminput} - {html_options name="source" id="source" options=$xrefTypeList.list} + {html_options name="item" id="item" options=$xrefTypeList.list} {/forminput} </div> diff --git a/templates/admin_xref_groups.tpl b/templates/admin_xref_groups.tpl index 3618c79..8f3d580 100644 --- a/templates/admin_xref_groups.tpl +++ b/templates/admin_xref_groups.tpl @@ -36,8 +36,8 @@ <input type="hidden" name="new_content_type_guid" value="{$activeGuid|escape}" /> <input type="hidden" name="content_type_guid" value="{$activeGuid|escape}" /> <div class="form-group"> - {formlabel label="Key (xref_type)" for="xref_type"} - {forminput}<input type="text" id="xref_type" name="xref_type" class="form-control" />{/forminput} + {formlabel label="Key (group)" for="x_group"} + {forminput}<input type="text" id="x_group" name="x_group" class="form-control" />{/forminput} </div> <div class="form-group"> {formlabel label="Title" for="title"} @@ -75,7 +75,7 @@ {foreach from=$xref_groups item=grp} <tr> <td>{$grp.content_type_guid|escape}</td> - <td><code>{$grp.xref_type|escape}</code></td> + <td><code>{$grp.x_group|escape}</code></td> <td>{$grp.title|escape}</td> <td>{$grp.sort_order}</td> <td>{$grp.role_id}</td> @@ -84,8 +84,9 @@ </td> <td> {if $grp.num_sources eq 0} - <a href="{$smarty.const.LIBERTY_PKG_URL}admin/admin_xref_groups.php?fDeleteGroup=1&xref_type={$grp.xref_type|escape}&del_content_type_guid={$grp.content_type_guid|escape}&content_type_guid={$activeGuid|escape}" + <a href="{$smarty.const.LIBERTY_PKG_URL}admin/admin_xref_groups.php?fDeleteGroup=1&x_group={$grp.x_group|escape}&del_content_type_guid={$grp.content_type_guid|escape}&content_type_guid={$activeGuid|escape}" onclick="return confirm('{tr}Delete this group?{/tr}')">{booticon iname="icon-trash" ipackage="icons" iforce=icon_text iexplain="Delete"}</a> + {/if} </td> </tr> diff --git a/templates/admin_xref_sources.tpl b/templates/admin_xref_sources.tpl index 58fddf6..9e9ec0a 100644 --- a/templates/admin_xref_sources.tpl +++ b/templates/admin_xref_sources.tpl @@ -40,11 +40,11 @@ {forminput}<input type="text" id="source" name="source" class="form-control" />{/forminput} </div> <div class="form-group"> - {formlabel label="Group" for="xref_type"} + {formlabel label="Group" for="x_group"} {forminput} - <select name="xref_type" id="xref_type" class="form-control"> + <select name="x_group" id="x_group" class="form-control"> {foreach from=$xref_groups item=grp} - <option value="{$grp.xref_type|escape}">{$grp.title|escape} ({$grp.xref_type|escape})</option> + <option value="{$grp.x_group|escape}">{$grp.title|escape} ({$grp.x_group|escape})</option> {/foreach} </select> {/forminput} @@ -62,8 +62,8 @@ {forminput}<input type="text" id="cross_ref_href" name="cross_ref_href" class="form-control" />{/forminput} </div> <div class="form-group"> - {formlabel label="Multi" for="multi"} - {forminput}<input type="number" id="multi" name="multi" value="0" class="form-control" style="width:5em" />{/forminput} + {formlabel label="Multiple" for="multiple"} + {forminput}<input type="number" id="multiple" name="multiple" value="0" class="form-control" style="width:5em" />{/forminput} </div> <div class="form-group"> {formlabel label="Role ID" for="role_id"} @@ -85,7 +85,7 @@ <th>{tr}Group{/tr}</th> <th>{tr}Title{/tr}</th> <th>{tr}Template{/tr}</th> - <th>{tr}Multi{/tr}</th> + <th>{tr}Multiple{/tr}</th> <th>{tr}Role{/tr}</th> <th>{tr}Entries{/tr}</th> <th>{tr}Actions{/tr}</th> @@ -95,16 +95,16 @@ {foreach from=$xref_sources item=src} <tr> <td>{$src.content_type_guid|escape}</td> - <td><code>{$src.source|escape}</code></td> - <td><code>{$src.xref_type|escape}</code></td> + <td><code>{$src.item|escape}</code></td> + <td><code>{$src.x_group|escape}</code></td> <td>{$src.cross_ref_title|escape}</td> <td>{$src.template|escape}</td> - <td>{$src.multi}</td> + <td>{$src.multiple}</td> <td>{$src.role_id}</td> <td>{$src.num_entries}</td> <td> {if $src.num_entries eq 0} - <a href="{$smarty.const.LIBERTY_PKG_URL}admin/admin_xref_sources.php?fDeleteSource=1&source={$src.source|escape}&del_content_type_guid={$src.content_type_guid|escape}&content_type_guid={$activeGuid|escape}" + <a href="{$smarty.const.LIBERTY_PKG_URL}admin/admin_xref_sources.php?fDeleteSource=1&source={$src.item|escape}&del_content_type_guid={$src.content_type_guid|escape}&content_type_guid={$activeGuid|escape}" onclick="return confirm('{tr}Delete this source?{/tr}')">{booticon iname="icon-trash" ipackage="icons" iforce=icon_text iexplain="Delete"}</a> {/if} </td> diff --git a/templates/edit_xref.tpl b/templates/edit_xref.tpl index 9dbb0d8..5261647 100644 --- a/templates/edit_xref.tpl +++ b/templates/edit_xref.tpl @@ -10,7 +10,7 @@ {form id="editXrefForm"} <input type="hidden" name="content_id" value="{$xrefInfo.content_id}" /> <input type="hidden" name="xref_id" value="{$xrefInfo.xref_id}" /> - <input type="hidden" name="source" value="{$xrefInfo.source|escape}" /> + <input type="hidden" name="item" value="{$xrefInfo.item|escape}" /> <div class="form-group"> {formlabel label="Type"} diff --git a/templates/list_xref.tpl b/templates/list_xref.tpl index 572cc34..e1a6bbc 100644 --- a/templates/list_xref.tpl +++ b/templates/list_xref.tpl @@ -33,7 +33,7 @@ </div> {if $allow_add && $gContent->isValid() && $gContent->hasUpdatePermission() && $source ne 'history'} <div> - {smartlink ititle="Add record" ipackage="liberty" ifile="add_xref.php" booticon="icon-note-add" content_id=$gContent->mInfo.content_id xref_type=$xref_type} + {smartlink ititle="Add record" ipackage="liberty" ifile="add_xref.php" booticon="icon-note-add" content_id=$gContent->mInfo.content_id group=$group} </div> {/if} {/legend} |
