diff --git a/lib/WebGUI/Asset/File/ZipArchive.pm b/lib/WebGUI/Asset/File/ZipArchive.pm index 428cd36f0..6584b9f1f 100644 --- a/lib/WebGUI/Asset/File/ZipArchive.pm +++ b/lib/WebGUI/Asset/File/ZipArchive.pm @@ -243,8 +243,9 @@ sub www_edit { return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->locked() unless $self->canEditIfLocked; $self->getAdminConsole->setHelp("zip archive add/edit", "Asset_ZipArchive"); - my $i18n = WebGUI::International->new($self->session,"Asset_ZipArchive"); - return $self->getAdminConsole->render($self->getEditForm->print, $i18n->get('zip archive add/edit title')); + my $i18n = WebGUI::International->new($self->session, 'Asset_Wobject'); + my $addEdit = ($self->session->form->process("func") eq 'add') ? $i18n->get('add') : $i18n->get('edit'); + return $self->getAdminConsole->render($self->getEditForm->print,$addEdit.' '.$self->getName); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm index 080fbed73..caf8935f7 100644 --- a/lib/WebGUI/Asset/Redirect.pm +++ b/lib/WebGUI/Asset/Redirect.pm @@ -86,8 +86,9 @@ sub www_edit { return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->locked() unless $self->canEditIfLocked; $self->getAdminConsole->setHelp("redirect add/edit", "Asset_Redirect"); - my $i18n = WebGUI::International->new($self->session, 'Asset_Redirect'); - return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get('redirect add/edit title')); + my $i18n = WebGUI::International->new($self->session, 'Asset_Wobject'); + my $addEdit = ($self->session->form->process("func") eq 'add') ? $i18n->get('add') : $i18n->get('edit'); + return $self->getAdminConsole->render($self->getEditForm->print,$addEdit.' '.$self->getName); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Help/Asset_Event.pm b/lib/WebGUI/Help/Asset_Event.pm index 3e9462632..483decba4 100644 --- a/lib/WebGUI/Help/Asset_Event.pm +++ b/lib/WebGUI/Help/Asset_Event.pm @@ -3,7 +3,7 @@ package WebGUI::Help::Asset_Event; our $HELP = { 'event add/edit' => { title => 'add/edit title', - body => 'add/edit body', + body => '', isa => [ { namespace => "Asset_Event", diff --git a/lib/WebGUI/Help/Asset_FilePile.pm b/lib/WebGUI/Help/Asset_FilePile.pm deleted file mode 100644 index 334ec2189..000000000 --- a/lib/WebGUI/Help/Asset_FilePile.pm +++ /dev/null @@ -1,51 +0,0 @@ -package WebGUI::Help::Asset_FilePile; - -our $HELP = { - - 'file pile add/edit' => { - title => 'file pile add/edit title', - body => 'file pile add/edit body', - fields => [ - { #isHidden - title => '886', - description => '886 description', - namespace => 'Asset_FilePile', - uiLevel => 6, - }, - { #newWindow - title => '940', - description => '940 description', - namespace => 'Asset_FilePile', - uiLevel => 6, - }, - { #ownerUserId - title => '108', - description => '108 description', - namespace => 'Asset_FilePile', - uiLevel => 6, - }, - { #groupIdView - title => '872', - description => '872 description', - namespace => 'Asset_FilePile', - uiLevel => 6, - }, - { #groupIdEdit - title => '871', - description => '871 description', - namespace => 'Asset_FilePile', - uiLevel => 6, - }, - { - title => 'upload files', - description => 'upload files description', - namespace => 'Asset_FilePile', - }, - ], - related => [ - ] - }, - -}; - -1; diff --git a/lib/WebGUI/Help/Asset_RSSCapable.pm b/lib/WebGUI/Help/Asset_RSSCapable.pm deleted file mode 100644 index 6abeee5fe..000000000 --- a/lib/WebGUI/Help/Asset_RSSCapable.pm +++ /dev/null @@ -1,30 +0,0 @@ -package WebGUI::Help::Asset_RSSCapable; - -our $HELP = { - 'rss capable' => { - title => 'rss capable title', - body => 'rss capable body', - # use the following to inherit stuff other help entries - isa => [ - ], - fields => [ #This array is used to list hover help for form fields. - { - title => 'rssEnabled label', - description => 'rssEnabled hoverHelp', - namespace => 'Asset_RSSCapable', - }, - { - title => 'rssTemplateId label', - description => 'rssTemplateId hoverHelp', - namespace => 'Asset_RSSCapable', - }, - ], - variables => [ - ], - related => [ ##This lists other help articles that are related to this one - ], - }, - -}; - -1; ##All perl modules must return true diff --git a/lib/WebGUI/Help/Asset_WikiPage.pm b/lib/WebGUI/Help/Asset_WikiPage.pm index 8deeb2ede..a70860aa2 100644 --- a/lib/WebGUI/Help/Asset_WikiPage.pm +++ b/lib/WebGUI/Help/Asset_WikiPage.pm @@ -3,7 +3,7 @@ package WebGUI::Help::Asset_WikiPage; our $HELP = { 'wiki page add/edit' => { title => 'add/edit title', - body => 'add/edit body', + body => '', isa => [ ], variables => [ diff --git a/lib/WebGUI/i18n/English/Asset_Event.pm b/lib/WebGUI/i18n/English/Asset_Event.pm index 80f6312cd..716a1f620 100644 --- a/lib/WebGUI/i18n/English/Asset_Event.pm +++ b/lib/WebGUI/i18n/English/Asset_Event.pm @@ -9,16 +9,11 @@ our $I18N = { }, 'add/edit title' => { - message => q{Event, Add/Edit}, + message => q{Event, Add/Edit Screen Template Variables}, lastUpdated => 0, context => q{Title for the Event Add/Edit Help screen}, }, - 'add/edit body' => { - message => q|The Add/Edit screen for the Event is templatable. The template variables that are available are listed below.|, - lastUpdated => 1171067184, - }, - 'formHeader' => { message => q|HTML and Javascript for the start of the Add/Edit Event form.|, lastUpdated => 1171067211, diff --git a/lib/WebGUI/i18n/English/Asset_File.pm b/lib/WebGUI/i18n/English/Asset_File.pm index 2e52c50a6..46c277753 100644 --- a/lib/WebGUI/i18n/English/Asset_File.pm +++ b/lib/WebGUI/i18n/English/Asset_File.pm @@ -89,6 +89,11 @@ our $I18N = { lastUpdated => 1165517718 }, + 'file template description' => { + message => q|File templates allow you to display information about the file, such as its filename, size or an icon representing the file type. In addition to the variables below, the File Asset template also has all the default Asset template variables. |, + lastUpdated => 1140196488, + }, + 'file template asset var title' => { message => q|File Template, Asset Variables|, lastUpdated => 1130456105, diff --git a/lib/WebGUI/i18n/English/Asset_FilePile.pm b/lib/WebGUI/i18n/English/Asset_FilePile.pm index 234481cbd..aeadf8820 100644 --- a/lib/WebGUI/i18n/English/Asset_FilePile.pm +++ b/lib/WebGUI/i18n/English/Asset_FilePile.pm @@ -1,21 +1,6 @@ package WebGUI::i18n::English::Asset_FilePile; our $I18N = { - 'file pile add/edit title' => { - message => q|File Pile, Add/Edit|, - lastUpdated => 1111735119, - }, - - 'file pile add/edit body' => { - message => q|
File Pile Assets allow you to upload lots of files to your site all at once. This is the only function that the File Pile has. If you want to display the files that have been uploaded, you'll need to use another Asset or Wobject.
- -Unlike most Assets, the File Pile does not share the base set of Asset properties. All File Piles -have the following properties:
- -|, - context => 'Describing file pile add/edit form specific fields', - lastUpdated => 1146630312, - }, '886 description' => { message => q|Whether or not this asset will be hidden from the navigation menu and site maps.
|, diff --git a/lib/WebGUI/i18n/English/Asset_RSSCapable.pm b/lib/WebGUI/i18n/English/Asset_RSSCapable.pm index 027c41da5..9a3fda2d7 100644 --- a/lib/WebGUI/i18n/English/Asset_RSSCapable.pm +++ b/lib/WebGUI/i18n/English/Asset_RSSCapable.pm @@ -7,16 +7,6 @@ our $I18N = 'rssTemplateId label' => { message => 'RSS Template', lastUpdate => 1162487361 }, 'rssTemplateId hoverHelp' => { message => q|The template to use for the RSS feed of this asset.|, lastUpdate => 1162487361 }, - 'rss capable title' => { - message => q|RSS Capable|, - lastUpdated => 1162956598 - }, - - 'rss capable body' => { - message => q|This Asset is used to enable other Assets to make their own RSS feeds using the RSSFromParent Asset. As a content manager or admin, you will probably never directly use this Asset.
|, - lastUpdated => 1162956563 - }, - 'assetName' => { message => 'RSS Capable', lastUpdate => 1162487361 }, }; diff --git a/lib/WebGUI/i18n/English/Asset_WikiPage.pm b/lib/WebGUI/i18n/English/Asset_WikiPage.pm index 06b4e543a..3b2aa69f9 100644 --- a/lib/WebGUI/i18n/English/Asset_WikiPage.pm +++ b/lib/WebGUI/i18n/English/Asset_WikiPage.pm @@ -95,11 +95,6 @@ our $I18N = lastUpdated => 1165790228, }, - 'add/edit body' => { - message => q|The add/edit screen for this Asset is templated. Fields seen by the user will not have hoverHelp. Variables available for use in the template are listed below:|, - lastUpdated => 1165790228, - }, - 'view title' => { message => q|Wiki Page, View Template|, lastUpdated => 1165790228,