Merge branch 'master' into survey

* master: (121 commits)
  Fix a POD typo.
  correct inbox message from user preface
  Fix a typo in the Default gallery view template
  Documentation bug in buildArrayRefOfHashRefs
  changed screenshots in Matrix Listing view to popup
  matrix privileging fixes
  Fix an i18n typo in the Post user defined variables.
  Remove debugging code.
  approval workflow fix
  matrix upgrade and privileging fixes
  fixed: Template parser cannot be set
  forward porting gallery bug fixes
  preparing for 7.7.0 dev
  parser should be a selectbox, not a selectlist.
  labeling survey as beta
  fixeding my borkes to the changelog
  fixed #9852: Users can accept private messages from Visitor, but Visitor cannot send messages
  preparing for 7.6.14 release
  fix AdSpace, Ad tests
  Restore the original properties for the profile category that was modified for test.
  ...

Conflicts:
	docs/gotcha.txt
	docs/upgrades/upgrade_7.6.10-7.6.11.pl
	lib/WebGUI/Asset/Wobject/Survey.pm
	lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm

www/extras/macro/AdminBar/slidePanel.css

@@ -1,15 +1,150 @@
 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;
    position:fixed; 
    _position:absolute; 
    top:0; 
    _top:expression(eval((document.documentElement && document.documentElement.scrollTop) ? document.documentElement.scrollTop : document.body.scrollTop)); 
    left:0;
    z-index: 100;
}

dl.accordion-menu dt.a-m-t {
	margin: 0;
	padding: 0;
    background-color:#dddddd;
    background-image: url(btn_bg.jpg);
    font-weight: bold;
    height: 20px;
	color: #444444;
    border: 1px solid #ACACAC; 
    line-height: 20px;
    font-size: 12px;
    text-align:center;
    font-family: sans-serif;
}

dl.accordion-menu dt.a-m-t-hover{
	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;
}


html.accordion-menu-js dt.a-m-t{
	margin: 0;
	padding: 0;
	cursor:pointer;
	zoom:1;
}

dl.accordion-menu dd.a-m-d {
	margin: 0;
	padding: 0;
    overflow: auto;
    background-color: #eeeeee;
    background-image: url(panel_bg.jpg);
    background-repeat: repeat-x;
    font-weight: normal;
}

dl.accordion-menu dd.a-m-d .link {
	margin: 0;
	padding: 0;
    display: block;
    width: 118px;
	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;
}

dl.accordion-menu dd.a-m-d .link img {
margin-left:-20px;
}

dl.accordion-menu dd.a-m-d .link:hover {

    color: blue;
    background-color: #F5F5F5;
}

html.accordion-menu-js dd.a-m-d{
	margin: 0;
	padding: 0;
	display:none;
}


html.accordion-menu-js dd.a-m-d-expand {
	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;
}


html.accordion-menu-js dt.a-m-t-expand {
	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;	
}
+
+dl.accordion-menu {
+        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)); */
+    left:0;
+    z-index: 100;
+}
+
+dl.accordion-menu dt.a-m-t {
+        margin: 0;
+        padding: 0;
+    background-color:#dddddd;
+    background-image: url(btn_bg.jpg);
+    font-weight: bold;
+    height: 20px;
+        color: #444444;
+    border: 1px solid #ACACAC; 
+    line-height: 20px;
+    font-size: 12px;
+    text-align:center;
+    font-family: sans-serif;
+}
+
+dl.accordion-menu dt.a-m-t-hover{
+        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;
+}
+
+
+html.accordion-menu-js dt.a-m-t{
+        margin: 0;
+        padding: 0;
+        cursor:pointer;
+        zoom:1;
+}
+
+dl.accordion-menu dd.a-m-d {
+        margin: 0;
+        padding: 0;
+    overflow: auto;
+    background-color: #eeeeee;
+    background-image: url(panel_bg.jpg);
+    background-repeat: repeat-x;
+    font-weight: normal;
+}
+
+dl.accordion-menu dd.a-m-d .link {
+        margin: 0;
+        padding: 0;
+    display: block;
+    width: 118px;
+        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;
+}
+
+dl.accordion-menu dd.a-m-d .link img {
+margin-left:-20px;
+}
+
+dl.accordion-menu dd.a-m-d .link:hover {
+
+    color: blue;
+    background-color: #F5F5F5;
+}
+
+html.accordion-menu-js dd.a-m-d{
+        margin: 0;
+        padding: 0;
+        display:none;
+}
+
+
+html.accordion-menu-js dd.a-m-d-expand {
+        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;
+}
+
+
+html.accordion-menu-js dt.a-m-t-expand {
+        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;  
+}
+
+
+
+
+
+

www/extras/wobject/Matrix/matrix.js

@@ -1,7 +1,7 @@
 YAHOO.util.Event.addListener(window, "load", function() {
     YAHOO.example.XHR_JSON = new function() {
         this.formatUrl = function(elCell, oRecord, oColumn, sData) {
-            elCell.innerHTML = "<a href='" + oRecord.getData("url") + "' target='_blank'>" + sData + "</a>";
+            elCell.innerHTML = "<a href='" + oRecord.getData("url") + "'>" + sData + "</a>";
         };
 	this.formatCheckBox = function(elCell, oRecord, oColumn, sData) { 
 		var innerHTML = "<input type='checkbox' name='listingId' value='" + sData + "' id='" + sData + "_checkBox'";
@@ -23,6 +23,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
 
 	var uri = "func=getCompareFormData";
 		if(typeof(listingIds) != 'undefined'){
+		uri = uri + ';__listingId_isIn=1';
 		for (var i = 0; i < listingIds.length; i++) {
 			uri = uri+';listingId='+listingIds[i];
 		}
@@ -33,7 +34,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
         this.myDataSource.connXhrMode = "queueRequests";
         this.myDataSource.responseSchema = {
             resultsList: "ResultSet.Result",
-            fields: ["title","views","clicks","compares","checked","lastUpdated","url","assetId"]
+            fields: ["title",{key: "views", parser: "number"},{key: "clicks", parser: "number"},{key: "compares", parser: "number"},{key: "checked"},{key: "lastUpdated", parser: "number"},"url","assetId"]
         };
 
         this.myDataTable = new YAHOO.widget.DataTable("compareForm", myColumnDefs,

www/extras/wobject/Matrix/matrixCompareList.js

@@ -71,8 +71,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
 	}
 
 	this.myDataSource.doBeforeParseData = function (oRequest, oFullResponse) {
-		myDataTable.getRecordSet().reset();
-		myDataTable.refreshView();
+		this.responseSchema.fields = oFullResponse.ResponseFields;
 		var existingColumns = myDataTable.getColumnSet().keys;
 		for (var i = 0; i < existingColumns.length; i++) {
 		if(i > 1){
@@ -114,6 +113,9 @@ YAHOO.util.Event.addListener(window, "load", function() {
 				uri = uri+';listingId='+compareCheckBoxes[i].value;
 			}
 		}
+		myDataTable.getRecordSet().reset();
+		myDataTable.refreshView();
+		myDataTable.showTableMessage('Loading...');
             	this.myDataSource.sendRequest(uri,callback2); 
         },this,true);
 
@@ -126,6 +128,9 @@ YAHOO.util.Event.addListener(window, "load", function() {
 				uri = uri+';listingId='+compareCheckBoxes[i].value;
 			}
 		}
+		myDataTable.getRecordSet().reset();
+		myDataTable.refreshView();
+		myDataTable.showTableMessage('Loading...');
             	this.myDataSource.sendRequest(uri,callback2); 
         },this,true);
 

www/extras/wobject/Matrix/matrixSearch.js

@@ -3,7 +3,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
 	var Dom = YAHOO.util.Dom;
 
         this.formatUrl = function(elCell, oRecord, oColumn, sData) {
-            elCell.innerHTML = "<a href='" + oRecord.getData("url") + "' target='_blank'>" + sData + "</a>";
+            elCell.innerHTML = "<a href='" + oRecord.getData("url") + "'>" + sData + "</a>";
         };
 	this.formatCheckBox = function(elCell, oRecord, oColumn, sData) { 
 		var innerHTML = "<input type='checkbox' name='listingId' value='" + sData + "' id='" + sData + "_checkBox'";
@@ -37,16 +37,11 @@ YAHOO.util.Event.addListener(window, "load", function() {
         var myDataTable = new YAHOO.widget.DataTable("compareForm", myColumnDefs,
                 this.myDataSource, {initialRequest:uri});
 
-	this.myDataSource.doBeforeParseData = function (oRequest, oFullResponse) {
-		myDataTable.getRecordSet().reset();
-		return oFullResponse;
-	}
 	var myDataSource = this.myDataSource;
 
         var myCallback = function() {
-		myDataTable.getRecordSet().reset();
-            this.set("sortedBy", null);
-            this.onDataReturnAppendRows.apply(this,arguments);
+		this.set("sortedBy", null);
+            	this.onDataReturnAppendRows.apply(this,arguments);
 		compareFormButton();
         };
 
@@ -66,6 +61,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
         	}
 		myDataTable.getRecordSet().reset();
 		myDataTable.refreshView();
+		myDataTable.showTableMessage('Loading...');
 		
 		myDataSource.sendRequest(newUri,callback2);
 		

www/extras/yui-webgui/build/assetManager/assetManager.js

@@ -46,16 +46,19 @@ WebGUI.AssetManager.addHighlightToRow
     Build a WebGUI style "More" menu for the asset referred to by url
 */
 WebGUI.AssetManager.buildMoreMenu
-= function ( url, linkElement ) {
+= function ( url, linkElement, isNotLocked ) {
     // Build a more menu
     var rawItems    = WebGUI.AssetManager.MoreMenuItems;
     var menuItems   = [];
+    var isLocked    = !isNotLocked;
     for ( var i = 0; i < rawItems.length; i++ ) {
         var itemUrl     = rawItems[i].url.match( /<url>/ )
                         ? rawItems[i].url.replace( /<url>(?:\?(.*))?/, WebGUI.AssetManager.appendToUrl(url, "$1") )
                         : url + rawItems[i].url
                         ;
-        menuItems.push( { "url" : itemUrl, "text" : rawItems[i].label } );
+        if (! (itemUrl.match( /func=edit;/) && isLocked )) {
+            menuItems.push( { "url" : itemUrl, "text" : rawItems[i].label } );
+        }
     }
     var options = {
         "zindex"                    : 1000,
@@ -109,7 +112,7 @@ WebGUI.AssetManager.formatActions = function ( elCell, oRecord, oColumn, orderNu
         oldMenu.parentNode.removeChild( oldMenu );
     }
 
-    var options = WebGUI.AssetManager.buildMoreMenu(oRecord.getData( 'url' ), more);
+    var options = WebGUI.AssetManager.buildMoreMenu(oRecord.getData( 'url' ), more, oRecord.getData( 'actions' ));
 
     var menu    = new YAHOO.widget.Menu( "moreMenu" + oRecord.getData( 'assetId' ), options );
     YAHOO.util.Event.onDOMReady( function () { menu.render( document.getElementById( 'assetManager' ) ) } );
@@ -346,10 +349,10 @@ WebGUI.AssetManager.selectRow = function ( child ) {
     Build a More menu for the last element of the Crumb trail
 */
 WebGUI.AssetManager.showMoreMenu 
-= function ( url, linkTextId ) {
+= function ( url, linkTextId, isNotLocked ) {
     var more    = document.getElementById(linkTextId);
 
-    var options = WebGUI.AssetManager.buildMoreMenu(url, more);
+    var options = WebGUI.AssetManager.buildMoreMenu(url, more, isNotLocked);
 
     var menu    = new YAHOO.widget.Menu( "crumbMoreMenu", options );
     menu.render( document.getElementById( 'assetManager' ) );

www/extras/yui-webgui/build/form/datatable.js

@@ -91,6 +91,7 @@ WebGUI.Form.DataTable
             delete data.columns[ i ].editorOptions;
         }
 
+        YAHOO.lang.JSON.dateToString = function(d) { return d.toString(); }; /* this overrides the default stringify date format */
         return YAHOO.lang.JSON.stringify( data );
     };