Removed /x from ErrorHandler HTML reformatting since it doesn't use embedded whitespace or comments.
Fixed a typo in the Macro_r_printable where an ending bold tag was dropped. Add some POD to Asset.pm talking about variables that are added when processTemplate is called. More ISA work in the Help system.
This commit is contained in:
parent
850abf9b6d
commit
0db2156374
6 changed files with 29 additions and 19 deletions
|
|
@ -1655,7 +1655,8 @@ sub processPropertiesFromFormPost {
|
|||
|
||||
=head2 processTemplate ( vars, templateId, template )
|
||||
|
||||
Returns the content generated from this template.
|
||||
Returns the content generated from this template. It adds the Asset control
|
||||
bar to the template variables, as well as all Asset properties and metadata.
|
||||
|
||||
=head3 hashRef
|
||||
|
||||
|
|
|
|||
|
|
@ -58,6 +58,10 @@ our $HELP = {
|
|||
namespace => "Asset",
|
||||
tag => "asset template"
|
||||
},
|
||||
{
|
||||
tag => 'pagination template variables',
|
||||
namespace => 'WebGUI'
|
||||
},
|
||||
],
|
||||
fields => [
|
||||
],
|
||||
|
|
@ -151,14 +155,6 @@ our $HELP = {
|
|||
tag => 'article add/edit',
|
||||
namespace => 'Asset_Article'
|
||||
},
|
||||
{
|
||||
tag => 'pagination template variables',
|
||||
namespace => 'WebGUI'
|
||||
},
|
||||
{
|
||||
tag => 'wobject template',
|
||||
namespace => 'Asset_Wobject'
|
||||
}
|
||||
]
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,6 +4,12 @@ our $HELP = {
|
|||
'dashboard add/edit' => {
|
||||
title => 'dashboard add/edit title',
|
||||
body => 'dashboard add/edit body',
|
||||
isa => [
|
||||
{
|
||||
namespace => "Asset_Wobject",
|
||||
tag => "wobject add/edit"
|
||||
},
|
||||
],
|
||||
fields => [
|
||||
{
|
||||
title => 'dashboard template field label',
|
||||
|
|
|
|||
|
|
@ -178,6 +178,16 @@ our $HELP = {
|
|||
body => '83',
|
||||
fields => [
|
||||
],
|
||||
isa => [
|
||||
{
|
||||
namespace => "Asset_Template",
|
||||
tag => "template variables"
|
||||
},
|
||||
{
|
||||
tag => 'wobject template',
|
||||
namespace => 'Asset_Wobject'
|
||||
}
|
||||
],
|
||||
variables => [
|
||||
{
|
||||
'name' => 'canEdit'
|
||||
|
|
@ -394,10 +404,6 @@ our $HELP = {
|
|||
tag => 'data form add/edit',
|
||||
namespace => 'Asset_DataForm'
|
||||
},
|
||||
{
|
||||
tag => 'wobject template',
|
||||
namespace => 'Asset_Wobject'
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -373,7 +373,8 @@ sub session {
|
|||
|
||||
=head2 showDebug ( )
|
||||
|
||||
Creates an HTML formatted string
|
||||
Creates an HTML formatted string of all internally stored debug information, warns,
|
||||
errors, sql queries and form data.
|
||||
|
||||
=cut
|
||||
|
||||
|
|
@ -395,9 +396,9 @@ sub showDebug {
|
|||
}
|
||||
}
|
||||
$text = JSON::objToJson($form, {pretty => 1, indent => 4, autoconv=>0, skipinvalid=>1});
|
||||
$text =~ s/&/&/xsg;
|
||||
$text =~ s/>/>/xsg;
|
||||
$text =~ s/</</xsg;
|
||||
$text =~ s/&/&/sg;
|
||||
$text =~ s/>/>/sg;
|
||||
$text =~ s/</</sg;
|
||||
$text =~ s/\n/\<br \/\>\n/g;
|
||||
$text =~ s/ / /g;
|
||||
$output .= '<div style="text-align: left;background-color: #aaaaee;color: #000000;">'.$text."</div>\n";
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ our $I18N = {
|
|||
'printable body' => {
|
||||
message => q|
|
||||
<p><b>^r(<i>link text</i>);</b><br />
|
||||
<b>^r("",<i>custom style name</i>);/b><br />
|
||||
<b>^r("",<i>custom style id</i>,<i>custom template URL</i>);/b><br />
|
||||
<b>^r("",<i>custom style name</i>);</b><br />
|
||||
<b>^r("",<i>custom style id</i>,<i>custom template URL</i>);</b><br />
|
||||
Creates a link to alter the style from a page to make it printable.
|
||||
</p>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue