oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed: IE6 shows Admin Bar over Asset Manager

Browse source
This commit is contained in:
Doug Bell 2009-02-25 23:55:40 +00:00
parent a18bccd543
commit 0828ecfef5
4 changed files with 93 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -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.

22
lib/WebGUI/AdminConsole.pm
View file

@ -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");
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

6
lib/WebGUI/Content/AssetManager.pm
View file

@ -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> &gt;</li>'; my $crumb_markup = '<li><a href="%s">%s</a> &gt;</li>';

132
www/extras/macro/AdminBar/slidePanel.css
View file

@ -1,37 +1,36 @@
dl.accordion-menu dd.a-m-d div.ncmct { dl.accordion-menu dd.a-m-d div.ncmct {
width: 140px; width: 140px;
border-bottom: 1px solid #bbbbbb; border-bottom: 1px solid #bbbbbb;
color: black; color: black;
font-weight: bold; font-weight: bold;
font-size: 12px; font-size: 12px;
margin-bottom: 5px; margin-bottom: 5px;
font-family: sans-serif; font-family: sans-serif;
} }
dl.accordion-menu { dl.accordion-menu {
margin: 0; margin: 0;
padding: 0; padding: 0;
width: 160px; width: 160px;
background: #eeeeee; background: #eeeeee;
position:fixed; position:fixed;
_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;
} }
dl.accordion-menu dt.a-m-t { dl.accordion-menu dt.a-m-t {
margin: 0; margin: 0;
padding: 0; padding: 0;
background-color:#dddddd; background-color:#dddddd;
background-image: url(btn_bg.jpg); background-image: url(btn_bg.jpg);
font-weight: bold; font-weight: bold;
height: 20px; height: 20px;
color: #444444; color: #444444;
border: 1px solid #ACACAC; border: 1px solid #ACACAC;
line-height: 20px; line-height: 20px;
font-size: 12px; font-size: 12px;
@ -40,31 +39,31 @@ dl.accordion-menu dt.a-m-t {
} }
dl.accordion-menu dt.a-m-t-hover{ dl.accordion-menu dt.a-m-t-hover{
margin: 0; margin: 0;
padding: 0; padding: 0;
background:#cdcdcd; background:#cdcdcd;
} }
dl.accordion-menu dt.a-m-t-down{ dl.accordion-menu dt.a-m-t-down{
margin: 0; margin: 0;
padding: 0; padding: 0;
border: solid 1px #222222; border: solid 1px #222222;
border-right-color: #dfdfdf; border-right-color: #dfdfdf;
border-bottom-color: #dfdfdf; border-bottom-color: #dfdfdf;
} }
html.accordion-menu-js dt.a-m-t{ html.accordion-menu-js dt.a-m-t{
margin: 0; margin: 0;
padding: 0; padding: 0;
cursor:pointer; cursor:pointer;
zoom:1; zoom:1;
} }
dl.accordion-menu dd.a-m-d { dl.accordion-menu dd.a-m-d {
margin: 0; margin: 0;
padding: 0; padding: 0;
overflow: auto; overflow: auto;
background-color: #eeeeee; background-color: #eeeeee;
background-image: url(panel_bg.jpg); 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 { dl.accordion-menu dd.a-m-d .link {
margin: 0; margin: 0;
padding: 0; padding: 0;
display: block; display: block;
width: 118px; width: 118px;
text-align:left; text-align:left;
padding-left:20px; padding-left:20px;
text-decoration: none; text-decoration: none;
color: black; color: black;
font-family: sans-serif; font-family: sans-serif;
cursor: pointer; cursor: pointer;
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
margin-bottom:5px; margin-bottom:5px;
margin-left:2px; margin-left:2px;
letter-spacing:0px; letter-spacing:0px;
text-transform:none; text-transform:none;
font-variant:normal; font-variant:normal;
line-height:12px; line-height:12px;
} }
dl.accordion-menu dd.a-m-d .link img { 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{ html.accordion-menu-js dd.a-m-d{
margin: 0; margin: 0;
padding: 0; padding: 0;
display:none; display:none;
} }
html.accordion-menu-js dd.a-m-d-expand { html.accordion-menu-js dd.a-m-d-expand {
margin: 0; margin: 0;
padding: 0; padding: 0;
display:block; display:block;
} }
html.accordion-menu-js dd.a-m-d-before-expand { html.accordion-menu-js dd.a-m-d-before-expand {
margin: 0; margin: 0;
padding: 0; padding: 0;
display:block; display:block;
position:relative; position:relative;
z-index:-1; z-index:-1;
opacity:0; opacity:0;
height:auto !important; height:auto !important;
visibility:hidden; visibility:hidden;
overflow:visible; overflow:visible;
} }
html.accordion-menu-js dt.a-m-t-expand { html.accordion-menu-js dt.a-m-t-expand {
margin: 0; margin: 0;
padding: 0; padding: 0;
border-left-color:#222222; border-left-color:#222222;
color:black; color:black;
background:#c0c0c0; background:#c0c0c0;
} }
html.accordion-menu-js dd.a-m-d-anim { html.accordion-menu-js dd.a-m-d-anim {
margin: 0; margin: 0;
padding: 0; padding: 0;
overflow:hidden; overflow:hidden;
display:block; display:block;
} }