merging 6.7.8 changes

This commit is contained in:
JT Smith 2005-10-22 16:12:31 +00:00
parent 177c9867e1
commit d0268c030b
2 changed files with 12 additions and 13 deletions

View file

@ -1,5 +1,4 @@
6.8.0 6.8.0
- Renamed "Page" asset to "Page / Layout" asset for clarity.
- Switched Date::Manip to DateTime and Time::HiRes to DateTime::HiRes for - Switched Date::Manip to DateTime and Time::HiRes to DateTime::HiRes for
better performance and more functionality. See gotchas for details. better performance and more functionality. See gotchas for details.

View file

@ -2,50 +2,50 @@ package WebGUI::i18n::English::Asset_Layout;
our $I18N = { our $I18N = {
'assetName' => { 'assetName' => {
message => q|Page / Layout|, message => q|Page Layout|,
lastUpdated => 1128832065, lastUpdated => 1128832065,
context=>q|The name of the layout asset.| context=>q|The name of the layout asset.|
}, },
'layout add/edit title' => { 'layout add/edit title' => {
message => q|Page / Layout, Add/Edit|, message => q|Page Layout, Add/Edit|,
lastUpdated => 1106683494, lastUpdated => 1106683494,
}, },
'layout add/edit body' => { 'layout add/edit body' => {
message => q| message => q|
<p>Page / Layout Assets are used to display multiple Assets on the same time, much like <p>Page Layout Assets are used to display multiple Assets on the same time, much like
Page / Layouts in version 5 of WebGUI. The Page / Layout Asset consists of a template with Page Layouts in version 5 of WebGUI. The Page Layout Asset consists of a template with
multiple content areas, and Assets that are children of the Page / Layout can be assigned multiple content areas, and Assets that are children of the Page Layout can be assigned
to be displayed in those areas. to be displayed in those areas.
<p>Page / Layout Assets are Wobjects and Assets, and share the same properties of both. Page / Layout <p>Page Layout Assets are Wobjects and Assets, and share the same properties of both. Page Layout
Assets also have these unique properties:</p>|, Assets also have these unique properties:</p>|,
context => 'Describing Page / Layout Add/Edit form specific fields', context => 'Describing Page Layout Add/Edit form specific fields',
lastUpdated => 1119410129, lastUpdated => 1119410129,
}, },
'template description' => { 'template description' => {
message => q|Choose a template from the list to display the contents of the Page / Layout Asset and message => q|Choose a template from the list to display the contents of the Page Layout Asset and
its children. its children.
<p/>|, <p/>|,
lastUpdated => 1119410080, lastUpdated => 1119410080,
}, },
'assets to hide description' => { 'assets to hide description' => {
message => q|This list contains one checkbox for each child Asset of the Page / Layout. Select the message => q|This list contains one checkbox for each child Asset of the Page Layout. Select the
checkbox for any Asset that you do not want displayed in the Page / Layout Asset. checkbox for any Asset that you do not want displayed in the Page Layout Asset.
<p/>|, <p/>|,
lastUpdated => 1119410080, lastUpdated => 1119410080,
}, },
'layout template title' => { 'layout template title' => {
message => q|Page / Layout Template|, message => q|Page Layout Template|,
lastUpdated => 1109987374, lastUpdated => 1109987374,
}, },
'layout template body' => { 'layout template body' => {
message => q|<p>The following variables are available in Page / Layout Templates:</p> message => q|<p>The following variables are available in Page Layout Templates:</p>
<P><b>showAdmin</b><br/> <P><b>showAdmin</b><br/>
A conditional showing if the current user has turned on Admin Mode and can edit this Asset. A conditional showing if the current user has turned on Admin Mode and can edit this Asset.