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

Merge branch 'master' into survey

Browse source 
* master: (127 commits)
  Prefill in the email address in the ITransact credentials form from the user's Shop address.
  fixed Matrix best/worst rated lists
  Fix bad form variable for phone number in EMS Badge address info.
  - Added a switch to allow the use of non-WebGUI objects with the Workflow
  fixing a problem with previous survey fix
  fixed #9671: Survey - breaks admin bar
  fixed a Matrix sql problem
  i18n the image labels and title for the asset manager, manage screen.
  Prevent an imported package from changing the a current asset's status from pending to anything else.
  Remove trailing comma in Shop/Transaction JS so IE6 works.
  fixed documentation
  fixed a bug when a matrix listing didn't have a forum attached
  small char encoding fix to merged upgrade
  fix small issue in addChild
  adding merge point
  Fix a problem with purging an EMS.
  Update this template so that it passes the template i18n test.
  Fix a broken i18n label in answer edit template for the Survey.
  Unify all Survey CSS into 1 file, and use it.
  Adding/fixing Survey i18n and Help
  ...

Conflicts:
	lib/WebGUI/Asset/Wobject/Survey.pm
	lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
	lib/WebGUI/i18n/English/Asset_Survey.pm
	www/extras/wobject/Survey/editsurvey/object.js
This commit is contained in:
Patrick Donelan 2009-02-10 07:57:42 +00:00
commit b0c5c09461
127 changed files with 5481 additions and 677 deletions
Download patch file Download diff file Expand all files Collapse all files

3
www/extras/account/account.css
View file

@ -380,8 +380,7 @@ ul.topTabs li {
list-style-type:none;
}
ul.topTabs li {
display:block;
float:left;
display:inline-block;
margin-right: 5px;
}
ul.topTabs li b {

4
www/extras/hoverhelp.js
View file

@ -13,8 +13,10 @@ function initHoverHelp (root) {
for (var i = tips.length; i--; ) {
var myTip = new YAHOO.widget.Tooltip(tips[i], {
autodismissdelay: 1000000,
context: tips[i].parentNode
context: tips[i].parentNode,
text : tips[i].innerHTML
});
tips[i].innerHTML = "";
}
}
YAHOO.util.Event.onDOMReady(initHoverHelp,'');

5
www/extras/wgwidget.js
View file

@ -30,7 +30,7 @@ WebGUI.widgetBox = {
return widgetFrame;
},
widget : function( url, parentId, width, height, templateId ) {
widget : function( url, parentId, width, height, templateId, styleTemplateId ) {
if(url == "") {
return "<iframe scrolling='no'><body>No content available from "+url+"</body></iframe>";
}
@ -49,6 +49,7 @@ WebGUI.widgetBox = {
this.url = url + "?func=widgetView&templateId=" + templateId;
this.url += ";width=" + width;
this.url += ";height=" + height;
this.url += ";styleTemplateId=" + styleTemplateId;
}
this.parentNodeId = parentId;
@ -111,7 +112,7 @@ WebGUI.widgetBox = {
var jsCode = "";
jsCode += "&lt;script type='text/javascript' src='" + params.wgWidgetPath + "'&gt; &lt;/script&gt;";
jsCode += "&lt;script type='text/javascript'&gt;";
jsCode += "document.write(WebGUI.widgetBox.widget('" + params.fullUrl + "', '" + params.assetId + "', " + params.width + ", " + params.height + ", '" + params.templateId + "')); &lt;/script&gt;";
jsCode += "document.write(WebGUI.widgetBox.widget('" + params.fullUrl + "', '" + params.assetId + "', " + params.width + ", " + params.height + ", '" + params.templateId + "', '" + params.styleTemplateId + "')); &lt;/script&gt;";
// Instantiate the Dialog
codeGeneratorButton = new YAHOO.widget.SimpleDialog("codeGeneratorButton", {

1
www/extras/wobject/Survey/editsurvey/object.js
View file

@ -121,6 +121,7 @@ Survey.ObjectTemplate = (function(){
editor.render();
dialog.show();
initHoverHelp(type);
}
};
})();

12
www/extras/yui-webgui/build/assetManager/assetManager.js vendored
View file

@ -151,12 +151,12 @@ WebGUI.AssetManager.formatLockedBy = function ( elCell, oRecord, oColumn, orderN
elCell.innerHTML
= oRecord.getData( 'lockedBy' )
? '<a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'func=manageRevisions') + '">'
+ '<img src="' + extras + '/assetManager/locked.gif" alt="locked by ' + oRecord.getData( 'lockedBy' ) + '" '
+ 'title="locked by ' + oRecord.getData( 'lockedBy' ) + '" border="0" />'
+ '<img src="' + extras + '/assetManager/locked.gif" alt="' + WebGUI.AssetManager.i18n.get('WebGUI', 'locked by') + ' ' + oRecord.getData( 'lockedBy' ) + '" '
+ 'title="' + WebGUI.AssetManager.i18n.get('WebGUI', 'locked by') + ' ' + oRecord.getData( 'lockedBy' ) + '" border="0" />'
+ '</a>'
: '<a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'func=manageRevisions') + '">'
+ '<img src="' + extras + '/assetManager/unlocked.gif" alt="unlocked" '
+ 'title="unlocked" border="0" />'
+ '<img src="' + extras + '/assetManager/unlocked.gif" alt="' + WebGUI.AssetManager.i18n.get('WebGUI', 'unlocked') + '" '
+ 'title="' + WebGUI.AssetManager.i18n.get('WebGUI', 'unlocked') +'" border="0" />'
+ '</a>'
;
};
@ -231,7 +231,9 @@ WebGUI.AssetManager.initManager = function (o) {
namespaces : {
'Asset' : [
"edit",
"More"
"More",
"unlocked",
"locked by"
],
'WebGUI' : [
"< prev",