diff --git a/lib/WebGUI/Image/Color.pm b/lib/WebGUI/Image/Color.pm
index a1e722236..0ec472e98 100644
--- a/lib/WebGUI/Image/Color.pm
+++ b/lib/WebGUI/Image/Color.pm
@@ -296,7 +296,7 @@ sub newByPalette {
my $session = shift;
my $paletteId = shift;
- my $sth = $session->db->read('select imageColor.* from imageColor, imagePaletteColors where '.
+ $sth = $session->db->read('select imageColor.* from imageColor, imagePaletteColors where '.
' imageColor.colorId=imagePaletteColors.colorId and paletteId=?', [
$paletteId
]);
diff --git a/lib/WebGUI/Image/Palette.pm b/lib/WebGUI/Image/Palette.pm
index d1d4995ec..2efc06de6 100644
--- a/lib/WebGUI/Image/Palette.pm
+++ b/lib/WebGUI/Image/Palette.pm
@@ -136,7 +136,7 @@ sub getColorIndex {
my $self = shift;
my $color = shift;
- my @palette = @{$self->getColorsInPalette};
+ @palette = @{$self->getColorsInPalette};
for ($index = 0; $index < scalar(@palette); $index++) {
return $index if ($self->getColor($index)->getId eq $color->getId);
diff --git a/lib/WebGUI/Operation/Graphics.pm b/lib/WebGUI/Operation/Graphics.pm
index 76d27f52c..7e44f04cc 100644
--- a/lib/WebGUI/Operation/Graphics.pm
+++ b/lib/WebGUI/Operation/Graphics.pm
@@ -22,8 +22,8 @@ sub _submenu {
}
$ac->addSubmenuItem($session->url->page('op=listPalettes'), $i18n->get('manage palettes'));
$ac->addSubmenuItem($session->url->page('op=listFonts'), $i18n->get('manage fonts'));
- $ac->addSubmenuItem($session->url->page('op=editPalette&pid=new'), $i18n->get('add palette'));
- $ac->addSubmenuItem($session->url->page('op=editFont&fid=new'), $i18n->get('add font'));
+ $ac->addSubmenuItem($session->url->page('op=editPalette;pid=new'), $i18n->get('add palette'));
+ $ac->addSubmenuItem($session->url->page('op=editFont;fid=new'), $i18n->get('add font'));
return $ac->render($workarea, $i18n->get('manage graphics'));
}
@@ -31,7 +31,7 @@ sub _submenu {
#### hoverhelp
#-------------------------------------------------------------------
sub _getColorForm {
- my ($f, $color, %transparencies);
+ my ($color, %transparencies);
my $session = shift;
my $colorId = shift;
@@ -128,6 +128,7 @@ sub www_addColorToPaletteSave {
my $color = WebGUI::Image::Color->new($session, $session->form->process('cid'));
if ($session->form->process('cid') eq 'new') {
+ $color->setName($session->form->process('colorName'));
$color->setFillTriplet($session->form->process('fillTriplet'));
$color->setFillAlpha($session->form->process('fillAlpha'));
$color->setStrokeTriplet($session->form->process('strokeTriplet'));
@@ -308,7 +309,7 @@ sub www_editPalette {
my $palette = WebGUI::Image::Palette->new($session, $paletteId);
$output .= '
';
- $output .= ' | '.$i18n->get('fill color').' | '.$i18n->get('stroke color').' | ';
+ $output .= ' | '.$i18n->get('fill color').' | '.$i18n->get('stroke color').' |
';
foreach $color (@{$palette->getColorsInPalette}) {
$output .= '';
$output .= '| ';
@@ -323,7 +324,7 @@ sub www_editPalette {
}
$output .= ' |
';
- $output .= ''.$i18n->get('add color').'
';
+ $output .= ''.$i18n->get('add color').'
';
}
return _submenu($session, $output);
@@ -368,19 +369,19 @@ sub www_listPalettes {
my $palettes = WebGUI::Image::Palette->getPaletteList($session);
$output .= '';
- $output .= ' | '.$i18n->get('palette name').' | ';
+ $output .= ' | '.$i18n->get('palette name').' |
';
foreach (keys %$palettes) {
$output .= '';
$output .= '| ';
- $output .= $session->icon->delete('op=deletePalette&pid='.$_);
- $output .= $session->icon->edit('op=editPalette&pid='.$_);
+ $output .= $session->icon->delete('op=deletePalette;pid='.$_);
+ $output .= $session->icon->edit('op=editPalette;pid='.$_);
$output .= ' | ';
$output .= ''.$palettes->{$_}.' | ';
$output .= '
';
}
$output .= '
';
- $output .= ''.$i18n->get('add color').'
';
+ $output .= ''.$i18n->get('add palette').'
';
return _submenu($session, $output);
}
@@ -427,19 +428,19 @@ sub www_listFonts {
my %fonts = $session->db->buildHash('select fontId, name from imageFont');
$output .= '';
- $output .= ' | | '.$i18n->get('font name').' | ';
+ $output .= ' | '.$i18n->get('font name').' |
';
foreach (keys %fonts) {
$output .= '';
$output .= '| ';
- $output .= $session->icon->delete('op=deleteFont&fid='.$_);
-# $output .= $session->icon->edit('op=editFont&fid='.$_);
+ $output .= $session->icon->delete('op=deleteFont;fid='.$_);
+# $output .= $session->icon->edit('op=editFont;fid='.$_);
$output .= ' | ';
$output .= ''.$fonts{$_}.' | ';
$output .= '
';
}
$output .= '
';
- $output .= ''.$i18n->get('add font').'
';
+ $output .= ''.$i18n->get('add font').'
';
return _submenu($session, $output);
}