Merge branch 'WebGUI8' of github.com:plainblack/webgui into 8

Conflicts:
	lib/WebGUI.pm
	lib/WebGUI/Auth/WebGUI.pm
	sbin/findBrokenAssets.pl
	sbin/testEnvironment.pl
This commit is contained in:
Doug Bell 2011-05-13 18:20:52 -05:00
commit 677ac978b6
89 changed files with 1064 additions and 448 deletions

View file

@ -100,9 +100,10 @@ WebGUI.Toolbar.prototype.render
// Edit button
var editButton = new YAHOO.widget.Button({
type : "push",
type : "link",
"container" : this.container,
label : assetData.helpers["edit"].label,
href : assetData.helpers["edit"].url,
onclick : {
fn: window.parent.admin.getHelperHandler( this.assetId, "edit", assetData.helpers["edit"] )
}