fixed: IE6 shows Admin Bar over Asset Manager
This commit is contained in:
parent
a18bccd543
commit
0828ecfef5
4 changed files with 93 additions and 68 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
7.6.14
|
7.6.14
|
||||||
|
- fixed: IE6 shows Admin Bar over Asset Manager
|
||||||
|
|
||||||
7.6.13
|
7.6.13
|
||||||
- fixed AdSpace bug: impressions and clicks for most non-human web clients will not be counted.
|
- fixed AdSpace bug: impressions and clicks for most non-human web clients will not be counted.
|
||||||
|
|
|
||||||
|
|
@ -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.
|
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
|
=cut
|
||||||
|
|
||||||
sub new {
|
sub new {
|
||||||
my $class = shift;
|
my $class = shift;
|
||||||
my $session = shift;
|
my $session = shift;
|
||||||
my $id = shift;
|
my $id = shift;
|
||||||
|
my $options = shift;
|
||||||
my $self;
|
my $self;
|
||||||
$self->{_session} = $session;
|
$self->{_session} = $session;
|
||||||
bless $self, $class;
|
bless $self, $class;
|
||||||
$self->{_function} = {};
|
$self->{_function} = {};
|
||||||
$self->{_functionId} = $id;
|
$self->{_functionId} = $id;
|
||||||
|
$self->{_options} = $options;
|
||||||
return $self;
|
return $self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -289,7 +299,17 @@ sub render {
|
||||||
}
|
}
|
||||||
|
|
||||||
$var{"backtosite.url"} = $self->session->url->getBackToSiteURL();
|
$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");
|
||||||
}
|
}
|
||||||
|
|
||||||
#-------------------------------------------------------------------
|
#-------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -323,7 +323,9 @@ JavaScript that will take over if the browser has the cojones.
|
||||||
|
|
||||||
sub www_manage {
|
sub www_manage {
|
||||||
my ( $session ) = @_;
|
my ( $session ) = @_;
|
||||||
my $ac = WebGUI::AdminConsole->new( $session, "assets" );
|
my $ac = WebGUI::AdminConsole->new( $session, "assets", {
|
||||||
|
showAdminBar => 1
|
||||||
|
} );
|
||||||
my $currentAsset = getCurrentAsset( $session );
|
my $currentAsset = getCurrentAsset( $session );
|
||||||
my $i18n = WebGUI::International->new( $session, "Asset" );
|
my $i18n = WebGUI::International->new( $session, "Asset" );
|
||||||
|
|
||||||
|
|
@ -413,7 +415,7 @@ sub www_manage {
|
||||||
YAHOO.util.Event.onDOMReady( WebGUI.AssetManager.initManager );
|
YAHOO.util.Event.onDOMReady( WebGUI.AssetManager.initManager );
|
||||||
</script>
|
</script>
|
||||||
ENDHTML
|
ENDHTML
|
||||||
my $output = WebGUI::Macro::AdminBar::process($session).'<div class="yui-skin-sam" id="assetManager">' . getHeader( $session );
|
my $output = '<div class="yui-skin-sam" id="assetManager">' . getHeader( $session );
|
||||||
|
|
||||||
### Crumbtrail
|
### Crumbtrail
|
||||||
my $crumb_markup = '<li><a href="%s">%s</a> ></li>';
|
my $crumb_markup = '<li><a href="%s">%s</a> ></li>';
|
||||||
|
|
|
||||||
|
|
@ -17,10 +17,9 @@ dl.accordion-menu {
|
||||||
_position:absolute;
|
_position:absolute;
|
||||||
top:0;
|
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:0;
|
||||||
_left: -175px;
|
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -146,3 +145,6 @@ html.accordion-menu-js dd.a-m-d-anim {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue