JBoss Rich Faces SVN: r4424 - in trunk/samples/calendar-sample/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-12-03 10:53:06 -0500 (Mon, 03 Dec 2007)
New Revision: 4424
Modified:
trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java
trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
Log:
attribute todayControlMode added
Modified: trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java
===================================================================
--- trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2007-12-03 15:26:40 UTC (rev 4423)
+++ trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2007-12-03 15:53:06 UTC (rev 4424)
@@ -54,6 +54,7 @@
private String jointPoint;
private String direction;
private String boundary;
+ private String todayControlMode;
private int counter;
@@ -106,6 +107,7 @@
showInput=true;
boundary = "inactive";
disabled = false;
+ todayControlMode = "select";
}
@@ -246,4 +248,12 @@
public void setShowApplyButton(boolean showApplyButton) {
this.showApplyButton = showApplyButton;
}
+
+ public String getTodayControlMode() {
+ return todayControlMode;
+ }
+
+ public void setTodayControlMode(String todayControlMode) {
+ this.todayControlMode = todayControlMode;
+ }
}
\ No newline at end of file
Modified: trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-12-03 15:26:40 UTC (rev 4423)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-12-03 15:53:06 UTC (rev 4424)
@@ -67,7 +67,8 @@
cellHeight="50"
cellWidth="50"
mode="ajax"
- showApplyButton="#{calendarBean.showApplyButton}">
+ showApplyButton="#{calendarBean.showApplyButton}"
+ todayControlMode="#{calendarBean.todayControlMode}">
<f:facet name="optionalHeader">
<h:outputText value="optionalHeader Facet" />
</f:facet>
@@ -134,6 +135,13 @@
<f:selectItem itemLabel="select" itemValue="select"/>
<f:selectItem itemLabel="scroll" itemValue="scroll"/>
</h:selectOneRadio>
+
+ <h:outputText value="TodayControlMode:" />
+ <h:selectOneRadio onclick="submit()" value="#{calendarBean.todayControlMode}">
+ <f:selectItem itemLabel="hidden" itemValue="hidden"/>
+ <f:selectItem itemLabel="select" itemValue="select"/>
+ <f:selectItem itemLabel="scroll" itemValue="scroll"/>
+ </h:selectOneRadio>
<h:outputText value="EnableManualInput:"></h:outputText>
<h:selectBooleanCheckbox value="#{calendarBean.enableManualInput}"
onclick="submit()">
16 years, 5 months
JBoss Rich Faces SVN: r4423 - in trunk/ui/calendar/src/main: java/org/richfaces/component and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-12-03 10:26:40 -0500 (Mon, 03 Dec 2007)
New Revision: 4423
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
server side code for todayControlMode
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-12-03 14:16:46 UTC (rev 4422)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-12-03 15:26:40 UTC (rev 4423)
@@ -518,12 +518,12 @@
<defaultvalue>true</defaultvalue>
</property>
<property>
- <name>showToday</name>
- <classname>boolean</classname>
+ <name>todayControlMode</name>
+ <classname>java.lang.String</classname>
<description>
- If false this bar should not be shown
+ Possible values are "scroll", "select", "hidden"
</description>
- <defaultvalue>true</defaultvalue>
+ <defaultvalue>"select"</defaultvalue>
</property>
<property>
<name>showApplyButton</name>
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-12-03 14:16:46 UTC (rev 4422)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-12-03 15:26:40 UTC (rev 4423)
@@ -191,9 +191,9 @@
public abstract void setShowScrollerBar(boolean showScrollerBar);
- public abstract boolean isShowToday();
+ public abstract String getTodayControlMode();
- public abstract void setShowToday(boolean showToday);
+ public abstract void setTodayControlMode(String todayControlMode);
public abstract boolean isShowApplyButton();
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-12-03 14:16:46 UTC (rev 4422)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-12-03 15:26:40 UTC (rev 4423)
@@ -158,7 +158,7 @@
style:'z-index: #{component.attributes["zindex"]}; #{component.attributes["style"]}',
firstWeekDay: #{this:getFirstWeekDay(context, component)},
minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)},
- showToday:#{component.attributes['showToday']},
+ todayControlMode:'#{component.attributes["todayControlMode"]}',
showScrollerBar:#{component.attributes['showScrollerBar']},
showWeeksBar:#{component.attributes['showWeeksBar']},
showWeekDaysBar:#{component.attributes['showWeekDaysBar']},
16 years, 5 months
JBoss Rich Faces SVN: r4422 - in trunk: ui/calendar/src/main/resources/org/richfaces/renderkit/html/css and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-12-03 09:16:46 -0500 (Mon, 03 Dec 2007)
New Revision: 4422
Removed:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/JQuerySpinBtn.xcss
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/spinbtn_updn.gif
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js
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
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-1192
some optimization
Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js
===================================================================
--- trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js 2007-12-03 14:14:17 UTC (rev 4421)
+++ trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js 2007-12-03 14:16:46 UTC (rev 4422)
@@ -72,8 +72,7 @@
if (attrValue)
html += " "+(i=='className'?'class':i)+'="'+this.xmlEscape(attrValue)+'"';
}
- if(inner == "") html+= "/>";
- else html+= ">"+inner+"</"+this.tag+">";
+ html+= ">"+inner+"</"+this.tag+">";
return html;
};
Deleted: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/JQuerySpinBtn.xcss
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/JQuerySpinBtn.xcss 2007-12-03 14:14:17 UTC (rev 4421)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/JQuerySpinBtn.xcss 2007-12-03 14:16:46 UTC (rev 4422)
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:template xmlns:f='http:/jsf.exadel.com/template'
- xmlns:u='http:/jsf.exadel.com/template/util'
- xmlns="http://www.w3.org/1999/xhtml" >
- <f:verbatim><![CDATA[
-/*
- Styles to make ordinary <INPUT type="text"/> look like a spinbutton/spinbox control.
- Use with JQuerySpinBtn.js to provide the spin functionality by reacting to mouse etc.
- (Requires a reference to the JQuery library found at http://jquery.com/src/latest/)
- (Hats-off to John Resig for creating the excellent JQuery library. It is fab.)
-
- This control is achieved with no extra html markup whatsoever and uses unobtrusive javascript.
-
- Written by George Adamson, Software Unity (george.jquery(a)softwareunity.com) September 2006.
- Big improvements added by Mark Gibson, (mgibson(a)designlinks.net) September 2006.
-
- Do contact me with comments and suggestions but please don't ask for support.
- As much as I'd love to help with specific problems I have plenty to get on with already!
-
- Go ahead and use it in your own projects. This code is provided 'as is'.
- Sure I've tested in heaps of ways. Its good for me, but you use it at your own risk.
- SoftwareUnity and I are certainly not responsible if your computer sets fire to the sofa,
- hacks into the pentagon, hijacks a plane or gives you any kind of hassle whatsoever.
-
- If you'd like your spin-button image in a different place then you'll need to alter both
- the CSS below and the javascript isMouseOverUpDn() function to accommodate the new position.
- You could even have left and right buttons either side of the textbox.
-*/
-
-INPUT.spin-button {
- padding-right:20px; /* Padding pevents text from covering the up/dn img. Works better in Firefox but also causes textbox to widen by 20px. Arrows can go wonky in IE when text is too long. Perhaps it could be fixed with script that monitored the horiz-scroll position? */
- background-repeat:no-repeat; /* Warning: Img may disappear in Firefox if you use 'background-attachment:fixed' ! */
- background-position:100% 0%;
-}
-
-INPUT.spin-button.up { /* Change button img when mouse is over the UP-arrow */
- cursor:pointer;
- background-position:100% -18px; /* 18px matches height of 2 visible buttons */
-}
-INPUT.spin-button.down { /* Change button img when mouse is over the DOWN-arrow */
- cursor:pointer;
- background-position:100% -36px; /* 36px matches height of 2x2 visible buttons */
-}
- ]]>
- </f:verbatim>
- <u:selector name="INPUT.spin-button">
- <u:style name="background-image">
- <f:resource f:key="/org/richfaces/renderkit/html/css/spinbtn_updn.gif" />
- </u:style>
- </u:selector>
-
-</f:template>
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 2007-12-03 14:14:17 UTC (rev 4421)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-12-03 14:16:46 UTC (rev 4422)
@@ -94,29 +94,20 @@
border: 0px;
padding: 0px 0px 0px 3px;
background: none transparent scroll repeat 0% 0%;
- margin: 0px;
}
.rich-calendar-spinner-input-container {
- padding: 0px;
- margin: 0px;
background-position: left top;
background-repeat: repeat-x;
border: 1px solid;
-
- width: 99%;
}
.rich-calendar-spinner-buttons {
border-width: 1px;
border-style: solid;
- padding: 0px;
- margin: 0px;
background-position: left top;
background-repeat: repeat-x;
font-size: 0px;
-
- width: 1%;
}
]]>
@@ -292,12 +283,12 @@
<u:style name="background" skin="additionalBackgroundColor"/>
<u:style name="border" value="1px solid"/>
<u:style name="border-color" skin="panelBorderColor"/>
-
- <u:style name="width" value="1%"/>
- <u:style name="z-index" value="2"/>
<u:style name="position" value="relative"/>
</u:selector>
+ <u:selector name=".rich-calendar-time-layout-container">
+ </u:selector>
+
<u:selector name=".rich-calendar-time-layout, .rich-calendar-time-layout input">
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
@@ -305,7 +296,6 @@
<u:selector name=".rich-calendar-time-layout-fields">
<u:style name="padding" value="7px 7px 5px 7px"/>
- <u:style name="text-align" value="center"/>
<u:style name="white-space" value="nowrap"/>
</u:selector>
@@ -392,13 +382,11 @@
<u:style name="border-right-color" skin="subBorderColor" />
</u:selector>
- <u:selector name=".rich-calendar-time-editor-shadow">
- <u:style name="background" skin="additionalBackgroundColor"/>
-
- <u:style name="z-index" value="1"/>
+ <u:selector name=".rich-calendar-time-layout-shadow">
+ <u:style name="background-color" skin="shadowBackgroundColor" />
+ <u:style name="opacity" value="0.3" />
+ <u:style name="filter" value="alpha(opacity=30)"/>
<u:style name="position" value="absolute"/>
-
- <u:style name="opacity" value="0.3"/>
- <u:style name="filter" value="alpha(opacity=30)"/>
</u:selector>
+
</f:template>
Deleted: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/spinbtn_updn.gif
===================================================================
(Binary files differ)
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 2007-12-03 14:14:17 UTC (rev 4421)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-12-03 14:16:46 UTC (rev 4422)
@@ -531,8 +531,8 @@
this.TIME_EDITOR_ID = this.id+'TimeEditor';
this.TIME_EDITOR_SHADOW_ID = this.id+'TimeEditorShadow';
- this.TIME_EDITOR_PANEL_ID = this.id+'TimeEditorPanel';
- this.TIME_EDITOR_PANEL_SHADOW_ID = this.id+'TimeEditorPanelShadow';
+ this.TIME_EDITOR_LAYOUT_ID = this.id+'TimeEditorLayout';
+ this.TIME_EDITOR_LAYOUT_SHADOW_ID = this.id+'TimeEditorLayoutShadow';
//this.popupIntervalId=null;
@@ -667,8 +667,8 @@
createTimeEditor: function(element)
{
var element = $(this.id);
- var htmlBegin = '<div id="'+this.TIME_EDITOR_SHADOW_ID+'" class="rich-calendar-time-shadow" style="position:absolute; display:none;"></div><table border="0" cellpadding="0" cellspacing="0" id="'+this.TIME_EDITOR_ID+'" style="position:absolute; display:none;"><tbody><tr><td align="center">';
- var htmlEndn = '</td></tr></tbody></table>';
+ var htmlBegin = '<div id="'+this.TIME_EDITOR_SHADOW_ID+'" class="rich-calendar-time-shadow" style="position:absolute; display:none;"></div><table border="0" cellpadding="0" cellspacing="0" id="'+this.TIME_EDITOR_ID+'" style="position:absolute; display:none;"><tbody><tr><td class="rich-calendar-time-layout-container" align="center"><div style="position:relative; width:100%">';
+ var htmlEndn = '</div></td></tr></tbody></table>';
new Insertion.After(element, htmlBegin+this.evaluateMarkup(CalendarView.timeEditor, this.calendarContext));
var te_shadow = $(this.TIME_EDITOR_SHADOW_ID);
var te = $(this.TIME_EDITOR_ID);
@@ -693,7 +693,7 @@
},
createSpinnerTable: function(id) {
- return '<td><table cellspacing="0" cellpadding="0" border="0"><tbody><tr>'+
+ return '<table cellspacing="0" cellpadding="0" border="0"><tbody><tr>'+
'<td class="rich-calendar-spinner-input-container">'+
'<input id="' + id + '" class="rich-calendar-spinner-input" type="text" />'+
'</td>'+
@@ -713,7 +713,7 @@
'</td></tr>'+
'</tbody></table>'+
'</td>'+
- '</tr></tbody></table></td>';
+ '</tr></tbody></table>';
},
setTimeProperties: function() {
@@ -774,15 +774,17 @@
this.timePatternHtml = timePattern.replace(/(^|[^\\Hhm])(H{1,2}|h{1,2}|m{2}|a)/g,
function($1,$2,$3) {
switch ($3) {
- case 'a' : return ($2 ? '<td>'+$2+'</td>' : '')+calendar.createSpinnerTable(id+'TimeSign');//'<input class="rich-calendar-time-input" id="'+id+'TimeSign"/>';
+ case 'a' : return ($2 ? '<td>'+$2+'</td>' : '')+'<td>'+calendar.createSpinnerTable(id+'TimeSign')+'</td>';//'<input class="rich-calendar-time-input" id="'+id+'TimeSign"/>';
case 'H' :
case 'HH' :
case 'h' :
- case 'hh' : return ($2 ? '<td>'+$2+'</td>' : '')+calendar.createSpinnerTable(id+'TimeHours');//'<input class="rich-calendar-time-input" id="'+id+'TimeHours"/>';
- case 'mm' : return ($2 ? '<td>'+$2+'</td>' : '')+calendar.createSpinnerTable(id+'TimeMinutes');//'<input class="rich-calendar-time-input" id="'+id+'TimeMinutes"/>';
+ case 'hh' : return ($2 ? '<td>'+$2+'</td>' : '')+'<td>'+calendar.createSpinnerTable(id+'TimeHours')+'</td>';//'<input class="rich-calendar-time-input" id="'+id+'TimeHours"/>';
+ case 'mm' : return ($2 ? '<td>'+$2+'</td>' : '')+'<td>'+calendar.createSpinnerTable(id+'TimeMinutes')+'</td>';//'<input class="rich-calendar-time-input" id="'+id+'TimeMinutes"/>';
}
}
);
+
+ this.timePatternHtml = '<table><tbody><tr>'+this.timePatternHtml+'</tr></tbody></table>';
if (m && h)
{
@@ -1700,21 +1702,20 @@
var te = $(this.TIME_EDITOR_ID);
var te_shadow = $(this.TIME_EDITOR_SHADOW_ID);
- var dim = Richfaces.Calendar.getOffsetDimensions(element);
+ /*var dim = Richfaces.Calendar.getOffsetDimensions(element);
te.style.width = te_shadow.style.width = dim.width + 'px';
te.style.height = te_shadow.style.height = dim.height + 'px';
te.style.left = te_shadow.style.left = element.style.left;
- te.style.top = te_shadow.style.top = element.style.top;
+ te.style.top = te_shadow.style.top = element.style.top;*/
+
+ Element.clonePosition(te, element);
+ Element.clonePosition(te_shadow, element);
this.updateTimeEditor();
te.show();
te_shadow.show();
-
- var te_panel = $(this.TIME_EDITOR_PANEL_ID);
- var te_panel_shadow = $(this.TIME_EDITOR_PANEL_SHADOW_ID);
-
- Element.clonePosition(te_panel_shadow, te_panel, {offsetLeft: 3, offsetTop: 3});
+ Element.clonePosition(this.TIME_EDITOR_LAYOUT_SHADOW_ID, this.TIME_EDITOR_LAYOUT_ID, {offsetLeft: 3, offsetTop: 3});
},
hideTimeEditor: function(updateTime)
@@ -1865,16 +1866,18 @@
)];
CalendarView.timeEditor = [
- new E('div', {'style': 'position: relative; width: 100%;'}, [
- new E('table',{'id': function(context) { return context.calendar.TIME_EDITOR_PANEL_ID; }, 'border': '0', 'cellpadding': '0', 'cellspacing': '0', 'class': 'rich-calendar-time-layout'},
+
+ new E('div',{'id': function(context){return context.calendar.TIME_EDITOR_LAYOUT_SHADOW_ID}, 'class': 'rich-calendar-time-layout-shadow'},null),
+
+ new E('table',{'id': function(context){return context.calendar.TIME_EDITOR_LAYOUT_ID}, 'border': '0', 'cellpadding': '0', 'cellspacing': '0', 'class': 'rich-calendar-time-layout'},
[
new E('tbody',{},
[
new E('tr',{},
[
- new E('td',{'class': 'rich-calendar-time-layout-fields', 'colspan': '2'},
+ new E('td',{'class': 'rich-calendar-time-layout-fields', 'colspan': '2', 'align': 'center'},
[
- new E('table', null, [new E('tbody', null, [new E('tr', null, [new ET(function (context) { return Richfaces.evalMacro("timeEditorFields", context)})])])])
+ new ET(function (context) { return Richfaces.evalMacro("timeEditorFields", context)})
])
]),
new E('tr',{},
@@ -1896,15 +1899,8 @@
])
])
])
- ]),
-
- new E('div',
- {
- 'id': function(context) { return context.calendar.TIME_EDITOR_PANEL_SHADOW_ID; },
- 'class': 'rich-calendar-time-editor-shadow'
- }
- , null)
- ])];
+ ]
+ )];
CalendarView.dayList = [new ET(function (context) { return context.day})];
CalendarView.weekNumber = [new ET(function (context) { return context.weekNumber})];
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-12-03 14:14:17 UTC (rev 4421)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-12-03 14:16:46 UTC (rev 4422)
@@ -11,7 +11,7 @@
<f:clientid var="clientId" />
<h:scripts>new org.ajax4jsf.javascript.PrototypeScript(),new org.ajax4jsf.javascript.AjaxScript(),/org/richfaces/renderkit/html/scripts/events.js,/org/richfaces/renderkit/html/scripts/utils.js,/org/richfaces/renderkit/html/scripts/json/json-dom.js,/org/richfaces/renderkit/html/scripts/scriptaculous/effects.js,/org/richfaces/renderkit/html/scripts/jquery/jquery.js,/org/richfaces/renderkit/html/scripts/jquery/jquery.js,/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js,/org/richfaces/renderkit/html/scripts/calendar.js</h:scripts>
- <h:styles>/org/richfaces/renderkit/html/css/JQuerySpinBtn.xcss,/org/richfaces/renderkit/html/css/calendar.xcss</h:styles>
+ <h:styles>/org/richfaces/renderkit/html/css/calendar.xcss</h:styles>
<f:call name="addPopupToAjaxRendered" />
16 years, 5 months
JBoss Rich Faces SVN: r4421 - in branches/3.1.x/ui/listShuttle/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-12-03 09:14:17 -0500 (Mon, 03 Dec 2007)
New Revision: 4421
Modified:
branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
Log:
listHeight,sourceListWidth,targetListWidth were added
Modified: branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml 2007-12-03 12:24:05 UTC (rev 4420)
+++ branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml 2007-12-03 14:14:17 UTC (rev 4421)
@@ -66,6 +66,24 @@
</property>
<property>
+ <name>sourceListWidth</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
+ <property>
+ <name>targetListWidth</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
+ <property>
+ <name>listsHeight</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
+ <property>
<name>orderControlsVisible</name>
<classname>boolean</classname>
<description>
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-03 12:24:05 UTC (rev 4420)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-03 14:14:17 UTC (rev 4421)
@@ -35,23 +35,16 @@
.ol_outputlist{ margin : 0px 8px 8px 8px;}
.ol_list_content {
- overflow-y : scroll;
- overflow-x: auto;
- /*width: 300px;
- height: 232px;*/
- width: 200px;
- height: 150px;
+ overflow: auto;
}
.ol_list_header {
overflow: hidden;
- /*width: 300px;*/
height: 18px;
}
.ol_internal_header_tab {
background : repeat scroll left top;
- /*width : 100%;*/
}
.ol_internal_header_tab th{background : url(ol_images/bg_header.png) top left repeat-x #C6D6EA; color : #000000; font-family : Arial; font-size :11px; font-weight : normal; border-bottom : 1px solid #bfbfc0;border-right : 1px solid #bfbfc0;border-left : 1px solid #EAF0F8;border-top : 1px solid #FFFFFF; padding : 2px}
Modified: branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-03 12:24:05 UTC (rev 4420)
+++ branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-03 14:14:17 UTC (rev 4421)
@@ -12,6 +12,7 @@
>
<jsp:directive.page import="org.richfaces.renderkit.OrderingComponentRendererBase" />
+ <jsp:directive.page import="org.richfaces.component.util.HtmlUtil" />
<h:styles>css/listShuttle.xcss</h:styles>
@@ -59,12 +60,31 @@
<tr>
<td>
<div id="#{clientId}headerBox" class="ol_list ol_outputlist">
- <div class="ol_list_header" style="width: #{component.attributes['listWidth']}px;">
+ <jsp:scriptlet>
+ <![CDATA[
+ String contentContainerStyle = "";
+ String sourceListWidthValue = (String) component.getAttributes().get("sourceListWidth");
+ if (sourceListWidthValue != null) {
+ contentContainerStyle = contentContainerStyle.concat("width:").concat(HtmlUtil.qualifySize(sourceListWidthValue)).concat(";");
+ variables.setVariable("contentContainerStyle", contentContainerStyle);
+ }
+ ]]>
+ </jsp:scriptlet>
+ <div class="ol_list_header" style="#{contentContainerStyle}">
<table id="#{clientId}internal_header_tab" class="ol_internal_header_tab rich-ordering-list-items" cellpadding="0" cellspacing="0">
<f:call name="encodeSLHeader"/>
</table>
</div>
- <div id="#{clientId}contentBox" class="ol_list_content" style="width: #{component.attributes['listWidth']}px; height:#{component.attributes['listHeight']}px;">
+ <jsp:scriptlet>
+ <![CDATA[
+ String listHeightValue = (String) component.getAttributes().get("listsHeight");
+ if (listHeightValue != null) {
+ contentContainerStyle = contentContainerStyle.concat("height:").concat(HtmlUtil.qualifySize(listHeightValue)).concat(";");
+ variables.setVariable("contentContainerStyle", contentContainerStyle);
+ }
+ ]]>
+ </jsp:scriptlet>
+ <div id="#{clientId}contentBox" class="ol_list_content" style="#{contentContainerStyle}">
<table id="#{clientId}internal_tab" class="ol_internal_tab" cellpadding="0" cellspacing="0">
<tbody id="#{clientId}tbody">
<jsp:scriptlet><![CDATA[
@@ -103,12 +123,30 @@
<tr>
<td>
<div id="#{clientId}tlHeaderBox" class="ol_list ol_outputlist">
- <div class="ol_list_header" style="width: #{component.attributes['listWidth']}px;">
+ <jsp:scriptlet>
+ <![CDATA[
+ contentContainerStyle = "";
+ String targetListWidthValue = (String) component.getAttributes().get("targetListWidth");
+ if (targetListWidthValue != null) {
+ contentContainerStyle = contentContainerStyle.concat("width:").concat(HtmlUtil.qualifySize(targetListWidthValue)).concat(";");
+ variables.setVariable("contentContainerStyle", contentContainerStyle);
+ }
+ ]]>
+ </jsp:scriptlet>
+ <div class="ol_list_header" style="#{contentContainerStyle}">
<table id="#{clientId}tlInternal_header_tab" class="ol_internal_header_tab rich-ordering-list-items" cellpadding="0" cellspacing="0">
<f:call name="encodeTLHeader"/>
</table>
</div>
- <div id="#{clientId}tlContentBox" class="ol_list_content" style="width: #{component.attributes['listWidth']}px; height:#{component.attributes['listHeight']}px;">
+ <jsp:scriptlet>
+ <![CDATA[
+ if (listHeightValue != null) {
+ contentContainerStyle = contentContainerStyle.concat("height:").concat(HtmlUtil.qualifySize(listHeightValue)).concat(";");
+ variables.setVariable("contentContainerStyle", contentContainerStyle);
+ }
+ ]]>
+ </jsp:scriptlet>
+ <div id="#{clientId}tlContentBox" class="ol_list_content" style="#{contentContainerStyle}">
<table id="#{clientId}tlInternal_tab" class="ol_internal_tab" cellpadding="0" cellspacing="0">
<tbody id="#{clientId}tlTbody">
<jsp:scriptlet><![CDATA[
16 years, 5 months
JBoss Rich Faces SVN: r4420 - trunk/ui/dataFilterSlider/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2007-12-03 07:24:05 -0500 (Mon, 03 Dec 2007)
New Revision: 4420
Modified:
trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml
Log:
RF-262 - add onerror, clientErrorMessage event to the dataFilterSlider component.
Modified: trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml
===================================================================
--- trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2007-12-03 12:22:44 UTC (rev 4419)
+++ trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2007-12-03 12:24:05 UTC (rev 4420)
@@ -163,16 +163,33 @@
<classname>java.lang.String</classname>
<description>
Event occur on sliding
- </description>
+ </description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
+ <name>onerror</name>
+ <classname>java.lang.String</classname>
+ <description>
+ HTML: a script expression; event fires whenever an JavaScript error occurs
+ </description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+
+ <property>
+ <name>clientErrorMessage</name>
+ <classname>java.lang.String</classname>
+ <description>
+ An error message to use in client side validation events
+ </description>
+ </property>
+
+ <property>
<name>onchange</name>
<classname>java.lang.String</classname>
<description>
Event occur on chage
- </description>
+ </description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
16 years, 5 months
JBoss Rich Faces SVN: r4419 - trunk/ui/tabPanel/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2007-12-03 07:22:44 -0500 (Mon, 03 Dec 2007)
New Revision: 4419
Modified:
trunk/ui/tabPanel/src/main/config/component/tabPanel.xml
Log:
RF-262 - Edit description of ontabchange event of the tabPanel component
Modified: trunk/ui/tabPanel/src/main/config/component/tabPanel.xml
===================================================================
--- trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2007-12-03 11:43:05 UTC (rev 4418)
+++ trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2007-12-03 12:22:44 UTC (rev 4419)
@@ -140,7 +140,7 @@
<name>ontabchange</name>
<classname>java.lang.String</classname>
<description>
- Event must occurs on than tab has been changed
+ HTML: a script expression; a tab has been changed
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
16 years, 5 months
JBoss Rich Faces SVN: r4418 - trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-03 06:43:05 -0500 (Mon, 03 Dec 2007)
New Revision: 4418
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
Log:
encodeHeaderRow method doesn't encode client events (RF-1440)
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2007-12-03 11:37:39 UTC (rev 4417)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2007-12-03 11:43:05 UTC (rev 4418)
@@ -28,6 +28,7 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.richfaces.component.UIDataTable;
import org.richfaces.component.UISubTable;
import org.richfaces.renderkit.AbstractTableRenderer;
@@ -63,11 +64,11 @@
String headerClass = (String) component.getAttributes().get(
facetName+"Class");
if (headers.hasNext()) {
- encodeRowStart(context,"dr-subtable-"+facetName+" rich-subtable-"+facetName ,headerClass, dataTable, writer);
+ writer.startElement(HTML.TR_ELEMENT, dataTable);
+ encodeStyleClass(writer, null, "dr-subtable-"+facetName+" rich-subtable-"+facetName, null, headerClass);
encodeHeaderFacets(context, writer, headers, "dr-subtable-"+facetName+"cell rich-subtable-"+facetName+"cell", headerClass,
facetName, "td");
-
- writer.endElement("tr");
+ writer.endElement(HTML.TR_ELEMENT);
}
}
16 years, 5 months
JBoss Rich Faces SVN: r4417 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2007-12-03 06:37:39 -0500 (Mon, 03 Dec 2007)
New Revision: 4417
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCSettings.xml
Log:
RF-929 - tomahawk - the uppercase letter
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCSettings.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCSettings.xml 2007-12-03 11:37:16 UTC (rev 4416)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCSettings.xml 2007-12-03 11:37:39 UTC (rev 4417)
@@ -36,7 +36,7 @@
<?dbhtml filename="ApacheMyFaces.html"?>
<title>Apache MyFaces</title>
<para>RichFaces works with all <property>Apache MyFaces</property> versions (1.1.1 - 1.1.6)
- including specific libraries like Tomahawk Sandbox and Trinidad (the previous ADF Faces).
+ including specific libraries like TOMAHAWK Sandbox and Trinidad (the previous ADF Faces).
However, there are some considerations to take into account for configuring applications to
work with <property>MyFaces</property> and RichFaces.</para>
<para>There are some problems with different filters defined in the web.xml file clashing. To
16 years, 5 months
JBoss Rich Faces SVN: r4416 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2007-12-03 06:37:16 -0500 (Mon, 03 Dec 2007)
New Revision: 4416
Modified:
trunk/docs/userguide/en/src/main/docbook/included/repeat.xml
Log:
RF-929 - tomahawk - the uppercase letter
Modified: trunk/docs/userguide/en/src/main/docbook/included/repeat.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/repeat.xml 2007-12-03 11:36:16 UTC (rev 4415)
+++ trunk/docs/userguide/en/src/main/docbook/included/repeat.xml 2007-12-03 11:37:16 UTC (rev 4416)
@@ -102,7 +102,7 @@
<property>"repeater.myRepeat"</property>
</emphasis></para>
</note>
-<para>One more benefit of this component is absence of strictly defined markup as JSF HTML DataTable and Tomahawk DataTable has, hence the components could be used more flexibly anywhere where it's necessary to output the results of selection from some collection.</para>
+ <para>One more benefit of this component is absence of strictly defined markup as JSF HTML DataTable and TOMAHAWK DataTable has, hence the components could be used more flexibly anywhere where it's necessary to output the results of selection from some collection.</para>
<para>The next example shows collection output as a plain HTML list</para>
<programlisting role="XML"><![CDATA[<ul>
<a4j:repeat ...>
16 years, 5 months
JBoss Rich Faces SVN: r4415 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2007-12-03 06:36:16 -0500 (Mon, 03 Dec 2007)
New Revision: 4415
Modified:
trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
Log:
RF-929 - tomahawk - the uppercase letter
Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-12-03 10:09:03 UTC (rev 4414)
+++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-12-03 11:36:16 UTC (rev 4415)
@@ -75,7 +75,7 @@
<title>Details of Usage</title>
<para>The <emphasis role="bold">
<property><rich:Datascroller></property>
- </emphasis> component provides table scrolling functionalitity the same as tomahawk scroller but
+ </emphasis> component provides table scrolling functionalitity the same as TOMAHAWK scroller but
with Ajax requests usage.</para>
<para>The component should be placed into footer of the parent table or be bound to it with the <emphasis>
<property>"for"</property>
16 years, 5 months