diff options
40 files changed, 242 insertions, 142 deletions
diff --git a/templates/add_xref.tpl b/templates/add_xref.tpl index 0ff1b49..fe19b78 100644 --- a/templates/add_xref.tpl +++ b/templates/add_xref.tpl @@ -20,7 +20,7 @@ function updateContactXrefFormat() { {/literal} </div> {formfeedback hash=$feedback} - {formfeedback warning=`$errors.title`} + {formfeedback warning=$errors.title} <div class="body"> {form enctype="multipart/form-data" id="editContactXrefForm"} @@ -53,7 +53,7 @@ function updateContactXrefFormat() { {/literal} {capture assign=textarea_help} {tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr} {/capture} - {textarea rows=5 noformat=1}{$xrefInfo.data}{/textarea} + {textarea rows=5 noformat=1 edit=$xrefInfo.data} {/legend} {/jstab} diff --git a/templates/add_xref_address.tpl b/templates/add_xref_address.tpl index 14818c0..45faee5 100644 --- a/templates/add_xref_address.tpl +++ b/templates/add_xref_address.tpl @@ -6,7 +6,7 @@ </div> {formfeedback hash=$feedback} - {formfeedback warning=`$errors.title`} + {formfeedback warning=$errors.title} <div class="body"> {form enctype="multipart/form-data" id="writexref"} @@ -44,7 +44,7 @@ {capture assign=textarea_help} {tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr} {/capture} - {textarea rows=5 noformat=1}{$xrefInfo.data}{/textarea} + {textarea rows=5 noformat=1 edit=$xrefInfo.data} {/legend} {/jstab} diff --git a/templates/admin_contact.tpl b/templates/admin_contact.tpl index dd2634c..c9361cb 100644 --- a/templates/admin_contact.tpl +++ b/templates/admin_contact.tpl @@ -4,11 +4,11 @@ {foreach from=$formContactListFeatures key=item item=output} <div class="row"> - {formlabel label=`$output.label` for=$item} + {formlabel label=$output.label for=$item} {forminput} {html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item} {/forminput} - {formhelp note=`$output.help` page=`$output.page`} + {formhelp note=$output.help page=$output.page} </div> {/foreach} diff --git a/templates/admin_contact_type.tpl b/templates/admin_contact_type.tpl index f0ef48d..6611be2 100644 --- a/templates/admin_contact_type.tpl +++ b/templates/admin_contact_type.tpl @@ -14,7 +14,7 @@ {form legend="Create a new Topic" enctype="multipart/form-data"} <input type="hidden" name="MAX_FILE_SIZE" value="1000000" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Contact Type Title" for="type_name"} {forminput} <input type="text" id="topic_name" name="type_name" /> @@ -23,7 +23,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn" name="fSubmitAddType" value="{tr}Add Contact Type{/tr}" /> + <input type="submit" class="ink-button" name="fSubmitAddType" value="{tr}Add Contact Type{/tr}" /> </div> {/form} diff --git a/templates/admin_xref_types.tpl b/templates/admin_xref_types.tpl index 4c43a51..a3f597c 100644 --- a/templates/admin_xref_types.tpl +++ b/templates/admin_xref_types.tpl @@ -14,7 +14,7 @@ {form legend="Create a new Source Type" enctype="multipart/form-data"} <input type="hidden" name="MAX_FILE_SIZE" value="1000000" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Source Type Title" for="cross_ref_title"} {forminput} <input type="text" id="cross_ref_title" name="cross_ref_title" /> @@ -22,7 +22,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Source Template" for="topic_name"} {forminput} <input type="text" id="template" name="template" /> @@ -31,7 +31,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn" name="fSubmitAddTopic" value="{tr}Add Topic{/tr}" /> + <input type="submit" class="ink-button" name="fSubmitAddTopic" value="{tr}Add Topic{/tr}" /> </div> {/form} @@ -82,7 +82,6 @@ <td align="right"> {smartlink ititle='edit' booticon="icon-edit" ifile='edit_xref_type.php' source=$xref_types[type].source} {* smartlink ititle='permissions' booticon="icon-key" ipackage='kernel' ifile='object_permissions.php' objectName="Topic `$xref_types[type].name`" object_type=topic permType=topics object_id=$xref_types[type].topic_id *} - <br /> <a href="{$smarty.const.CONTACT_PKG_URL}admin/admin_topics.php?fRemoveSource=1&source={$xref_types[type].topic_id}">{booticon iname="icon-trash" ipackage="icons" iforce=icon_text iexplain="Remove Source"}</a> </td> </tr> diff --git a/templates/contact_options_inc.tpl b/templates/contact_options_inc.tpl index 5f1bed1..51b0fc1 100644 --- a/templates/contact_options_inc.tpl +++ b/templates/contact_options_inc.tpl @@ -11,4 +11,5 @@ <script type="text/javascript">/* <![CDATA[ */ document.write("<label><input name=\"switcher\" id=\"switcher\" type=\"checkbox\" onclick=\"BitBase.switchCheckboxes(this.form.id,'contact_type_guid[]','switcher')\" /> {tr}Select all{/tr}</label><br />"); /* ]]> */</script> + <input type="submit" name="refresh" value="{tr}Update Contact Filter{/tr}" /> {/strip} diff --git a/templates/display_address.tpl b/templates/display_address.tpl index b5ac5c8..e0ec3b9 100644 --- a/templates/display_address.tpl +++ b/templates/display_address.tpl @@ -23,24 +23,26 @@ {$address.county}, {/if} {$address.postcode} {/forminput} + <div class="clear"></div> </div> {if $locate == 1 && isset($address.x_coordinate) && ($address.x_coordinate <> '') } <div class="row"> {formlabel label="Visual Centre Coordinates" for="street_start_x"} {forminput} Lat: {$address.y_coordinate|escape} Lon: {$address.x_coordinate|escape} - <<a href="http://www.openstreetmap.org/index.html?mlat={$address.y_coordinate}&mlon={$address.x_coordinate}&zoom=16&layers=BOFT" title="{$propertyInfo.title}" target="_blank"> + <br /><<a href="http://www.openstreetmap.org/index.html?mlat={$address.y_coordinate}&mlon={$address.x_coordinate}&zoom=16&layers=BOFT" title="{$propertyInfo.title}" target="_blank"> OpenStreetMap </a>> <<a href="http://www.bing.com/maps/?cp={$address.y_coordinate}~{$address.x_coordinate}&lvl=16&style=r&q={$address.postcode}#" title="{$address.title}" target="_blank"> Multimap </a>> <<a href="http://www.google.co.uk/maps?f=q&source=s_q&hl=en&q={$address.postcode}&ll={$address.y_coordinate},{$address.x_coordinate}&z=16" title="{$address.title}" target="_blank"> Google </a>><br /> - Navigate to <<a href="http://openrouteservice.org/index.php?start=-1.822164,52.073197&end={$address.x_coordinate},{$address.y_coordinate}&pref=Fastest&lang=en&unit=MI" title="{$propertyInfo.title}" target="_blank"> + Navigate to <<a href="http://openrouteservice.org/index.php?start=-1.860930,52.039980&end={$address.x_coordinate},{$address.y_coordinate}&pref=Fastest&lang=en&unit=MI" title="{$propertyInfo.title}" target="_blank"> OpenRouteService </a>> {$address.rpa|escape} {/forminput} + <div class="clear"></div> </div> {/if} diff --git a/templates/display_contact.tpl b/templates/display_contact.tpl index 1c5dfbb..aac8215 100644 --- a/templates/display_contact.tpl +++ b/templates/display_contact.tpl @@ -6,6 +6,7 @@ {forminput} {$pageInfo.usn|escape} {/forminput} + <div class="clear"></div> </div> {/if} {if isset($pageInfo.name) && ($pageInfo.name <> '') } @@ -14,6 +15,7 @@ {forminput} {$pageInfo.name|escape} {/forminput} + <div class="clear"></div> </div> {/if} {if isset($pageInfo.organisation) && ($pageInfo.organisation <> '') } @@ -22,6 +24,7 @@ {forminput} {$pageInfo.organisation|escape} {/forminput} + <div class="clear"></div> </div> {/if} {if isset($pageInfo.dob) && ($pageInfo.dob <> '') } @@ -30,6 +33,7 @@ {forminput} {$pageInfo.dob|bit_long_date} {/forminput} + <div class="clear"></div> </div> {/if} {if isset($pageInfo.nino) && ($pageInfo.nino <> '') } @@ -38,6 +42,7 @@ {forminput} {$pageInfo.nino|escape} {/forminput} + <div class="clear"></div> </div> {/if} {section name=address loop=$pageInfo.address} diff --git a/templates/display_type_header.tpl b/templates/display_type_header.tpl index 0fd6285..fa79ba8 100644 --- a/templates/display_type_header.tpl +++ b/templates/display_type_header.tpl @@ -5,5 +5,6 @@ {if isset($type.content_id) }{$type.cross_ref_title}<br/> {/if} {/foreach} {/forminput} + <div class="clear"></div> </div> diff --git a/templates/edit.tpl b/templates/edit.tpl index 0048376..d933ed5 100644 --- a/templates/edit.tpl +++ b/templates/edit.tpl @@ -24,7 +24,7 @@ alert( "{$errors.edit_conflict|strip_tags}" ); --> </script> - {formfeedback warning=`$errors.edit_conflict`} + {formfeedback warning=$errors.edit_conflict} {/if} {strip} @@ -32,12 +32,12 @@ {form enctype="multipart/form-data" id="editpageform"} {jstabs} {jstab title="$editLabel Body"} - {legend legend="`$editLabel` Details"} + {legend legend="$editLabel Details"} <input type="hidden" name="content_id" value="{$pageInfo.content_id}" /> <div class="row"> - {formfeedback warning=`$errors.names`} - {formfeedback warning=`$errors.store`} + {formfeedback warning=$errors.names} + {formfeedback warning=$errors.store} {formlabel label="$conDescr Contact" for="contentno"} {if !$pageInfo.content_id} @@ -49,6 +49,7 @@ Edit Contact Entry No : {$pageInfo.content_id} {/forminput} {/if} + <div class="clear"></div> </div> {include file="bitpackage:contact/edit_type_header.tpl"} @@ -59,24 +60,28 @@ {forminput} <input size="60" type="text" name="prefix" id="prefix" value="{$pageInfo.prefix|escape}" /> {/forminput} + <div class="clear"></div> </div> <div class="row"> {formlabel label="Forename" for="forename"} {forminput} <input size="60" type="text" name="forename" id="forename" value="{$pageInfo.forename|escape}" /> {/forminput} + <div class="clear"></div> </div> <div class="row"> {formlabel label="Surname" for="surname"} {forminput} <input size="60" type="text" name="surname" id="surname" value="{$pageInfo.surname|escape}" /> {/forminput} + <div class="clear"></div> </div> <div class="row"> {formlabel label="Suffix" for="suffix"} {forminput} <input size="60" type="text" name="suffix" id="suffix" value="{$pageInfo.suffix|escape}" /> {/forminput} + <div class="clear"></div> </div> {/if} {if $pageInfo.organisation or $pageInfo.contact_types.1.content_id or !isset( $pageInfo.contact_types ) } @@ -85,6 +90,7 @@ {forminput} <input size="60" type="text" name="organisation" id="organisation" value="{$pageInfo.organisation|escape}" /> {/forminput} + <div class="clear"></div> </div> {/if} {* include edit_personal.tpl *} @@ -94,6 +100,7 @@ {forminput} <input size="10" type="text" name="xkey" id="xkey" value="{$pageInfo.xkey|escape}" /> {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -101,6 +108,7 @@ {forminput} <input size="60" type="text" name="description" id="description" value="{$pageInfo.description|escape}" /> {/forminput} + <div class="clear"></div> </div> {/legend} {/jstab} @@ -108,7 +116,7 @@ {jstab title="Contact Notes"} {legend legend="Notes Body"} <div class="row"> - {textarea rows=30 noformat=1}{$pageInfo.edit}{/textarea} + {textarea rows=30 noformat=1 edit=$pageInfo.edit} </div> {if $page ne 'SandBox'} diff --git a/templates/edit_contact.tpl b/templates/edit_contact.tpl index 0a83405..53ac74f 100644 --- a/templates/edit_contact.tpl +++ b/templates/edit_contact.tpl @@ -42,36 +42,42 @@ {forminput} <input size="60" type="text" name="prefix" id="prefix" value="{$pageInfo.prefix|escape}" /> {/forminput} + <div class="clear"></div> </div> <div class="row"> {formlabel label="Forename" for="forename"} {forminput} <input size="60" type="text" name="forename" id="forename" value="{$pageInfo.forename|escape}" /> {/forminput} + <div class="clear"></div> </div> <div class="row"> {formlabel label="Surname" for="surname"} {forminput} <input size="60" type="text" name="surname" id="surname" value="{$pageInfo.surname|escape}" /> {/forminput} + <div class="clear"></div> </div> <div class="row"> {formlabel label="Suffix" for="suffix"} {forminput} <input size="60" type="text" name="suffix" id="suffix" value="{$pageInfo.suffix|escape}" /> {/forminput} + <div class="clear"></div> </div> <div class="row"> {formlabel label="Organisation" for="organisation"} {forminput} <input size="60" type="text" name="organisation" id="organisation" value="{$pageInfo.organisation|escape}" /> {/forminput} + <div class="clear"></div> </div> <div class="row"> {formlabel label="NI Number" for="nino"} {forminput} <input size="10" type="text" name="nino" id="nino" value="{$pageInfo.nino|escape}" /> {/forminput} + <div class="clear"></div> </div> *} <div class="row"> @@ -79,6 +85,7 @@ {forminput} <input size="60" type="text" name="description" id="description" value="{$pageInfo.description|escape}" /> {/forminput} + <div class="clear"></div> </div> <div class="row"> {formlabel label="Memo" for="$textarea_id"} @@ -87,6 +94,7 @@ <input type="hidden" name="cols" value="{$cols}" /> <textarea id="{$textarea_id}" name="edit" rows="{$rows|default:20}" cols="{$cols|default:80}">{if !$preview}{$pageInfo.data|escape}{else}{$edit}{/if}</textarea> {/forminput} + <div class="clear"></div> </div> <div class="row submit"> diff --git a/templates/edit_key_break.tpl b/templates/edit_key_break.tpl index 670fced..8ee1f50 100644 --- a/templates/edit_key_break.tpl +++ b/templates/edit_key_break.tpl @@ -6,7 +6,7 @@ </div> {formfeedback hash=$feedback} - {formfeedback warning=`$errors.title`} + {formfeedback warning=$errors.title} <div class="body"> {form enctype="multipart/form-data" id="writexref"} @@ -20,6 +20,7 @@ <input type="text" name="xref" id="xref" value="{$xrefInfo.xref|escape}" /> {formhelp note="Link to job that caused seal break."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -28,6 +29,7 @@ <input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> {formhelp note="ID Key use to access data in other systems identified by the xref type."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -36,13 +38,14 @@ <input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="Variable text element such as url or email address."} {/forminput} + <div class="clear"></div> </div> {formlabel label="Reference Notes" for="data"} {capture assign=textarea_help} {tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr} {/capture} - {textarea rows=5 noformat=1}{$xrefInfo.data}{/textarea} + {textarea rows=5 noformat=1 edit=$xrefInfo.data} {/legend} <div class="row submit"> <input type="submit" name="fCancel" value="{tr}Cancel{/tr}" /> diff --git a/templates/edit_type_header.tpl b/templates/edit_type_header.tpl index 7e2663b..7fcf73a 100644 --- a/templates/edit_type_header.tpl +++ b/templates/edit_type_header.tpl @@ -12,5 +12,6 @@ {/if} {/forminput} {formhelp note=""} + <div class="clear"></div> </div> diff --git a/templates/edit_xref.tpl b/templates/edit_xref.tpl index 3a0c2ac..1d7a8a9 100644 --- a/templates/edit_xref.tpl +++ b/templates/edit_xref.tpl @@ -6,7 +6,7 @@ </div> {formfeedback hash=$feedback} - {formfeedback warning=`$errors.title`} + {formfeedback warning=$errors.title} <div class="body"> {form enctype="multipart/form-data" id="writexref"} @@ -22,6 +22,7 @@ <input type="text" name="xref" id="xref" value="{$xrefInfo.xref|escape}" /> {formhelp note="Link to other contact/content entries."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -30,6 +31,7 @@ <input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> {formhelp note="ID Key use to access data in other systems identified by the xref type."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -38,13 +40,14 @@ <input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="Variable text element such as url or email address."} {/forminput} + <div class="clear"></div> </div> {formlabel label="Reference Notes" for="data"} {capture assign=textarea_help} {tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr} {/capture} - {textarea rows=5 noformat=1}{$xrefInfo.data}{/textarea} + {textarea rows=5 noformat=1 edit=$xrefInfo.data} {/legend} {/jstab} @@ -59,6 +62,7 @@ <span dir="ltr">{html_select_time prefix="start_" time=$xrefInfo.start_date display_seconds=false} {$siteTimeZone}</span> {formhelp note="This xref record becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -70,6 +74,7 @@ <span dir="ltr">{html_select_time prefix="end_" time=$xrefInfo.end_date display_seconds=false} {$siteTimeZone}</span> {formhelp note="This xref record finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} {/jstab} diff --git a/templates/edit_xref_address.tpl b/templates/edit_xref_address.tpl index 38b3e03..c8386c0 100644 --- a/templates/edit_xref_address.tpl +++ b/templates/edit_xref_address.tpl @@ -6,7 +6,7 @@ </div> {formfeedback hash=$feedback} - {formfeedback warning=`$errors.title`} + {formfeedback warning=$errors.title} <div class="body"> {form enctype="multipart/form-data" id="writexref"} @@ -22,7 +22,7 @@ {capture assign=textarea_help} {tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr} {/capture} - {textarea rows=5 noformat=1}{$xrefInfo.data}{/textarea} + {textarea rows=5 noformat=1 edit=$xrefInfo.data} {/legend} {/jstab} {include file="bitpackage:contact/edit_xref_dates.tpl"} diff --git a/templates/edit_xref_address_fields.tpl b/templates/edit_xref_address_fields.tpl index 0595d85..38f1b21 100644 --- a/templates/edit_xref_address_fields.tpl +++ b/templates/edit_xref_address_fields.tpl @@ -5,6 +5,7 @@ <input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="House name and/or number when used with postcode, or free format full address."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -13,5 +14,6 @@ <input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> <input type="submit" name="fPostcode" value="{tr}Postcode Lookup{/tr}" /> {formhelp note="Postcode for address."} {/forminput} + <div class="clear"></div> </div> {/strip} diff --git a/templates/edit_xref_contact.tpl b/templates/edit_xref_contact.tpl index 963ee9e..6f54df5 100644 --- a/templates/edit_xref_contact.tpl +++ b/templates/edit_xref_contact.tpl @@ -22,7 +22,7 @@ {capture assign=textarea_help} {tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr} {/capture} - {textarea rows=5 noformat=1}{$xrefInfo.data}{/textarea} + {textarea rows=5 noformat=1 edit=$xrefInfo.data} {/legend} {/jstab} diff --git a/templates/edit_xref_contact_fields.tpl b/templates/edit_xref_contact_fields.tpl index c3c7c58..c008458 100644 --- a/templates/edit_xref_contact_fields.tpl +++ b/templates/edit_xref_contact_fields.tpl @@ -5,6 +5,7 @@ <input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> {formhelp note="Phone number for `$xrefInfo.template_title` type of xref record."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -13,5 +14,6 @@ <input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="Name for `$xrefInfo.template_title` type of xref record."} {/forminput} + <div class="clear"></div> </div> {/strip} diff --git a/templates/edit_xref_dates.tpl b/templates/edit_xref_dates.tpl index d8201ff..56b7d04 100644 --- a/templates/edit_xref_dates.tpl +++ b/templates/edit_xref_dates.tpl @@ -10,6 +10,7 @@ <span dir="ltr">{html_select_time prefix="start_" time=$xrefInfo.start_date display_seconds=false} {$siteTimeZone}</span> {formhelp note="This xref record becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -21,6 +22,7 @@ <span dir="ltr">{html_select_time prefix="end_" time=$xrefInfo.end_date display_seconds=false} {$siteTimeZone}</span> {formhelp note="This xref record finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} {/jstab} diff --git a/templates/edit_xref_generic_fields.tpl b/templates/edit_xref_generic_fields.tpl index 6be08f8..6134eff 100644 --- a/templates/edit_xref_generic_fields.tpl +++ b/templates/edit_xref_generic_fields.tpl @@ -5,6 +5,7 @@ <input type="text" name="xref" id="xref" value="{$xrefInfo.xref|escape}" /> {formhelp note="Link to other contact/content entries."} {/forminput} + <div class="clear"></div> </div> <div class="row"> {formlabel label="Reference Key" for="xkey"} @@ -12,6 +13,7 @@ <input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> {formhelp note="ID Key use to access data in other systems identified by the xref type."} {/forminput} + <div class="clear"></div> </div> <div class="row"> {formlabel label="Reference Text" for="xkey_ext"} @@ -19,5 +21,6 @@ <input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="Variable text element such as url or email address."} {/forminput} + <div class="clear"></div> </div> {/strip} diff --git a/templates/edit_xref_key_seal.tpl b/templates/edit_xref_key_seal.tpl index 4d5b5af..88981e2 100644 --- a/templates/edit_xref_key_seal.tpl +++ b/templates/edit_xref_key_seal.tpl @@ -6,7 +6,7 @@ </div> {formfeedback hash=$feedback} - {formfeedback warning=`$errors.title`} + {formfeedback warning=$errors.title} <div class="body"> {form enctype="multipart/form-data" id="writexref"} @@ -22,6 +22,7 @@ <input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> {formhelp note="Key Seal Code from key management system."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -30,13 +31,14 @@ <input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="Contract number."} {/forminput} + <div class="clear"></div> </div> {formlabel label="Key Seal Notes" for="data"} {capture assign=textarea_help} {tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr} {/capture} - {textarea rows=5 noformat=1}{$xrefInfo.data}{/textarea} + {textarea rows=5 noformat=1 edit=$xrefInfo.data} {/legend} {/jstab} @@ -51,6 +53,7 @@ <span dir="ltr">{html_select_time prefix="start_" time=$xrefInfo.start_date display_seconds=false} {$siteTimeZone}</span> {formhelp note="This key seal record becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -62,6 +65,7 @@ <span dir="ltr">{html_select_time prefix="end_" time=$xrefInfo.end_date display_seconds=false} {$siteTimeZone}</span> {formhelp note="This key seal record finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} {/jstab} diff --git a/templates/edit_xref_key_seal_fields.tpl b/templates/edit_xref_key_seal_fields.tpl index 1879e60..d3ae05f 100644 --- a/templates/edit_xref_key_seal_fields.tpl +++ b/templates/edit_xref_key_seal_fields.tpl @@ -5,6 +5,7 @@ <input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> {formhelp note="Key Seal Code from key management system."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -13,5 +14,6 @@ <input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="Contract number."} {/forminput} + <div class="clear"></div> </div> {/strip} diff --git a/templates/edit_xref_locate.tpl b/templates/edit_xref_locate.tpl index aefb5d7..4810e4e 100644 --- a/templates/edit_xref_locate.tpl +++ b/templates/edit_xref_locate.tpl @@ -6,7 +6,7 @@ </div> {formfeedback hash=$feedback} - {formfeedback warning=`$errors.title`} + {formfeedback warning=$errors.title} <div class="body"> {form enctype="multipart/form-data" id="writexref"} @@ -19,9 +19,10 @@ <div class="row"> {formlabel label="Geographic Location" for="xref"} {forminput} - <a class="item" href="http://www.openstreetmap.org/?lat={$xrefInfo.xkey_ext}&lon={$xrefInfo.xkey}&zoom=15&layers=MN" target="_blank">{tr}OpenStreetMap Link{/tr}</a> + <a class="item" href="http://www.openstreetmap.org/?mlat={$xrefInfo.xkey_ext}&mlon={$xrefInfo.xkey}&zoom=17&layers=MN" target="_blank">{tr}OpenStreetMap Link{/tr}</a> {formhelp note="Use one of the graphical tools like multimap or google maps to identify actual co-ordinates."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -30,6 +31,7 @@ <input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> {formhelp note="Longitude for the location."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -38,13 +40,14 @@ <input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="Latitude for the location."} {/forminput} + <div class="clear"></div> </div> {formlabel label="Location Directions" for="data"} {capture assign=textarea_help} {tr}Directions to assist finding the actual location where site is not accessable via the postcode.{/tr} {/capture} - {textarea rows=5 noformat=1}{$xrefInfo.data}{/textarea} + {textarea rows=5 noformat=1 edit=$xrefInfo.data} {/legend} {/jstab} @@ -59,6 +62,7 @@ <span dir="ltr">{html_select_time prefix="start_" time=$xrefInfo.start_date display_seconds=false} {$siteTimeZone}</span> {formhelp note="This address becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -70,6 +74,7 @@ <span dir="ltr">{html_select_time prefix="end_" time=$xrefInfo.end_date display_seconds=false} {$siteTimeZone}</span> {formhelp note="This address finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} {/jstab} diff --git a/templates/edit_xref_locate_fields.tpl b/templates/edit_xref_locate_fields.tpl index 1514f4a..a3ea922 100644 --- a/templates/edit_xref_locate_fields.tpl +++ b/templates/edit_xref_locate_fields.tpl @@ -2,9 +2,10 @@ <div class="row"> {formlabel label="Geographic Location" for="`$output`xref"} {forminput} - <a class="item" href="http://www.openstreetmap.org/?lat={$xrefInfo.xkey_ext}&lon={$xrefInfo.xkey}&zoom=15&layers=MN" target="_blank">{tr}OpenStreetMap Link{/tr}</a> + <a class="item" href="http://www.openstreetmap.org/?mlat={$xrefInfo.xkey_ext}&mlon={$xrefInfo.xkey}&zoom=17&layers=MN" target="_blank">{tr}OpenStreetMap Link{/tr}</a> {formhelp note="Use one of the graphical tools like multimap or google maps to identify actual co-ordinates."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -13,6 +14,7 @@ <input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> {formhelp note="Longitude for the location."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -21,5 +23,6 @@ <input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="Latitude for the location."} {/forminput} + <div class="clear"></div> </div> {/strip} diff --git a/templates/edit_xref_phone.tpl b/templates/edit_xref_phone.tpl index 63b51d8..2741fd0 100644 --- a/templates/edit_xref_phone.tpl +++ b/templates/edit_xref_phone.tpl @@ -6,7 +6,7 @@ </div> {formfeedback hash=$feedback} - {formfeedback warning=`$errors.title`} + {formfeedback warning=$errors.title} <div class="body"> {form enctype="multipart/form-data" id="writexref"} @@ -22,7 +22,7 @@ {capture assign=textarea_help} {tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr} {/capture} - {textarea rows=5 noformat=1}{$xrefInfo.data}{/textarea} + {textarea rows=5 noformat=1 edit=$xrefInfo.data} {/legend} {/jstab} diff --git a/templates/edit_xref_phone_fields.tpl b/templates/edit_xref_phone_fields.tpl index 86358c0..aa76914 100644 --- a/templates/edit_xref_phone_fields.tpl +++ b/templates/edit_xref_phone_fields.tpl @@ -5,5 +5,6 @@ <input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> {formhelp note="Telephone number. Use (+xx) for country code and include leading zero."} {/forminput} + <div class="clear"></div> </div> {/strip} diff --git a/templates/edit_xref_text.tpl b/templates/edit_xref_text.tpl index dfde0bd..f2b7c4c 100644 --- a/templates/edit_xref_text.tpl +++ b/templates/edit_xref_text.tpl @@ -6,7 +6,7 @@ </div> {formfeedback hash=$feedback} - {formfeedback warning=`$errors.title`} + {formfeedback warning=$errors.title} <div class="body"> {form enctype="multipart/form-data" id="writexref"} @@ -22,13 +22,14 @@ <input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="Simple free format text entries like email or web addresses."} {/forminput} + <div class="clear"></div> </div> {formlabel label="`$xrefInfo.template_title` Notes" for="data"} {capture assign=textarea_help} {tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr} {/capture} - {textarea rows=5 noformat=1}{$xrefInfo.data}{/textarea} + {textarea rows=5 noformat=1 edit=$xrefInfo.data} {/legend} {/jstab} @@ -43,6 +44,7 @@ <span dir="ltr">{html_select_time prefix="start_" time=$xrefInfo.start_date display_seconds=false} {$siteTimeZone}</span> {formhelp note="This xref record becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -54,6 +56,7 @@ <span dir="ltr">{html_select_time prefix="end_" time=$xrefInfo.end_date display_seconds=false} {$siteTimeZone}</span> {formhelp note="This xref record finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} {/jstab} diff --git a/templates/edit_xref_text_fields.tpl b/templates/edit_xref_text_fields.tpl index 00ed7d5..587e64e 100644 --- a/templates/edit_xref_text_fields.tpl +++ b/templates/edit_xref_text_fields.tpl @@ -5,5 +5,6 @@ <input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="Simple free format text entries like email or web addresses."} {/forminput} + <div class="clear"></div> </div> {/strip} diff --git a/templates/edit_xref_type.tpl b/templates/edit_xref_type.tpl index 4e481ae..e69c532 100644 --- a/templates/edit_xref_type.tpl +++ b/templates/edit_xref_type.tpl @@ -20,6 +20,7 @@ <input type="text" id="topic_name" name="topic_name" value="{$gContent->mInfo.topic_name}" /> {formhelp note=""} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -28,6 +29,7 @@ <input type="checkbox" id="topic_enabled" name="active_topic" {if $gContent->mInfo.active_topic == 'y'}checked="checked"{/if} /> {formhelp note=""} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -36,6 +38,7 @@ <input name="upload" id="t-image" type="file" /> {formhelp note=""} {/forminput} + <div class="clear"></div> </div> <div class="row"> diff --git a/templates/edit_xref_value.tpl b/templates/edit_xref_value.tpl index a524cd9..2bd0d8c 100644 --- a/templates/edit_xref_value.tpl +++ b/templates/edit_xref_value.tpl @@ -6,7 +6,7 @@ </div> {formfeedback hash=$feedback} - {formfeedback warning=`$errors.title`} + {formfeedback warning=$errors.title} <div class="body"> {form enctype="multipart/form-data" id="writexref"} @@ -22,7 +22,7 @@ {capture assign=textarea_help} {tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr} {/capture} - {textarea rows=5 noformat=1}{$xrefInfo.data}{/textarea} + {textarea rows=5 noformat=1 edit=$xrefInfo.data} {/legend} {/jstab} {include file="bitpackage:contact/edit_xref_dates.tpl"} diff --git a/templates/edit_xref_value_fields.tpl b/templates/edit_xref_value_fields.tpl index e776f6d..3ae02aa 100644 --- a/templates/edit_xref_value_fields.tpl +++ b/templates/edit_xref_value_fields.tpl @@ -5,5 +5,6 @@ <input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" /> {formhelp note="Numeric values such as distaces and counts."} {/forminput} + <div class="clear"></div> </div> {/strip} diff --git a/templates/list_contact.tpl b/templates/list_contact.tpl index 608db86..6d9ed21 100644 --- a/templates/list_contact.tpl +++ b/templates/list_contact.tpl @@ -6,116 +6,116 @@ {bithelp} </div> -<div class="admin contact"> -<div class="header"> -<h1><a href="{$gBitLoc.CONTACT_PKG_URL}list_contact.php">{tr}Contact Records{/tr}</a></h1> -</div> +<div class="listing contact"> + <div class="header"> + <h1><a href="{$gBitLoc.CONTACT_PKG_URL}list_contact.php">{tr}Contact Records{/tr}</a></h1> + </div> -<div class="body"> + <div class="body"> -<table class="find"> -<tr><td>{tr}Find{/tr}</td> - <td> - <form method="get" action="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php"> - <input type="text" name="find" value="{$listInfo.find|escape}" /> - <input type="submit" name="search" value="{tr}find{/tr}" /> - <input type="hidden" name="sort_mode" value="{$listInfo.sort_mode|escape}" /> - </form> - </td> -</tr> -</table> + <table class="find"> + <tr><td>{tr}Find{/tr}</td> + <td> + <form method="get" action="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php"> + <input type="text" name="find" value="{$listInfo.find|escape}" /> + <input type="submit" name="search" value="{tr}find{/tr}" /> + <input type="hidden" name="sort_mode" value="{$listInfo.sort_mode|escape}" /> + </form> + </td> + </tr> + </table> -<form id="checkform" method="post" action="{$smarty.server.PHP_SELF}"> -<input type="hidden" name="offset" value="{$listInfo.offset|escape}" /> -<input type="hidden" name="sort_mode" value="{$listInfo.sort_mode|escape}" /> -<table class="data"> -<tr> -{* at the moment, the only working option to use the checkboxes for is deleting pages. so for now the checkboxes are visible iff $bit_p_remove is set. Other applications make sense as well (categorize, convert to pdf, etc). Add necessary corresponding permission here: *} + <form id="checkform" method="post" action="{$smarty.server.PHP_SELF}"> + <input type="hidden" name="offset" value="{$listInfo.offset|escape}" /> + <input type="hidden" name="sort_mode" value="{$listInfo.sort_mode|escape}" /> + <table class="data"> + <tr> + {* at the moment, the only working option to use the checkboxes for is deleting pages. so for now the checkboxes are visible iff $bit_p_remove is set. Other applications make sense as well (categorize, convert to pdf, etc). Add necessary corresponding permission here: *} -{if $gBitUser->hasPermission('p_remove_contact')} {* ... "or $bit_p_other_sufficient_condition_for_checkboxes eq 'y'" *} - {assign var='checkboxes_on' value='y'} -{else} - {assign var='checkboxes_on' value='n'} -{/if} -{if $checkboxes_on eq 'y'} - <th> </th>{/if} -{if $contact_list_content_id eq 'y'} - <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'content_id_desc'}content_id_asc{else}content_id_desc{/if}">{tr}Contact Id{/tr}</a></th> -{/if}{if $contact_list_title eq 'y'} - <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'title_desc'}title_asc{else}title_desc{/if}">{tr}Title{/tr}</a></th> - <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'town_desc'}town_asc{else}town_desc{/if}">{tr}Town{/tr}</a></th> - <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'county_desc'}county_asc{else}county_desc{/if}">{tr}County{/tr}</a></th> - <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'postcode_desc'}postcode_asc{else}postcode_desc{/if}">{tr}Postcode{/tr}</a></th> -{/if}{if $contact_list_description eq 'y'} - <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'description_desc'}description_asc{else}description_desc{/if}">{tr}Description{/tr}</a></th> -{/if} -</tr> + {if $gBitUser->hasPermission('p_remove_contact')} {* ... "or $bit_p_other_sufficient_condition_for_checkboxes eq 'y'" *} + {assign var='checkboxes_on' value='y'} + {else} + {assign var='checkboxes_on' value='n'} + {/if} + {if $checkboxes_on eq 'y'} + <th> </th>{/if} + {if $contact_list_content_id eq 'y'} + <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'content_id_desc'}content_id_asc{else}content_id_desc{/if}">{tr}Contact Id{/tr}</a></th> + {/if}{if $contact_list_title eq 'y'} + <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'title_desc'}title_asc{else}title_desc{/if}">{tr}Title{/tr}</a></th> + <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'town_desc'}town_asc{else}town_desc{/if}">{tr}Town{/tr}</a></th> + <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'county_desc'}county_asc{else}county_desc{/if}">{tr}County{/tr}</a></th> + <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'postcode_desc'}postcode_asc{else}postcode_desc{/if}">{tr}Postcode{/tr}</a></th> + {/if}{if $contact_list_description eq 'y'} + <th><a href="{$gBitLoc.CONTACT_PKG_URL}list_contacts.php?offset={$listInfo.offset}&sort_mode={if $listInfo.sort_mode eq 'description_desc'}description_asc{else}description_desc{/if}">{tr}Description{/tr}</a></th> + {/if} + </tr> -{cycle values="even,odd" print=false} -{section name=changes loop=$list} -<tr class="{cycle}"> -{if $checkboxes_on eq 'y'} - <td><input type="checkbox" name="checked[]" value="{$list[changes].content_id|escape}" /></td> -{/if} -{if $contact_list_content_id eq 'y'} - <td><a href="{$gBitLoc.CONTACT_PKG_URL}index.php?content_id={$list[changes].content_id|escape:"url"}" title="{$list[changes].content_id}">{$list[changes].content_id|truncate:20:"...":true}</a> - {if $gBitUser->hasPermission('p_edit_contact')} - <br />(<a href="{$gBitLoc.CONTACT_PKG_URL}edit.php?content_id={$list[changes].content_id|escape:"url"}">{tr}edit{/tr}</a>) + {cycle values="even,odd" print=false} + {section name=changes loop=$list} + <tr class="{cycle}"> + {if $checkboxes_on eq 'y'} + <td><input type="checkbox" name="checked[]" value="{$list[changes].content_id|escape}" /></td> + {/if} + {if $contact_list_content_id eq 'y'} + <td><a href="{$gBitLoc.CONTACT_PKG_URL}index.php?content_id={$list[changes].content_id|escape:"url"}" title="{$list[changes].content_id}">{$list[changes].content_id|truncate:20:"...":true}</a> + {if $gBitUser->hasPermission('p_edit_contact')} + <br />(<a href="{$gBitLoc.CONTACT_PKG_URL}edit.php?content_id={$list[changes].content_id|escape:"url"}">{tr}edit{/tr}</a>) + {/if} + </td> {/if} - </td> -{/if} -{if $contact_list_title eq 'y'} - <td style="text-align:center;">{$list[changes].title}</td> - <td style="text-align:center;">{$list[changes].town}</td> - <td style="text-align:center;">{$list[changes].county}</td> - <td style="text-align:center;">{$list[changes].postcode}<br /> - {$list[changes].pcdetail}</td> -{/if} -{if $contact_list_description eq 'y'} - <td style="text-align:center;">{$list[changes].data}</td> -{/if} -</tr> -{sectionelse} - <tr class="norecords"><td colspan="16"> - {tr}No records found{/tr} - </td></tr> -{/section} + {if $contact_list_title eq 'y'} + <td style="text-align:center;">{$list[changes].title}</td> + <td style="text-align:center;">{$list[changes].town}</td> + <td style="text-align:center;">{$list[changes].county}</td> + <td style="text-align:center;">{$list[changes].postcode}<br /> + {$list[changes].pcdetail}</td> + {/if} + {if $contact_list_description eq 'y'} + <td style="text-align:center;">{$list[changes].data}</td> + {/if} + </tr> + {sectionelse} + <tr class="norecords"><td colspan="16"> + {tr}No records found{/tr} + </td></tr> + {/section} -{if $checkboxes_on eq 'y'} -<tr><td colspan="16"> - <script language="Javascript" type="text/javascript"> - <!-- - // check / uncheck all. - // in the future, we could extend this to happen serverside as well for the convenience of people w/o javascript. - document.write("<tr><td><input name=\"switcher\" type=\"checkbox\" onclick=\"BitBase.switchCheckboxes(this.form.id,'checked[]','switcher')\" /></td>"); - document.write("<td colspan=\"15\">{tr}All{/tr}</td></tr>"); - //--> - </script> -</td></tr> -{/if} -</table> + {if $checkboxes_on eq 'y'} + <tr><td colspan="16"> + <script language="Javascript" type="text/javascript"> + <!-- + // check / uncheck all. + // in the future, we could extend this to happen serverside as well for the convenience of people w/o javascript. + document.write("<tr><td><input name=\"switcher\" type=\"checkbox\" onclick=\"BitBase.switchCheckboxes(this.form.id,'checked[]','switcher')\" /></td>"); + document.write("<td colspan=\"15\">{tr}All{/tr}</td></tr>"); + //--> + </script> + </td></tr> + {/if} + </table> -{if $checkboxes_on eq 'y'} {* what happens to the checked items *} - <select name="submit_mult" onchange="this.form.submit();"> - <option value="" selected="selected">{tr}with checked{/tr}:</option> - {if $gBitUser->hasPermission('p_remove_contact')} - <option value="remove_contact">{tr}remove{/tr}</option> - {/if} - {* add here e.g. <option value="categorize">{tr}categorize{/tr}</option> *} - </select> - <script language="Javascript" type="text/javascript"> - <!-- - // Fake js to allow the use of the <noscript> tag (so non-js-users kenn still submit) - //--> - </script> - <noscript> - <input type="submit" value="{tr}ok{/tr}" /> - </noscript> -{/if} -</form> + {if $checkboxes_on eq 'y'} {* what happens to the checked items *} + <select name="submit_mult" onchange="this.form.submit();"> + <option value="" selected="selected">{tr}with checked{/tr}:</option> + {if $gBitUser->hasPermission('p_remove_contact')} + <option value="remove_contact">{tr}remove{/tr}</option> + {/if} + {* add here e.g. <option value="categorize">{tr}categorize{/tr}</option> *} + </select> + <script language="Javascript" type="text/javascript"> + <!-- + // Fake js to allow the use of the <noscript> tag (so non-js-users kenn still submit) + //--> + </script> + <noscript> + <input type="submit" value="{tr}ok{/tr}" /> + </noscript> + {/if} + </form> -</div><!-- end .body --> + </div><!-- end .body --> -{libertypagination} + {pagination} -</div> {* end .admin *} +</div> {* end contact *} diff --git a/templates/show_contact.tpl b/templates/show_contact.tpl index 38967f8..4d02d1f 100644 --- a/templates/show_contact.tpl +++ b/templates/show_contact.tpl @@ -17,8 +17,8 @@ {include file="bitpackage:tasks/list_tasks.tpl"} {/jstab} {/if} - {jstab title="Documents" class="contact_docs"} - Link to private fisheye document gallery + {jstab title="Images" class="contact_pics"} + {include file="`$smarty.const.FISHEYE_PKG_PATH`gallery_views/`$galLayout`/fisheye_`$galLayout`_test.tpl" } {/jstab} {/jstabs} </div> {* end .body *} diff --git a/templates/view_xref.tpl b/templates/view_xref.tpl index 6e96c81..bbfe2c3 100644 --- a/templates/view_xref.tpl +++ b/templates/view_xref.tpl @@ -16,6 +16,7 @@ {/if} {formhelp note="Link to other contact/content entries."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -28,6 +29,7 @@ {/if} {formhelp note="ID Key use to access data in other systems identified by the xref type."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -40,6 +42,7 @@ {/if} {formhelp note="Variable text element such as url or email address."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -48,6 +51,7 @@ {$xrefInfo.data|escape} {formhelp note="Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link."} {/forminput} + <div class="clear"></div> </div> {/legend} @@ -62,6 +66,7 @@ {/if} {formhelp note="This xref record becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -74,6 +79,7 @@ {/if} {formhelp note="This xref record finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} <a class="item" href="{$smarty.const.CONTACT_PKG_URL}index.php?content_id={$xrefInfo.content_id}">{tr}Return{/tr}</a> diff --git a/templates/view_xref_address.tpl b/templates/view_xref_address.tpl index 83d68ea..bdcb63e 100644 --- a/templates/view_xref_address.tpl +++ b/templates/view_xref_address.tpl @@ -16,6 +16,7 @@ {/if} {formhelp note="House name and/or number when used with postcode, or free format full address."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -28,6 +29,7 @@ {/if} {formhelp note="Postcode for address."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -36,6 +38,7 @@ {$xrefInfo.data|escape} {formhelp note="Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link."} {/forminput} + <div class="clear"></div> </div> {/legend} @@ -50,6 +53,7 @@ {/if} {formhelp note="This address record becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -62,6 +66,7 @@ {/if} {formhelp note="This address record finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} <a class="item" href="{$smarty.const.CONTACT_PKG_URL}index.php?content_id={$xrefInfo.content_id}">{tr}Return{/tr}</a> diff --git a/templates/view_xref_contact.tpl b/templates/view_xref_contact.tpl index 6017945..6c9771e 100644 --- a/templates/view_xref_contact.tpl +++ b/templates/view_xref_contact.tpl @@ -16,6 +16,7 @@ {/if} {formhelp note="Phone number for `$xrefInfo.template_title` type of xref record."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -28,6 +29,7 @@ {/if} {formhelp note="Name for `$xrefInfo.template_title` type of xref record."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -36,6 +38,7 @@ {$xrefInfo.data|escape} {formhelp note="Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link."} {/forminput} + <div class="clear"></div> </div> {/legend} @@ -50,6 +53,7 @@ {/if} {formhelp note="This key seal code becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -62,6 +66,7 @@ {/if} {formhelp note="This key seal code finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} <a class="item" href="{$smarty.const.CONTACT_PKG_URL}index.php?content_id={$xrefInfo.content_id}">{tr}Return{/tr}</a> diff --git a/templates/view_xref_key_seal.tpl b/templates/view_xref_key_seal.tpl index 808145f..0cedaff 100644 --- a/templates/view_xref_key_seal.tpl +++ b/templates/view_xref_key_seal.tpl @@ -16,6 +16,7 @@ {/if} {formhelp note="Key Seal Code from key management system."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -28,6 +29,7 @@ {/if} {formhelp note="Contract number."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -36,6 +38,7 @@ {$xrefInfo.data|escape} {formhelp note="Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link."} {/forminput} + <div class="clear"></div> </div> {/legend} @@ -50,6 +53,7 @@ {/if} {formhelp note="This key seal code becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -62,6 +66,7 @@ {/if} {formhelp note="This key seal code finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} <a class="item" href="{$smarty.const.CONTACT_PKG_URL}index.php?content_id={$xrefInfo.content_id}">{tr}Return{/tr}</a> diff --git a/templates/view_xref_locate.tpl b/templates/view_xref_locate.tpl index d96b4e3..542ff73 100644 --- a/templates/view_xref_locate.tpl +++ b/templates/view_xref_locate.tpl @@ -12,6 +12,7 @@ <a class="item" href="http://www.openstreetmap.org/?lat={$xrefInfo.xkey_ext}&lon={$xrefInfo.xkey}&zoom=15&layers=MN" target="_blank">{tr}OpenStreetMap Link{/tr}</a> {formhelp note="Use one of the graphical tools like multimap or google maps to identify actual co-ordinates."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -24,6 +25,7 @@ {/if} {formhelp note="Easting for location (x_coord - longitude)."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -36,6 +38,7 @@ {/if} {formhelp note="Northing for location (y_coord - latitude)."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -44,6 +47,7 @@ {$xrefInfo.data|escape} {formhelp note="Directions to assist finding the actual location where site is not accessable via the postcode."} {/forminput} + <div class="clear"></div> </div> {/legend} @@ -58,6 +62,7 @@ {/if} {formhelp note="This address record becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -70,6 +75,7 @@ {/if} {formhelp note="This address record finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} <a class="item" href="{$smarty.const.CONTACT_PKG_URL}index.php?content_id={$xrefInfo.content_id}">{tr}Return{/tr}</a> diff --git a/templates/view_xref_phone.tpl b/templates/view_xref_phone.tpl index ae562c1..0a8008a 100644 --- a/templates/view_xref_phone.tpl +++ b/templates/view_xref_phone.tpl @@ -16,6 +16,7 @@ {/if} {formhelp note="ID Key use to access data in other systems identified by the xref type."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -24,6 +25,7 @@ {$xrefInfo.data|escape} {formhelp note="Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link."} {/forminput} + <div class="clear"></div> </div> {/legend} @@ -38,6 +40,7 @@ {/if} {formhelp note="This `$xrefInfo.template_title` number becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -50,6 +53,7 @@ {/if} {formhelp note="This `$xrefInfo.template_title` number finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} <a class="item" href="{$smarty.const.CONTACT_PKG_URL}index.php?content_id={$xrefInfo.content_id}">{tr}Return{/tr}</a> diff --git a/templates/view_xref_text.tpl b/templates/view_xref_text.tpl index 8a48b94..620851d 100644 --- a/templates/view_xref_text.tpl +++ b/templates/view_xref_text.tpl @@ -16,6 +16,7 @@ {/if} {formhelp note="`$xrefInfo.template_title` simple text entry."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -24,6 +25,7 @@ {$xrefInfo.data|escape} {formhelp note="Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link."} {/forminput} + <div class="clear"></div> </div> {/legend} @@ -38,6 +40,7 @@ {/if} {formhelp note="This `$xrefInfo.template_title` number becomes valid on this date."} {/forminput} + <div class="clear"></div> </div> <div class="row"> @@ -50,6 +53,7 @@ {/if} {formhelp note="This `$xrefInfo.template_title` number finishes on this date."} {/forminput} + <div class="clear"></div> </div> {/legend} <a class="item" href="{$smarty.const.CONTACT_PKG_URL}index.php?content_id={$xrefInfo.content_id}">{tr}Return{/tr}</a> |