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

className is the full class name. type is the i18n name

Browse source
This commit is contained in:
Doug Bell 2011-04-19 14:01:25 -05:00
parent 45ca3ea8d8
commit 8906c3f28a
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/WebGUI/Admin.pm
View file

@ -145,7 +145,8 @@ sub getAssetData {
canEdit => $asset->canEdit && $asset->canEditIfLocked, canEdit => $asset->canEdit && $asset->canEditIfLocked,
helpers => $asset->getHelpers, helpers => $asset->getHelpers,
icon => $asset->getIcon("small"), icon => $asset->getIcon("small"),
className => $asset->getName, type => $asset->getName,
className => $asset->className,
revisions => [ $asset->getRevisionDates ], revisions => [ $asset->getRevisionDates ],
); );

18
www/extras/admin/admin.js
View file

@ -520,7 +520,7 @@ WebGUI.Admin.prototype.updateAssetHelpers
= function ( assetDef ) { = function ( assetDef ) {
var typeEl = document.getElementById( 'helper_asset_name' ); var typeEl = document.getElementById( 'helper_asset_name' );
typeEl.style.backgroundImage = 'url(' + assetDef.icon + ')'; typeEl.style.backgroundImage = 'url(' + assetDef.icon + ')';
typeEl.innerHTML = assetDef.className; typeEl.innerHTML = assetDef.type;
// Clear old helpers // Clear old helpers
var helperEl = document.getElementById( 'helper_list' ); var helperEl = document.getElementById( 'helper_list' );
@ -1328,7 +1328,7 @@ WebGUI.Admin.AssetTable
{ key: 'canEdit' }, { key: 'canEdit' },
{ key: 'helpers' }, { key: 'helpers' },
{ key: 'title' }, { key: 'title' },
{ key: 'className' }, { key: 'type' },
{ key: 'revisionDate' }, { key: 'revisionDate' },
{ key: 'assetSize' }, { key: 'assetSize' },
{ key: 'lockedBy' }, { key: 'lockedBy' },
@ -1362,10 +1362,10 @@ WebGUI.Admin.AssetTable
sortable: true sortable: true
}, },
{ {
key: 'className', key: 'type',
label: window.admin.i18n.get('Asset','type'), label: window.admin.i18n.get('Asset','type'),
sortable: true, sortable: true,
formatter: bind( this, this.formatClassName ) formatter: bind( this, this.formatType )
}, },
{ {
key: 'revisionDate', key: 'revisionDate',
@ -1476,13 +1476,13 @@ WebGUI.Admin.AssetTable.prototype.formatAssetSize
}; };
/** /**
* formatClassName ( ) * formatType ( )
* Format the asset class name * Format the asset class name
*/ */
WebGUI.Admin.AssetTable.prototype.formatClassName WebGUI.Admin.AssetTable.prototype.formatType
= function ( elCell, oRecord, oColumn, orderNumber ) { = function ( elCell, oRecord, oColumn, orderNumber ) {
elCell.innerHTML = '<img src="' + oRecord.getData( 'icon' ) + '" /> ' elCell.innerHTML = '<img src="' + oRecord.getData( 'icon' ) + '" /> '
+ oRecord.getData( "className" ); + oRecord.getData( "type" );
}; };
/** /**
@ -2538,7 +2538,7 @@ WebGUI.Admin.Search.prototype.addFilter
filter.dataSource.responseType = YAHOO.util.XHRDataSource.TYPE_JSON; filter.dataSource.responseType = YAHOO.util.XHRDataSource.TYPE_JSON;
filter.dataSource.responseSchema = { filter.dataSource.responseSchema = {
resultsList : "results", resultsList : "results",
fields : [ 'className', 'title', 'icon' ] fields : [ 'type', 'title', 'icon' ]
}; };
createAutocomplete( li, filter ); createAutocomplete( li, filter );
@ -2546,7 +2546,7 @@ WebGUI.Admin.Search.prototype.addFilter
filter.autocomplete.formatResult = function ( result, query, match ) { filter.autocomplete.formatResult = function ( result, query, match ) {
return '<div style="float: left; width: 50px; height: 50px; background: url(' + result.icon + ') no-repeat 50% 50%;"></div>' return '<div style="float: left; width: 50px; height: 50px; background: url(' + result.icon + ') no-repeat 50% 50%;"></div>'
+ '<div class="autocomplete_value">' + result.name + "</div>" + '<div class="autocomplete_value">' + result.name + "</div>"
+ '<div class="autocomplete_subtext">' + result.className + '</div>'; + '<div class="autocomplete_subtext">' + result.type + '</div>';
}; };