oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improved Rich Text selection list, changed CS and Wiki to use it

Browse source
This commit is contained in:
Graham Knop 2008-08-26 21:10:18 +00:00
parent 7901eb9642
commit ac3070956d
6 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset/Snippet.pm
View file

@ -205,7 +205,7 @@ sub view {
}
my $output = $self->get("snippet");
WebGUI::Macro::process($self->session,\$output);
$output = $self->getToolbar.$output if ($self->session->var->get("adminOn") && !$calledAsWebMethod);
$output = $self->getToolbar.$output if ($self->session->var->isAdminOn && !$calledAsWebMethod);
if ($self->getValue("processAsTemplate")) {
$output = WebGUI::Asset::Template->processRaw($self->session, $output, $self->get);
}

5
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -414,8 +414,6 @@ sub definition {
($useKarma? (karmaRank=>$i18n->get('karma rank')) : ()),
);
my $richEditorOptions = $session->db->buildHashRef("select distinct(assetData.assetId), assetData.title from asset, assetData where asset.className='WebGUI::Asset::RichEdit' and asset.assetId=assetData.assetId order by assetData.title");
my %properties;
tie %properties, 'Tie::IxHash';
%properties = (
@ -612,12 +610,11 @@ sub definition {
hoverHelp=>$i18n->get('filter code description'),
},
richEditor =>{
fieldType=>"selectBox",
fieldType=>"selectRichEditor",
defaultValue=>"PBrichedit000000000002",
tab=>'display',
label=>$i18n->get('rich editor'),
hoverHelp=>$i18n->get('rich editor description'),
options=>$richEditorOptions,
},
attachmentsPerPost =>{
fieldType=>"integer",

6
lib/WebGUI/Asset/Wobject/WikiMaster.pm
View file

@ -181,9 +181,6 @@ sub definition {
my $definition = shift;
my $i18n = WebGUI::International->new($session, 'Asset_WikiMaster');
# BUGGO: duplication with Collaboration; move this into WebGUI::Asset::RichEdit
my $richEditorOptions = $session->db->buildHashRef("select distinct(assetData.assetId), assetData.title from asset, assetData where asset.className='WebGUI::Asset::RichEdit' and asset.assetId=assetData.assetId order by assetData.title");
my %properties;
tie %properties, 'Tie::IxHash';
%properties =
@ -200,8 +197,7 @@ sub definition {
hoverHelp => $i18n->get('groupToAdminister hoverHelp'),
label => $i18n->get('groupToAdminister label') },
richEditor => { fieldType => 'selectBox',
options => $richEditorOptions,
richEditor => { fieldType => 'selectRichEditor',
defaultValue => 'PBrichedit000000000001',
tab => 'display',
hoverHelp => $i18n->get('richEditor hoverHelp'),