Menu
▾
▴
andro-hacker — For under-the-hood topics
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
(58) |
Mar
(126) |
Apr
(96) |
May
(42) |
Jun
(59) |
Jul
(80) |
Aug
(95) |
Sep
(99) |
Oct
(137) |
Nov
(54) |
Dec
(138) |
| 2009 |
Jan
(174) |
Feb
(83) |
Mar
(36) |
Apr
(22) |
May
(16) |
Jun
(11) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ken...@us...> - 2009-02-19 21:26:03
|
Revision: 1262
http://andro.svn.sourceforge.net/andro/?rev=1262&view=rev
Author: kendowns
Date: 2009-02-19 21:25:59 +0000 (Thu, 19 Feb 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/debian/debian/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-19 21:25:53
|
Revision: 1261
http://andro.svn.sourceforge.net/andro/?rev=1261&view=rev
Author: kendowns
Date: 2009-02-19 21:25:48 +0000 (Thu, 19 Feb 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/debian/application/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-19 21:22:21
|
Revision: 1260
http://andro.svn.sourceforge.net/andro/?rev=1260&view=rev
Author: kendowns
Date: 2009-02-19 21:22:11 +0000 (Thu, 19 Feb 2009)
Log Message:
-----------
Debian Install Files
Added Paths:
-----------
trunk/debian/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-18 15:20:53
|
Revision: 1259
http://andro.svn.sourceforge.net/andro/?rev=1259&view=rev
Author: kendowns
Date: 2009-02-18 15:20:49 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
First possible release candidate 1
Added Paths:
-----------
releases/2009.02.18/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-18 15:11:56
|
Revision: 1258
http://andro.svn.sourceforge.net/andro/?rev=1258&view=rev
Author: kendowns
Date: 2009-02-18 15:11:54 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Sourceforge bug 2612968. Fixed regression after bug 2612810.
Modified Paths:
--------------
trunk/andro/lib/androLib.php
Modified: trunk/andro/lib/androLib.php
===================================================================
--- trunk/andro/lib/androLib.php 2009-02-18 15:03:06 UTC (rev 1257)
+++ trunk/andro/lib/androLib.php 2009-02-18 15:11:54 UTC (rev 1258)
@@ -3015,16 +3015,16 @@
$iWidth = $width;
if($table_id_fko <> '') {
$iWidth -= x6cssdefine('bodyfs','12px')*.67*5;
- $this->colStyles[$styleId]
+ $this->colStyles[$styleId.' input']
="width: {$iWidth}px; $cssExtra";
}
else if($type_id == 'mime-f') {
$iWidth -= x6cssdefine('bodyfs','12px')*.67*20;
- $this->colStyles[$styleId]
+ $this->colStyles[$styleId.' input']
="width: {$iWidth}px; $cssExtra";
}
else if(!in_array($type_id,array('cbool','gender'))) {
- $this->colStyles[$styleId]
+ $this->colStyles[$styleId.' input']
="width: {$iWidth}px; $cssExtra";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-18 15:03:10
|
Revision: 1257
http://andro.svn.sourceforge.net/andro/?rev=1257&view=rev
Author: kendowns
Date: 2009-02-18 15:03:06 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Sourceforge bug 2612810. Clicking on child tables "jumbled" search results. Fixed by using unique styles to prevent styles overwriting each other.
Modified Paths:
--------------
trunk/andro/lib/androLib.php
Modified: trunk/andro/lib/androLib.php
===================================================================
--- trunk/andro/lib/androLib.php 2009-02-18 14:41:03 UTC (rev 1256)
+++ trunk/andro/lib/androLib.php 2009-02-18 15:03:06 UTC (rev 1257)
@@ -2921,7 +2921,7 @@
$input->hp['value'] ="*VALUE_$colname*";
$input->hp['xClassRow'] = 0;
$input->hp['xTabGroup'] = 'rowEdit';
- $wrapper->addClass('cell_'.$colname);
+ $wrapper->addClass($this->hp['id'].'_'.$colname);
if(!in_array($colinfo['type_id'],array('cbool','gender'))){
unset($input->hp['size']);
}
@@ -3010,28 +3010,28 @@
if(in_array($type_id,array('int','numb','money'))) {
$cssExtra = 'text-align: right';
}
- $this->colStyles['div.cell_'.$column_id]
- ="width: {$width}px; $cssExtra";
+ $styleId = 'div.'.$this->hp['id'].'_'.$column_id;
+ $this->colStyles[$styleId] ="width: {$width}px; $cssExtra";
$iWidth = $width;
if($table_id_fko <> '') {
$iWidth -= x6cssdefine('bodyfs','12px')*.67*5;
- $this->colStyles['div.cell_'.$column_id.' input']
+ $this->colStyles[$styleId]
="width: {$iWidth}px; $cssExtra";
}
else if($type_id == 'mime-f') {
$iWidth -= x6cssdefine('bodyfs','12px')*.67*20;
- $this->colStyles['div.cell_'.$column_id.' input']
+ $this->colStyles[$styleId]
="width: {$iWidth}px; $cssExtra";
}
else if(!in_array($type_id,array('cbool','gender'))) {
- $this->colStyles['div.cell_'.$column_id.' input']
+ $this->colStyles[$styleId]
="width: {$iWidth}px; $cssExtra";
}
# Finally, generate the HTML.
$div = $this->dhead->h('div',$description);
$div->hp['xColumn'] = $column_id;
- $div->addclass('cell_'.$column_id);
+ $div->addclass($this->hp['id'].'_'.$column_id);
$this->headers[] = $div;
}
/****m* androHtmlGrid/lastColumn
@@ -3200,7 +3200,10 @@
}
if($class!='') $div->addClass($class);
$div->hp['gColumn'] = $this->lastCell;
- $div->addClass('cell_'.$this->columns[$this->lastCell]['column_id']);
+ $div->addClass(
+ $this->hp['id']
+ .'_'.$this->columns[$this->lastCell]['column_id']
+ );
/*
$div->hp['style'] ="
overflow: hidden;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-18 14:41:07
|
Revision: 1256
http://andro.svn.sourceforge.net/andro/?rev=1256&view=rev
Author: kendowns
Date: 2009-02-18 14:41:03 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Sourceforge Bug 2612788. Child table heights not correct.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-02-18 14:37:42 UTC (rev 1255)
+++ trunk/andro/clib/x6.js 2009-02-18 14:41:03 UTC (rev 1256)
@@ -6184,7 +6184,7 @@
function() {
$(ui.panel).animate({height: newHeightT},spd,null
,function() {
- x6tabs.slideUpData(tabsUl,newChild,newHeight);
+ x6tabs.slideUpData(tabsUl,newChild,newHeightT);
x6.byId(topPane).currentChild = newChild;
}
);
@@ -6204,7 +6204,7 @@
,function() {
$(ui.panel).animate({height: newHeightT},400,null
,function() {
- x6tabs.slideUpData(tabsUl,newChild,newHeight);
+ x6tabs.slideUpData(tabsUl,newChild,newHeightT);
x6.byId(topPane).currentChild = newChild;
}
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-18 14:37:47
|
Revision: 1255
http://andro.svn.sourceforge.net/andro/?rev=1255&view=rev
Author: kendowns
Date: 2009-02-18 14:37:42 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Sourceforge bug 2612788. Sorting on empty grid displayed raw JSON result instead of empty grid.
Modified Paths:
--------------
trunk/andro/lib/androX6.php
Modified: trunk/andro/lib/androX6.php
===================================================================
--- trunk/andro/lib/androX6.php 2009-02-18 14:28:42 UTC (rev 1254)
+++ trunk/andro/lib/androX6.php 2009-02-18 14:37:42 UTC (rev 1255)
@@ -372,9 +372,11 @@
}
# <----- RETURN (MAYBE)
+ # Sourceforge 2612788 - this is actually an exit, not
+ # a return.
if(count($awhere) == 0 ) {
if(gp('xReturnAll','N')=='N' && !$allowNoFilters){
- return;
+ exit;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-18 14:28:50
|
Revision: 1254
http://andro.svn.sourceforge.net/andro/?rev=1254&view=rev
Author: kendowns
Date: 2009-02-18 14:28:42 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Sourceforge bug 2547824.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-02-17 23:36:15 UTC (rev 1253)
+++ trunk/andro/clib/x6.js 2009-02-18 14:28:42 UTC (rev 1254)
@@ -6053,17 +6053,10 @@
// other tab while processing is going on.
tabs.disableAll([ui.index]);
- // If we set objectfocus to '--null--', we turn off events
- // for all objects, which is good, user can't go clicking
- // things during animations. But if they clicked 'hide'
- // we turn the parent back on.
+ // Set object focus to --null--, which turns off all
+ // objects during animation.
var tablePar = x6.p(tabs,'x6parentTable');
- if(ui.index > 0) {
- x6events.fireEvent('objectFocus','--null--');
- }
- else {
- x6events.fireEvent('objectFocus','ddisp_'+tablePar);
- }
+ x6events.fireEvent('objectFocus','--null--');
var topPane = x6.p(tabs,'x6slideUp');
var tpi = x6.p(tabs,'x6slideUpInner');
@@ -6092,6 +6085,9 @@
},
slideUp: function(tabsUl,event,ui,topPane,topPaneI) {
+ // This is animation speed
+ var spd = 400;
+
var obj = x6.byId(topPane);
if(typeof(obj.currentChild)=='undefined') obj.currentChild='*';
var currentChild = obj.currentChild
@@ -6100,65 +6096,121 @@
// if UI.index = 0, they clicked hide.
if(ui.index==0) {
if(currentChild!='*') {
+ // KFD 2/18/09 Sourceforge 2547824
+ // THIS IS IN FINAL FORM. LOOKS GOOD. WORKS.
+ // Sliding tabs around works much better if we first
+ // slide up the inner content, then slide everything
+ // else down.
var newHeight = $('#'+topPane).height()+350;
var newHeightI= $('#'+topPaneI).height()+350;
- $('#'+topPaneI).animate( {height: newHeightI},500,null
- ,function() { $(this).css('overflow-y','scroll'); }
+ $('#'+currentChild).slideUp(200
+ ,function() {
+ // Wait 1/10 of a second and start slidin
+ // the top-outer container down
+ setTimeout(
+ function() {
+ $('#'+topPane).animate(
+ {height: newHeight}
+ ,spd
+ );
+ }
+ ,100
+ );
+ // Wait another 1/10 of a second and start sliding
+ // the top-inner container down. Do all wrap-up
+ // when that is finished.
+ setTimeout(
+ function() {
+ var pt
+ = 'ddisp_'
+ + $(tabsUl).prop('x6parenttable');
+ $('#'+topPaneI).animate(
+ {height: newHeightI}
+ ,spd
+ ,null
+ ,function() {
+ $(this).css('overflow-y','scroll');
+ obj.currentChild = '*';
+ tabsUl.enableAll();
+ x6events.fireEvent(
+ 'objectFocus'
+ ,pt
+ );
+ }
+ );
+ }
+ ,200
+ );
+ }
);
- $('#'+topPane).animate( {height: newHeight},500);
- obj.currentChild = '*';
- tabsUl.enableAll();
- $('#'+currentChild).css('overflow','hidden').height(3);
- x6events.fireEvent(
- 'objectFocus','ddisp_'+$(tabsUl).prop('x6parenttable')
- );
return true;
}
}
- // Make the current tab effectively invisible
- $(ui.panel).css('overflow','hidden').height(3);
-
-
// If no tab, slide up and slide down
if(currentChild=='*') {
var newHeight = $('#'+topPane).height()-350;
var newHeightI= $('#'+topPaneI).height()-350;
- setTimeout(function() {
- $('#'+topPaneI).animate( {height: newHeightI},500,null
- ,function() {
- $(this).css('overflow-y','scroll');
- }
- );
- },100);
- $('#'+topPane).animate( {height: newHeight},500 );
- var newHeight=$(ui.panel).height()+350;
- setTimeout(function() {
- $(ui.panel).animate({height: newHeight},500,null
+
+ // KFD 2/18/09. Sourceforge 2547824
+ // Apparently jQuery loses track of how high an inner
+ // tab should be (or we are not telling it properly).
+ // If a tab was previously displayed and is now
+ // being displayed again, we have to set the height to
+ // 0 before starting, otherwise it ends up twice as
+ // high as it should be.
+ $(ui.panel).height(0);
+
+ // Begin the inner immediately
+ $('#'+topPaneI).animate( {height: newHeightI},spd,null
+ ,function() {
+ $(this).css('overflow-y','scroll');
+ }
+ );
+ // Wait 1/10 of a second and start sliding up the
+ // outer top pane.
+ setTimeout(
+ function() {
+ $('#'+topPane).animate( {height: newHeight},spd );
+ }
+ ,100
+ );
+
+ // Wait another 1/10 of a second and slide down the
+ // tab itself as an animate.
+ var newHeightT=$(ui.panel).height()+350;
+ var newheightT = 353;
+ setTimeout(
+ function() {
+ $(ui.panel).animate({height: newHeightT},spd,null
,function() {
x6tabs.slideUpData(tabsUl,newChild,newHeight);
+ x6.byId(topPane).currentChild = newChild;
}
);
- },200);
- x6.byId(topPane).currentChild = newChild;
+ }
+ ,200
+ );
return true;
}
// If we are still here, they picked one child tab
- // while another was still open. We have to drop down
- // the selected tab. We have to do this even if they
- // swap around between tabs, because jQuery restores the
- // original height (3px or so) when it hides a tab.
+ // while another was still open. We have to slide up
+ // the current tab, then animate the new one down,
+ // then we call for data.
var newHeight=$(ui.panel).height()+350;
- setTimeout(function() {
- $(ui.panel).animate({height: newHeight},500,null
+ var newHeightT = 353;
+ $('#'+currentChild).slideUp(200
+ ,function() {
+ $(ui.panel).animate({height: newHeightT},400,null
,function() {
x6tabs.slideUpData(tabsUl,newChild,newHeight);
+ x6.byId(topPane).currentChild = newChild;
}
);
- $('#'+currentChild).css('overflow','hidden').height(3);
- },100);
- x6.byId(topPane).currentChild = newChild;
+ }
+ );
+
return true;
},
@@ -6645,39 +6697,7 @@
var mw = $('#x6modal').width();
var ww = $(window).width();
var wh = $(window).height();
-
- /*
- // Make sure the width is at least the title
- // and the link
- var h1w = $('#x6modal .x6modaltop b').width();
- var aw = $('#x6modal .x6modaltop a').width();
- if(mw < (h1w + aw +40)) {
- mw = h1w + aw + 40;
- $('#x6modal').css('width',mw);
- }
- // Make sure the height is at least 1/2 of the window
- if(mh < (wh/2)) {
- mh = Math.floor(wh/2);
- $('#x6modal').css('height',mh);
- }
- // Make sure height is notmore than window less 100
- if(mh > (wh - 100)) {
- mh = wh - 100;
- $('#x6modal').css('height',mh);
- }
-
- // Unconditionally set the inner height, who knows
- // where its gone off to.
- var ihNew = mh - $('#x6modal .x6modaltop').height();
- ihNew -= Number($(mObj).attr('xSpacing'));
-
- if(ih > ihNew) {
- $('#x6modal .x6modalinner').css('overflow-y','scroll');
- }
- $('#x6modal .x6modalinner').css('height',ihNew);
- */
-
// now center this guy.
var left = Math.floor( (ww-mw)/2 );
$('#x6modal')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 23:36:21
|
Revision: 1253
http://andro.svn.sourceforge.net/andro/?rev=1253&view=rev
Author: kendowns
Date: 2009-02-17 23:36:15 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
A few more bug fixes for today
Added Paths:
-----------
releases/2009.02.17.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 21:18:17
|
Revision: 1252
http://andro.svn.sourceforge.net/andro/?rev=1252&view=rev
Author: kendowns
Date: 2009-02-17 21:18:15 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Sourceforge bug 2568464. Sorted search results were coming back wrong size.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-02-17 21:08:31 UTC (rev 1251)
+++ trunk/andro/clib/x6.js 2009-02-17 21:18:15 UTC (rev 1252)
@@ -5928,14 +5928,7 @@
$(this).find('.tbody').html('');
return;
}
- //x6.json.addParm('x6action' ,'browseFetch');
- //x6.json.addParm('xSortable' ,'N');
- //x6.json.addParm('xReturnAll' ,'N');
- json.addParm('x6action' ,'browseFetch');
- json.addParm('xSortable' ,x6.p(this,'xSortable' ,'N'));
- json.addParm('xReturnAll' ,'N');
- json.addParm('xGridHeight',x6.p(this,'xGridHeight',500));
- json.addParm('xLookups' ,x6.p(this,'xLookups' ,'N'));
+ this.gridParms(json);
// Add the "exact match" parm if it is part of the
// the grid. Notice it is a one-timer
@@ -5977,12 +5970,8 @@
// Fetch the filters as well
this.addFilters(json);
-
- json.addParm('x6action','browseFetch');
- json.addParm('xGridHeight',x6.p(this,'xGridHeight'));
- json.addParm('xSortable' ,x6.p(this,'xSortable' ));
- json.addParm('xReturnAll' ,x6.p(this,'xReturnAll' ));
- json.addParm('xButtonBar' ,x6.p(this,'xButtonBar','N'));
+ this.gridParms(json);
+
json.addParm('sortCol',args.sortCol);
json.addParm('sortAsc',args.sortAsc);
x6dialogs.pleaseWait();
@@ -6011,6 +6000,14 @@
json.addParm('x6w_'+x6.p(this,'xColumnId'),$(this).prop('value'));
});
}
+ self.gridParms = function(json) {
+ json.addParm('x6action' ,'browseFetch');
+ json.addParm('xSortable' ,x6.p(this,'xSortable' ,'N'));
+ json.addParm('xReturnAll' ,x6.p(this,'xReturnAll' ,'N'));
+ json.addParm('xGridHeight',x6.p(this,'xGridHeight',500));
+ json.addParm('xLookups' ,x6.p(this,'xLookups' ,'N'));
+ json.addParm('xButtonBar' ,x6.p(this,'xButtonBar','N'));
+ }
/* --------------------------------------------------------------- */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 21:08:39
|
Revision: 1251
http://andro.svn.sourceforge.net/andro/?rev=1251&view=rev
Author: kendowns
Date: 2009-02-17 21:08:31 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Sourceforge bug 2610193. Sorting on a search grid was not respecting filters.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-02-17 20:50:41 UTC (rev 1250)
+++ trunk/andro/clib/x6.js 2009-02-17 21:08:31 UTC (rev 1251)
@@ -5916,27 +5916,15 @@
*/
self.fetch = function(doFetch) {
if(doFetch==null) doFetch=false;
- var cntNoBlank = 0;
// Initialize and then scan
- var json = new x6JSON('x6page',this.zTable);
- $(this).find(".thead :input").each(function() {
- if(typeof(this.zValue)=='undefined')
- this.zValue = this.getAttribute('xValue');
- if($(this).prop('value')!=this.zValue) {
- doFetch = true;
- }
- if($(this).prop('value')!='') {
- cntNoBlank++;
- }
- this.zValue = $(this).prop('value');
- json.addParm('x6w_'+x6.p(this,'xColumnId'),$(this).prop('value'));
- });
+ var json = new x6JSON('x6page',this.zTable);
+ this.addFilters(json);
- if(doFetch) {
+ if(this.doFetch) {
// Clear the previous results
x6.data.browseFetchHtml = '';
- if(cntNoBlank==0) {
+ if(this.cntNoBlank==0) {
$(this).find('.tbody').html('');
return;
}
@@ -5986,6 +5974,9 @@
json.addParm('tableIdPar',tablePar );
json.addParm('skeyPar' ,skeyPar );
}
+
+ // Fetch the filters as well
+ this.addFilters(json);
json.addParm('x6action','browseFetch');
json.addParm('xGridHeight',x6.p(this,'xGridHeight'));
@@ -6002,6 +5993,24 @@
delete json;
x6dialogs.clear();
}
+
+ self.addFilters = function(json) {
+ this.doFetch = false;
+ this.cntNoBlank = 0;
+ var grid = this;
+ $(this).find(".thead :input").each(function() {
+ if(typeof(this.zValue)=='undefined')
+ this.zValue = this.getAttribute('xValue');
+ if($(this).prop('value')!=this.zValue) {
+ grid.doFetch = true;
+ }
+ if($(this).prop('value')!='') {
+ grid.cntNoBlank++;
+ }
+ this.zValue = $(this).prop('value');
+ json.addParm('x6w_'+x6.p(this,'xColumnId'),$(this).prop('value'));
+ });
+ }
/* --------------------------------------------------------------- */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 20:50:43
|
Revision: 1250
http://andro.svn.sourceforge.net/andro/?rev=1250&view=rev
Author: kendowns
Date: 2009-02-17 20:50:41 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Sourceforge bug 2589696, x6select was not scrolling.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-02-17 17:29:35 UTC (rev 1249)
+++ trunk/andro/clib/x6.js 2009-02-17 20:50:41 UTC (rev 1250)
@@ -4011,6 +4011,8 @@
// get current row
var rowNow = $('.x6select div.hilight');
var jqBody = $('.x6select .tbody');
+ // get the height of a row
+ var lineHeight = $('.x6select .tbody > div > div:first').height()
if(rowNow.length==0) {
$(jqBody[0].firstChild).addClass('hilight');
}
@@ -4021,7 +4023,7 @@
var rowsBelow = $(rowNow).nextAll().length;
if(rowsBelow > 5) {
var stNow = $('.x6select .tbody').scrollTop();
- $(jqBody).scrollTop(stNow - ( this.lineHeight + 3));
+ $(jqBody).scrollTop(stNow - ( lineHeight + 3));
}
}
else {
@@ -4030,7 +4032,7 @@
var rowsAbove = $(rowNow).prevAll().length;
if(rowsAbove > 5) {
var stNow = $(jqBody).scrollTop();
- $(jqBody).scrollTop(stNow + this.lineHeight + 3);
+ $(jqBody).scrollTop(stNow + lineHeight + 3);
}
}
x6.console.log("row now ",rowNow);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 17:29:38
|
Revision: 1249
http://andro.svn.sourceforge.net/andro/?rev=1249&view=rev
Author: kendowns
Date: 2009-02-17 17:29:35 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
6 bugs so far and counting. this release is actually for Josh to make the debian package.
Added Paths:
-----------
releases/2009.02.17/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 17:23:23
|
Revision: 1248
http://andro.svn.sourceforge.net/andro/?rev=1248&view=rev
Author: kendowns
Date: 2009-02-17 17:23:14 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
New login form only used on debian install. Deb package creates root user "start/start". this login form has those values pre-filled. Also changed welcome page to trap for this user and force user to create new root user.
Modified Paths:
--------------
trunk/andro/application/x_welcome.php
Added Paths:
-----------
trunk/andro/application/x_login_form.inc.html.done
Added: trunk/andro/application/x_login_form.inc.html.done
===================================================================
--- trunk/andro/application/x_login_form.inc.html.done (rev 0)
+++ trunk/andro/application/x_login_form.inc.html.done 2009-02-17 17:23:14 UTC (rev 1248)
@@ -0,0 +1,36 @@
+<br/>
+<center>
+<h1>Andromeda Node Manager - New Install</h1>
+<h3>Use "start" as username and password</h3>
+</center>
+
+<br/>
+<br/>
+<table align="center">
+ <tr>
+ <td class="logincaption">Login Name:</td>
+ <td class="logininput">
+ <input class="login" id="loginUID" name="loginUID"
+ maxlength="60" size="10" value="start" />
+ </td>
+ </tr>
+ <tr>
+ <td class="logincaption">Password:</td>
+ <td class="logininput">
+ <input class="login" name="loginPWD"
+ type="password" maxlength="20" size="10" value="start" />
+ </td>
+ </tr>
+ <tr><td colspan="2"> </td></tr>
+ <tr>
+ <td class="logincaption"> </td>
+ <td class="logininput">
+ <input class="login" type="submit" name="pushSave" value="Login" />
+ </td>
+ </tr>
+</table>
+<br/>
+<br/>
+<center>
+<a href="<?php echo $hForgot?>">Forgotten Password and Change Password</a>
+</center>
Property changes on: trunk/andro/application/x_login_form.inc.html.done
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/andro/application/x_welcome.php
===================================================================
--- trunk/andro/application/x_welcome.php 2009-02-17 16:26:38 UTC (rev 1247)
+++ trunk/andro/application/x_welcome.php 2009-02-17 17:23:14 UTC (rev 1248)
@@ -1,6 +1,82 @@
<?php
class x_welcome extends x_table2 {
function main() {
+ # KFD 2/17/09. If installed with Debian package, will
+ # have username and password of "start".
+ # Must force a new id now.
+ #
+ if(SessionGet('UID')=='start') {
+ if(gp('user_id')<>'') {
+ if(gp('user_id')=='') {
+ ErrorAdd("User Id may not be empty");
+ }
+ if(substr(gp('user_id'),0,5)=='andro') {
+ ErrorAdd("User Id may not begin with 'andro'");
+ }
+ if(gp('password1')<>gp('password2')) {
+ ErrorAdd("Passwords do not match");
+ }
+ if(strlen(trim(gp('password1')))==0) {
+ ErrorAdd("Password may not be empty");
+ }
+ if(!Errors()) {
+ $row = array(
+ 'user_id'=>gp('user_id')
+ ,'member_password'=>gp('password1')
+ );
+ SQLX_Insert('usersroot',$row);
+ if(!Errors()) {
+ scDBConn_Pop();
+ SessionSet('UID',gp('user_id'));
+ SessionSet('PWD',gp('password1'));
+ scDBConn_Push();
+ SQL("DELETE FROM USERSROOT WHERE user_id='start'");
+
+ # Get rid of the form that replaces login
+ $file=fsDirTop().'application/x_login_form.inc.html';
+ $fileto=$file.'.done';
+ @rename($file,$fileto);
+
+ ?>
+ <h1>New Root User Created</h1>
+
+ <p>Your new user is created.</p>
+
+ <p><a href="index.php?st2logout=1">
+ Return to Login Page</a></p>
+ <?php
+ return;
+ }
+ }
+ }
+
+
+ ?>
+ <h1>New Install - Must Create User</h1>
+
+ <p>You are logged into your Node Manager with the default
+ username of "start" and password "start". We have to change
+ this right now so nobody can get into your new system.
+ </p>
+
+ <p>Please provide a new ROOT (superuser) user id and password
+ below. Andromeda will create the new user, log you in as
+ that user, and remove the "start" user.
+ </p>
+
+ <table>
+ <tr><td align="left">User Name
+ <td><input name = 'user_id' /> (may not begin with 'andro')
+ <tr><td align="left">Password
+ <td><input type="password" name = 'password1'/>
+ <tr><td align="left">Password (verify)
+ <td><input type="password" name = 'password2'/>
+ </table>
+ <input type="submit" value="Create User Now" />
+ <?php
+ return;
+ }
+
/* FUTURE X6 VERSION OF NODE MANAGER
?>
<h1>Node Manager Upgrade Required</h1>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 16:26:44
|
Revision: 1247
http://andro.svn.sourceforge.net/andro/?rev=1247&view=rev
Author: kendowns
Date: 2009-02-17 16:26:38 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Sourceforge Bug 2609083. Lookups on conventional screens were returning all rows when entering '*' instead of limiting to 100. Fixed.
Modified Paths:
--------------
trunk/andro/lib/androX6.php
Modified: trunk/andro/lib/androX6.php
===================================================================
--- trunk/andro/lib/androX6.php 2009-02-17 15:53:44 UTC (rev 1246)
+++ trunk/andro/lib/androX6.php 2009-02-17 16:26:38 UTC (rev 1247)
@@ -341,11 +341,17 @@
# Build the where clause
#
$this->flat = $this->dd['flat'];
+ $allowNoFilters=false;
foreach($vals as $column_id=>$colvalue) {
if(!isset($this->flat[$column_id])) continue;
if($colvalue=='*') {
$awhere=array();
- gpSet('xReturnAll','Y');
+ # KFD 2/17/09 Sourceforge 2609083
+ # Doing this returned all rows on regular
+ # searches. Whatever it was for, it cannot
+ # be done here this way.
+ #gpSet('xReturnAll','Y');
+ $allowNoFilters = true;
break;
}
@@ -366,16 +372,22 @@
}
# <----- RETURN (MAYBE)
- if(count($awhere) == 0 && gp('xReturnAll','N')=='N') return;
+ if(count($awhere) == 0 ) {
+ if(gp('xReturnAll','N')=='N' && !$allowNoFilters){
+ return;
+ }
+ }
# Generate the limit
$SLimit = ' LIMIT 100';
if($tabPar <> '') {
if(a($this->dd['fk_parents'][$tabPar],'uiallrows','N')=='Y') {
- $SLimit = '';
+ $SLimit = ' LIMIT 100';
}
}
- if(gp('xReturnAll','N')=='Y') $SLimit = '';
+ if(gp('xReturnAll','N')=='Y') {
+ $SLimit = '';
+ }
# Build the Order by
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 15:53:48
|
Revision: 1246
http://andro.svn.sourceforge.net/andro/?rev=1246&view=rev
Author: kendowns
Date: 2009-02-17 15:53:44 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Sourceforge 2321898, trap for empty comparison operator.
Modified Paths:
--------------
trunk/andro/application/androBuild.php
Modified: trunk/andro/application/androBuild.php
===================================================================
--- trunk/andro/application/androBuild.php 2009-02-17 14:40:24 UTC (rev 1245)
+++ trunk/andro/application/androBuild.php 2009-02-17 15:53:44 UTC (rev 1246)
@@ -3038,7 +3038,7 @@
$retval = $retval && $this->SpecDDL_Triggers_Automated();
$this->SpecDDL_Triggers_ColConsTypes();
$this->SpecDDL_Triggers_ColConsMinMax();
- $this->SpecDDL_Triggers_Chains();
+ $retval = $retval && $this->SpecDDL_Triggers_Chains();
$this->SpecDDL_Triggers_Cascades();
$this->SpecDDL_Triggers_Histories();
@@ -5391,16 +5391,42 @@
function SpecDDL_Triggers_Chains() {
$chains = $this->SpecDDL_Triggers_ChainsList();
+
+ # KFD 2/17/09 Sourceforge 2321898. Trap for empty comparison operators
+ # Very hard to do this is SQL because of the table
+ # structures. So we must scan the array of chains
+ # and look for any test that has a _compare array
+ # but an empty compoper field.
+ #
+ $errors = 0;
+ foreach($chains as $key=>$chaindetails) {
+ foreach($chaindetails['tests'] as $idx=>$test) {
+ if(count($test['_compare'])>0 && trim($test['compoper']) == '') {
+ $tid = $chaindetails['table_id'];
+ $cid = $chaindetails['column_id'];
+ $chain= $chaindetails['chain'];
+ x_EchoFlush(
+ ">>> ERROR in Chain Definition, no comparison operator"
+ );
+ x_EchoFlush(">>> -> table $tid, column $cid, chain $chain");
+ x_EchoFlush(">>> -> comparison details:");
+ hprint_r($test['_compare']);
+ $errors++;
+ }
+ }
+ }
+ if($errors > 0) return false;
+
+ // KFD 5/26/07, attach chains to $this->utabs, so we can save them
+ // out in the dd and use them in client code.
+ foreach($chains as $x=>$chain) {
+ $this->utabs[$chain['table_id']]['chains'][$x]=$chain;
+ }
- // KFD 5/26/07, attach chains to $this->utabs, so we can save them
- // out in the dd and use them in client code.
- foreach($chains as $x=>$chain) {
- $this->utabs[$chain['table_id']]['chains'][$x]=$chain;
- }
-
$this->SpecDDL_Triggers_ChainsCode($chains);
$this->SpecDDL_Triggers_ChainsBuild($chains);
+ return true;
}
function SpecDDL_Triggers_ChainsList() {
@@ -5454,7 +5480,7 @@
}
- // Final, send them back to calling program
+ // Final, send them back to calling program
return $chains;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 14:40:28
|
Revision: 1245
http://andro.svn.sourceforge.net/andro/?rev=1245&view=rev
Author: kendowns
Date: 2009-02-17 14:40:24 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Sourceforge 2609092 fixed, slight visual twitch on grid when mousing/clicking on rows.
Modified Paths:
--------------
trunk/andro/templates/x6/skins/x6skin.Default.Gray.1024.css
trunk/andro/templates/x6/skins/x6skin.Default.Gray.1280.css
trunk/andro/templates/x6/skins/x6skin.Default.Gray.1400.css
trunk/andro/templates/x6/skins/x6skin.Default.Gray.1440.css
trunk/andro/templates/x6/skins/x6skin.Default.Gray.1650.css
trunk/andro/templates/x6/skins/x6skin.Default.Gray.800.css
trunk/andro/templates/x6/skinsources/x6skin.Default.yaml
trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.1024.ser.txt
trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.1280.ser.txt
trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.1400.ser.txt
trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.1440.ser.txt
trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.1650.ser.txt
trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.800.ser.txt
Modified: trunk/andro/templates/x6/skins/x6skin.Default.Gray.1024.css
===================================================================
--- trunk/andro/templates/x6/skins/x6skin.Default.Gray.1024.css 2009-02-17 14:39:22 UTC (rev 1244)
+++ trunk/andro/templates/x6/skins/x6skin.Default.Gray.1024.css 2009-02-17 14:40:24 UTC (rev 1245)
@@ -1,6 +1,6 @@
/* ==================================================== *\
* Andromeda Generated CSS file
- * Generated: Wed, 28 Jan 2009 13:46:54 -0500
+ * Generated: Tue, 17 Feb 2009 09:38:12 -0500
* Skin, color, size: Default, Gray, 1024
\* ==================================================== */
@@ -492,7 +492,7 @@
height: 24px;
}
-div.tbody div.selected input {
+div.tbody div input {
margin-left: -2px;
margin-right: -2px;
}
Modified: trunk/andro/templates/x6/skins/x6skin.Default.Gray.1280.css
===================================================================
--- trunk/andro/templates/x6/skins/x6skin.Default.Gray.1280.css 2009-02-17 14:39:22 UTC (rev 1244)
+++ trunk/andro/templates/x6/skins/x6skin.Default.Gray.1280.css 2009-02-17 14:40:24 UTC (rev 1245)
@@ -1,6 +1,6 @@
/* ==================================================== *\
* Andromeda Generated CSS file
- * Generated: Wed, 28 Jan 2009 13:46:54 -0500
+ * Generated: Tue, 17 Feb 2009 09:38:12 -0500
* Skin, color, size: Default, Gray, 1280
\* ==================================================== */
@@ -492,7 +492,7 @@
height: 32px;
}
-div.tbody div.selected input {
+div.tbody div input {
margin-left: -2px;
margin-right: -2px;
}
Modified: trunk/andro/templates/x6/skins/x6skin.Default.Gray.1400.css
===================================================================
--- trunk/andro/templates/x6/skins/x6skin.Default.Gray.1400.css 2009-02-17 14:39:22 UTC (rev 1244)
+++ trunk/andro/templates/x6/skins/x6skin.Default.Gray.1400.css 2009-02-17 14:40:24 UTC (rev 1245)
@@ -1,6 +1,6 @@
/* ==================================================== *\
* Andromeda Generated CSS file
- * Generated: Wed, 28 Jan 2009 13:46:54 -0500
+ * Generated: Tue, 17 Feb 2009 09:38:12 -0500
* Skin, color, size: Default, Gray, 1400
\* ==================================================== */
@@ -492,7 +492,7 @@
height: 32px;
}
-div.tbody div.selected input {
+div.tbody div input {
margin-left: -2px;
margin-right: -2px;
}
Modified: trunk/andro/templates/x6/skins/x6skin.Default.Gray.1440.css
===================================================================
--- trunk/andro/templates/x6/skins/x6skin.Default.Gray.1440.css 2009-02-17 14:39:22 UTC (rev 1244)
+++ trunk/andro/templates/x6/skins/x6skin.Default.Gray.1440.css 2009-02-17 14:40:24 UTC (rev 1245)
@@ -1,6 +1,6 @@
/* ==================================================== *\
* Andromeda Generated CSS file
- * Generated: Wed, 28 Jan 2009 13:46:54 -0500
+ * Generated: Tue, 17 Feb 2009 09:38:12 -0500
* Skin, color, size: Default, Gray, 1440
\* ==================================================== */
@@ -492,7 +492,7 @@
height: 28px;
}
-div.tbody div.selected input {
+div.tbody div input {
margin-left: -2px;
margin-right: -2px;
}
Modified: trunk/andro/templates/x6/skins/x6skin.Default.Gray.1650.css
===================================================================
--- trunk/andro/templates/x6/skins/x6skin.Default.Gray.1650.css 2009-02-17 14:39:22 UTC (rev 1244)
+++ trunk/andro/templates/x6/skins/x6skin.Default.Gray.1650.css 2009-02-17 14:40:24 UTC (rev 1245)
@@ -1,6 +1,6 @@
/* ==================================================== *\
* Andromeda Generated CSS file
- * Generated: Wed, 28 Jan 2009 13:46:54 -0500
+ * Generated: Tue, 17 Feb 2009 09:38:12 -0500
* Skin, color, size: Default, Gray, 1650
\* ==================================================== */
@@ -492,7 +492,7 @@
height: 32px;
}
-div.tbody div.selected input {
+div.tbody div input {
margin-left: -2px;
margin-right: -2px;
}
Modified: trunk/andro/templates/x6/skins/x6skin.Default.Gray.800.css
===================================================================
--- trunk/andro/templates/x6/skins/x6skin.Default.Gray.800.css 2009-02-17 14:39:22 UTC (rev 1244)
+++ trunk/andro/templates/x6/skins/x6skin.Default.Gray.800.css 2009-02-17 14:40:24 UTC (rev 1245)
@@ -1,6 +1,6 @@
/* ==================================================== *\
* Andromeda Generated CSS file
- * Generated: Wed, 28 Jan 2009 13:46:54 -0500
+ * Generated: Tue, 17 Feb 2009 09:38:12 -0500
* Skin, color, size: Default, Gray, 800
\* ==================================================== */
@@ -492,7 +492,7 @@
height: 18px;
}
-div.tbody div.selected input {
+div.tbody div input {
margin-left: -2px;
margin-right: -2px;
}
Modified: trunk/andro/templates/x6/skinsources/x6skin.Default.yaml
===================================================================
--- trunk/andro/templates/x6/skinsources/x6skin.Default.yaml 2009-02-17 14:39:22 UTC (rev 1244)
+++ trunk/andro/templates/x6/skinsources/x6skin.Default.yaml 2009-02-17 14:40:24 UTC (rev 1245)
@@ -473,9 +473,8 @@
# static
z-index: 1000
# flavor
- border-top: 1px solid *black
- # # varies with skin
- # top: *menupost
+ # # varies with skin
+ # top: *menupost
border-top: 1px solid *black
border-bottom: 1px solid *black
border-left: 1px solid *black
@@ -746,7 +745,15 @@
padding-right: *pad0
padding-left: *pad0
- div.tbody div.selected input:
+ # KFD 2/17/09 Sourceforge 2609092
+ #div.tbody div.selected input:
+ # margin-left: -2px
+ # margin-right: -2px
+ # KFD 2/17/09 Sourceforge 2609092
+ #div.tbody div.hilight input:
+ # margin-left: -2px
+ # margin-right: -2px
+ div.tbody div input:
margin-left: -2px
margin-right: -2px
Modified: trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.1024.ser.txt
===================================================================
--- trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.1024.ser.txt 2009-02-17 14:39:22 UTC (rev 1244)
+++ trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.1024.ser.txt 2009-02-17 14:40:24 UTC (rev 1245)
@@ -1 +1 @@
-a:2:{s:7:"defines";a:68:{s:4:"link";s:4:"blue";s:7:"bgcdark";s:7:"#d0d0d0";s:8:"bgclight";s:7:"#f0f0f0";s:11:"shadowlight";s:7:"#ffFFff";s:10:"shadowdark";s:7:"#909090";s:5:"black";s:7:"#000000";s:5:"white";s:7:"#ffffff";s:7:"bgcmenu";s:7:"#4A79B5";s:4:"dark";s:7:"#5E71A2";s:8:"selected";s:7:"#30FF30";s:7:"flavor0";s:7:"#A0FFA0";s:7:"flavor1";s:7:"#A0A0FF";s:7:"flavor2";s:7:"#FFA0A0";s:7:"flavor3";s:7:"#FF00FF";s:10:"clrChanged";s:6:"yellow";s:8:"clrError";s:7:"#ff4500";s:5:"clrOk";s:7:"#7fff00";s:11:"clrRequired";s:7:"#abcdef";s:3:"bw0";s:3:"1px";s:4:"zero";s:1:"0";s:3:"ff0";s:7:"verdana";s:3:"bs0";s:5:"solid";s:5:"bor1t";s:17:"1px solid #909090";s:5:"bor1b";s:17:"1px solid #ffFFff";s:5:"bor1l";s:17:"1px solid #909090";s:5:"bor1r";s:17:"1px solid #ffFFff";s:5:"bor2t";s:17:"1px solid #ffFFff";s:5:"bor2b";s:17:"1px solid #909090";s:5:"bor2l";s:17:"1px solid #ffFFff";s:5:"bor2r";s:17:"1px solid #909090";s:5:"bor3t";s:17:"1px solid #909090";s:5:"bor3b";s:17:"1px solid #909090";s:5:"bor3l";s:17:"1px solid #909090";s:5:"bor3r";s:17:"1px solid #909090";s:5:"bordr";s:17:"1px solid #f0f0f0";s:6:"bordr2";s:17:"1px solid #d0d0d0";s:12:"insideheight";s:5:"605px";s:10:"tinpheight";s:4:"18px";s:9:"barheight";s:4:"24px";s:5:"barlh";s:4:"25px";s:3:"fs0";s:4:"12px";s:3:"lh0";s:4:"18px";s:3:"lh1";s:4:"16px";s:5:"lhtab";s:4:"16px";s:6:"fsfoot";s:4:"10px";s:6:"lhfoot";s:4:"16px";s:8:"lhstatus";s:4:"20px";s:8:"lhbutton";s:4:"12px";s:6:"lhmbar";s:4:"21px";s:4:"fsh1";s:4:"18px";s:4:"lhh1";s:4:"28px";s:4:"fsh2";s:4:"16px";s:4:"lhh2";s:4:"24px";s:10:"menumartop";s:3:"2px";s:8:"menupadb";s:3:"2px";s:8:"menupost";s:4:"23px";s:12:"outsidewidth";s:5:"991px";s:11:"insidewidth";s:5:"990px";s:7:"menupad";s:3:"6px";s:6:"tabpad";s:4:"12px";s:4:"pad0";s:3:"3px";s:8:"pad0more";s:3:"4px";s:8:"pad0less";s:3:"2px";s:4:"pad1";s:3:"6px";s:8:"tinppadt";s:3:"3px";s:13:"dropdownwidth";s:5:"200px";s:13:"dropdownshift";s:4:"-7px";s:18:"dropdowninnerwidth";s:5:"188px";}s:3:"css";a:85:{s:7:".fadein";a:1:{s:7:"display";s:4:"none";}s:7:".x6main";a:4:{s:8:"position";s:8:"relative";s:16:"background-color";s:7:"#f0f0f0";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";}s:17:"a.button_disabled";a:2:{s:6:"cursor";s:7:"default";s:7:"outline";s:1:"0";}s:1:"a";a:1:{s:7:"outline";s:1:"0";}s:42:"a.button_disabled,a.button,div.thead div a";a:2:{s:15:"text-decoration";s:4:"none";s:7:"display";s:5:"block";}s:8:".flavor1";a:1:{s:16:"background-color";s:7:"#A0A0FF";}s:8:".flavor2";a:1:{s:16:"background-color";s:7:"#FFA0A0";}s:8:".flavor3";a:1:{s:16:"background-color";s:7:"#FF00FF";}s:4:"body";a:9:{s:16:"background-color";s:7:"#d0d0d0";s:5:"color";s:7:"#000000";s:11:"font-family";s:7:"verdana";s:9:"font-size";s:4:"12px";s:11:"line-height";s:4:"16px";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:3:"3px";s:12:"margin-right";s:3:"3px";}s:6:"body a";a:1:{s:5:"color";s:4:"blue";}s:2:"h1";a:7:{s:9:"font-size";s:4:"18px";s:11:"line-height";s:4:"28px";s:11:"font-weight";s:6:"bolder";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"6px";}s:2:"h2";a:2:{s:6:"height";s:4:"16px";s:11:"font-weight";s:6:"bolder";}s:5:".box1";a:5:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:16:"background-color";s:7:"#f0f0f0";}s:5:".box2";a:5:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:16:"background-color";s:7:"#d0d0d0";}s:5:".box3";a:4:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";}s:7:".x6body";a:7:{s:16:"background-color";s:7:"#f0f0f0";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:6:"height";s:5:"605px";s:5:"width";s:5:"990px";}s:13:".x6commandBar";a:6:{s:16:"background-color";s:7:"#d0d0d0";s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:12:"padding-left";s:3:"3px";}s:10:".statusBar";a:2:{s:11:"line-height";s:4:"20px";s:9:"font-size";s:3:"80%";}s:19:".statusBar .sbright";a:1:{s:5:"float";s:5:"right";}s:18:".statusBar .sbleft";a:1:{s:5:"float";s:4:"left";}s:9:".x6footer";a:5:{s:11:"padding-top";s:3:"3px";s:9:"font-size";s:4:"10px";s:11:"line-height";s:4:"16px";s:16:"background-color";s:7:"#d0d0d0";s:5:"width";s:5:"991px";}s:21:"select,input,textarea";a:6:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:11:"font-family";s:7:"verdana";s:9:"font-size";s:4:"12px";}s:11:"tr.selected";a:2:{s:16:"background-color";s:7:"#5E71A2";s:5:"color";s:7:"#ffffff";}s:35:"input.changed,input.changedSelected";a:1:{s:16:"background-color";s:6:"yellow";}s:37:"select.changed,select.changedSelected";a:1:{s:16:"background-color";s:6:"yellow";}s:41:"textarea.changed,textarea.changedSelected";a:1:{s:16:"background-color";s:6:"yellow";}s:11:"input.error";a:1:{s:16:"background-color";s:7:"#ff4500";}s:14:"input.required";a:1:{s:16:"background-color";s:7:"#abcdef";}s:51:"input[disabled],select[disabled],textarea[disabled]";a:6:{s:16:"background-color";s:7:"#f0f0f0";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:5:"color";s:7:"#000000";}s:12:"td.x6Input a";a:1:{s:12:"padding-left";s:3:"3px";}s:10:"div.x6menu";a:4:{s:16:"background-color";s:7:"#d0d0d0";s:11:"line-height";s:4:"21px";s:6:"height";s:4:"23px";s:5:"width";s:5:"991px";}s:13:"div.x6menu ul";a:3:{s:6:"margin";s:1:"0";s:7:"padding";s:1:"0";s:7:"z-index";s:4:"1000";}s:15:"div.x6menu ul a";a:4:{s:15:"text-decoration";s:4:"none";s:5:"color";s:7:"#000000";s:7:"display";s:5:"block";s:7:"z-index";s:4:"1000";}s:16:"div.x6menu ul li";a:12:{s:7:"display";s:6:"inline";s:5:"float";s:4:"left";s:6:"height";s:4:"auto";s:7:"z-index";s:4:"1000";s:6:"cursor";s:7:"pointer";s:10:"border-top";s:17:"1px solid #d0d0d0";s:13:"border-bottom";s:17:"1px solid #d0d0d0";s:11:"border-left";s:17:"1px solid #d0d0d0";s:12:"border-right";s:17:"1px solid #d0d0d0";s:12:"padding-left";s:3:"6px";s:13:"padding-right";s:3:"6px";s:14:"padding-bottom";s:3:"2px";}s:25:"div.x6menu ul li.selected";a:6:{s:16:"background-color";s:7:"#4A79B5";s:5:"color";s:7:"#ffffff";s:10:"border-top";s:17:"1px solid #000000";s:13:"border-bottom";s:1:"0";s:11:"border-left";s:17:"1px solid #000000";s:12:"border-right";s:17:"1px solid #000000";}s:27:"div.x6menu ul li.selected a";a:1:{s:5:"color";s:7:"#ffffff";}s:16:"div.x6menu ul ul";a:2:{s:7:"display";s:5:"block";s:8:"position";s:8:"absolute";}s:25:"div.x6menu ul ul.dropdown";a:9:{s:7:"z-index";s:4:"1000";s:10:"border-top";s:17:"1px solid #000000";s:13:"border-bottom";s:17:"1px solid #000000";s:11:"border-left";s:17:"1px solid #000000";s:12:"border-right";s:17:"1px solid #000000";s:16:"background-color";s:7:"#ffffff";s:5:"width";s:5:"200px";s:11:"margin-left";s:4:"-7px";s:10:"margin-top";s:3:"2px";}s:19:"div.x6menu ul li li";a:3:{s:7:"display";s:5:"block";s:5:"float";s:4:"none";s:7:"z-index";s:4:"1000";}s:22:"div.x6menu ul li ul li";a:4:{s:11:"text-indent";s:1:"0";s:6:"margin";s:1:"0";s:7:"padding";s:1:"0";s:6:"border";s:1:"0";}s:24:"div.x6menu ul li ul li a";a:4:{s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:12:"padding-left";s:3:"6px";s:13:"padding-right";s:1:"0";}s:33:"div.x6menu ul li.selected ul li a";a:1:{s:5:"color";s:7:"#000000";}s:30:"div.x6menu ul li ul li a;hover";a:2:{s:16:"background-color";s:7:"#4A79B5";s:5:"color";s:7:"#ffffff";}s:16:"@x6menu_left div";a:3:{s:11:"font-weight";s:6:"bolder";s:9:"font-size";s:4:"125%";s:6:"cursor";s:7:"pointer";}s:24:"@x6menu_left div.hilight";a:2:{s:16:"background-color";s:7:"#4A79B5";s:5:"color";s:5:"white";}s:21:"@x6menu_right div div";a:6:{s:11:"font-weight";s:6:"bolder";s:9:"font-size";s:4:"105%";s:6:"cursor";s:7:"pointer";s:11:"line-height";s:4:"200%";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";}s:29:"@x6menu_right div div.hilight";a:1:{s:16:"background-color";s:7:"#d0d0d0";}s:14:"table.x6Detail";a:2:{s:14:"border-spacing";s:1:"0";s:15:"border-collapse";s:8:"collapse";}s:12:"td.x6Caption";a:5:{s:10:"text-align";s:5:"right";s:11:"padding-top";s:3:"3px";s:12:"padding-left";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:14:"vertical-align";s:3:"top";}s:12:".ui-tabs-nav";a:14:{s:10:"list-style";s:4:"none";s:5:"float";s:4:"left";s:8:"position";s:8:"relative";s:6:"bottom";s:4:"-1px";s:7:"z-index";s:1:"1";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:11:"padding-top";s:1:"0";s:14:"padding-bottom";s:1:"0";s:12:"padding-left";s:1:"0";s:13:"padding-right";s:1:"0";s:12:"border-right";s:17:"1px solid #909090";}s:15:".ui-tabs-nav li";a:16:{s:15:"text-decoration";s:4:"none";s:10:"list-style";s:4:"none";s:5:"float";s:4:"left";s:11:"line-height";s:4:"16px";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:11:"padding-top";s:3:"6px";s:14:"padding-bottom";s:3:"6px";s:12:"padding-left";s:3:"6px";s:13:"padding-right";s:3:"6px";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:1:"0";}s:17:".ui-tabs-nav li a";a:13:{s:10:"list-style";s:4:"none";s:5:"float";s:4:"left";s:15:"text-decoration";s:4:"none";s:7:"outline";s:4:"none";s:5:"color";s:7:"#000000";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:10:"border-top";s:1:"0";s:13:"border-bottom";s:1:"0";s:11:"border-left";s:1:"0";s:12:"border-right";s:1:"0";}s:14:".ui-tabs-panel";a:16:{s:15:"text-decoration";s:4:"none";s:10:"list-style";s:4:"none";s:5:"clear";s:4:"left";s:7:"outline";s:1:"0";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:11:"padding-top";s:1:"0";s:14:"padding-bottom";s:1:"0";s:12:"padding-left";s:1:"0";s:13:"padding-right";s:1:"0";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";}s:13:".ui-tabs-hide";a:1:{s:7:"display";s:4:"none";}s:33:".ui-tabs-nav li.ui-state-active a";a:1:{s:5:"color";s:7:"#ffffff";}s:31:".ui-tabs-nav li.ui-state-active";a:1:{s:16:"background-color";s:7:"#5E71A2";}s:35:".ui-tabs-nav li.ui-state-disabled a";a:2:{s:5:"color";s:7:"#d0d0d0";s:6:"cursor";s:7:"default";}s:11:"span.button";a:5:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:6:"cursor";s:7:"pointer";}s:21:"span.button_mousedown";a:5:{s:13:"border-bottom";s:17:"1px solid #ffFFff";s:10:"border-top";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:6:"cursor";s:7:"pointer";}s:24:"div.x6buttonBar a.button";a:14:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:5:"color";s:7:"#ffffff";s:16:"background-color";s:7:"#4A79B5";s:11:"margin-left";s:3:"3px";s:10:"margin-top";s:3:"3px";s:13:"margin-bottom";s:3:"3px";s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";s:11:"line-height";s:4:"12px";}s:34:"div.x6buttonBar a.button_mousedown";a:4:{s:13:"border-bottom";s:17:"1px solid #ffFFff";s:10:"border-top";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";}s:33:"div.x6buttonBar a.button_disabled";a:13:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";s:5:"color";s:7:"#909090";s:11:"margin-left";s:3:"3px";s:10:"margin-top";s:3:"3px";s:13:"margin-bottom";s:3:"3px";s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";s:11:"line-height";s:4:"12px";}s:13:"div.thead div";a:2:{s:6:"height";s:4:"24px";s:16:"background-color";s:7:"#d0d0d0";}s:17:"div.thead div div";a:8:{s:5:"float";s:4:"left";s:11:"line-height";s:4:"24px";s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:13:"padding-right";s:3:"3px";s:12:"padding-left";s:3:"3px";}s:9:"div.tbody";a:3:{s:10:"overflow-x";s:6:"hidden";s:10:"overflow-y";s:6:"scroll";s:5:"clear";s:4:"both";}s:17:"div.tbody div div";a:10:{s:5:"float";s:4:"left";s:8:"overflow";s:6:"hidden";s:10:"border-top";s:1:"0";s:13:"border-bottom";s:1:"0";s:11:"border-left";s:17:"1px solid #f0f0f0";s:12:"border-right";s:17:"1px solid #f0f0f0";s:13:"padding-right";s:3:"3px";s:12:"padding-left";s:3:"3px";s:11:"line-height";s:4:"24px";s:6:"height";s:4:"24px";}s:28:"div.tbody div.selected input";a:2:{s:11:"margin-left";s:4:"-2px";s:12:"margin-right";s:4:"-2px";}s:25:"div.tbody div.flavor0 div";a:3:{s:16:"background-color";s:7:"#A0FFA0";s:11:"border-left";s:17:"1px solid #A0FFA0";s:12:"border-right";s:17:"1px solid #A0FFA0";}s:25:"div.tbody div.flavor1 div";a:3:{s:16:"background-color";s:7:"#A0A0FF";s:11:"border-left";s:17:"1px solid #A0A0FF";s:12:"border-right";s:17:"1px solid #A0A0FF";}s:25:"div.tbody div.flavor2 div";a:3:{s:16:"background-color";s:7:"#FFA0A0";s:11:"border-left";s:17:"1px solid #FFA0A0";s:12:"border-right";s:17:"1px solid #FFA0A0";}s:25:"div.tbody div.flavor3 div";a:3:{s:16:"background-color";s:7:"#FF00FF";s:11:"border-left";s:17:"1px solid #FF00FF";s:12:"border-right";s:17:"1px solid #FF00FF";}s:15:"div.tbody input";a:2:{s:11:"padding-top";s:3:"3px";s:6:"height";s:4:"18px";}s:25:"div.tbody div.hilight div";a:3:{s:16:"background-color";s:7:"#d0d0d0";s:11:"border-left";s:17:"1px solid #d0d0d0";s:12:"border-right";s:17:"1px solid #d0d0d0";}s:18:"div.x6select table";a:2:{s:14:"border-spacing";s:1:"0";s:16:"background-color";s:7:"#ffffff";}s:38:"div.x6select table tbody tr.hilight td";a:1:{s:16:"background-color";s:7:"#d0d0d0";}s:30:"div.x6select table thead tr th";a:5:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:16:"background-color";s:7:"#f0f0f0";}s:10:"@dialogbox";a:2:{s:6:"border";s:17:"6px solid #4A79B5";s:16:"background-color";s:7:"#ffffff";}s:13:".x6modalblock";a:9:{s:7:"z-index";s:5:"10000";s:16:"background-color";s:7:"#000000";s:6:"cursor";s:4:"wait";s:7:"display";s:4:"none";s:8:"position";s:8:"absolute";s:3:"top";s:7:"-5000px";s:4:"left";s:7:"-5000px";s:5:"width";s:7:"20000px";s:6:"height";s:7:"20000px";}s:8:".x6modal";a:9:{s:8:"position";s:8:"absolute";s:7:"display";s:4:"none";s:7:"z-index";s:5:"10001";s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:16:"background-color";s:7:"#d0d0d0";s:7:"padding";s:3:"3px";}s:11:".x6modaltop";a:2:{s:6:"height";s:4:"24px";s:11:"line-height";s:4:"24px";}s:13:".x6modaltop a";a:1:{s:15:"text-decoration";s:4:"none";}s:13:".x6modalinner";a:6:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:7:"padding";s:3:"3px";s:16:"background-color";s:7:"#f0f0f0";}s:16:"table.x6standard";a:5:{s:10:"max-height";s:5:"605px";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";}s:28:"table.x6standard thead tr th";a:1:{s:16:"background-color";s:7:"#d0d0d0";}s:28:"table.x6standard tbody tr td";a:1:{s:14:"vertical-align";s:3:"top";}}}
\ No newline at end of file
+a:2:{s:7:"defines";a:68:{s:4:"link";s:4:"blue";s:7:"bgcdark";s:7:"#d0d0d0";s:8:"bgclight";s:7:"#f0f0f0";s:11:"shadowlight";s:7:"#ffFFff";s:10:"shadowdark";s:7:"#909090";s:5:"black";s:7:"#000000";s:5:"white";s:7:"#ffffff";s:7:"bgcmenu";s:7:"#4A79B5";s:4:"dark";s:7:"#5E71A2";s:8:"selected";s:7:"#30FF30";s:7:"flavor0";s:7:"#A0FFA0";s:7:"flavor1";s:7:"#A0A0FF";s:7:"flavor2";s:7:"#FFA0A0";s:7:"flavor3";s:7:"#FF00FF";s:10:"clrChanged";s:6:"yellow";s:8:"clrError";s:7:"#ff4500";s:5:"clrOk";s:7:"#7fff00";s:11:"clrRequired";s:7:"#abcdef";s:3:"bw0";s:3:"1px";s:4:"zero";s:1:"0";s:3:"ff0";s:7:"verdana";s:3:"bs0";s:5:"solid";s:5:"bor1t";s:17:"1px solid #909090";s:5:"bor1b";s:17:"1px solid #ffFFff";s:5:"bor1l";s:17:"1px solid #909090";s:5:"bor1r";s:17:"1px solid #ffFFff";s:5:"bor2t";s:17:"1px solid #ffFFff";s:5:"bor2b";s:17:"1px solid #909090";s:5:"bor2l";s:17:"1px solid #ffFFff";s:5:"bor2r";s:17:"1px solid #909090";s:5:"bor3t";s:17:"1px solid #909090";s:5:"bor3b";s:17:"1px solid #909090";s:5:"bor3l";s:17:"1px solid #909090";s:5:"bor3r";s:17:"1px solid #909090";s:5:"bordr";s:17:"1px solid #f0f0f0";s:6:"bordr2";s:17:"1px solid #d0d0d0";s:12:"insideheight";s:5:"605px";s:10:"tinpheight";s:4:"18px";s:9:"barheight";s:4:"24px";s:5:"barlh";s:4:"25px";s:3:"fs0";s:4:"12px";s:3:"lh0";s:4:"18px";s:3:"lh1";s:4:"16px";s:5:"lhtab";s:4:"16px";s:6:"fsfoot";s:4:"10px";s:6:"lhfoot";s:4:"16px";s:8:"lhstatus";s:4:"20px";s:8:"lhbutton";s:4:"12px";s:6:"lhmbar";s:4:"21px";s:4:"fsh1";s:4:"18px";s:4:"lhh1";s:4:"28px";s:4:"fsh2";s:4:"16px";s:4:"lhh2";s:4:"24px";s:10:"menumartop";s:3:"2px";s:8:"menupadb";s:3:"2px";s:8:"menupost";s:4:"23px";s:12:"outsidewidth";s:5:"991px";s:11:"insidewidth";s:5:"990px";s:7:"menupad";s:3:"6px";s:6:"tabpad";s:4:"12px";s:4:"pad0";s:3:"3px";s:8:"pad0more";s:3:"4px";s:8:"pad0less";s:3:"2px";s:4:"pad1";s:3:"6px";s:8:"tinppadt";s:3:"3px";s:13:"dropdownwidth";s:5:"200px";s:13:"dropdownshift";s:4:"-7px";s:18:"dropdowninnerwidth";s:5:"188px";}s:3:"css";a:85:{s:7:".fadein";a:1:{s:7:"display";s:4:"none";}s:7:".x6main";a:4:{s:8:"position";s:8:"relative";s:16:"background-color";s:7:"#f0f0f0";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";}s:17:"a.button_disabled";a:2:{s:6:"cursor";s:7:"default";s:7:"outline";s:1:"0";}s:1:"a";a:1:{s:7:"outline";s:1:"0";}s:42:"a.button_disabled,a.button,div.thead div a";a:2:{s:15:"text-decoration";s:4:"none";s:7:"display";s:5:"block";}s:8:".flavor1";a:1:{s:16:"background-color";s:7:"#A0A0FF";}s:8:".flavor2";a:1:{s:16:"background-color";s:7:"#FFA0A0";}s:8:".flavor3";a:1:{s:16:"background-color";s:7:"#FF00FF";}s:4:"body";a:9:{s:16:"background-color";s:7:"#d0d0d0";s:5:"color";s:7:"#000000";s:11:"font-family";s:7:"verdana";s:9:"font-size";s:4:"12px";s:11:"line-height";s:4:"16px";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:3:"3px";s:12:"margin-right";s:3:"3px";}s:6:"body a";a:1:{s:5:"color";s:4:"blue";}s:2:"h1";a:7:{s:9:"font-size";s:4:"18px";s:11:"line-height";s:4:"28px";s:11:"font-weight";s:6:"bolder";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"6px";}s:2:"h2";a:2:{s:6:"height";s:4:"16px";s:11:"font-weight";s:6:"bolder";}s:5:".box1";a:5:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:16:"background-color";s:7:"#f0f0f0";}s:5:".box2";a:5:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:16:"background-color";s:7:"#d0d0d0";}s:5:".box3";a:4:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";}s:7:".x6body";a:7:{s:16:"background-color";s:7:"#f0f0f0";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:6:"height";s:5:"605px";s:5:"width";s:5:"990px";}s:13:".x6commandBar";a:6:{s:16:"background-color";s:7:"#d0d0d0";s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:12:"padding-left";s:3:"3px";}s:10:".statusBar";a:2:{s:11:"line-height";s:4:"20px";s:9:"font-size";s:3:"80%";}s:19:".statusBar .sbright";a:1:{s:5:"float";s:5:"right";}s:18:".statusBar .sbleft";a:1:{s:5:"float";s:4:"left";}s:9:".x6footer";a:5:{s:11:"padding-top";s:3:"3px";s:9:"font-size";s:4:"10px";s:11:"line-height";s:4:"16px";s:16:"background-color";s:7:"#d0d0d0";s:5:"width";s:5:"991px";}s:21:"select,input,textarea";a:6:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:11:"font-family";s:7:"verdana";s:9:"font-size";s:4:"12px";}s:11:"tr.selected";a:2:{s:16:"background-color";s:7:"#5E71A2";s:5:"color";s:7:"#ffffff";}s:35:"input.changed,input.changedSelected";a:1:{s:16:"background-color";s:6:"yellow";}s:37:"select.changed,select.changedSelected";a:1:{s:16:"background-color";s:6:"yellow";}s:41:"textarea.changed,textarea.changedSelected";a:1:{s:16:"background-color";s:6:"yellow";}s:11:"input.error";a:1:{s:16:"background-color";s:7:"#ff4500";}s:14:"input.required";a:1:{s:16:"background-color";s:7:"#abcdef";}s:51:"input[disabled],select[disabled],textarea[disabled]";a:6:{s:16:"background-color";s:7:"#f0f0f0";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:5:"color";s:7:"#000000";}s:12:"td.x6Input a";a:1:{s:12:"padding-left";s:3:"3px";}s:10:"div.x6menu";a:4:{s:16:"background-color";s:7:"#d0d0d0";s:11:"line-height";s:4:"21px";s:6:"height";s:4:"23px";s:5:"width";s:5:"991px";}s:13:"div.x6menu ul";a:3:{s:6:"margin";s:1:"0";s:7:"padding";s:1:"0";s:7:"z-index";s:4:"1000";}s:15:"div.x6menu ul a";a:4:{s:15:"text-decoration";s:4:"none";s:5:"color";s:7:"#000000";s:7:"display";s:5:"block";s:7:"z-index";s:4:"1000";}s:16:"div.x6menu ul li";a:12:{s:7:"display";s:6:"inline";s:5:"float";s:4:"left";s:6:"height";s:4:"auto";s:7:"z-index";s:4:"1000";s:6:"cursor";s:7:"pointer";s:10:"border-top";s:17:"1px solid #d0d0d0";s:13:"border-bottom";s:17:"1px solid #d0d0d0";s:11:"border-left";s:17:"1px solid #d0d0d0";s:12:"border-right";s:17:"1px solid #d0d0d0";s:12:"padding-left";s:3:"6px";s:13:"padding-right";s:3:"6px";s:14:"padding-bottom";s:3:"2px";}s:25:"div.x6menu ul li.selected";a:6:{s:16:"background-color";s:7:"#4A79B5";s:5:"color";s:7:"#ffffff";s:10:"border-top";s:17:"1px solid #000000";s:13:"border-bottom";s:1:"0";s:11:"border-left";s:17:"1px solid #000000";s:12:"border-right";s:17:"1px solid #000000";}s:27:"div.x6menu ul li.selected a";a:1:{s:5:"color";s:7:"#ffffff";}s:16:"div.x6menu ul ul";a:2:{s:7:"display";s:5:"block";s:8:"position";s:8:"absolute";}s:25:"div.x6menu ul ul.dropdown";a:9:{s:7:"z-index";s:4:"1000";s:10:"border-top";s:17:"1px solid #000000";s:13:"border-bottom";s:17:"1px solid #000000";s:11:"border-left";s:17:"1px solid #000000";s:12:"border-right";s:17:"1px solid #000000";s:16:"background-color";s:7:"#ffffff";s:5:"width";s:5:"200px";s:11:"margin-left";s:4:"-7px";s:10:"margin-top";s:3:"2px";}s:19:"div.x6menu ul li li";a:3:{s:7:"display";s:5:"block";s:5:"float";s:4:"none";s:7:"z-index";s:4:"1000";}s:22:"div.x6menu ul li ul li";a:4:{s:11:"text-indent";s:1:"0";s:6:"margin";s:1:"0";s:7:"padding";s:1:"0";s:6:"border";s:1:"0";}s:24:"div.x6menu ul li ul li a";a:4:{s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:12:"padding-left";s:3:"6px";s:13:"padding-right";s:1:"0";}s:33:"div.x6menu ul li.selected ul li a";a:1:{s:5:"color";s:7:"#000000";}s:30:"div.x6menu ul li ul li a;hover";a:2:{s:16:"background-color";s:7:"#4A79B5";s:5:"color";s:7:"#ffffff";}s:16:"@x6menu_left div";a:3:{s:11:"font-weight";s:6:"bolder";s:9:"font-size";s:4:"125%";s:6:"cursor";s:7:"pointer";}s:24:"@x6menu_left div.hilight";a:2:{s:16:"background-color";s:7:"#4A79B5";s:5:"color";s:5:"white";}s:21:"@x6menu_right div div";a:6:{s:11:"font-weight";s:6:"bolder";s:9:"font-size";s:4:"105%";s:6:"cursor";s:7:"pointer";s:11:"line-height";s:4:"200%";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";}s:29:"@x6menu_right div div.hilight";a:1:{s:16:"background-color";s:7:"#d0d0d0";}s:14:"table.x6Detail";a:2:{s:14:"border-spacing";s:1:"0";s:15:"border-collapse";s:8:"collapse";}s:12:"td.x6Caption";a:5:{s:10:"text-align";s:5:"right";s:11:"padding-top";s:3:"3px";s:12:"padding-left";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:14:"vertical-align";s:3:"top";}s:12:".ui-tabs-nav";a:14:{s:10:"list-style";s:4:"none";s:5:"float";s:4:"left";s:8:"position";s:8:"relative";s:6:"bottom";s:4:"-1px";s:7:"z-index";s:1:"1";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:11:"padding-top";s:1:"0";s:14:"padding-bottom";s:1:"0";s:12:"padding-left";s:1:"0";s:13:"padding-right";s:1:"0";s:12:"border-right";s:17:"1px solid #909090";}s:15:".ui-tabs-nav li";a:16:{s:15:"text-decoration";s:4:"none";s:10:"list-style";s:4:"none";s:5:"float";s:4:"left";s:11:"line-height";s:4:"16px";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:11:"padding-top";s:3:"6px";s:14:"padding-bottom";s:3:"6px";s:12:"padding-left";s:3:"6px";s:13:"padding-right";s:3:"6px";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:1:"0";}s:17:".ui-tabs-nav li a";a:13:{s:10:"list-style";s:4:"none";s:5:"float";s:4:"left";s:15:"text-decoration";s:4:"none";s:7:"outline";s:4:"none";s:5:"color";s:7:"#000000";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:10:"border-top";s:1:"0";s:13:"border-bottom";s:1:"0";s:11:"border-left";s:1:"0";s:12:"border-right";s:1:"0";}s:14:".ui-tabs-panel";a:16:{s:15:"text-decoration";s:4:"none";s:10:"list-style";s:4:"none";s:5:"clear";s:4:"left";s:7:"outline";s:1:"0";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:11:"padding-top";s:1:"0";s:14:"padding-bottom";s:1:"0";s:12:"padding-left";s:1:"0";s:13:"padding-right";s:1:"0";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";}s:13:".ui-tabs-hide";a:1:{s:7:"display";s:4:"none";}s:33:".ui-tabs-nav li.ui-state-active a";a:1:{s:5:"color";s:7:"#ffffff";}s:31:".ui-tabs-nav li.ui-state-active";a:1:{s:16:"background-color";s:7:"#5E71A2";}s:35:".ui-tabs-nav li.ui-state-disabled a";a:2:{s:5:"color";s:7:"#d0d0d0";s:6:"cursor";s:7:"default";}s:11:"span.button";a:5:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:6:"cursor";s:7:"pointer";}s:21:"span.button_mousedown";a:5:{s:13:"border-bottom";s:17:"1px solid #ffFFff";s:10:"border-top";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:6:"cursor";s:7:"pointer";}s:24:"div.x6buttonBar a.button";a:14:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:5:"color";s:7:"#ffffff";s:16:"background-color";s:7:"#4A79B5";s:11:"margin-left";s:3:"3px";s:10:"margin-top";s:3:"3px";s:13:"margin-bottom";s:3:"3px";s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";s:11:"line-height";s:4:"12px";}s:34:"div.x6buttonBar a.button_mousedown";a:4:{s:13:"border-bottom";s:17:"1px solid #ffFFff";s:10:"border-top";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";}s:33:"div.x6buttonBar a.button_disabled";a:13:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";s:5:"color";s:7:"#909090";s:11:"margin-left";s:3:"3px";s:10:"margin-top";s:3:"3px";s:13:"margin-bottom";s:3:"3px";s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";s:11:"line-height";s:4:"12px";}s:13:"div.thead div";a:2:{s:6:"height";s:4:"24px";s:16:"background-color";s:7:"#d0d0d0";}s:17:"div.thead div div";a:8:{s:5:"float";s:4:"left";s:11:"line-height";s:4:"24px";s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:13:"padding-right";s:3:"3px";s:12:"padding-left";s:3:"3px";}s:9:"div.tbody";a:3:{s:10:"overflow-x";s:6:"hidden";s:10:"overflow-y";s:6:"scroll";s:5:"clear";s:4:"both";}s:17:"div.tbody div div";a:10:{s:5:"float";s:4:"left";s:8:"overflow";s:6:"hidden";s:10:"border-top";s:1:"0";s:13:"border-bottom";s:1:"0";s:11:"border-left";s:17:"1px solid #f0f0f0";s:12:"border-right";s:17:"1px solid #f0f0f0";s:13:"padding-right";s:3:"3px";s:12:"padding-left";s:3:"3px";s:11:"line-height";s:4:"24px";s:6:"height";s:4:"24px";}s:19:"div.tbody div input";a:2:{s:11:"margin-left";s:4:"-2px";s:12:"margin-right";s:4:"-2px";}s:25:"div.tbody div.flavor0 div";a:3:{s:16:"background-color";s:7:"#A0FFA0";s:11:"border-left";s:17:"1px solid #A0FFA0";s:12:"border-right";s:17:"1px solid #A0FFA0";}s:25:"div.tbody div.flavor1 div";a:3:{s:16:"background-color";s:7:"#A0A0FF";s:11:"border-left";s:17:"1px solid #A0A0FF";s:12:"border-right";s:17:"1px solid #A0A0FF";}s:25:"div.tbody div.flavor2 div";a:3:{s:16:"background-color";s:7:"#FFA0A0";s:11:"border-left";s:17:"1px solid #FFA0A0";s:12:"border-right";s:17:"1px solid #FFA0A0";}s:25:"div.tbody div.flavor3 div";a:3:{s:16:"background-color";s:7:"#FF00FF";s:11:"border-left";s:17:"1px solid #FF00FF";s:12:"border-right";s:17:"1px solid #FF00FF";}s:15:"div.tbody input";a:2:{s:11:"padding-top";s:3:"3px";s:6:"height";s:4:"18px";}s:25:"div.tbody div.hilight div";a:3:{s:16:"background-color";s:7:"#d0d0d0";s:11:"border-left";s:17:"1px solid #d0d0d0";s:12:"border-right";s:17:"1px solid #d0d0d0";}s:18:"div.x6select table";a:2:{s:14:"border-spacing";s:1:"0";s:16:"background-color";s:7:"#ffffff";}s:38:"div.x6select table tbody tr.hilight td";a:1:{s:16:"background-color";s:7:"#d0d0d0";}s:30:"div.x6select table thead tr th";a:5:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:16:"background-color";s:7:"#f0f0f0";}s:10:"@dialogbox";a:2:{s:6:"border";s:17:"6px solid #4A79B5";s:16:"background-color";s:7:"#ffffff";}s:13:".x6modalblock";a:9:{s:7:"z-index";s:5:"10000";s:16:"background-color";s:7:"#000000";s:6:"cursor";s:4:"wait";s:7:"display";s:4:"none";s:8:"position";s:8:"absolute";s:3:"top";s:7:"-5000px";s:4:"left";s:7:"-5000px";s:5:"width";s:7:"20000px";s:6:"height";s:7:"20000px";}s:8:".x6modal";a:9:{s:8:"position";s:8:"absolute";s:7:"display";s:4:"none";s:7:"z-index";s:5:"10001";s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:16:"background-color";s:7:"#d0d0d0";s:7:"padding";s:3:"3px";}s:11:".x6modaltop";a:2:{s:6:"height";s:4:"24px";s:11:"line-height";s:4:"24px";}s:13:".x6modaltop a";a:1:{s:15:"text-decoration";s:4:"none";}s:13:".x6modalinner";a:6:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:7:"padding";s:3:"3px";s:16:"background-color";s:7:"#f0f0f0";}s:16:"table.x6standard";a:5:{s:10:"max-height";s:5:"605px";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";}s:28:"table.x6standard thead tr th";a:1:{s:16:"background-color";s:7:"#d0d0d0";}s:28:"table.x6standard tbody tr td";a:1:{s:14:"vertical-align";s:3:"top";}}}
\ No newline at end of file
Modified: trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.1280.ser.txt
===================================================================
--- trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.1280.ser.txt 2009-02-17 14:39:22 UTC (rev 1244)
+++ trunk/andro/templates/x6/skinsphp/x6skin.Default.Gray.1280.ser.txt 2009-02-17 14:40:24 UTC (rev 1245)
@@ -1 +1 @@
-a:2:{s:7:"defines";a:68:{s:4:"link";s:4:"blue";s:7:"bgcdark";s:7:"#d0d0d0";s:8:"bgclight";s:7:"#f0f0f0";s:11:"shadowlight";s:7:"#ffFFff";s:10:"shadowdark";s:7:"#909090";s:5:"black";s:7:"#000000";s:5:"white";s:7:"#ffffff";s:7:"bgcmenu";s:7:"#4A79B5";s:4:"dark";s:7:"#5E71A2";s:8:"selected";s:7:"#30FF30";s:7:"flavor0";s:7:"#A0FFA0";s:7:"flavor1";s:7:"#A0A0FF";s:7:"flavor2";s:7:"#FFA0A0";s:7:"flavor3";s:7:"#FF00FF";s:10:"clrChanged";s:6:"yellow";s:8:"clrError";s:7:"#ff4500";s:5:"clrOk";s:7:"#7fff00";s:11:"clrRequired";s:7:"#abcdef";s:3:"bw0";s:3:"1px";s:4:"zero";s:1:"0";s:3:"ff0";s:7:"verdana";s:3:"bs0";s:5:"solid";s:5:"bor1t";s:17:"1px solid #909090";s:5:"bor1b";s:17:"1px solid #ffFFff";s:5:"bor1l";s:17:"1px solid #909090";s:5:"bor1r";s:17:"1px solid #ffFFff";s:5:"bor2t";s:17:"1px solid #ffFFff";s:5:"bor2b";s:17:"1px solid #909090";s:5:"bor2l";s:17:"1px solid #ffFFff";s:5:"bor2r";s:17:"1px solid #909090";s:5:"bor3t";s:17:"1px solid #909090";s:5:"bor3b";s:17:"1px solid #909090";s:5:"bor3l";s:17:"1px solid #909090";s:5:"bor3r";s:17:"1px solid #909090";s:5:"bordr";s:17:"1px solid #f0f0f0";s:6:"bordr2";s:17:"1px solid #d0d0d0";s:12:"insideheight";s:5:"806px";s:10:"tinpheight";s:4:"24px";s:9:"barheight";s:4:"32px";s:5:"barlh";s:4:"33px";s:3:"fs0";s:4:"16px";s:3:"lh0";s:4:"24px";s:3:"lh1";s:4:"21px";s:5:"lhtab";s:4:"21px";s:6:"fsfoot";s:4:"13px";s:6:"lhfoot";s:4:"21px";s:8:"lhstatus";s:4:"26px";s:8:"lhbutton";s:4:"16px";s:6:"lhmbar";s:4:"28px";s:4:"fsh1";s:4:"24px";s:4:"lhh1";s:4:"37px";s:4:"fsh2";s:4:"21px";s:4:"lhh2";s:4:"32px";s:10:"menumartop";s:3:"2px";s:8:"menupadb";s:3:"2px";s:8:"menupost";s:4:"30px";s:12:"outsidewidth";s:6:"1238px";s:11:"insidewidth";s:6:"1237px";s:7:"menupad";s:3:"7px";s:6:"tabpad";s:4:"15px";s:4:"pad0";s:3:"3px";s:8:"pad0more";s:3:"5px";s:8:"pad0less";s:3:"2px";s:4:"pad1";s:3:"7px";s:8:"tinppadt";s:3:"3px";s:13:"dropdownwidth";s:5:"250px";s:13:"dropdownshift";s:4:"-8px";s:18:"dropdowninnerwidth";s:5:"235px";}s:3:"css";a:85:{s:7:".fadein";a:1:{s:7:"display";s:4:"none";}s:7:".x6main";a:4:{s:8:"position";s:8:"relative";s:16:"background-color";s:7:"#f0f0f0";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";}s:17:"a.button_disabled";a:2:{s:6:"cursor";s:7:"default";s:7:"outline";s:1:"0";}s:1:"a";a:1:{s:7:"outline";s:1:"0";}s:42:"a.button_disabled,a.button,div.thead div a";a:2:{s:15:"text-decoration";s:4:"none";s:7:"display";s:5:"block";}s:8:".flavor1";a:1:{s:16:"background-color";s:7:"#A0A0FF";}s:8:".flavor2";a:1:{s:16:"background-color";s:7:"#FFA0A0";}s:8:".flavor3";a:1:{s:16:"background-color";s:7:"#FF00FF";}s:4:"body";a:9:{s:16:"background-color";s:7:"#d0d0d0";s:5:"color";s:7:"#000000";s:11:"font-family";s:7:"verdana";s:9:"font-size";s:4:"16px";s:11:"line-height";s:4:"21px";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:3:"3px";s:12:"margin-right";s:3:"3px";}s:6:"body a";a:1:{s:5:"color";s:4:"blue";}s:2:"h1";a:7:{s:9:"font-size";s:4:"24px";s:11:"line-height";s:4:"37px";s:11:"font-weight";s:6:"bolder";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"7px";}s:2:"h2";a:2:{s:6:"height";s:4:"21px";s:11:"font-weight";s:6:"bolder";}s:5:".box1";a:5:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:16:"background-color";s:7:"#f0f0f0";}s:5:".box2";a:5:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:16:"background-color";s:7:"#d0d0d0";}s:5:".box3";a:4:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";}s:7:".x6body";a:7:{s:16:"background-color";s:7:"#f0f0f0";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:6:"height";s:5:"806px";s:5:"width";s:6:"1237px";}s:13:".x6commandBar";a:6:{s:16:"background-color";s:7:"#d0d0d0";s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:12:"padding-left";s:3:"3px";}s:10:".statusBar";a:2:{s:11:"line-height";s:4:"26px";s:9:"font-size";s:3:"80%";}s:19:".statusBar .sbright";a:1:{s:5:"float";s:5:"right";}s:18:".statusBar .sbleft";a:1:{s:5:"float";s:4:"left";}s:9:".x6footer";a:5:{s:11:"padding-top";s:3:"3px";s:9:"font-size";s:4:"13px";s:11:"line-height";s:4:"21px";s:16:"background-color";s:7:"#d0d0d0";s:5:"width";s:6:"1238px";}s:21:"select,input,textarea";a:6:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:11:"font-family";s:7:"verdana";s:9:"font-size";s:4:"16px";}s:11:"tr.selected";a:2:{s:16:"background-color";s:7:"#5E71A2";s:5:"color";s:7:"#ffffff";}s:35:"input.changed,input.changedSelected";a:1:{s:16:"background-color";s:6:"yellow";}s:37:"select.changed,select.changedSelected";a:1:{s:16:"background-color";s:6:"yellow";}s:41:"textarea.changed,textarea.changedSelected";a:1:{s:16:"background-color";s:6:"yellow";}s:11:"input.error";a:1:{s:16:"background-color";s:7:"#ff4500";}s:14:"input.required";a:1:{s:16:"background-color";s:7:"#abcdef";}s:51:"input[disabled],select[disabled],textarea[disabled]";a:6:{s:16:"background-color";s:7:"#f0f0f0";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:5:"color";s:7:"#000000";}s:12:"td.x6Input a";a:1:{s:12:"padding-left";s:3:"3px";}s:10:"div.x6menu";a:4:{s:16:"background-color";s:7:"#d0d0d0";s:11:"line-height";s:4:"28px";s:6:"height";s:4:"30px";s:5:"width";s:6:"1238px";}s:13:"div.x6menu ul";a:3:{s:6:"margin";s:1:"0";s:7:"padding";s:1:"0";s:7:"z-index";s:4:"1000";}s:15:"div.x6menu ul a";a:4:{s:15:"text-decoration";s:4:"none";s:5:"color";s:7:"#000000";s:7:"display";s:5:"block";s:7:"z-index";s:4:"1000";}s:16:"div.x6menu ul li";a:12:{s:7:"display";s:6:"inline";s:5:"float";s:4:"left";s:6:"height";s:4:"auto";s:7:"z-index";s:4:"1000";s:6:"cursor";s:7:"pointer";s:10:"border-top";s:17:"1px solid #d0d0d0";s:13:"border-bottom";s:17:"1px solid #d0d0d0";s:11:"border-left";s:17:"1px solid #d0d0d0";s:12:"border-right";s:17:"1px solid #d0d0d0";s:12:"padding-left";s:3:"7px";s:13:"padding-right";s:3:"7px";s:14:"padding-bottom";s:3:"2px";}s:25:"div.x6menu ul li.selected";a:6:{s:16:"background-color";s:7:"#4A79B5";s:5:"color";s:7:"#ffffff";s:10:"border-top";s:17:"1px solid #000000";s:13:"border-bottom";s:1:"0";s:11:"border-left";s:17:"1px solid #000000";s:12:"border-right";s:17:"1px solid #000000";}s:27:"div.x6menu ul li.selected a";a:1:{s:5:"color";s:7:"#ffffff";}s:16:"div.x6menu ul ul";a:2:{s:7:"display";s:5:"block";s:8:"position";s:8:"absolute";}s:25:"div.x6menu ul ul.dropdown";a:9:{s:7:"z-index";s:4:"1000";s:10:"border-top";s:17:"1px solid #000000";s:13:"border-bottom";s:17:"1px solid #000000";s:11:"border-left";s:17:"1px solid #000000";s:12:"border-right";s:17:"1px solid #000000";s:16:"background-color";s:7:"#ffffff";s:5:"width";s:5:"250px";s:11:"margin-left";s:4:"-8px";s:10:"margin-top";s:3:"2px";}s:19:"div.x6menu ul li li";a:3:{s:7:"display";s:5:"block";s:5:"float";s:4:"none";s:7:"z-index";s:4:"1000";}s:22:"div.x6menu ul li ul li";a:4:{s:11:"text-indent";s:1:"0";s:6:"margin";s:1:"0";s:7:"padding";s:1:"0";s:6:"border";s:1:"0";}s:24:"div.x6menu ul li ul li a";a:4:{s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:12:"padding-left";s:3:"7px";s:13:"padding-right";s:1:"0";}s:33:"div.x6menu ul li.selected ul li a";a:1:{s:5:"color";s:7:"#000000";}s:30:"div.x6menu ul li ul li a;hover";a:2:{s:16:"background-color";s:7:"#4A79B5";s:5:"color";s:7:"#ffffff";}s:16:"@x6menu_left div";a:3:{s:11:"font-weight";s:6:"bolder";s:9:"font-size";s:4:"125%";s:6:"cursor";s:7:"pointer";}s:24:"@x6menu_left div.hilight";a:2:{s:16:"background-color";s:7:"#4A79B5";s:5:"color";s:5:"white";}s:21:"@x6menu_right div div";a:6:{s:11:"font-weight";s:6:"bolder";s:9:"font-size";s:4:"105%";s:6:"cursor";s:7:"pointer";s:11:"line-height";s:4:"200%";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";}s:29:"@x6menu_right div div.hilight";a:1:{s:16:"background-color";s:7:"#d0d0d0";}s:14:"table.x6Detail";a:2:{s:14:"border-spacing";s:1:"0";s:15:"border-collapse";s:8:"collapse";}s:12:"td.x6Caption";a:5:{s:10:"text-align";s:5:"right";s:11:"padding-top";s:3:"3px";s:12:"padding-left";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:14:"vertical-align";s:3:"top";}s:12:".ui-tabs-nav";a:14:{s:10:"list-style";s:4:"none";s:5:"float";s:4:"left";s:8:"position";s:8:"relative";s:6:"bottom";s:4:"-1px";s:7:"z-index";s:1:"1";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:11:"padding-top";s:1:"0";s:14:"padding-bottom";s:1:"0";s:12:"padding-left";s:1:"0";s:13:"padding-right";s:1:"0";s:12:"border-right";s:17:"1px solid #909090";}s:15:".ui-tabs-nav li";a:16:{s:15:"text-decoration";s:4:"none";s:10:"list-style";s:4:"none";s:5:"float";s:4:"left";s:11:"line-height";s:4:"21px";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:11:"padding-top";s:3:"7px";s:14:"padding-bottom";s:3:"7px";s:12:"padding-left";s:3:"7px";s:13:"padding-right";s:3:"7px";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:1:"0";}s:17:".ui-tabs-nav li a";a:13:{s:10:"list-style";s:4:"none";s:5:"float";s:4:"left";s:15:"text-decoration";s:4:"none";s:7:"outline";s:4:"none";s:5:"color";s:7:"#000000";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:10:"border-top";s:1:"0";s:13:"border-bottom";s:1:"0";s:11:"border-left";s:1:"0";s:12:"border-right";s:1:"0";}s:14:".ui-tabs-panel";a:16:{s:15:"text-decoration";s:4:"none";s:10:"list-style";s:4:"none";s:5:"clear";s:4:"left";s:7:"outline";s:1:"0";s:10:"margin-top";s:1:"0";s:13:"margin-bottom";s:1:"0";s:11:"margin-left";s:1:"0";s:12:"margin-right";s:1:"0";s:11:"padding-top";s:1:"0";s:14:"padding-bottom";s:1:"0";s:12:"padding-left";s:1:"0";s:13:"padding-right";s:1:"0";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";}s:13:".ui-tabs-hide";a:1:{s:7:"display";s:4:"none";}s:33:".ui-tabs-nav li.ui-state-active a";a:1:{s:5:"color";s:7:"#ffffff";}s:31:".ui-tabs-nav li.ui-state-active";a:1:{s:16:"background-color";s:7:"#5E71A2";}s:35:".ui-tabs-nav li.ui-state-disabled a";a:2:{s:5:"color";s:7:"#d0d0d0";s:6:"cursor";s:7:"default";}s:11:"span.button";a:5:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:6:"cursor";s:7:"pointer";}s:21:"span.button_mousedown";a:5:{s:13:"border-bottom";s:17:"1px solid #ffFFff";s:10:"border-top";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:6:"cursor";s:7:"pointer";}s:24:"div.x6buttonBar a.button";a:14:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:5:"color";s:7:"#ffffff";s:16:"background-color";s:7:"#4A79B5";s:11:"margin-left";s:3:"3px";s:10:"margin-top";s:3:"3px";s:13:"margin-bottom";s:3:"3px";s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";s:11:"line-height";s:4:"16px";}s:34:"div.x6buttonBar a.button_mousedown";a:4:{s:13:"border-bottom";s:17:"1px solid #ffFFff";s:10:"border-top";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";}s:33:"div.x6buttonBar a.button_disabled";a:13:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";s:5:"color";s:7:"#909090";s:11:"margin-left";s:3:"3px";s:10:"margin-top";s:3:"3px";s:13:"margin-bottom";s:3:"3px";s:11:"padding-top";s:3:"3px";s:14:"padding-bottom";s:3:"3px";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";s:11:"line-height";s:4:"16px";}s:13:"div.thead div";a:2:{s:6:"height";s:4:"32px";s:16:"background-color";s:7:"#d0d0d0";}s:17:"div.thead div div";a:8:{s:5:"float";s:4:"left";s:11:"line-height";s:4:"32px";s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:13:"padding-right";s:3:"3px";s:12:"padding-left";s:3:"3px";}s:9:"div.tbody";a:3:{s:10:"overflow-x";s:6:"hidden";s:10:"overflow-y";s:6:"scroll";s:5:"clear";s:4:"both";}s:17:"div.tbody div div";a:10:{s:5:"float";s:4:"left";s:8:"overflow";s:6:"hidden";s:10:"border-top";s:1:"0";s:13:"border-bottom";s:1:"0";s:11:"border-left";s:17:"1px solid #f0f0f0";s:12:"border-right";s:17:"1px solid #f0f0f0";s:13:"padding-right";s:3:"3px";s:12:"padding-left";s:3:"3px";s:11:"line-height";s:4:"32px";s:6:"height";s:4:"32px";}s:28:"div.tbody div.selected input";a:2:{s:11:"margin-left";s:4:"-2px";s:12:"margin-right";s:4:"-2px";}s:25:"div.tbody div.flavor0 div";a:3:{s:16:"background-color";s:7:"#A0FFA0";s:11:"border-left";s:17:"1px solid #A0FFA0";s:12:"border-right";s:17:"1px solid #A0FFA0";}s:25:"div.tbody div.flavor1 div";a:3:{s:16:"background-color";s:7:"#A0A0FF";s:11:"border-left";s:17:"1px solid #A0A0FF";s:12:"border-right";s:17:"1px solid #A0A0FF";}s:25:"div.tbody div.flavor2 div";a:3:{s:16:"background-color";s:7:"#FFA0A0";s:11:"border-left";s:17:"1px solid #FFA0A0";s:12:"border-right";s:17:"1px solid #FFA0A0";}s:25:"div.tbody div.flavor3 div";a:3:{s:16:"background-color";s:7:"#FF00FF";s:11:"border-left";s:17:"1px solid #FF00FF";s:12:"border-right";s:17:"1px solid #FF00FF";}s:15:"div.tbody input";a:2:{s:11:"padding-top";s:3:"3px";s:6:"height";s:4:"24px";}s:25:"div.tbody div.hilight div";a:3:{s:16:"background-color";s:7:"#d0d0d0";s:11:"border-left";s:17:"1px solid #d0d0d0";s:12:"border-right";s:17:"1px solid #d0d0d0";}s:18:"div.x6select table";a:2:{s:14:"border-spacing";s:1:"0";s:16:"background-color";s:7:"#ffffff";}s:38:"div.x6select table tbody tr.hilight td";a:1:{s:16:"background-color";s:7:"#d0d0d0";}s:30:"div.x6select table thead tr th";a:5:{s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:16:"background-color";s:7:"#f0f0f0";}s:10:"@dialogbox";a:2:{s:6:"border";s:17:"7px solid #4A79B5";s:16:"background-color";s:7:"#ffffff";}s:13:".x6modalblock";a:9:{s:7:"z-index";s:5:"10000";s:16:"background-color";s:7:"#000000";s:6:"cursor";s:4:"wait";s:7:"display";s:4:"none";s:8:"position";s:8:"absolute";s:3:"top";s:7:"-5000px";s:4:"left";s:7:"-5000px";s:5:"width";s:7:"20000px";s:6:"height";s:7:"20000px";}s:8:".x6modal";a:9:{s:8:"position";s:8:"absolute";s:7:"display";s:4:"none";s:7:"z-index";s:5:"10001";s:10:"border-top";s:17:"1px solid #ffFFff";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #ffFFff";s:12:"border-right";s:17:"1px solid #909090";s:16:"background-color";s:7:"#d0d0d0";s:7:"padding";s:3:"3px";}s:11:".x6modaltop";a:2:{s:6:"height";s:4:"32px";s:11:"line-height";s:4:"32px";}s:13:".x6modaltop a";a:1:{s:15:"text-decoration";s:4:"none";}s:13:".x6modalinner";a:6:{s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #ffFFff";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #ffFFff";s:7:"padding";s:3:"3px";s:16:"background-color";s:7:"#f0f0f0";}s:16:"table.x6standard";a:5:{s:10:"max-height";s:5:"806px";s:10:"border-top";s:17:"1px solid #909090";s:13:"border-bottom";s:17:"1px solid #909090";s:11:"border-left";s:17:"1px solid #909090";s:12:"border-right";s:17:"1px solid #909090";}s:28:"table.x6standard thead tr th";a:1:{s:16:"background-color";s:7:"#d0d0d0";}s:28:"table.x6standard tbody tr td";a:1:{s:14:"vertical-align";s:3:"top";}}}
\ No newline at end of file
+a:2:{s:7:"defines";a:68:{s:4:"link";s:4:"blue";s:7:"bgcdark";s:7:"#d0d0d0";s:8:"bgclight";s:7:"#f0f0f0";s:11:"shadowlight";s:7:"#ffFFff";s:10:"shadowdark";s:7:"#909090";s:5:"black";s:7:"#000000";s:5:"white";s:7:"#ffffff";s:7:"bgcmenu";s:7:"#4A79B5";s:4:"dark";s:7:"#5E71A2";s:8:"selected";s:7:"#30FF30";s:7:"flavor0";s:7:"#A0FFA0";s:7:"flavor1";s:7:"#A0A0FF";s:7:"flavor2";s:7:"#FFA0A0";s:7:"flavor3";s:7:"#FF00FF";s:10:"clrChanged";s:6:"yellow";s:8:"clrError";s:7:"#ff4500";s:5:"clrOk";s:7:"#7fff00";s:11:"clrRequired";s:7:"#abcdef";s:3:"bw0";s:3:"1px";s:4:"zero";s:1:"0";s:3:"ff0";s:7:"verdana";s:3:"bs0";s:5:"solid";s:5:"bor1t";s:17:"1px solid #909090";s:5:"bor1b";s:17:"1px solid #ffFFff";s:5:"bor1l";s:17:"1px solid #909090";s:5:"bor1r";s:17:"1px solid #ffFFff";s:5:"bor2t";s:17:"1px solid #ffFFff";s:5:"bor2b";s:17:"1px solid #909090";s:5:"bor2l";s:17:"1px solid #ffFFff";s:5:"bor2r";s:17:"1px solid #909090";s:5:"bor3t";s:17:"1px solid #909090";s:5:"bor3b";s:17:"1px solid #909090";s:5:"bor3l";s:17:"1px solid #909090";s:5:"bor3r";s:17:"1px solid #909090";s:5:"bordr";s:17:"1px solid #f0f0f0";s:6:"bordr2";s:17:"1px solid #d0d0d0";s:12:"insideheight";s:5:"806px";s:10:"tinpheight";s:4:"24px";s:9:"barheight";s:4:"32px";s:5:"barlh";s:4:"33px";s:3:"fs0";s:4:"16px";s:3:"lh0";s:4:"24px";s:3:"lh1";s:4:"21px";s:5:"lhtab";s:4:"21px";s:6:"fsfoot";s:4:"13px";s:6:"lhfoot";s:4:"21px";s:8:"lhstatus";s:4:"26px";s:8:"lhbutton";s:4:"16px";s:6:"lhmbar";s:4:"28px";s:4:"fsh1";s:4:"24px";s:4:"lhh1";s:4:"37px";s:4:"fsh2";s:4:"21px";s:4:"lhh2";s:4:"32px";s:10:"menumartop";s:3:"2px";s:8:"menupadb";s:3:"2px";s:8:"menupost";s:4:"30px";s:12:"outsidewidth";s:6:"1238px";s:11:"insidewidth";s:6:"1237px";s:7:"menupad";s:3:"7px";s:6:"tabpad";s:4:"15px";s:4:"pad0";s:3:"3px";s:8:"pad0more";s:3:"5px";s:8:"pad0less";s:3:"2px";s:4:"pad1";s:3:"7px";s:8:"tinppadt";s:3:"3px";s:13:"dropdownwidth";s:5:"250px";s:13:"dropdownshift";s:4:"-8px";s:18:"dropdowninnerwidth";s:5:"235px";}s:3:"css";a:85:{s:7:".fadein";a:1:{s:7:"display";s:4:"none";}s:7:".x6main";a:4:{s:8:"position";s:8:"relative";s:16:"background-color";s:7:"#f0f0f0";s:12:"padding-left";s:3:"3px";s:13:"padding-right";s:3:"3px";}s:17:"a.button_disabled";a:2:{s:6:"cursor";s:7:"default";s:7:"outline";s:1:"0";}s:1:"a";a:1:{s:7:"outline";s:1:"0";}s:42:"a.button_disabled,a.button,div.thead div a";a:2:{s:15:"text-decoration";s:4:"none";s:7:"display";s:5:"block"...
[truncated message content] |
|
From: <ken...@us...> - 2009-02-17 14:39:35
|
Revision: 1244
http://andro.svn.sourceforge.net/andro/?rev=1244&view=rev
Author: kendowns
Date: 2009-02-17 14:39:22 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Sourceforge 2609269
Modified Paths:
--------------
trunk/andro/lib/x6skinJob.php
Modified: trunk/andro/lib/x6skinJob.php
===================================================================
--- trunk/andro/lib/x6skinJob.php 2009-02-17 14:29:26 UTC (rev 1243)
+++ trunk/andro/lib/x6skinJob.php 2009-02-17 14:39:22 UTC (rev 1244)
@@ -64,6 +64,7 @@
$files = scandir($dir);
foreach($files as $file) {
+ echo "<br/>$dir$file;";
# These lines filter out entries that are not skins
$apieces = explode('.',$file);
if(count($apieces)!=3 ) continue;
@@ -73,7 +74,14 @@
# Load the file and process it. We assume the
# middle piece of the file is the name of the
# template.
- $yaml = loadYaml($dir.$file);
+ list($yaml,$errors) = loadYaml($dir.$file);
+ if(count($errors) > 0) {
+ echo "<h2>Errors encountered in skin file</h2>";
+ echo "<p>File: $dir$file</p>";
+ hprint_r($errors);
+ return;
+ }
+ removeYamlLineNumbers($yaml);
$this->writeCSS($apieces[1],$yaml['defines'],$yaml['css']);
}
}
@@ -276,6 +284,7 @@
$selector = str_replace(';',':',$selector);
echo "$selector {\n";
foreach($rules as $rule=>$value) {
+ if($rule=='__yaml_line') continue;
if(trim($value)=='' || is_null($value)) continue;
echo " ".str_pad($rule.':',25,' ',STR_PAD_RIGHT)."$value;\n";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 14:29:29
|
Revision: 1243
http://andro.svn.sourceforge.net/andro/?rev=1243&view=rev
Author: kendowns
Date: 2009-02-17 14:29:26 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Sourceforge bug 2609269 fixed.
Modified Paths:
--------------
trunk/andro/lib/androLib.php
Modified: trunk/andro/lib/androLib.php
===================================================================
--- trunk/andro/lib/androLib.php 2009-02-17 14:28:46 UTC (rev 1242)
+++ trunk/andro/lib/androLib.php 2009-02-17 14:29:26 UTC (rev 1243)
@@ -5609,8 +5609,20 @@
function loadYaml($filename) {
include_once("spyc.php");
- return Spyc::YAMLLoad($filename);
+ $parser = new Spyc;
+ $temparray = $parser->load($filename);
+ return array($temparray,$parser->errors);
}
+function removeYamlLineNumbers(&$yaml) {
+ foreach($yaml as $key=>$value) {
+ if($key=='__yaml_line') {
+ unset($yaml[$key]);
+ }
+ elseif(is_array($value)) {
+ removeYamlLineNumbers($yaml[$key]);
+ }
+ }
+}
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 14:28:56
|
Revision: 1242
http://andro.svn.sourceforge.net/andro/?rev=1242&view=rev
Author: kendowns
Date: 2009-02-17 14:28:46 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Trivial: indentation correction.
Modified Paths:
--------------
trunk/andro/application/androBuild.php
Modified: trunk/andro/application/androBuild.php
===================================================================
--- trunk/andro/application/androBuild.php 2009-02-17 13:52:44 UTC (rev 1241)
+++ trunk/andro/application/androBuild.php 2009-02-17 14:28:46 UTC (rev 1242)
@@ -1201,7 +1201,7 @@
$row['srcfile']=$srcfile;
$return = $this->DBB_Insert("zdd.",$table,$cLoadSuffix,$row);
if($return == '') {
- x_echoFlush(
+ x_echoFlush(
" Parent object defined at line ".$properties['__yaml_line']
);
hprint_r($properties);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 13:52:48
|
Revision: 1241
http://andro.svn.sourceforge.net/andro/?rev=1241&view=rev
Author: kendowns
Date: 2009-02-17 13:52:44 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Sourceforge bug 2609176.
Modified Paths:
--------------
trunk/andro/lib/androX6.php
Modified: trunk/andro/lib/androX6.php
===================================================================
--- trunk/andro/lib/androX6.php 2009-02-17 13:46:08 UTC (rev 1240)
+++ trunk/andro/lib/androX6.php 2009-02-17 13:52:44 UTC (rev 1241)
@@ -1064,7 +1064,13 @@
$input=input($this->dd['flat'][$column],$tabLoop);
$input->hp['xSkey'] = $row['skey'];
- $input->hp['value'] = htmlentities($row[$column]);
+ # KFD 2/17/09 Sourceforge bug 2609176
+ if($input->htype=='textarea') {
+ $input->setHtml(htmlentities($row[$column]));
+ }
+ else {
+ $input->hp['value'] = htmlentities($row[$column]);
+ }
$td = $tr->h('td');
$td->setHtml($input->bufferedRender());
$td->addClass('x6Input');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 13:46:16
|
Revision: 1240
http://andro.svn.sourceforge.net/andro/?rev=1240&view=rev
Author: kendowns
Date: 2009-02-17 13:46:08 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Sourceforge bug 2591306 resolved.
Modified Paths:
--------------
trunk/andro/application/androBuild.php
trunk/andro/lib/androLib.php
Modified: trunk/andro/application/androBuild.php
===================================================================
--- trunk/andro/application/androBuild.php 2009-02-17 13:22:46 UTC (rev 1239)
+++ trunk/andro/application/androBuild.php 2009-02-17 13:46:08 UTC (rev 1240)
@@ -9409,6 +9409,10 @@
$text.="\n ";
if($docomma) $text.=",";
$docomma = true;
+ # KFD 2/17/09 Sourceforge 2591306
+ # See also androLib, configWrite(),
+ # code is duplicated.
+ $value = str_replace("'","\'",$value);
$text.="'$column_id'=>'$value'";
}
$text.="\n);\n?>";
Modified: trunk/andro/lib/androLib.php
===================================================================
--- trunk/andro/lib/androLib.php 2009-02-17 13:22:46 UTC (rev 1239)
+++ trunk/andro/lib/androLib.php 2009-02-17 13:46:08 UTC (rev 1240)
@@ -4473,6 +4473,9 @@
$text.="\n ";
if($docomma) $text.=",";
$docomma = true;
+ # KFD 2/17/09 Sourceforge 2591306
+ # See also androBuild, code is duplicated.
+ $value = str_replace("'","\'",$value);
$text.="'$column_id'=>'$value'";
}
$text.="\n);\n?>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-17 13:22:50
|
Revision: 1239
http://andro.svn.sourceforge.net/andro/?rev=1239&view=rev
Author: kendowns
Date: 2009-02-17 13:22:46 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Sourceforge 2546056, graceful message if bad value of gp_page or x6page.
Modified Paths:
--------------
trunk/andro/lib/androX6.php
trunk/andro/lib/index_hidden.php
trunk/andro/lib/x_table2.php
Modified: trunk/andro/lib/androX6.php
===================================================================
--- trunk/andro/lib/androX6.php 2009-02-13 18:07:16 UTC (rev 1238)
+++ trunk/andro/lib/androX6.php 2009-02-17 13:22:46 UTC (rev 1239)
@@ -828,6 +828,20 @@
# *******************************************************************
# ===================================================================
function profile_conventional() {
+ # KFD 2/17/09 Sourceforge 2546056. The dispatching system
+ # sends page requests here by default. This is
+ # where we have to work out if there is a bad
+ # page request.
+ if(!isset($this->dd['table_id'])) {
+ ?>
+ <h1>No Page By That Name</h1>
+
+ <p>There is no page <b><?php echo hx(gp('x6page'))?></b>.
+ <?php
+ return;
+ }
+
+
# KFD 2/9/09, new feature for Jeff/wholdist. If "table_id_par"
# was passed in, load a certain row from the parent
# table into the bulletin board. Specifically this
Modified: trunk/andro/lib/index_hidden.php
===================================================================
--- trunk/andro/lib/index_hidden.php 2009-02-13 18:07:16 UTC (rev 1238)
+++ trunk/andro/lib/index_hidden.php 2009-02-17 13:22:46 UTC (rev 1239)
@@ -656,6 +656,11 @@
# is x6main, this means an unprogrammed page: there is
# no custom program file and no profile in the yaml.
# So we default to the conventional profile.
+ #
+ # KFD 2/17/09 Sourceforge 2546056
+ # This means that bad page requests go to
+ # profile_conventional(), so that is where
+ # we trap for them. See androX6::profile_conventional()
if($x6method=='x6main' && $x6class=='androX6') {
$x6method = 'profile_conventional';
Modified: trunk/andro/lib/x_table2.php
===================================================================
--- trunk/andro/lib/x_table2.php 2009-02-13 18:07:16 UTC (rev 1238)
+++ trunk/andro/lib/x_table2.php 2009-02-17 13:22:46 UTC (rev 1239)
@@ -236,6 +236,18 @@
if(vgfGet('suppress_maintenance',false)) return;
vgfset('maintenance',true);
+ # KFD 2/17/09 Sourceforge 2546056
+ # If we are in default main code branch, and
+ # there is no data dictionary, the user has
+ # called a bad page.
+ if(!isset($this->table['projections'])) {
+ ?>
+ <h1>Bad Page Request</h1>
+ <p>There is no page <?php echo hx(gp('gp_page'))?>
+ <?php
+ return;
+ }
+
// If a "fk jump", retrieve skey and make it look
// like an edit call.
if(gp('gp_pk')<>'') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-13 18:07:19
|
Revision: 1238
http://andro.svn.sourceforge.net/andro/?rev=1238&view=rev
Author: kendowns
Date: 2009-02-13 18:07:16 +0000 (Fri, 13 Feb 2009)
Log Message:
-----------
Added Paths:
-----------
releases/2009.02.13/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
