diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 7a6c55e23..f7aea5942 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,5 @@ 7.6.14 + - fixed: IE6 shows Admin Bar over Asset Manager 7.6.13 - fixed AdSpace bug: impressions and clicks for most non-human web clients will not be counted. diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm index 1f400235f..29a6bc807 100644 --- a/lib/WebGUI/AdminConsole.pm +++ b/lib/WebGUI/AdminConsole.pm @@ -215,17 +215,27 @@ A reference to the current session. If supplied, provides a list of defaults such as title and icons for the admin console. +=head3 options + +A hash reference of options with the following keys + +=head4 showAdminBar + +If true, will show the admin bar on this admin console page + =cut sub new { my $class = shift; my $session = shift; my $id = shift; + my $options = shift; my $self; $self->{_session} = $session; bless $self, $class; $self->{_function} = {}; $self->{_functionId} = $id; + $self->{_options} = $options; return $self; } @@ -289,7 +299,17 @@ sub render { } $var{"backtosite.url"} = $self->session->url->getBackToSiteURL(); - return $self->session->style->process(WebGUI::Asset::Template->new($self->session,$self->session->setting->get("AdminConsoleTemplate"))->process(\%var),"PBtmpl0000000000000137"); + my $template + = WebGUI::Asset::Template->new( + $self->session, + $self->session->setting->get("AdminConsoleTemplate") + ); + if ( $self->{_options}->{showAdminBar} ) { + $var{adminBar} + = WebGUI::Macro::AdminBar::process($self->session); + } + my $output = $template->process(\%var); + return $self->session->style->process($output,"PBtmpl0000000000000137"); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm index 593a9ba3b..6a635402c 100644 --- a/lib/WebGUI/Content/AssetManager.pm +++ b/lib/WebGUI/Content/AssetManager.pm @@ -323,7 +323,9 @@ JavaScript that will take over if the browser has the cojones. sub www_manage { my ( $session ) = @_; - my $ac = WebGUI::AdminConsole->new( $session, "assets" ); + my $ac = WebGUI::AdminConsole->new( $session, "assets", { + showAdminBar => 1 + } ); my $currentAsset = getCurrentAsset( $session ); my $i18n = WebGUI::International->new( $session, "Asset" ); @@ -413,7 +415,7 @@ sub www_manage { YAHOO.util.Event.onDOMReady( WebGUI.AssetManager.initManager ); ENDHTML - my $output = WebGUI::Macro::AdminBar::process($session).'
' . getHeader( $session ); + my $output = '
' . getHeader( $session ); ### Crumbtrail my $crumb_markup = '
  • %s >
    • '; diff --git a/www/extras/macro/AdminBar/slidePanel.css b/www/extras/macro/AdminBar/slidePanel.css index a2dfeb2df..3803ace92 100644 --- a/www/extras/macro/AdminBar/slidePanel.css +++ b/www/extras/macro/AdminBar/slidePanel.css @@ -1,37 +1,36 @@ dl.accordion-menu dd.a-m-d div.ncmct { - width: 140px; - border-bottom: 1px solid #bbbbbb; - color: black; - font-weight: bold; - font-size: 12px; - margin-bottom: 5px; + width: 140px; + border-bottom: 1px solid #bbbbbb; + color: black; + font-weight: bold; + font-size: 12px; + margin-bottom: 5px; font-family: sans-serif; } dl.accordion-menu { - margin: 0; - padding: 0; - width: 160px; - background: #eeeeee; + margin: 0; + padding: 0; + width: 160px; + background: #eeeeee; position:fixed; _position:absolute; top:0; - - - _top:expression(eval((document.documentElement && document.documentElement.scrollTop) ? document.documentElement.scrollTop : document.body.scrollTop)); + + /* + _top:expression(eval((document.documentElement && document.documentElement.scrollTop) ? document.documentElement.scrollTop : document.body.scrollTop)); */ left:0; - _left: -175px; z-index: 100; } dl.accordion-menu dt.a-m-t { - margin: 0; - padding: 0; + margin: 0; + padding: 0; background-color:#dddddd; background-image: url(btn_bg.jpg); font-weight: bold; height: 20px; - color: #444444; + color: #444444; border: 1px solid #ACACAC; line-height: 20px; font-size: 12px; @@ -40,31 +39,31 @@ dl.accordion-menu dt.a-m-t { } dl.accordion-menu dt.a-m-t-hover{ - margin: 0; - padding: 0; - background:#cdcdcd; + margin: 0; + padding: 0; + background:#cdcdcd; } dl.accordion-menu dt.a-m-t-down{ - margin: 0; - padding: 0; - border: solid 1px #222222; - border-right-color: #dfdfdf; - border-bottom-color: #dfdfdf; + margin: 0; + padding: 0; + border: solid 1px #222222; + border-right-color: #dfdfdf; + border-bottom-color: #dfdfdf; } html.accordion-menu-js dt.a-m-t{ - margin: 0; - padding: 0; - cursor:pointer; - zoom:1; + margin: 0; + padding: 0; + cursor:pointer; + zoom:1; } dl.accordion-menu dd.a-m-d { - margin: 0; - padding: 0; + margin: 0; + padding: 0; overflow: auto; background-color: #eeeeee; background-image: url(panel_bg.jpg); @@ -73,24 +72,24 @@ dl.accordion-menu dd.a-m-d { } dl.accordion-menu dd.a-m-d .link { - margin: 0; - padding: 0; + margin: 0; + padding: 0; display: block; width: 118px; - text-align:left; - padding-left:20px; + text-align:left; + padding-left:20px; text-decoration: none; color: black; font-family: sans-serif; cursor: pointer; font-weight: normal; font-size: 12px; - margin-bottom:5px; - margin-left:2px; - letter-spacing:0px; - text-transform:none; - font-variant:normal; - line-height:12px; + margin-bottom:5px; + margin-left:2px; + letter-spacing:0px; + text-transform:none; + font-variant:normal; + line-height:12px; } dl.accordion-menu dd.a-m-d .link img { @@ -104,45 +103,48 @@ dl.accordion-menu dd.a-m-d .link:hover { } html.accordion-menu-js dd.a-m-d{ - margin: 0; - padding: 0; - display:none; + margin: 0; + padding: 0; + display:none; } html.accordion-menu-js dd.a-m-d-expand { - margin: 0; - padding: 0; - display:block; + margin: 0; + padding: 0; + display:block; } html.accordion-menu-js dd.a-m-d-before-expand { - margin: 0; - padding: 0; - display:block; - position:relative; - z-index:-1; - opacity:0; - height:auto !important; - visibility:hidden; - overflow:visible; + margin: 0; + padding: 0; + display:block; + position:relative; + z-index:-1; + opacity:0; + height:auto !important; + visibility:hidden; + overflow:visible; } html.accordion-menu-js dt.a-m-t-expand { - margin: 0; - padding: 0; - border-left-color:#222222; - color:black; - background:#c0c0c0; + margin: 0; + padding: 0; + border-left-color:#222222; + color:black; + background:#c0c0c0; } html.accordion-menu-js dd.a-m-d-anim { - margin: 0; - padding: 0; - overflow:hidden; - display:block; + margin: 0; + padding: 0; + overflow:hidden; + display:block; } + + +