From 624b2e5d399f6318f22903fe630336a3921931e9 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Sat, 11 Jun 2005 01:50:41 +0000 Subject: [PATCH] clean up WebGUI settings help and labeling --- lib/WebGUI/Help/WebGUI.pm | 10 -- lib/WebGUI/Operation/Settings.pm | 6 +- lib/WebGUI/i18n/English/Asset.pm | 8 +- lib/WebGUI/i18n/English/WebGUI.pm | 170 ++++++++++++++++++------------ 4 files changed, 106 insertions(+), 88 deletions(-) diff --git a/lib/WebGUI/Help/WebGUI.pm b/lib/WebGUI/Help/WebGUI.pm index bbc610bbb..23a7be6d1 100644 --- a/lib/WebGUI/Help/WebGUI.pm +++ b/lib/WebGUI/Help/WebGUI.pm @@ -68,16 +68,6 @@ our $HELP = { } ] }, - 'messaging settings edit' => { - title => '663', - body => '618', - related => [ - { - tag => 'settings', - namespace => 'WebGUI' - } - ] - }, 'style sheets using' => { title => '668', diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm index 7398e7427..80b91a8bd 100644 --- a/lib/WebGUI/Operation/Settings.pm +++ b/lib/WebGUI/Operation/Settings.pm @@ -98,7 +98,7 @@ sub www_editSettings { ); $tabform->getTab("content")->yesNo( -name=>"metaDataEnabled", - -label=>$i18n->get("Enable Metadata ?", 'Asset'), + -label=>$i18n->get("Enable Metadata ?"), -value=>$session{setting}{metaDataEnabled} ); # user interface settings @@ -126,13 +126,13 @@ sub www_editSettings { ); $tabform->getTab("ui")->template( -name=>"userFunctionStyleId", - -label=>"User Function Style", + -label=>$i18n->get('user function style'), -namespace=>"style", -value=>$session{setting}{userFunctionStyleId} ); $tabform->getTab("ui")->template( -name=>"AdminConsoleTemplate", - -label=>"Admin Console Template", + -label=>$i18n->get('admin console template'), -namespace=>"AdminConsole", -value=>$session{setting}{AdminConsoleTemplate} ); diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm index 0aa4ebe21..d8261df76 100644 --- a/lib/WebGUI/i18n/English/Asset.pm +++ b/lib/WebGUI/i18n/English/Asset.pm @@ -320,11 +320,6 @@ These are the icons and URLs that allow editing, cutting, copying, deleting and lastUpdated => 1089039511 }, - 'Enable Metadata ?' => { - message => q|Enable Metadata ?|, - lastUpdated => 1089039511 - }, - 'Edit Metadata' => { message => q|Edit Metadata property|, lastUpdated => 1089039511 @@ -401,8 +396,7 @@ information about the content, and is defined in terms of property-value pairs.< source with a value of newspaper.

Metadata properties are defined globally, while Metadata values are set for each asset under the tab "Meta" in the asset properties.

-

Before you can use metadata in WebGUI, you'll have to switch the "Enable Metadata -?" setting to Yes in the Manage Settings menu.

+

Before you can use metadata in WebGUI, you have to enable metadata in the WebGUI Settings (Content tab)

Usage of metadata: