From c401680a7cbe4ffffbcd496fa671e319a4967fc1 Mon Sep 17 00:00:00 2001 From: Lester Caine Date: Fri, 29 May 2026 15:03:00 +0100 Subject: Standardise xref templates to _item naming; add value and group templates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rename all view_xref_*_record.tpl → view_xref_*_item.tpl throughout - LibertyContent: getXrefRecordTemplate/ListTemplate/EditTemplate use _item naming with three-level fallback (pkg/guid subdir → pkg root → liberty); getXrefRecordTemplate falls back to text_item if template file not found; getXrefEditTemplate checks liberty _item before generic edit_xref.tpl - list_xref.tpl: assign _rowTpl before method call to avoid Smarty section variable resolution issue inside PHP method call arguments - New templates: view_xref_value_item.tpl, edit_xref_value_item.tpl for simple numeric xref items (xkey field, not data) Co-Authored-By: Claude Sonnet 4.6 --- includes/classes/LibertyContent.php | 45 ++++++++++++++++++++++--------- templates/edit_xref_value_item.tpl | 34 +++++++++++++++++++++++ templates/list_xref.tpl | 3 ++- templates/view_xref_address_item.tpl | 28 +++++++++++++++++++ templates/view_xref_address_record.tpl | 28 ------------------- templates/view_xref_bank_item.tpl | 28 +++++++++++++++++++ templates/view_xref_bank_record.tpl | 28 ------------------- templates/view_xref_contact_item.tpl | 34 +++++++++++++++++++++++ templates/view_xref_contact_record.tpl | 34 ----------------------- templates/view_xref_date_item.tpl | 28 +++++++++++++++++++ templates/view_xref_date_record.tpl | 28 ------------------- templates/view_xref_image_item.tpl | 1 + templates/view_xref_image_record.tpl | 1 - templates/view_xref_inc_report_item.tpl | 1 + templates/view_xref_inc_report_record.tpl | 1 - templates/view_xref_key_seal_item.tpl | 1 + templates/view_xref_key_seal_record.tpl | 1 - templates/view_xref_locate_item.tpl | 28 +++++++++++++++++++ templates/view_xref_locate_record.tpl | 28 ------------------- templates/view_xref_phone_item.tpl | 28 +++++++++++++++++++ templates/view_xref_phone_record.tpl | 28 ------------------- templates/view_xref_sig_item.tpl | 28 +++++++++++++++++++ templates/view_xref_sig_record.tpl | 28 ------------------- templates/view_xref_text_item.tpl | 34 +++++++++++++++++++++++ templates/view_xref_text_record.tpl | 34 ----------------------- templates/view_xref_value_item.tpl | 28 +++++++++++++++++++ 26 files changed, 336 insertions(+), 252 deletions(-) create mode 100644 templates/edit_xref_value_item.tpl create mode 100644 templates/view_xref_address_item.tpl delete mode 100644 templates/view_xref_address_record.tpl create mode 100644 templates/view_xref_bank_item.tpl delete mode 100644 templates/view_xref_bank_record.tpl create mode 100644 templates/view_xref_contact_item.tpl delete mode 100644 templates/view_xref_contact_record.tpl create mode 100644 templates/view_xref_date_item.tpl delete mode 100644 templates/view_xref_date_record.tpl create mode 100644 templates/view_xref_image_item.tpl delete mode 100644 templates/view_xref_image_record.tpl create mode 100644 templates/view_xref_inc_report_item.tpl delete mode 100644 templates/view_xref_inc_report_record.tpl create mode 100644 templates/view_xref_key_seal_item.tpl delete mode 100644 templates/view_xref_key_seal_record.tpl create mode 100644 templates/view_xref_locate_item.tpl delete mode 100644 templates/view_xref_locate_record.tpl create mode 100644 templates/view_xref_phone_item.tpl delete mode 100644 templates/view_xref_phone_record.tpl create mode 100644 templates/view_xref_sig_item.tpl delete mode 100644 templates/view_xref_sig_record.tpl create mode 100644 templates/view_xref_text_item.tpl delete mode 100644 templates/view_xref_text_record.tpl create mode 100644 templates/view_xref_value_item.tpl diff --git a/includes/classes/LibertyContent.php b/includes/classes/LibertyContent.php index 9f79e45..58894be 100755 --- a/includes/classes/LibertyContent.php +++ b/includes/classes/LibertyContent.php @@ -2157,10 +2157,17 @@ class LibertyContent extends LibertyBase implements BitCacheable { */ public function getXrefListTemplate( ?string $pTemplate = null ): string { if( $pTemplate ) { - $package = $this->mType['handler_package'] ?? 'liberty'; + $package = $this->mType['handler_package'] ?? 'liberty'; $pkgConst = strtoupper( $package ).'_PKG_PATH'; - if( defined( $pkgConst ) && file_exists( constant( $pkgConst ).'templates/list_xref_'.$pTemplate.'.tpl' ) ) { - return 'bitpackage:'.$package.'/list_xref_'.$pTemplate.'.tpl'; + if( defined( $pkgConst ) ) { + $base = constant( $pkgConst ).'templates/'; + $file = 'view_xref_'.$pTemplate.'_group.tpl'; + if( $this->mContentTypeGuid && file_exists( $base.$this->mContentTypeGuid.'/'.$file ) ) { + return 'bitpackage:'.$package.'/'.$this->mContentTypeGuid.'/'.$file; + } + if( file_exists( $base.$file ) ) { + return 'bitpackage:'.$package.'/'.$file; + } } } return 'bitpackage:liberty/list_xref.tpl'; @@ -2168,26 +2175,40 @@ class LibertyContent extends LibertyBase implements BitCacheable { public function getXrefRecordTemplate( ?string $pTemplate = null ): string { $pTemplate = $pTemplate ?: 'text'; - $package = $this->mType['handler_package'] ?? 'liberty'; + $package = $this->mType['handler_package'] ?? 'liberty'; $pkgConst = strtoupper( $package ).'_PKG_PATH'; if( defined( $pkgConst ) ) { - $pkgTpl = constant( $pkgConst ).'templates/view_xref_'.$pTemplate.'_record.tpl'; - if( file_exists( $pkgTpl ) ) { - return 'bitpackage:'.$package.'/view_xref_'.$pTemplate.'_record.tpl'; + $base = constant( $pkgConst ).'templates/'; + $file = 'view_xref_'.$pTemplate.'_item.tpl'; + if( $this->mContentTypeGuid && file_exists( $base.$this->mContentTypeGuid.'/'.$file ) ) { + return 'bitpackage:'.$package.'/'.$this->mContentTypeGuid.'/'.$file; + } + if( file_exists( $base.$file ) ) { + return 'bitpackage:'.$package.'/'.$file; } } - return 'bitpackage:liberty/view_xref_'.$pTemplate.'_record.tpl'; + $libertyTpl = LIBERTY_PKG_PATH.'templates/view_xref_'.$pTemplate.'_item.tpl'; + return file_exists( $libertyTpl ) + ? 'bitpackage:liberty/view_xref_'.$pTemplate.'_item.tpl' + : 'bitpackage:liberty/view_xref_text_item.tpl'; } public function getXrefEditTemplate( ?string $pTemplate = null ): string { $pTemplate = $pTemplate ?: 'text'; - $package = $this->mType['handler_package'] ?? 'liberty'; + $package = $this->mType['handler_package'] ?? 'liberty'; $pkgConst = strtoupper( $package ).'_PKG_PATH'; if( defined( $pkgConst ) ) { - $pkgTpl = constant( $pkgConst ).'templates/edit_xref_'.$pTemplate.'.tpl'; - if( file_exists( $pkgTpl ) ) { - return 'bitpackage:'.$package.'/edit_xref_'.$pTemplate.'.tpl'; + $base = constant( $pkgConst ).'templates/'; + $file = 'edit_xref_'.$pTemplate.'_item.tpl'; + if( $this->mContentTypeGuid && file_exists( $base.$this->mContentTypeGuid.'/'.$file ) ) { + return 'bitpackage:'.$package.'/'.$this->mContentTypeGuid.'/'.$file; } + if( file_exists( $base.$file ) ) { + return 'bitpackage:'.$package.'/'.$file; + } + } + if( file_exists( LIBERTY_PKG_PATH.'templates/edit_xref_'.$pTemplate.'_item.tpl' ) ) { + return 'bitpackage:liberty/edit_xref_'.$pTemplate.'_item.tpl'; } return 'bitpackage:liberty/edit_xref.tpl'; } diff --git a/templates/edit_xref_value_item.tpl b/templates/edit_xref_value_item.tpl new file mode 100644 index 0000000..0418d1e --- /dev/null +++ b/templates/edit_xref_value_item.tpl @@ -0,0 +1,34 @@ +{strip} +
+
+

{tr}Edit Value{/tr}: {$gContent->getTitle()|escape}

+
+
+ {formfeedback error=$errors} + {form id="editXrefForm"} + + + + +
+ {formlabel label="Type"} + {forminput} +

{$xrefInfo.source_title|escape}

+ {/forminput} +
+ +
+ {formlabel label="Value" for="xkey"} + {forminput} + + {/forminput} +
+ +
+ + +
+ {/form} +
+
+{/strip} diff --git a/templates/list_xref.tpl b/templates/list_xref.tpl index a670111..70183ce 100644 --- a/templates/list_xref.tpl +++ b/templates/list_xref.tpl @@ -21,8 +21,9 @@ {section name=xref loop=$gContent->mInfo.$source} + {assign var=_rowTpl value=$gContent->mInfo.$source[xref].template} - {include file=$gContent->getXrefRecordTemplate($gContent->mInfo.$source[xref].template)} + {include file=$gContent->getXrefRecordTemplate($_rowTpl)} {sectionelse} diff --git a/templates/view_xref_address_item.tpl b/templates/view_xref_address_item.tpl new file mode 100644 index 0000000..21af596 --- /dev/null +++ b/templates/view_xref_address_item.tpl @@ -0,0 +1,28 @@ +{strip} +{$gContent->mInfo.$source[xref].source_title|escape} +  +{$gContent->mInfo.$source[xref].xkey_ext|escape}, {$gContent->mInfo.$source[xref].xkey|escape} +{$gContent->mInfo.$source[xref].data|escape} + + {if $source ne 'history'} + {$gContent->mInfo.$source[xref].start_date|bit_short_date} + {else} + {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {/if} + +{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} + + + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {/if} + {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} + {if $source eq 'history'} + {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {else} + {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {/if} + {/if} + + +{/strip} diff --git a/templates/view_xref_address_record.tpl b/templates/view_xref_address_record.tpl deleted file mode 100644 index 21af596..0000000 --- a/templates/view_xref_address_record.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{strip} -{$gContent->mInfo.$source[xref].source_title|escape} -  -{$gContent->mInfo.$source[xref].xkey_ext|escape}, {$gContent->mInfo.$source[xref].xkey|escape} -{$gContent->mInfo.$source[xref].data|escape} - - {if $source ne 'history'} - {$gContent->mInfo.$source[xref].start_date|bit_short_date} - {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} - {/if} - -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} - - - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} - {/if} - {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} - {else} - {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} - {/if} - {/if} - - -{/strip} diff --git a/templates/view_xref_bank_item.tpl b/templates/view_xref_bank_item.tpl new file mode 100644 index 0000000..099ce6b --- /dev/null +++ b/templates/view_xref_bank_item.tpl @@ -0,0 +1,28 @@ +{strip} +{$gContent->mInfo.$source[xref].source_title|escape} +  +{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} +{$gContent->mInfo.$source[xref].data|escape} + + {if $source ne 'history'} + {$gContent->mInfo.$source[xref].start_date|bit_short_date} + {else} + {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {/if} + +{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} + + + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {/if} + {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} + {if $source eq 'history'} + {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {else} + {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {/if} + {/if} + + +{/strip} diff --git a/templates/view_xref_bank_record.tpl b/templates/view_xref_bank_record.tpl deleted file mode 100644 index 099ce6b..0000000 --- a/templates/view_xref_bank_record.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{strip} -{$gContent->mInfo.$source[xref].source_title|escape} -  -{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} -{$gContent->mInfo.$source[xref].data|escape} - - {if $source ne 'history'} - {$gContent->mInfo.$source[xref].start_date|bit_short_date} - {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} - {/if} - -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} - - - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} - {/if} - {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} - {else} - {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} - {/if} - {/if} - - -{/strip} diff --git a/templates/view_xref_contact_item.tpl b/templates/view_xref_contact_item.tpl new file mode 100644 index 0000000..c89a8ae --- /dev/null +++ b/templates/view_xref_contact_item.tpl @@ -0,0 +1,34 @@ +{strip} +{$gContent->mInfo.$source[xref].source_title|escape} + + {if isset($gContent->mInfo.$source[xref].xref) && $gContent->mInfo.$source[xref].xref > 100} + {$gContent->mInfo.$source[xref].xref|escape} + {else} +   + {/if} + +{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} +{$gContent->mInfo.$source[xref].data|escape} + + {if $source ne 'history'} + {$gContent->mInfo.$source[xref].start_date|bit_short_date} + {else} + {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {/if} + +{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} + + + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {/if} + {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} + {if $source eq 'history'} + {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {else} + {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {/if} + {/if} + + +{/strip} diff --git a/templates/view_xref_contact_record.tpl b/templates/view_xref_contact_record.tpl deleted file mode 100644 index c89a8ae..0000000 --- a/templates/view_xref_contact_record.tpl +++ /dev/null @@ -1,34 +0,0 @@ -{strip} -{$gContent->mInfo.$source[xref].source_title|escape} - - {if isset($gContent->mInfo.$source[xref].xref) && $gContent->mInfo.$source[xref].xref > 100} - {$gContent->mInfo.$source[xref].xref|escape} - {else} -   - {/if} - -{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} -{$gContent->mInfo.$source[xref].data|escape} - - {if $source ne 'history'} - {$gContent->mInfo.$source[xref].start_date|bit_short_date} - {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} - {/if} - -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} - - - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} - {/if} - {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} - {else} - {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} - {/if} - {/if} - - -{/strip} diff --git a/templates/view_xref_date_item.tpl b/templates/view_xref_date_item.tpl new file mode 100644 index 0000000..099ce6b --- /dev/null +++ b/templates/view_xref_date_item.tpl @@ -0,0 +1,28 @@ +{strip} +{$gContent->mInfo.$source[xref].source_title|escape} +  +{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} +{$gContent->mInfo.$source[xref].data|escape} + + {if $source ne 'history'} + {$gContent->mInfo.$source[xref].start_date|bit_short_date} + {else} + {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {/if} + +{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} + + + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {/if} + {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} + {if $source eq 'history'} + {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {else} + {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {/if} + {/if} + + +{/strip} diff --git a/templates/view_xref_date_record.tpl b/templates/view_xref_date_record.tpl deleted file mode 100644 index 099ce6b..0000000 --- a/templates/view_xref_date_record.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{strip} -{$gContent->mInfo.$source[xref].source_title|escape} -  -{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} -{$gContent->mInfo.$source[xref].data|escape} - - {if $source ne 'history'} - {$gContent->mInfo.$source[xref].start_date|bit_short_date} - {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} - {/if} - -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} - - - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} - {/if} - {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} - {else} - {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} - {/if} - {/if} - - -{/strip} diff --git a/templates/view_xref_image_item.tpl b/templates/view_xref_image_item.tpl new file mode 100644 index 0000000..9effe61 --- /dev/null +++ b/templates/view_xref_image_item.tpl @@ -0,0 +1 @@ +{include file="bitpackage:contact/view_xref_image_record.tpl"} diff --git a/templates/view_xref_image_record.tpl b/templates/view_xref_image_record.tpl deleted file mode 100644 index 9effe61..0000000 --- a/templates/view_xref_image_record.tpl +++ /dev/null @@ -1 +0,0 @@ -{include file="bitpackage:contact/view_xref_image_record.tpl"} diff --git a/templates/view_xref_inc_report_item.tpl b/templates/view_xref_inc_report_item.tpl new file mode 100644 index 0000000..6fc138f --- /dev/null +++ b/templates/view_xref_inc_report_item.tpl @@ -0,0 +1 @@ +{include file="bitpackage:contact/view_xref_inc_report_record.tpl"} diff --git a/templates/view_xref_inc_report_record.tpl b/templates/view_xref_inc_report_record.tpl deleted file mode 100644 index 6fc138f..0000000 --- a/templates/view_xref_inc_report_record.tpl +++ /dev/null @@ -1 +0,0 @@ -{include file="bitpackage:contact/view_xref_inc_report_record.tpl"} diff --git a/templates/view_xref_key_seal_item.tpl b/templates/view_xref_key_seal_item.tpl new file mode 100644 index 0000000..0fe0b18 --- /dev/null +++ b/templates/view_xref_key_seal_item.tpl @@ -0,0 +1 @@ +{include file="bitpackage:contact/view_xref_key_seal_record.tpl"} diff --git a/templates/view_xref_key_seal_record.tpl b/templates/view_xref_key_seal_record.tpl deleted file mode 100644 index 0fe0b18..0000000 --- a/templates/view_xref_key_seal_record.tpl +++ /dev/null @@ -1 +0,0 @@ -{include file="bitpackage:contact/view_xref_key_seal_record.tpl"} diff --git a/templates/view_xref_locate_item.tpl b/templates/view_xref_locate_item.tpl new file mode 100644 index 0000000..099ce6b --- /dev/null +++ b/templates/view_xref_locate_item.tpl @@ -0,0 +1,28 @@ +{strip} +{$gContent->mInfo.$source[xref].source_title|escape} +  +{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} +{$gContent->mInfo.$source[xref].data|escape} + + {if $source ne 'history'} + {$gContent->mInfo.$source[xref].start_date|bit_short_date} + {else} + {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {/if} + +{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} + + + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {/if} + {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} + {if $source eq 'history'} + {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {else} + {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {/if} + {/if} + + +{/strip} diff --git a/templates/view_xref_locate_record.tpl b/templates/view_xref_locate_record.tpl deleted file mode 100644 index 099ce6b..0000000 --- a/templates/view_xref_locate_record.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{strip} -{$gContent->mInfo.$source[xref].source_title|escape} -  -{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} -{$gContent->mInfo.$source[xref].data|escape} - - {if $source ne 'history'} - {$gContent->mInfo.$source[xref].start_date|bit_short_date} - {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} - {/if} - -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} - - - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} - {/if} - {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} - {else} - {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} - {/if} - {/if} - - -{/strip} diff --git a/templates/view_xref_phone_item.tpl b/templates/view_xref_phone_item.tpl new file mode 100644 index 0000000..5c95005 --- /dev/null +++ b/templates/view_xref_phone_item.tpl @@ -0,0 +1,28 @@ +{strip} +{$gContent->mInfo.$source[xref].source_title|escape} +  +{$gContent->mInfo.$source[xref].xkey|escape} +{$gContent->mInfo.$source[xref].data|escape} + + {if $source ne 'history'} + {$gContent->mInfo.$source[xref].start_date|bit_short_date} + {else} + {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {/if} + +{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} + + + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {/if} + {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} + {if $source eq 'history'} + {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {else} + {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {/if} + {/if} + + +{/strip} diff --git a/templates/view_xref_phone_record.tpl b/templates/view_xref_phone_record.tpl deleted file mode 100644 index 5c95005..0000000 --- a/templates/view_xref_phone_record.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{strip} -{$gContent->mInfo.$source[xref].source_title|escape} -  -{$gContent->mInfo.$source[xref].xkey|escape} -{$gContent->mInfo.$source[xref].data|escape} - - {if $source ne 'history'} - {$gContent->mInfo.$source[xref].start_date|bit_short_date} - {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} - {/if} - -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} - - - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} - {/if} - {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} - {else} - {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} - {/if} - {/if} - - -{/strip} diff --git a/templates/view_xref_sig_item.tpl b/templates/view_xref_sig_item.tpl new file mode 100644 index 0000000..099ce6b --- /dev/null +++ b/templates/view_xref_sig_item.tpl @@ -0,0 +1,28 @@ +{strip} +{$gContent->mInfo.$source[xref].source_title|escape} +  +{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} +{$gContent->mInfo.$source[xref].data|escape} + + {if $source ne 'history'} + {$gContent->mInfo.$source[xref].start_date|bit_short_date} + {else} + {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {/if} + +{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} + + + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {/if} + {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} + {if $source eq 'history'} + {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {else} + {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {/if} + {/if} + + +{/strip} diff --git a/templates/view_xref_sig_record.tpl b/templates/view_xref_sig_record.tpl deleted file mode 100644 index 099ce6b..0000000 --- a/templates/view_xref_sig_record.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{strip} -{$gContent->mInfo.$source[xref].source_title|escape} -  -{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} -{$gContent->mInfo.$source[xref].data|escape} - - {if $source ne 'history'} - {$gContent->mInfo.$source[xref].start_date|bit_short_date} - {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} - {/if} - -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} - - - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} - {/if} - {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} - {else} - {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} - {/if} - {/if} - - -{/strip} diff --git a/templates/view_xref_text_item.tpl b/templates/view_xref_text_item.tpl new file mode 100644 index 0000000..c89a8ae --- /dev/null +++ b/templates/view_xref_text_item.tpl @@ -0,0 +1,34 @@ +{strip} +{$gContent->mInfo.$source[xref].source_title|escape} + + {if isset($gContent->mInfo.$source[xref].xref) && $gContent->mInfo.$source[xref].xref > 100} + {$gContent->mInfo.$source[xref].xref|escape} + {else} +   + {/if} + +{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} +{$gContent->mInfo.$source[xref].data|escape} + + {if $source ne 'history'} + {$gContent->mInfo.$source[xref].start_date|bit_short_date} + {else} + {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {/if} + +{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} + + + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {/if} + {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} + {if $source eq 'history'} + {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {else} + {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {/if} + {/if} + + +{/strip} diff --git a/templates/view_xref_text_record.tpl b/templates/view_xref_text_record.tpl deleted file mode 100644 index c89a8ae..0000000 --- a/templates/view_xref_text_record.tpl +++ /dev/null @@ -1,34 +0,0 @@ -{strip} -{$gContent->mInfo.$source[xref].source_title|escape} - - {if isset($gContent->mInfo.$source[xref].xref) && $gContent->mInfo.$source[xref].xref > 100} - {$gContent->mInfo.$source[xref].xref|escape} - {else} -   - {/if} - -{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} -{$gContent->mInfo.$source[xref].data|escape} - - {if $source ne 'history'} - {$gContent->mInfo.$source[xref].start_date|bit_short_date} - {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} - {/if} - -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} - - - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} - {/if} - {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} - {else} - {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} - {/if} - {/if} - - -{/strip} diff --git a/templates/view_xref_value_item.tpl b/templates/view_xref_value_item.tpl new file mode 100644 index 0000000..b289054 --- /dev/null +++ b/templates/view_xref_value_item.tpl @@ -0,0 +1,28 @@ +{strip} +{$gContent->mInfo.$source[xref].source_title|escape} +  +{$gContent->mInfo.$source[xref].xkey|escape} +{$gContent->mInfo.$source[xref].xkey_ext|escape} + + {if $source ne 'history'} + {$gContent->mInfo.$source[xref].start_date|bit_short_date} + {else} + {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {/if} + +{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} + + + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {/if} + {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} + {if $source eq 'history'} + {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {else} + {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {/if} + {/if} + + +{/strip} -- cgit v1.3