New i18n, reformat code, XHTML compliance in docs.
This commit is contained in:
parent
04852c9dc8
commit
069d4e4871
3 changed files with 27 additions and 22 deletions
|
|
@ -46,9 +46,7 @@ sub _drawQueryBuilder {
|
||||||
my $fieldCount = scalar(keys %$fields);
|
my $fieldCount = scalar(keys %$fields);
|
||||||
|
|
||||||
unless ($fieldCount) { # No fields found....
|
unless ($fieldCount) { # No fields found....
|
||||||
return 'No metadata defined yet.
|
return sprintf $i18n->get('no metadata yet'), $self->session->url->page('func=manageMetaData');
|
||||||
<a href="'.$self->session->url->page('func=manageMetaData').
|
|
||||||
'">Click here</a> to define metadata attributes.';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Static form fields
|
# Static form fields
|
||||||
|
|
@ -71,7 +69,6 @@ sub _drawQueryBuilder {
|
||||||
$self->session->style->setScript($self->session->url->extras('wobject/Shortcut/querybuilder.js'), {type=>"text/javascript"});
|
$self->session->style->setScript($self->session->url->extras('wobject/Shortcut/querybuilder.js'), {type=>"text/javascript"});
|
||||||
$self->session->style->setLink($self->session->url->extras('wobject/Shortcut/querybuilder.css'), {type=>"text/css", rel=>"stylesheet"});
|
$self->session->style->setLink($self->session->url->extras('wobject/Shortcut/querybuilder.css'), {type=>"text/css", rel=>"stylesheet"});
|
||||||
my $output;
|
my $output;
|
||||||
'/wobject/Shortcut/querybuilder.css" type="text/css" rel="stylesheet">';
|
|
||||||
$output .= qq|<table cellspacing="0" cellpadding="0" border="0"><tr><td colspan="5" align="right">$shortcutCriteriaField</td></tr><tr><td></td><td></td><td></td><td></td><td class="qbtdright"></td></tr><tr><td></td><td></td><td></td><td></td><td class="qbtdright">$conjunctionField</td></tr>|;
|
$output .= qq|<table cellspacing="0" cellpadding="0" border="0"><tr><td colspan="5" align="right">$shortcutCriteriaField</td></tr><tr><td></td><td></td><td></td><td></td><td class="qbtdright"></td></tr><tr><td></td><td></td><td></td><td></td><td class="qbtdright">$conjunctionField</td></tr>|;
|
||||||
|
|
||||||
# Here starts the field loop
|
# Here starts the field loop
|
||||||
|
|
@ -783,9 +780,13 @@ sub www_editOverride {
|
||||||
-value=>$overrides{overrides}{$fieldName}{newValue},
|
-value=>$overrides{overrides}{$fieldName}{newValue},
|
||||||
-hoverHelp=>$i18n->get("Place something in this box if you dont want to use the automatically generated field")
|
-hoverHelp=>$i18n->get("Place something in this box if you dont want to use the automatically generated field")
|
||||||
);
|
);
|
||||||
$f->readOnly(-label=>$i18n->get("Replacement Value"),-value=>$overrides{overrides}{$fieldName}{parsedValue},-hoverHelp=>$i18n->get("This is the example output of the field when parsed for user preference macros")) if $self->isDashlet;
|
$f->readOnly(
|
||||||
$f->submit;
|
-label=>$i18n->get("Replacement Value"),
|
||||||
$output .= $f->print;
|
-value=>$overrides{overrides}{$fieldName}{parsedValue},
|
||||||
|
-hoverHelp=>$i18n->get("This is the example output of the field when parsed for user preference macros")
|
||||||
|
) if $self->isDashlet;
|
||||||
|
$f->submit;
|
||||||
|
$output .= $f->print;
|
||||||
return $self->_submenu($output,$i18n->get('Edit Override'));
|
return $self->_submenu($output,$i18n->get('Edit Override'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,8 @@ our $HELP = {
|
||||||
body => '6',
|
body => '6',
|
||||||
fields => [
|
fields => [
|
||||||
{
|
{
|
||||||
title => '85',
|
title => '1',
|
||||||
description => '85 description',
|
description => '1 description',
|
||||||
namespace => 'Asset_Shortcut',
|
namespace => 'Asset_Shortcut',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -16,8 +16,8 @@ our $HELP = {
|
||||||
namespace => 'Asset_Shortcut',
|
namespace => 'Asset_Shortcut',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title => '1',
|
title => '85',
|
||||||
description => '1 description',
|
description => '85 description',
|
||||||
namespace => 'Asset_Shortcut',
|
namespace => 'Asset_Shortcut',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -128,15 +128,15 @@ Now, go back to manage Overrides, and it should show the original value, new val
|
||||||
},
|
},
|
||||||
|
|
||||||
'Resolve Multiples description' => {
|
'Resolve Multiples description' => {
|
||||||
message => q|Sets the order to use when multiple assets are selected. Random means that if multiple assets match the shortcut criteria then the shortcut will select a random asset.<br>
|
message => q|Sets the order to use when multiple assets are selected. Random means that if multiple assets match the shortcut criteria then the shortcut will select a random asset.<br />
|
||||||
Most Recent will select the most recent asset that match the shortcut criteria.|,
|
Most Recent will select the most recent asset that match the shortcut criteria.|,
|
||||||
lastUpdated => 1127959329,
|
lastUpdated => 1146540399,
|
||||||
},
|
},
|
||||||
|
|
||||||
'Criteria description' => {
|
'Criteria description' => {
|
||||||
message => q|A statement to determinate what to mirror, in the form of "color = blue and weight != heavy". Multiple expressions may be joined with "and" and "or". <br>
|
message => q|A statement to determinate what to mirror, in the form of "color = blue and weight != heavy". Multiple expressions may be joined with "and" and "or". <br />
|
||||||
A property or value must be quoted if it contains spaces. Feel free to use the criteria builder to build your statements.|,
|
A property or value must be quoted if it contains spaces. Feel free to use the criteria builder to build your statements.|,
|
||||||
lastUpdated => 1119905806,
|
lastUpdated => 1146540405,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -212,16 +212,18 @@ A property or value must be quoted if it contains spaces. Feel free to use the c
|
||||||
|
|
||||||
'shortcut template body' => {
|
'shortcut template body' => {
|
||||||
message => q|<p>These variables are available in Shortcut Templates:</p>
|
message => q|<p>These variables are available in Shortcut Templates:</p>
|
||||||
<p><b>shortcut.content</b><br>
|
<p><b>shortcut.content</b><br />
|
||||||
The content from the mirrored Asset. If any overrides were enabled in the Shortcut then the override content will be used instead of the content from the mirrored Asset.</p>
|
The content from the mirrored Asset. If any overrides were enabled in the Shortcut then the override content will be used instead of the content from the mirrored Asset.</p>
|
||||||
<p><b>originalURL</b><br>
|
<p><b>originalURL</b><br />
|
||||||
The URL to the Asset being mirrored by this Shortcut.</p>
|
The URL to the Asset being mirrored by this Shortcut.</p>
|
||||||
<p><b>isShortcut</b><br>
|
<p><b>isShortcut</b><br />
|
||||||
A boolean indicating that this Asset is a Shortcut. This can be used in conjuction with another boolean for Admin mode to quickly show Content Managers that this is a Shortcut Asset.</p>
|
A boolean indicating that this Asset is a Shortcut. This can be used in conjuction with another boolean for Admin mode to quickly show Content Managers that this is a Shortcut Asset.</p>
|
||||||
<p><b>shortcut.label</b><br>
|
<p><b>shortcut.label</b><br />
|
||||||
The word "Shortcut".</p>
|
The word "Shortcut".</p>
|
||||||
|
<p><b>shortcut.<b>properties</b><br />
|
||||||
|
Any properties assigned to this shortcut will be available in the template by their name.</p>
|
||||||
|,
|
|,
|
||||||
lastUpdated => 1109525761,
|
lastUpdated => 1146540530,
|
||||||
},
|
},
|
||||||
|
|
||||||
'The unique name of a user preference parameter you are inventing' => {
|
'The unique name of a user preference parameter you are inventing' => {
|
||||||
|
|
@ -410,8 +412,10 @@ The word "Shortcut".</p>
|
||||||
lastUpdated => 1133619940,
|
lastUpdated => 1133619940,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
'no metadata yet' => {
|
||||||
|
message => q|No metadata defined yet. <a href="%s">Click here</a> to define metadata attributes.|,
|
||||||
|
lastUpdated => 1146539258,
|
||||||
|
},
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue