diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index f88ce6540..0daf9b117 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -15,6 +15,7 @@ for details. - rfe: Admin bar doesn't resize with the browser - fix: Left Admin Bar overlap problem + - Color coded most buttons, green for proceed and red for go back. - fix: A bug where it was possible to delete a system page if it were made the child of a non-system page that you had edit rights to. - api: Added a unified contraints system for the file and image assets. diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 887ecb57b..38450c3c9 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -791,7 +791,10 @@ sub getEditForm { $uiLevelOverride =~ s/\:\:/_/g; my $tabform = WebGUI::TabForm->new($self->session,undef,undef,$self->getUrl(),$uiLevelOverride); if ($self->session->config->get("enableSaveAndCommit")) { - $tabform->submitAppend(WebGUI::Form::submit($self->session, {name=>"saveAndCommit", value=>$i18n->get("save and commit")})); + $tabform->submitAppend(WebGUI::Form::submit($self->session, { + name => "saveAndCommit", + value => $i18n->get("save and commit"), + })); } $tabform->hidden({ name=>"func", diff --git a/lib/WebGUI/Form/Submit.pm b/lib/WebGUI/Form/Submit.pm index 127660765..df41c3da6 100644 --- a/lib/WebGUI/Form/Submit.pm +++ b/lib/WebGUI/Form/Submit.pm @@ -68,12 +68,13 @@ Renders a button. sub toHtml { my $self = shift; my $value = $self->fixQuotes($self->get("value")); + my $extras = $self->get("extras") || q|class="forwardButton"|; my $i18n = WebGUI::International->new($self->session); $self->{_params}{extras} ||= 'onclick="this.value=\''.$i18n->get(452).'\'"'; my $html = 'get("name").'" ' if ($self->get("name")); $html .= 'id="'.$self->get('id').'" ' unless ($self->get('id') eq "_formId"); - $html .= 'value="'.$value.'" '.$self->get("extras").' />'; + $html .= 'value="'.$value.'" '.$extras.' />'; return $html; } diff --git a/lib/WebGUI/TabForm.pm b/lib/WebGUI/TabForm.pm index f3be68841..bde3a06d2 100644 --- a/lib/WebGUI/TabForm.pm +++ b/lib/WebGUI/TabForm.pm @@ -208,9 +208,11 @@ sub new { my $i18n = WebGUI::International->new($session); my $cancel = WebGUI::Form::button($session,{ value=>$i18n->get('cancel'), - extras=>q|onclick="history.go(-1);"| + extras=>q|onclick="history.go(-1);" class="backwardButton"| }); - bless { _session=>$session, _uiLevelOverride=>$uiLevelOverride, _cancel=>$cancel, _submit=>WebGUI::Form::submit($session), _form=>WebGUI::Form::formHeader($session), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class; + bless { _session=>$session, _uiLevelOverride=>$uiLevelOverride, _cancel=>$cancel, + _submit=>WebGUI::Form::submit($session), + _form=>WebGUI::Form::formHeader($session), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class; } diff --git a/www/extras/adminConsole/adminConsole.css b/www/extras/adminConsole/adminConsole.css index c1f1d3d04..f8cb2ea62 100644 --- a/www/extras/adminConsole/adminConsole.css +++ b/www/extras/adminConsole/adminConsole.css @@ -3,6 +3,18 @@ html,body { padding: 0px; } +.forwardButton { + background-color: #008000; + border: 2px outset #00a000; + color: white; +} + +.backwardButton { + background-color: #800000; + border: 2px outset #a00000; + color: white; +} + .wrapper { background-image: url(bg.jpg); background-repeat: repeat-x;