JBoss Rich Faces SVN: r5234 - branches/3.1.x/ui/dataTable/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-01-09 12:32:01 -0500 (Wed, 09 Jan 2008)
New Revision: 5234
Modified:
branches/3.1.x/ui/dataTable/src/main/config/component/column.xml
Log:
http://jira.jboss.com/jira/browse/RF-1704
Modified: branches/3.1.x/ui/dataTable/src/main/config/component/column.xml
===================================================================
--- branches/3.1.x/ui/dataTable/src/main/config/component/column.xml 2008-01-09 17:19:35 UTC (rev 5233)
+++ branches/3.1.x/ui/dataTable/src/main/config/component/column.xml 2008-01-09 17:32:01 UTC (rev 5234)
@@ -66,7 +66,6 @@
<description>
Attribute defines width of column. Default value is "100px".
</description>
- <defaultvalue>"100px"</defaultvalue>
</property>
<property>
16 years, 3 months
JBoss Rich Faces SVN: r5233 - in trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html: scripts and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-01-09 12:19:35 -0500 (Wed, 09 Jan 2008)
New Revision: 5233
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
RF-1717
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2008-01-09 17:09:30 UTC (rev 5232)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2008-01-09 17:19:35 UTC (rev 5233)
@@ -49,6 +49,7 @@
.rich-calendar-month{
vertical-align : middle;
text-align : center;
+ height : 22px;
}
.rich-calendar-days{
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-01-09 17:09:30 UTC (rev 5232)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-01-09 17:19:35 UTC (rev 5233)
@@ -549,6 +549,7 @@
// style - table style
// className - table class
+ //var _d = new Date();
this.id = id;
this.params = parameters;
@@ -649,6 +650,8 @@
var bottomStyleClass;
var htmlTextWeekDayBar='';
var context;
+ var tempStr = "$('"+this.id+"').component.";
+ var eventsStr = 'onclick="'+tempStr+'eventCellOnClick(event, this);" onmouseover="'+tempStr+'eventCellOnMouseOver(event, this);" onmouseout="'+tempStr+'eventCellOnMouseOut(event, this);"';
if (this.params.showWeekDaysBar)
{
var htmlTextWeekDayBar = '<tr id="'+this.params.weekDayBarId+'">';
@@ -674,6 +677,7 @@
// week & weekNumber creation
var htmlTextWeek='';
var p=0;
+ this.dayCellClassName = [];
for (k=1;k<7;k++)
{
@@ -693,15 +697,16 @@
if (i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber) styleClass+=" rich-calendar-holly";
if (i==6) styleClass+=" rich-right-cell";
- htmlTextWeek+='<td class="'+styleClass+'" id="'+this.DATE_ELEMENT_ID+p+'">'+(this.customDayListMarkup ? '<div class="rich-calendar-cell-div'+(this.params.dayCellClass ? ' '+this.params.dayCellClass : '')+'"></div>' : '')+'</td>';
+ this.dayCellClassName.push(styleClass);
+ htmlTextWeek+='<td class="'+styleClass+'" id="'+this.DATE_ELEMENT_ID+p+'"'+
+ eventsStr+
+ '>'+(this.customDayListMarkup ? '<div class="rich-calendar-cell-div'+(this.params.dayCellClass ? ' '+this.params.dayCellClass : '')+'"></div>' : '')+'</td>';
p++;
}
htmlTextWeek+='</tr>';
}
- var span=$(this.POPUP_ID);
-
- var obj = span.nextSibling;
+ var obj = $(this.POPUP_ID).nextSibling;
if (this.params.popup && Richfaces.browser.isIE6)
{
do {
@@ -730,14 +735,12 @@
obj.component = this;
obj.richfacesComponent="richfaces:calendar";
+ // memory leaks fix
obj = null;
- span = null;
if(this.params.submitFunction) this.submitFunction = this.params.submitFunction.bind(this);
this.prepareEvents();
- this.doSetCellEvents=true;
-
// add onclick event handlers to input field and popup button
if (this.params.popup && !this.params.disabled)
{
@@ -749,6 +752,8 @@
}
}
+ //alert(new Date().getTime()-_d.getTime());
+
},
dateEditorSelectYear: function(value)
@@ -1044,10 +1049,6 @@
if (this.isEditorVisible) this.hideEditor();
- /*this.stopTimer();
- this.stopPopupEvents($(this.id));
- this.stopPopupEvents($(this.POPUP_ID));*/
-
var element = $(this.id);
if (this.invokeEvent("collapse", element))
@@ -1061,19 +1062,6 @@
Element.hide(element);
this.isVisible = false;
- /*if (this.floatedToBody && this.parent)
- {
- if (iframe)
- {
- document.body.removeChild(iframe);
- this.parent.appendChild(iframe);
- }
- document.body.removeChild(element);
- this.parent.appendChild(element);
- this.floatedToBody = false;
- this.parent = null;
- }*/
-
}
},
@@ -1090,13 +1078,6 @@
var iframe=null;
if (Richfaces.browser.isIE6) iframe = $(this.IFRAME_ID);
- /*if (!this.floatedToBody) {
- this.parent = element.parentNode;
- if (iframe) document.body.insertBefore(this.parent.removeChild(iframe), null);
- document.body.insertBefore(this.parent.removeChild(element), null);
- this.floatedToBody = true;
- }*/
-
var base = $(this.POPUP_ID)
var baseInput = base.firstChild;
var baseButton = baseInput.nextSibling;
@@ -1106,9 +1087,6 @@
this.selectDate(baseInput.value);
}
- /*this.setPopupEvents(e);
- this.setPopupEvents(base);*/
-
//rect calculation
var offsetBase = Position.cumulativeOffset(baseButton);
@@ -1222,52 +1200,9 @@
},
prepareEvents: function() {
- this.eventCellOnClick = this.eventCellOnClick.bindAsEventListener(this);
- this.eventCellOnMouseOver = this.eventCellOnMouseOver.bindAsEventListener(this);
- this.eventCellOnMouseOut = this.eventCellOnMouseOut.bindAsEventListener(this);
this.eventOnCollapse = this.eventOnCollapse.bindAsEventListener(this);
- //this.eventOnMouseOver = this.eventOnMouseOver.bindAsEventListener(this);
- //this.eventOnMouseOut = this.eventOnMouseOut.bindAsEventListener(this);
},
-/* setPopupEvents: function(obj) {
- Event.observe(obj, "mouseover", this.eventOnMouseOver, false);
- Event.observe(obj, "mouseout", this.eventOnMouseOut, false);
- },
-
- stopPopupEvents: function(obj) {
- Event.stopObserving(obj, "mouseover", this.eventOnMouseOver, false);
- Event.stopObserving(obj, "mouseout", this.eventOnMouseOut, false);
- },
- *
- stopTimer: function()
- {
- if (this.popupIntervalId!=null)
- {
- clearTimeout(this.popupIntervalId);
- this.popupIntervalId=null;
- }
- },
-
- eventOnMouseOver: function(e) {
- this.stopTimer();
- },
-
- eventOnMouseOut: function(e) {
- if (this.popupIntervalId==null) this.popupIntervalId = setTimeout('$("'+this.id+'").component.doCollapse()',400);
- },*/
-
- setCellEvents: function(obj) {
- Event.observe(obj, "click", this.eventCellOnClick, false);
- Event.observe(obj, "mouseover", this.eventCellOnMouseOver, false);
- Event.observe(obj, "mouseout", this.eventCellOnMouseOut, false);
- },
- stopCellEvents: function(obj) {
- Event.stopObserving(obj, "click", this.eventCellOnClick, false);
- Event.stopObserving(obj, "mouseover", this.eventCellOnMouseOver, false);
- Event.stopObserving(obj, "mouseout", this.eventCellOnMouseOut, false);
- },
-
invokeEvent: function(eventName, element, event, date) {
var eventFunction = this.params['on'+eventName];
var result;
@@ -1306,59 +1241,44 @@
return result;
},
- eventCellOnClick: function (e) {
- var obj = Event.findElementByAttr(e, "TD", "id", this.DATE_ELEMENT_ID, true);
- if (obj)
+ eventCellOnClick: function (e, obj) {
+ var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
+ if (daydata.enabled && daydata._month==0)
{
- var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
- if (daydata.enabled && daydata._month==0)
+ var date=new Date(this.currentDate);
+ date.setDate(daydata.day);
+
+ if (this.selectDate(date,true) && !this.showApplyButton)
{
- var date=new Date(this.currentDate);
- date.setDate(daydata.day);
+ this.doCollapse();
+ }
- if (this.selectDate(date,true) && !this.showApplyButton)
+ } else {
+ if (this.params.boundaryDatesMode == "scroll")
+ if (daydata._month==-1) this.prevMonth(); else this.nextMonth();
+ else if (this.params.boundaryDatesMode == "select")
+ {
+ if (this.selectDate(daydata.date) && !this.showApplyButton)
{
- this.doCollapse();
+ this.doCollapse();
}
-
- } else {
- if (this.params.boundaryDatesMode == "scroll")
- if (daydata._month==-1) this.prevMonth(); else this.nextMonth();
- else if (this.params.boundaryDatesMode == "select")
- {
- //var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
- if (this.selectDate(daydata.date) && !this.showApplyButton)
- {
- this.doCollapse();
- }
- }
}
}
},
- eventCellOnMouseOver: function (e) {
- var obj = Event.findElementByAttr(e, "TD", "id", this.DATE_ELEMENT_ID, true);
- if (obj)
+ eventCellOnMouseOver: function (e, obj) {
+ var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
+ if (this.invokeEvent("datemouseover", obj, e, daydata.date) && daydata.enabled)
{
- var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
- //var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
- if (this.invokeEvent("datemouseover", obj, e, daydata.date) && daydata.enabled)
- {
- if (daydata._month==0 && obj.id!=this.selectedDateCellId && obj.id!=this.todayCellId) Element.addClassName(obj,'rich-calendar-hover');
- }
+ if (daydata._month==0 && obj.id!=this.selectedDateCellId && obj.id!=this.todayCellId) Element.addClassName(obj,'rich-calendar-hover');
}
},
- eventCellOnMouseOut: function (e) {
- var obj = Event.findElementByAttr(e, "TD", "id", this.DATE_ELEMENT_ID, true);
- if (obj)
+ eventCellOnMouseOut: function (e, obj) {
+ var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
+ if (this.invokeEvent("datemouseout", obj, e, daydata.date) && daydata.enabled)
{
- var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
- //var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
- if (this.invokeEvent("datemouseout", obj, e, daydata.date) && daydata.enabled)
- {
- if (daydata._month==0 && obj.id!=this.selectedDateCellId && obj.id!=this.todayCellId) Element.removeClassName(obj,'rich-calendar-hover');
- }
+ if (daydata._month==0 && obj.id!=this.selectedDateCellId && obj.id!=this.todayCellId) Element.removeClassName(obj,'rich-calendar-hover');
}
},
@@ -1375,7 +1295,7 @@
// styleClass
// }
- if (!$(this.id).component) return;
+ //if (!$(this.id).component) return;
if (daysData) {
this.daysData = this.indexData(daysData, isAjaxMode);
@@ -1456,7 +1376,7 @@
},
render:function() {
-
+ //var _d=new Date();
this.todayDate = new Date();
var currentYear = this.getCurrentYear();
@@ -1546,11 +1466,10 @@
var boundaryDatesModeFlag = (this.params.boundaryDatesMode == "scroll" || this.params.boundaryDatesMode == "select");
- this.todayCellId = this.clearEffect(this.todayCellId, this.highlightEffect, "rich-calendar-today");
- this.selectedDateCellId = this.clearEffect(this.selectedDateCellId, this.highlightEffect2, "rich-calendar-select", "rich-calendar-btn");
+ this.todayCellId = this.clearEffect(this.todayCellId, this.highlightEffect);
+ this.selectedDateCellId = this.clearEffect(this.selectedDateCellId, this.highlightEffect2);
//var _d=new Date();
-
var obj = $(this.params.weekNumberBarId+"1");
for (var k=1;k<7;k++)
{
@@ -1581,9 +1500,6 @@
while (element)
{
- // TODO fix start/stop event's calls
- //this.stopCellEvents(element);
-
dataobj.elementId=element.id;
dataobj.date=new Date(currentYear, currentMonth+dataobj._month, dataobj.day);
dataobj.weekNumber = weeknumber;
@@ -1598,7 +1514,7 @@
else
{
var styleclass = this.params.dayStyleClass(dataobj);
- dataobj.customStyleClass = dataobj.styleClass
+ dataobj.customStyleClass = dataobj.styleClass;
if (styleclass) dataobj.customStyleClass += " " + styleclass;
}
@@ -1607,58 +1523,48 @@
if (weekdaycounter==6) weekdaycounter=0; else weekdaycounter++;
- // class styles
- e = Element.classNames(element);
- // remove custom style class
- if (element.rich && element.rich.customStyleClass)
- {
- element.rich.customStyleClass.split(' ').each(function(name){e.remove(name);});
- element.rich.customStyleClass = null;
- }
+ var classNames = this.dayCellClassName[p];
+ // class styles
if (dataobj._month!=0)
{
- e.add('rich-calendar-boundary-dates');
+ classNames+=' rich-calendar-boundary-dates';
if (boundaryDatesModeFlag)
- e.add('rich-calendar-btn');
- else
- e.remove('rich-calendar-btn');}
+ {
+ classNames+=' rich-calendar-btn';
+ }
+ }
else
{
- e.remove('rich-calendar-boundary-dates');
- if (dataobj.enabled) e.add('rich-calendar-btn'); else e.remove('rich-calendar-btn');
+ if (todayflag && dataobj.day==todaydate)
+ {
+ this.todayCellId = element.id;
+ this.todayCellColor = this.getCellBackgroundColor(element);
+ classNames+=" rich-calendar-today";
+ }
+
+ if (selectedflag && dataobj.day==selecteddate)
+ {
+ this.selectedDateCellId = element.id;
+ this.selectedDateCellColor = this.getCellBackgroundColor(element);
+ classNames+=" rich-calendar-select";
+ }
+ else if (dataobj.enabled) classNames+=' rich-calendar-btn';
// add custom style class
if (dataobj.customStyleClass)
{
- e.add(dataobj.customStyleClass);
- element.rich = {customStyleClass: dataobj.customStyleClass};
+ classNames+=' '+dataobj.customStyleClass;
}
}
+ element.className = classNames;
- // TODO make some optimization with rich-calendar-today class
- if (todayflag && dataobj._month==0 && dataobj.day==todaydate)
- {
- this.todayCellId = element.id;
- this.todayCellColor = this.getCellBackgroundColor(element);
- e.add("rich-calendar-today");
- }
-
- if (selectedflag && dataobj._month==0 && dataobj.day==selecteddate)
- {
- this.selectedDateCellId = element.id;
- this.selectedDateCellColor = this.getCellBackgroundColor(element);
- e.remove("rich-calendar-btn");
- e.add("rich-calendar-select");
- }
-
- if (this.doSetCellEvents) this.setCellEvents(element);
p++;
dataobj = this.days[p];
element=element.nextSibling;
}
- obj = obj.nextSibling;
+ obj = obj.nextSibling;
}
//alert(new Date().getTime()-_d.getTime());
@@ -1673,7 +1579,6 @@
element.style.height = "0px";
}
}*/
- this.doSetCellEvents = false;
},
renderHF: function()
16 years, 3 months
JBoss Rich Faces SVN: r5232 - in trunk/sandbox/ui/combobox/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-01-09 12:09:30 -0500 (Wed, 09 Jan 2008)
New Revision: 5232
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
component corrected
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 16:57:40 UTC (rev 5231)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 17:09:30 UTC (rev 5232)
@@ -43,7 +43,8 @@
}
.rich-cb-list-scroll {
- overflow : auto;
+ overflow-y : auto;
+ overflow-x : hidden;
}
.rich-cb-list-cord {
@@ -115,7 +116,6 @@
background : center no-repeat; cursor : pointer;
}
-
]]>
</f:verbatim>
@@ -162,6 +162,12 @@
<u:style name="font-size" skin="headerSizeFont"/>
</u:selector>
+ <u:selector name=".rich-cb-font-disabled">
+ <u:style name="color" skin="tabDisabledTextColor"/>
+ <u:style name="font-family" skin="headerFamilyFont"/>
+ <u:style name="font-size" skin="headerSizeFont"/>
+ </u:selector>
+
<u:selector name=".rich-cb-field">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.images.ComboBoxInputGradient" />
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 16:57:40 UTC (rev 5231)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 17:09:30 UTC (rev 5232)
@@ -208,8 +208,10 @@
this.listParent.style.visibility = "hidden";
this.listParent.show();
- Richfaces.ComboBoxList.LAYOUT_BORDER = Richfaces.getBorderWidth(this.listParent, "tb");
- Richfaces.ComboBoxList.LAYOUT_PADDING = Richfaces.getPaddingWidth(this.listParent, "tb");
+ Richfaces.ComboBoxList.LAYOUT_BORDER_V = Richfaces.getBorderWidth(this.listParent, "tb");
+ Richfaces.ComboBoxList.LAYOUT_BORDER_H = Richfaces.getBorderWidth(this.listParent, "lr");
+ Richfaces.ComboBoxList.LAYOUT_PADDING_V = Richfaces.getPaddingWidth(this.listParent, "tb");
+ Richfaces.ComboBoxList.LAYOUT_PADDING_H = Richfaces.getPaddingWidth(this.listParent, "lr");
this.listParent.hide();
this.listParent.style.visibility = "visible";
@@ -268,7 +270,7 @@
currentItemsHeight = itemHeight * rowsAmount;
}
- if (this.height && (this.height < currentItemsHeight)) {
+ if (this.height && (parseInt(this.height) < currentItemsHeight)) {
if (this.height < currentItemsHeight) {
height = currentItemsHeight;
}
@@ -281,12 +283,17 @@
}
if (Prototype.Browser.IE) {
- height += Richfaces.ComboBoxList.LAYOUT_BORDER - Richfaces.ComboBoxList.LAYOUT_PADDING;
+ height = parseInt(height) + Richfaces.ComboBoxList.LAYOUT_BORDER_V + Richfaces.ComboBoxList.LAYOUT_PADDING_V;
}
this.listParent.style.height = height;
if (this.width) {
- this.listParent.style.width = this.width
+ var width = this.width;
+ if (Prototype.Browser.Gecko) {
+ width = parseInt(this.width) - Richfaces.ComboBoxList.LAYOUT_BORDER_H - Richfaces.ComboBoxList.LAYOUT_PADDING_H;
+ }
+ this.listParent.style.width = width;
+ this.list.style.width = width;
}
},
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 16:57:40 UTC (rev 5231)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 17:09:30 UTC (rev 5232)
@@ -62,7 +62,7 @@
</input>
<input type="text" class="rich-cb-strut rich-cb-font" style="width:#{listWidth}">
</input>
- <div id="listParent#{clientId}" class="rich-cb-list-cord rich-cb-list-scroll rich-cb-list-decoration rich-cb-list-position" style="display:none">
+ <div id="listParent#{clientId}" style="display:none;" class="rich-cb-list-cord rich-cb-list-scroll rich-cb-list-decoration rich-cb-list-position">
<div id="list#{clientId}">
<f:call name="encodeItems"/>
</div>
16 years, 3 months
JBoss Rich Faces SVN: r5231 - trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-09 11:57:40 -0500 (Wed, 09 Jan 2008)
New Revision: 5231
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
Log:
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 16:34:43 UTC (rev 5230)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 16:57:40 UTC (rev 5231)
@@ -91,7 +91,7 @@
.rich-cb-button {
position : absolute;
top : 0px;
- right : 0px;
+ right : 0px; //left: fullWidth - 17px;
width : 17px;
margin : 0px;
border : 1px solid #C0C0C0;
16 years, 3 months
JBoss Rich Faces SVN: r5230 - trunk/sandbox/ui/combobox/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-09 11:34:43 -0500 (Wed, 09 Jan 2008)
New Revision: 5230
Modified:
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
add button gradient processing
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 15:55:45 UTC (rev 5229)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 16:34:43 UTC (rev 5230)
@@ -54,9 +54,11 @@
<div id="#{clientId}" class="rich-cb-font rich-cb-shell" style="width:#{listWidth}">
<input id="comboboxField#{clientId}" class="rich-cb-font rich-cb-field" type="text" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}">
</input>
- <input readonly="true" type="text" value="" class="rich-cb-button rich-cb-font rich-cb-button-bg">
+ <input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-cb-button rich-cb-font rich-cb-button-bg">
</input>
- <input id="comboboxButton#{clientId}" readonly="true" type="text" value="" class="rich-cb-button rich-cb-font rich-cb-button-arrow">
+ <input id="comboboxButton#{clientId}" readonly="true" type="text" value="" class="rich-cb-button rich-cb-font rich-cb-button-arrow"
+ onmousedown="document.getElementById('comboBoxButtonBG#{clientId}').className='rich-cb-button rich-cb-font rich-cb-button-bg-press'"
+ onmouseup="document.getElementById('comboBoxButtonBG#{clientId}').className='rich-cb-button rich-cb-font rich-cb-button-bg'" >
</input>
<input type="text" class="rich-cb-strut rich-cb-font" style="width:#{listWidth}">
</input>
16 years, 3 months
JBoss Rich Faces SVN: r5229 - trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-09 10:55:45 -0500 (Wed, 09 Jan 2008)
New Revision: 5229
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
Log:
add disable, active classes
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 15:55:09 UTC (rev 5228)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 15:55:45 UTC (rev 5229)
@@ -166,13 +166,13 @@
},
doActive : function() {
- //this.button.className = ""; //FIXME
- this.field.className = "rich-cb-width rich-cb-font rich-cb-field"; //FIXME
+ this.button.className = "rich-cb-button rich-cb-font rich-cb-button-arrow";
+ this.field.className = "rich-cb-width rich-cb-font rich-cb-field"; //FIXME
},
doDisable : function() {
- //this.button.className = ""; //FIXME
- this.field.className = "rich-cb-width rich-cb-font rich-cb-field-disabled"; //FIXME
+ this.button.className = "rich-cb-button rich-cb-font rich-cb-button-arrow-disabled";
+ this.field.className = "rich-cb-width rich-cb-font-disabled rich-cb-field-disabled"; //FIXME
}
};
16 years, 3 months
JBoss Rich Faces SVN: r5228 - trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-09 10:55:09 -0500 (Wed, 09 Jan 2008)
New Revision: 5228
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
Log:
add new styles
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 15:53:19 UTC (rev 5227)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 15:55:09 UTC (rev 5228)
@@ -14,13 +14,16 @@
.rich-cb-font {
}
+.rich-cb-font-disabled {
+}
+
.rich-cb-field-disabled {
position : absolute;
top : 0px; left : 0;
padding-right :20px;
padding-left :3px;
margin : 0px;
- border : 1px solid #eeeeee;
+ border : 1px solid;
background-position:left top;
background-repeat:repeat-x;
}
@@ -60,6 +63,10 @@
}
+.rich-cb-width {
+ width : 150px;
+}
+
.rich-cb-strut {
position : relative;
visibility : hidden;
@@ -90,22 +97,25 @@
border : 1px solid #C0C0C0;
}
-.rich-cb-button-bg-disabled {
- background : top repeat-x;
-}
-
.rich-cb-button-bg {
background : top repeat-x;
+ cursor : pointer;
}
.rich-cb-button-bg-press {
background : top repeat-x;
+ cursor : pointer;
}
.rich-cb-button-arrow {
background : center no-repeat; cursor : pointer;
}
+.rich-cb-button-arrow-disabled {
+ background : center no-repeat; cursor : pointer;
+}
+
+
]]>
</f:verbatim>
@@ -117,13 +127,6 @@
<u:style name="background-color" skin="tabBackgroundColor"/>
</u:selector>
- <u:selector name=".rich-cb-button-bg-disabled">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.images.ComboBoxDisableButtonGradient" />
- </u:style>
- <u:style name="background-color" skin="tabBackgroundColor"/>
- </u:selector>
-
<u:selector name=".rich-cb-button-bg-press">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonPressGradient" />
@@ -137,6 +140,12 @@
</u:style>
</u:selector>
+ <u:selector name=".rich-cb-button-arrow-disabled">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.images.ComboBoxArrowImageDisable" />
+ </u:style>
+ </u:selector>
+
<u:selector name=".rich-cb-button">
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
@@ -147,6 +156,12 @@
<u:style name="color" skin="generalTextColor"/>
</u:selector>
+ <u:selector name=".rich-cb-font-disabled">
+ <u:style name="color" skin="tabDisabledTextColor"/>
+ <u:style name="font-family" skin="headerFamilyFont"/>
+ <u:style name="font-size" skin="headerSizeFont"/>
+ </u:selector>
+
<u:selector name=".rich-cb-field">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.images.ComboBoxInputGradient" />
@@ -173,6 +188,8 @@
<u:style name="border-color" skin="generalTextColor"/>
</u:selector>
+ <u:selector name=".rich-cb-field-disabled">
+ <u:style name="border-color" skin="tabBackgroundColor"/>
+ </u:selector>
-
</f:template>
16 years, 3 months
JBoss Rich Faces SVN: r5227 - trunk/sandbox/ui/combobox/src/main/config/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-09 10:53:19 -0500 (Wed, 09 Jan 2008)
New Revision: 5227
Modified:
trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml
Log:
Modified: trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml
===================================================================
--- trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml 2008-01-09 15:52:55 UTC (rev 5226)
+++ trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml 2008-01-09 15:53:19 UTC (rev 5227)
@@ -12,8 +12,8 @@
<resource class="org.richfaces.renderkit.images.ComboBoxButtonPressGradient">
<name>org.richfaces.renderkit.images.ComboBoxButtonPressGradient</name>
</resource>
- <resource class="org.richfaces.renderkit.images.ComboBoxDisableButtonGradient">
- <name>org.richfaces.renderkit.images.ComboBoxDisableButtonGradient</name>
+ <resource class="org.richfaces.renderkit.images.ComboBoxArrowImageDisable">
+ <name>org.richfaces.renderkit.images.ComboBoxArrowImageDisable</name>
</resource>
16 years, 3 months
JBoss Rich Faces SVN: r5226 - trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-09 10:52:55 -0500 (Wed, 09 Jan 2008)
New Revision: 5226
Added:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImageDisable.java
Removed:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxDisableInputGradient.java
Modified:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonPressGradient.java
Log:
new images
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java 2008-01-09 15:20:59 UTC (rev 5225)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java 2008-01-09 15:52:55 UTC (rev 5226)
@@ -24,6 +24,15 @@
*/
public class ComboBoxArrowImage extends Java2Dresource{
+
+ protected static final String ICON_COLOR = "generalTextColor";
+ protected static final String BACKGROUND_COLOR = "tabBackgroundColor";
+ protected static final String BORDER_COLOR = "generalBackgroundColor";
+
+ protected static final String DISABLED_ICON_COLOR = "tabDisabledTextColor";
+ protected static final String DISABLED_BACKGROUND_COLOR = "tabBackgroundColor";
+ protected static final String DISABLED_BORDER_COLOR = "generalBackgroundColor";
+
private static final Dimension dimensions = new Dimension(15, 15);
public ComboBoxArrowImage() {
@@ -42,33 +51,94 @@
if (objectArray == null) {
return null;
}
- return new Integer(new Zipper2(objectArray).nextIntColor());
+ Zipper2 zipper = new Zipper2(objectArray);
+ return new Color[] {zipper.nextColor(), zipper.nextColor(), zipper.nextColor()};
+ }
+
+ protected Object getDataToStore(FacesContext context, Object data) {
+ return storeData(context, ICON_COLOR, BACKGROUND_COLOR, BORDER_COLOR);
}
- protected Object getDataToStore(FacesContext context, Object data) {
+ protected Object storeData(FacesContext context, String colorSkinParam, String backgroundSkinParam, String borderSkinParam) {
+
Skin skin = SkinFactory.getInstance().getSkin(context);
- String skinParameter = "generalTextColor";
- String headerTextColor = (String) skin.getParameter(context, skinParameter);
- if (null == headerTextColor || "".equals(headerTextColor)) {
- Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
- headerTextColor = (String) defaultSkin.getParameter(context, skinParameter);
+ Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
+
+ byte [] ret = new byte[9];
+
+ Color color = null;
+ Zipper2 zipper = new Zipper2(ret);
+
+ String color1 = (String) skin.getParameter(context, colorSkinParam);
+
+ if (null == color1 || "".equals(color1)) {
+ color1 = (String) defaultSkin.getParameter(context, colorSkinParam);
+ }
+
+ if (color1 == null) {
+ color1 = "#FFFFFF";
}
+
+ color = HtmlColor.decode(color1);
+
+ zipper.addColor(color);
+
+ String color2 = (String) skin.getParameter(context, backgroundSkinParam);
+ if (null == color2 || "".equals(color2))
+ color2 = (String) defaultSkin.getParameter(context, backgroundSkinParam);
+
+ if (color2 == null) {
+ color2 = "#000000";
+ }
+
+ color = HtmlColor.decode(color2);
+ zipper.addColor(color);
+
+ String color3 = (String) skin.getParameter(context, borderSkinParam);
+ if (null == color3 || "".equals(color3))
+ color3 = (String) defaultSkin.getParameter(context, backgroundSkinParam);
+
+ if (color3 == null) {
+ color3 = "#000000";
+ }
+
+ color = HtmlColor.decode(color3);
+ zipper.addColor(color);
+
+ return ret;
+ }
- int intValue = HtmlColor.decode( headerTextColor == null ? "#000000":headerTextColor ).getRGB();
- byte[] ret = new byte[3];
- new Zipper2(ret).addColor(intValue);
+ protected void paint(ResourceContext context, Graphics2D g2d) {
+ Color [] data = (Color[]) restoreData(context);
+ Color textColor = data[0];
+// Color backgroundColor = data[1];
+ Color borderColor = data[2];
- return ret;
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+ g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE);
+ g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
+ g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+ g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+
+ if (textColor != null && borderColor != null && g2d != null) {
+
+ g2d.setColor(textColor);
+ g2d.translate(7, 5);
+ paintBaseTriangle(g2d);
+ g2d.translate(-7, -5);
+
+ g2d.setColor(borderColor);
+ g2d.drawLine(4, 5, 10, 5);
+ g2d.drawLine(11, 6, 7, 10);
+ g2d.drawLine(7, 10, 3, 6);
+ }
}
- protected void paint(ResourceContext context, Graphics2D g2d) {
- Integer color = (Integer) restoreData(context);
- g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
- g2d.setColor(new Color(color.intValue()));
- g2d.drawLine(4,5,10,5);
- g2d.drawLine(5,6,9,6);
- g2d.drawLine(6,7,8,7);
- g2d.drawLine(7,8,7,8);
+ protected void paintBaseTriangle(Graphics2D g2d) {
+ for (int i = 0; i < 7; i++) {
+ g2d.drawLine(-3 + i, 1, -3 + i, 1 + (i < 4 ? i : 6 - i));
+ }
}
-
}
Added: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImageDisable.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImageDisable.java (rev 0)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImageDisable.java 2008-01-09 15:52:55 UTC (rev 5226)
@@ -0,0 +1,19 @@
+/**
+ *
+ */
+package org.richfaces.renderkit.images;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * @author Anton Belevich
+ * @since 3.2.0
+ * ComboBox disable arrow image renderer
+ *
+ */
+public class ComboBoxArrowImageDisable extends ComboBoxArrowImage{
+
+ protected Object storeData(FacesContext context, String colorSkinParam, String backgroundSkinParam, String borderSkinParam) {
+ return super.storeData(context, DISABLED_ICON_COLOR, BACKGROUND_COLOR, DISABLED_BORDER_COLOR);
+ }
+}
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java 2008-01-09 15:20:59 UTC (rev 5225)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java 2008-01-09 15:52:55 UTC (rev 5226)
@@ -4,6 +4,7 @@
package org.richfaces.renderkit.images;
import org.richfaces.renderkit.html.BaseGradient;
+import org.richfaces.skin.Skin;
/**
* @author Anton Belevich
@@ -12,6 +13,6 @@
*/
public class ComboBoxButtonGradient extends BaseGradient {
public ComboBoxButtonGradient() {
- super(30,50 , 20,"generalBackgroundColor", "tabBackgroundColor");
+ super(8, 18, 9,Skin.generalBackgroundColor, "tabBackgroundColor");
}
}
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonPressGradient.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonPressGradient.java 2008-01-09 15:20:59 UTC (rev 5225)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonPressGradient.java 2008-01-09 15:52:55 UTC (rev 5226)
@@ -4,15 +4,16 @@
package org.richfaces.renderkit.images;
import org.richfaces.renderkit.html.BaseGradient;
+import org.richfaces.skin.Skin;
/**
* @author Anton Belevich
- *
+ * @since 3.2.0
*/
public class ComboBoxButtonPressGradient extends BaseGradient{
public ComboBoxButtonPressGradient() {
- super(30,50 , 20, "tabBackgroundColor","generalBackgroundColor");
+ super(7,15 , 9, "tabBackgroundColor",Skin.generalBackgroundColor);
}
}
Deleted: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxDisableInputGradient.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxDisableInputGradient.java 2008-01-09 15:20:59 UTC (rev 5225)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxDisableInputGradient.java 2008-01-09 15:52:55 UTC (rev 5226)
@@ -1,15 +0,0 @@
-/**
- *
- */
-package org.richfaces.renderkit.images;
-
-import org.richfaces.renderkit.html.BaseGradient;
-
-
-/**
- * @author Anton Belevich
- *
- */
-public class ComboBoxDisableInputGradient extends BaseGradient {
-
-}
16 years, 3 months
JBoss Rich Faces SVN: r5225 - in management/design/fileUpload/markup: images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2008-01-09 10:20:59 -0500 (Wed, 09 Jan 2008)
New Revision: 5225
Added:
management/design/fileUpload/markup/images/bg_ProgressBar.png
management/design/fileUpload/markup/images/ico_file_32.gif
Removed:
management/design/fileUpload/markup/images/bg_header.psd
management/design/fileUpload/markup/images/bg_uploaded.png
management/design/fileUpload/markup/images/ico_delete.gif
management/design/fileUpload/markup/images/ico_file.gif
Modified:
management/design/fileUpload/markup/file_upload.html
Log:
Modified: management/design/fileUpload/markup/file_upload.html
===================================================================
--- management/design/fileUpload/markup/file_upload.html 2008-01-09 14:56:58 UTC (rev 5224)
+++ management/design/fileUpload/markup/file_upload.html 2008-01-09 15:20:59 UTC (rev 5225)
@@ -6,26 +6,26 @@
<style>
body{margin : 20px}
-.upload_font{font-family : verdana; font-size : 11px}
+.upload_font{font-family : verdana /*generalFamilyFont*/ ; font-size : 10px/*generalSizeFont*/;}
#upload_table{width : 100%}
-#upload_table td{border-bottom:1px solid #c0c0c0;white-space : nowrap; padding : 4 0 4 0;}
+#upload_table td{border-bottom:1px solid #c0c0c0 /*tableBorderColor*/;white-space : nowrap; padding : 4 0 4 0;}
#upload_footer{width : 100%}
#upload_footer td{white-space : nowrap; padding : 5 0 5 0;}
.upload_list_width{ width:350px;}
-.upload_list_decor{ border:1px solid #c0c0c0; background : #FFFFFF;}
-.upload_list_overflow{height : 200px; overflow-y : auto; overflow-x : hidden;}
-.upload_icon{ width : 30; text-align : center;}
-.upload_name{ width : 140; overflow : hidden}
-.upload_size{ width : 100; text-align : right;}
-.upload_itemdel{ width : 80; text-align : center;}
-.upload_anc{ color : #a00000; text-decoration : none}
+.upload_list_decor{ border:1px solid #c0c0c0 /*tableBorderColor*/; background : #FFFFFF /*tableBackgroundColor*/;}
+.upload_list_overflow{height : 200px; overflow : auto; overflow-x : hidden;}
+.upload_icon{ width : 50; padding-top : 10; padding-bottom : 10; text-align : center;}
+.upload_name{ width : 200; overflow : hidden; padding-top : 1; padding-bottom : 1;}
+.upload_del{ width : 90; text-align : center; padding-top : 3; padding-bottom : 3;}
+.upload_scroll{ width : 10; text-align : center;}
+.upload_anc{ color : ##0078D0/*generalLinkColor*/;}
-.upload_footer_decor{ background : #224986; border-top:1px solid #c0c0c0;}
+.upload_footer_decor{ background : #EAF0F8 /*additionalBackgroundColor*/; border-top: 1px solid #c0c0c0 /*tableBorderColor*/;}
.upload_footer_firstcol{ width : 100%}
-.upload_footer_total{ width : 100; text-align : right; color : #ffffff;}
+.upload_footer_del{ width : 90; text-align : center;}
.upload_btn_over{
display : inline;
@@ -44,6 +44,9 @@
cursor : pointer;
}
+.upload_bar_exterior{ border : 1px solid #c0c0c0 /*panelBorderColor*/;}
+.upload_bar_uploaded{width : 70%; height : 100%; background : #FF9409 /**/; background-image : url(images/bg_ProgressBar.png);background-repeat : repeat-x; font-size : 0px;}
+.upload_bar_shell{width : 198; height : 8; background : #F1F1F1/*tableSubfooterBackgroundColor*/;}
</style>
</head>
@@ -55,19 +58,32 @@
<table border="0" cellpadding="0" cellspacing="0" id="upload_table">
<tr>
<td>
- <div class="upload_font upload_icon"><img src="images/ico_file.gif" width="16" height="16" alt="" border="0"></div>
+ <div class="upload_font upload_icon"><img src="images/ico_file_32.gif" width="32" height="32" alt="" border="0"></div>
</td>
<td>
<div class="upload_font upload_name">
file_upload.html
</div>
+
+ <div class="upload_font upload_name">
+ <!--Done-->
+ <div class="upload_bar_exterior">
+ <div class="upload_bar_shell">
+ <div class="upload_bar_uploaded">
+
+ </div>
+ </div>
+ </div>
+ <!--br-->
+ </div>
</td>
<td>
- <div class="upload_font upload_size">3KB</div>
+ <div class="upload_font upload_del"><a href="#" class="upload_anc">Delete</a></div>
+ <div class="upload_font upload_del"><a href="#" class="upload_anc">Upload</a></div>
</td>
<td>
- <div class="upload_font upload_itemdel"><a href="#" class="upload_anc">x</a></div>
+ <div class="upload_font upload_scroll"></div>
</td>
</tr>
</table>
@@ -82,11 +98,12 @@
<input style="padding-left : 10; padding-right : 10; font-weight : bold" value="Upload" type="Button" class="upload_btn_over upload_font" onmouseover="this.className='upload_btn_over upload_font'" onmouseout="this.className='upload_btn_over upload_font'" onmousedown="this.className='upload_btn_press upload_font'">
</td>
<td>
- <div class="upload_font upload_footer_total">Total : <b>33KB</b></div>
+ <div class="upload_font upload_footer_del">
+ <input value="Clear" type="Button" class="upload_btn_over upload_font" onmouseover="this.className='upload_btn_over upload_font'" onmouseout="this.className='upload_btn_over upload_font'" onmousedown="this.className='upload_btn_press upload_font'">
+ </div>
</td>
<td>
- <div class="upload_font upload_itemdel">
- <input value="Clear" type="Button" class="upload_btn_over upload_font" onmouseover="this.className='upload_btn_over upload_font'" onmouseout="this.className='upload_btn_over upload_font'" onmousedown="this.className='upload_btn_press upload_font'">
+ <div class="upload_font upload_scroll">
</div>
</td>
</tr>
Added: management/design/fileUpload/markup/images/bg_ProgressBar.png
===================================================================
(Binary files differ)
Property changes on: management/design/fileUpload/markup/images/bg_ProgressBar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: management/design/fileUpload/markup/images/bg_header.psd
===================================================================
(Binary files differ)
Deleted: management/design/fileUpload/markup/images/bg_uploaded.png
===================================================================
(Binary files differ)
Deleted: management/design/fileUpload/markup/images/ico_delete.gif
===================================================================
(Binary files differ)
Deleted: management/design/fileUpload/markup/images/ico_file.gif
===================================================================
(Binary files differ)
Added: management/design/fileUpload/markup/images/ico_file_32.gif
===================================================================
(Binary files differ)
Property changes on: management/design/fileUpload/markup/images/ico_file_32.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 3 months