diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 060c324fe..609ea9635 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -7,6 +7,9 @@ - fix [ 1213516 ] Survey.pm: question order=response driven doesn't work (Thanks to misja1) - fix [ 1212596 ] Field disableContentLock is missing in Shortcut table + - fix [ 1214399 ] Admin Bar Unusable + - fix [ 1196086 ] certain DOCTYPEs break the admin slidebar + - fix [ 1189186 ] 6.6 CVS Admin menu is invisible on failsafe templater - fix [ 1215228 ] getToolbar uses get("url") instead of getUrl - fix [ 1187040 ] getNextChildRank doesn't handle rank 999999 diff --git a/lib/WebGUI/ErrorHandler.pm b/lib/WebGUI/ErrorHandler.pm index 72614b90d..edfda66ad 100644 --- a/lib/WebGUI/ErrorHandler.pm +++ b/lib/WebGUI/ErrorHandler.pm @@ -280,19 +280,19 @@ Creates an HTML formatted string sub showDebug { my $text = $WebGUI::Session::session{debug}{'error'}; $text =~ s/\n/\
\n/g; - my $output = '
'.$text."
\n"; + my $output = '
'.$text."
\n"; $text = $WebGUI::Session::session{debug}{'warn'}; $text =~ s/\n/\
\n/g; - $output .= '
'.$text."
\n"; + $output .= '
'.$text."
\n"; $text = $WebGUI::Session::session{debug}{'info'}; $text =~ s/\n/\
\n/g; - $output .= '
'.$text."
\n"; + $output .= '
'.$text."
\n"; $text = $WebGUI::Session::session{debug}{'debug'}; $text =~ s/\n/\
\n/g; - $output .= '
'.$text."
\n"; + $output .= '
'.$text."
\n"; $text = getSessionVars(); $text =~ s/\n/\
\n/g; - $output .= '
'.$text."
\n"; + $output .= '
'.$text."
\n"; return $output; } diff --git a/www/extras/slidePanel/slidePanel.css b/www/extras/slidePanel/slidePanel.css index bcdf3689b..c03cb4dd0 100644 --- a/www/extras/slidePanel/slidePanel.css +++ b/www/extras/slidePanel/slidePanel.css @@ -18,13 +18,13 @@ font-family:arial; font-size:11px; cursor:hand; - border-width:1; + border-width:1px; border-color: #ACACAC; background-color:#dddddd; background-image: url(btn_bg.jpg); position:absolute; - left:0; - top: 0; + left:0px; + top: 0px; border-style: solid; } @@ -35,7 +35,7 @@ .scrollPanelUp { position:absolute; - top:40; + top:40px; } .scrollPanelDown { @@ -45,12 +45,12 @@ .slidePanel { position:absolute; background-color: #eeeeee; - + z-index: 100; } .panel, .panelLinkHolder { position:absolute; - left:0; + left:0px; background-color: #eeeeee; background-image: url(panel_bg.jpg); background-repeat: repeat-x; @@ -61,7 +61,7 @@ overflow: hidden; height: 20px; cursor: hand; - left:0; + left:0px; font-size: 11px; font-family: helvetica, arial, sans; } @@ -71,7 +71,7 @@ height: 20px; overflow: hidden; cursor: hand; - left:0; + left:0px; border: 1px solid #DEDCDC; font-size: 11px; font-family: helvetica, arial, sans; diff --git a/www/extras/slidePanel/slidePanel.js b/www/extras/slidePanel/slidePanel.js index c8be6f692..e3d0462f3 100644 --- a/www/extras/slidePanel/slidePanel.js +++ b/www/extras/slidePanel/slidePanel.js @@ -127,6 +127,7 @@ function b_addPanel(panel) { // Draw the slider function b_draw() { + document.body.style.marginLeft = '160px'; var i; var j; var t=0; @@ -137,33 +138,35 @@ function b_draw() { var slidemenu_width='160px' //specify width of menu (in pixels) var slidemenu_reveal='15px' //specify amount that menu should protrude initially var slidemenu_top='0px' //specify vertical offset of menu on page - document.write('
'); - document.write('
»
»
»
»
»
'); + //document.write('
'); + document.write('
'); + //document.write('
»
»
»
»
»
'); + //slide panel . document.write('
'); + document.write(this.xpos+'px; top:'+this.ypos+'px; width:'+this.width); + document.write('px; height:'+this.height+'px; ') + document.write('; clip:rect(0px,'+this.width+'px,'+this.height+'px,0px)">'); h=this.height-((this.panels.length-1)*panelButtonHeight) //one layer for every panel... for (i=0;i'); t=t+panelButtonHeight; //one layer to host the panel links document.write('
'); + document.write('_f style="top:'+panelLinkTop+'px; width:'); + document.write(this.width+'px; height:'); + document.write((this.panels[i].img.length*this.buttonspace)+'px;">'); mtop=0 for (j=0;j'); - document.write('icon'); + document.write('
'); + document.write('icon'); document.write(' '+this.panels[i].lbl[j]); document.write('
'); mtop=mtop+this.buttonspace; @@ -174,7 +177,7 @@ function b_draw() { document.write('') @@ -253,9 +256,9 @@ function b_showPanel(nr) { l = this.panels.length; for (i=0;inr) { - this.panels[i].obj.style.top=this.height-((l-i)*panelButtonHeight); + this.panels[i].obj.style.top=this.height-((l-i)*panelButtonHeight)+"px"; } else { - this.panels[i].obj.style.top=i*panelButtonHeight; + this.panels[i].obj.style.top=i*panelButtonHeight+"px"; } } }