merging commerce branch back into head

This commit is contained in:
JT Smith 2008-04-20 18:08:26 +00:00
commit 5fb4807edc
1326 changed files with 55293 additions and 41167 deletions

View file

@ -146,8 +146,6 @@ sub toHtml {
}
my $i=0;
my $options = $self->getOptions;
$self->session->errorHandler->warn(JSON->new->encode($options));
foreach my $key (keys %{$options}) {
$i++;
my @values = $self->getDefaultValue;

View file

@ -122,10 +122,6 @@ sub toHtml {
return qq{<a href="javascript:YAHOO.WebGUI.ColorPicker.display('$id', '${id}_swatch');" id="${id}_swatch" class="colorPickerFormSwatch" style="background-color: $value"></a>
<input onchange="YAHOO.util.Dom.setStyle('${id}_swatch', 'background-color', this.value)"
maxlength="7" name="$name" type="text" size="8" value="$value" id="$id" />};
# <a href="#" id="${id}_swatch" class="colorPickerFormSwatch" style="background-color: #008000;"></a>
# <input maxlength="7" name="$name" type="text" size="8" value="$value" id="$id" />
# <script type="text/javascript">YAHOO.WebGUI.Form.ColorPicker.attach('$id', '${id}_swatch')</script>
}
1;

View file

@ -70,10 +70,9 @@ Renders the form field to HTML as a table row. The row is not displayed because
=cut
sub toHtml {
my $self = shift;
sub toHtmlWithWrapper {
my $self = shift;
my $value = $self->fixMacros($self->fixQuotes($self->fixSpecialCharacters($self->getDefaultValue))) || '';
my $manageButton = "&nbsp;";
if ($value) {
$manageButton = $self->session->icon->manage("op=editGroup;gid=".$value);