Merge branch 'WebGUI8' of github.com:plainblack/webgui into WebGUI8
Conflicts: www/extras/admin/admin.js
This commit is contained in:
David Delikat
commit
ffbc759dd2
222 changed files with 2532 additions and 1732 deletions
|
|
@ -31,10 +31,6 @@ WebGUI.Admin = function(cfg){
|
|||
}
|
||||
|
||||
// TODO: This should be i18n
|
||||
this.localeMonths = [
|
||||
'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August',
|
||||
'September', 'October', 'November', 'December'
|
||||
];
|
||||
|
||||
// Custom events
|
||||
this.afterNavigate = new YAHOO.util.CustomEvent( "afterNavigate", this );
|
||||
|
|
@ -124,6 +120,20 @@ WebGUI.Admin = function(cfg){
|
|||
// Private methods
|
||||
// Initialize these things AFTER the i18n is fetched
|
||||
var _init = function () {
|
||||
self.localeMonths = [
|
||||
self.i18n.get('DateTime', 'january'),
|
||||
self.i18n.get('DateTime', 'february'),
|
||||
self.i18n.get('DateTime', 'march'),
|
||||
self.i18n.get('DateTime', 'april'),
|
||||
self.i18n.get('DateTime', 'may'),
|
||||
self.i18n.get('DateTime', 'june'),
|
||||
self.i18n.get('DateTime', 'july'),
|
||||
self.i18n.get('DateTime', 'august'),
|
||||
self.i18n.get('DateTime', 'september'),
|
||||
self.i18n.get('DateTime', 'october'),
|
||||
self.i18n.get('DateTime', 'november'),
|
||||
self.i18n.get('DateTime', 'december')
|
||||
];
|
||||
self.afterNavigate.subscribe( self.requestUpdateCurrentVersionTag, self );
|
||||
self.requestUpdateCurrentVersionTag();
|
||||
|
||||
|
|
@ -148,10 +158,13 @@ WebGUI.Admin = function(cfg){
|
|||
// Get I18N
|
||||
this.i18n = new WebGUI.i18n( {
|
||||
namespaces : {
|
||||
'WebGUI' : [ '< prev', 'next >', 'locked by' ],
|
||||
'Asset' : [ 'rank', '99', 'type', 'revision date', 'size', 'locked', 'More', 'unlocked', 'edit',
|
||||
'update', 'delete', '43', 'cut', 'Copy', 'duplicate', 'create shortcut'
|
||||
]
|
||||
'WebGUI' : [ '< prev', 'next >', 'locked by', '364', 'Loading...' ],
|
||||
'Asset' : [ 'rank', '99', 'type', 'revision date', 'size', 'locked', 'More', 'unlocked', 'edit',
|
||||
'update', 'delete', '43', 'cut', 'Copy', 'duplicate', 'create shortcut'
|
||||
],
|
||||
'DateTime' : [ 'january', 'february', 'march', 'april', 'may', 'june',
|
||||
'july', 'august', 'september', 'october', 'november', 'december'
|
||||
]
|
||||
},
|
||||
onpreload : {
|
||||
fn : _init
|
||||
|
|
@ -943,7 +956,7 @@ WebGUI.Admin.prototype.openTab
|
|||
|
||||
// Prepare the tab
|
||||
var newTab = new YAHOO.widget.Tab({
|
||||
label : "Loading...",
|
||||
label : window.admin.i18n.get('WebGUI','Loading...'),
|
||||
content : ''
|
||||
});
|
||||
newTab.get('contentEl').appendChild( iframe );
|
||||
|
|
@ -1399,25 +1412,25 @@ WebGUI.Admin.AssetTable
|
|||
},
|
||||
{
|
||||
key: 'title',
|
||||
label: window.admin.i18n.get('Asset', '99'),
|
||||
label: admin.i18n.get('Asset', '99'),
|
||||
formatter: bind( this, this.formatTitle ),
|
||||
sortable: true
|
||||
},
|
||||
{
|
||||
key: 'type',
|
||||
label: window.admin.i18n.get('Asset','type'),
|
||||
sortable: true,
|
||||
label: admin.i18n.get('Asset','type'),
|
||||
sortable: false,
|
||||
formatter: bind( this, this.formatType )
|
||||
},
|
||||
{
|
||||
key: 'revisionDate',
|
||||
label: window.admin.i18n.get('Asset','revision date' ),
|
||||
label: admin.i18n.get('Asset','revision date' ),
|
||||
formatter: bind( this, this.formatRevisionDate ),
|
||||
sortable: true
|
||||
},
|
||||
{
|
||||
key: 'assetSize',
|
||||
label: window.admin.i18n.get('Asset','size' ),
|
||||
label: admin.i18n.get('Asset','size' ),
|
||||
formatter: bind( this, this.formatAssetSize ),
|
||||
sortable: true
|
||||
},
|
||||
|
|
@ -1494,7 +1507,7 @@ WebGUI.Admin.AssetTable.prototype.addMenuOpenHandler
|
|||
= function ( elem, assetId, helpers ) {
|
||||
var self = this;
|
||||
YAHOO.util.Event.addListener( elem, "click", function(){
|
||||
self.showHelperMenu( elem, assetId, helpers );
|
||||
self.admin.showHelperMenu( elem, assetId, helpers );
|
||||
} );
|
||||
};
|
||||
|
||||
|
|
@ -2205,14 +2218,14 @@ WebGUI.Admin.Tree.prototype.onDataReturnInitializeTable
|
|||
elItem.className = "clickable";
|
||||
var self = this;
|
||||
var crumbMenu = function () {
|
||||
self.showHelperMenu( elItem, currentAssetId, currentHelpers );
|
||||
self.admin.showHelperMenu( elItem, currentAssetId, currentHelpers );
|
||||
};
|
||||
YAHOO.util.Event.addListener( elItem, "click", crumbMenu, this, true );
|
||||
elItem.appendChild( document.createTextNode( oResponse.meta.currentAsset.title ) );
|
||||
elCrumb.appendChild( elItem );
|
||||
|
||||
// TODO: Update current asset
|
||||
window.admin.navigate( oResponse.meta.currentAsset.assetId );
|
||||
window.admin.navigate( currentAssetId );
|
||||
|
||||
// TODO Hide loading screen
|
||||
};
|
||||
|
|
@ -2420,7 +2433,7 @@ WebGUI.Admin.Search
|
|||
newForm.style.display = "block";
|
||||
|
||||
var newTab = new YAHOO.widget.Tab({
|
||||
label : "Search",
|
||||
label : window.admin.i18n.get('WebGUI','364'),
|
||||
content : ''
|
||||
});
|
||||
this.tab = newTab;
|
||||
|
|
@ -2500,7 +2513,7 @@ WebGUI.Admin.Search.prototype.addFilter
|
|||
|
||||
var type = menuitem.value;
|
||||
filter.type = type;
|
||||
li.className = "filter_" + filter.type;
|
||||
li.mlassName = "filter_" + filter.type;
|
||||
|
||||
var ul = this.searchFiltersContainer;
|
||||
ul.appendChild( li );
|
||||
|
|
@ -2637,7 +2650,7 @@ WebGUI.Admin.Search.prototype.addFilter
|
|||
filter.button = new YAHOO.widget.Button( {
|
||||
name : "className",
|
||||
type : "menu",
|
||||
label : "Choose...",
|
||||
label : window.admin.i18n.get('WebGUI','Choose...'),
|
||||
container : li,
|
||||
menu : filter.menu
|
||||
} );
|
||||
|
|
|
|||
19
www/extras/yui-webgui/build/form/datatable.js
vendored
19
www/extras/yui-webgui/build/form/datatable.js
vendored
|
|
@ -1,4 +1,5 @@
|
|||
|
||||
/*global WebGUI*/
|
||||
// Initialize namespace
|
||||
if (typeof WebGUI == "undefined") {
|
||||
var WebGUI = {};
|
||||
|
|
@ -49,7 +50,7 @@ WebGUI.Form.DataTable
|
|||
data = {};
|
||||
var columns = this.dataTable.getColumnSet().getDefinitions();
|
||||
for ( var i = 0; i < columns.length; i++ ) {
|
||||
data[ columns[ i ].key ] = columns[i].formatter == "date" ? new Date : "";
|
||||
data[ columns[ i ].key ] = columns[i].formatter == "date" ? new Date() : "";
|
||||
}
|
||||
}
|
||||
this.dataTable.addRow( data );
|
||||
|
|
@ -85,7 +86,7 @@ WebGUI.Form.DataTable
|
|||
|
||||
// Get the columns
|
||||
var cols = this.dataTable.getColumnSet().getDefinitions();
|
||||
for ( var i = 0; i < cols.length; i++ ) {
|
||||
for ( i = 0; i < cols.length; i++ ) {
|
||||
data.columns[ i ] = cols[i];
|
||||
delete data.columns[ i ].editor;
|
||||
delete data.columns[ i ].editorOptions;
|
||||
|
|
@ -459,10 +460,12 @@ WebGUI.Form.DataTable
|
|||
format.name = "format_" + i;
|
||||
|
||||
for ( var x = 0; x < availableFormats.length; x++ ) {
|
||||
var selected = cols[i].formatter == availableFormats[x].value;
|
||||
var opt = new Option(
|
||||
availableFormats[x].label,
|
||||
availableFormats[x].value,
|
||||
cols[i].formatter == availableFormats[x].value
|
||||
selected,
|
||||
selected
|
||||
);
|
||||
format.appendChild( opt );
|
||||
}
|
||||
|
|
@ -606,7 +609,7 @@ WebGUI.Form.DataTable
|
|||
var oldKey = data[ "oldKey_" + i ];
|
||||
var newKey = data[ "newKey_" + i ];
|
||||
var format = data[ "format_" + i ][0];
|
||||
var col = this.dataTable.getColumn( oldKey );
|
||||
col = this.dataTable.getColumn( oldKey );
|
||||
|
||||
// Don't allow adding multiple columns with same key
|
||||
if ( oldKey != newKey && this.dataTable.getColumn( newKey ) ) {
|
||||
|
|
@ -618,9 +621,9 @@ WebGUI.Form.DataTable
|
|||
// If the key has changed, update the row data
|
||||
if ( col && col.key != newKey ) {
|
||||
var rows = this.dataTable.getRecordSet().getRecords();
|
||||
for ( var i = 0; i < rows.length; i++ ) {
|
||||
rows[ i ].setData( newKey, rows[ i ].getData( oldKey ) );
|
||||
rows[ i ].setData( oldKey, undefined );
|
||||
for ( var r = 0; r < rows.length; r++ ) {
|
||||
rows[ r ].setData( newKey, rows[ r ].getData( oldKey ) );
|
||||
rows[ r ].setData( oldKey, undefined );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -655,7 +658,7 @@ WebGUI.Form.DataTable
|
|||
var numRecords = allRecords.length;
|
||||
for (j=0; j < numRecords; j++) {
|
||||
if (format == "date") {
|
||||
allRecords[j].setData(newKey, new Date);
|
||||
allRecords[j].setData(newKey, new Date());
|
||||
} else {
|
||||
allRecords[j].setData(newKey, '');
|
||||
}
|
||||
|
|
|
|||
10
www/extras/yui-webgui/build/layout/draggable.js
vendored
10
www/extras/yui-webgui/build/layout/draggable.js
vendored
|
|
@ -8,17 +8,17 @@ var draggableObjectList=new Array();
|
|||
//Internal Config (Do not Edit)
|
||||
|
||||
//browser check
|
||||
var dom=document.getElementById&&!document.all
|
||||
//var dom=document.getElementById&&!document.all
|
||||
var docElement = document.documentElement;
|
||||
var pageURL = "";
|
||||
var topelement=dom? "HTML" : "BODY"
|
||||
//var topelement=dom? "HTML" : "BODY"
|
||||
var pageHeight=0;
|
||||
var pageWidth=0;
|
||||
var scrollJump=50;
|
||||
var blankCount=1;
|
||||
|
||||
var Dom = YAHOO.util.Dom;
|
||||
var Event = YAHOO.util.Event;
|
||||
//var Event = YAHOO.util.Event;
|
||||
var DDM = YAHOO.util.DragDropMgr;
|
||||
|
||||
|
||||
|
|
@ -26,6 +26,8 @@ var DDM = YAHOO.util.DragDropMgr;
|
|||
//goes up the parent tree until class is found. If not found, returns null
|
||||
function dragable_getObjectByClass(target,clazz) {
|
||||
var classMatch = new RegExp("\\b" + clazz + "\\b");
|
||||
var dom=document.getElementById&&!document.all;
|
||||
var topelement=dom? "HTML" : "BODY";
|
||||
while (target.tagName!=topelement && target.className.search(classMatch) == -1){
|
||||
target=dom? target.parentNode : target.parentElement
|
||||
}
|
||||
|
|
@ -153,7 +155,7 @@ YAHOO.extend(YAHOO.webgui.DDList, YAHOO.util.DDProxy, {
|
|||
|
||||
onDrag: function(e) {
|
||||
// Keep track of the direction of the drag for use during onDragOver
|
||||
var y = Event.getPageY(e);
|
||||
var y = YAHOO.util.Event.getPageY(e);
|
||||
if (y < this.lastY) {
|
||||
this.goingUp = true;
|
||||
} else if (y > this.lastY) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue