diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm index 8e86681f5..e48bce3c3 100644 --- a/lib/WebGUI/Asset/Shortcut.pm +++ b/lib/WebGUI/Asset/Shortcut.pm @@ -46,9 +46,7 @@ sub _drawQueryBuilder { my $fieldCount = scalar(keys %$fields); unless ($fieldCount) { # No fields found.... - return 'No metadata defined yet. - Click here to define metadata attributes.'; + return sprintf $i18n->get('no metadata yet'), $self->session->url->page('func=manageMetaData'); } # 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->setLink($self->session->url->extras('wobject/Shortcut/querybuilder.css'), {type=>"text/css", rel=>"stylesheet"}); my $output; - '/wobject/Shortcut/querybuilder.css" type="text/css" rel="stylesheet">'; $output .= qq||; # Here starts the field loop @@ -783,9 +780,13 @@ sub www_editOverride { -value=>$overrides{overrides}{$fieldName}{newValue}, -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->submit; - $output .= $f->print; + $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->submit; + $output .= $f->print; return $self->_submenu($output,$i18n->get('Edit Override')); } diff --git a/lib/WebGUI/Help/Asset_Shortcut.pm b/lib/WebGUI/Help/Asset_Shortcut.pm index 3df96fb6a..0d08e9782 100644 --- a/lib/WebGUI/Help/Asset_Shortcut.pm +++ b/lib/WebGUI/Help/Asset_Shortcut.pm @@ -6,8 +6,8 @@ our $HELP = { body => '6', fields => [ { - title => '85', - description => '85 description', + title => '1', + description => '1 description', namespace => 'Asset_Shortcut', }, { @@ -16,8 +16,8 @@ our $HELP = { namespace => 'Asset_Shortcut', }, { - title => '1', - description => '1 description', + title => '85', + description => '85 description', namespace => 'Asset_Shortcut', }, { diff --git a/lib/WebGUI/i18n/English/Asset_Shortcut.pm b/lib/WebGUI/i18n/English/Asset_Shortcut.pm index 5e6a30c16..cc2f33530 100644 --- a/lib/WebGUI/i18n/English/Asset_Shortcut.pm +++ b/lib/WebGUI/i18n/English/Asset_Shortcut.pm @@ -128,15 +128,15 @@ Now, go back to manage Overrides, and it should show the original value, new val }, '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.
+ 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.
Most Recent will select the most recent asset that match the shortcut criteria.|, - lastUpdated => 1127959329, + lastUpdated => 1146540399, }, '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".
+ 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".
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' => { message => q|

These variables are available in Shortcut Templates:

-

shortcut.content
+

shortcut.content
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.

-

originalURL
+

originalURL
The URL to the Asset being mirrored by this Shortcut.

-

isShortcut
+

isShortcut
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.

-

shortcut.label
+

shortcut.label
The word "Shortcut".

+

shortcut.properties
+Any properties assigned to this shortcut will be available in the template by their name.

|, - lastUpdated => 1109525761, + lastUpdated => 1146540530, }, 'The unique name of a user preference parameter you are inventing' => { @@ -410,8 +412,10 @@ The word "Shortcut".

lastUpdated => 1133619940, }, - - + 'no metadata yet' => { + message => q|No metadata defined yet. Click here to define metadata attributes.|, + lastUpdated => 1146539258, + }, };
$shortcutCriteriaField
$conjunctionField