JBoss Rich Faces SVN: r170 - tags/3_0_0/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: pkotikov
Date: 2007-03-27 06:06:06 -0400 (Tue, 27 Mar 2007)
New Revision: 170
Modified:
tags/3_0_0/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
Log:
http://jira.exadel.com/browse/RFA-118
added visibility:hidden;
Modified: tags/3_0_0/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
===================================================================
--- tags/3_0_0/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss 2007-03-26 20:14:12 UTC (rev 169)
+++ tags/3_0_0/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss 2007-03-27 10:06:06 UTC (rev 170)
@@ -38,6 +38,7 @@
position : absolute;
text-align : center;
z-index : 1;
+ visibility : hidden;
}
.dr-insldr-handler-sel{
background-color : transparent;
17 years, 1 month
JBoss Rich Faces SVN: r168 - in trunk/richfaces: menu-components/src/main/templates/org/richfaces and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-26 16:02:55 -0400 (Mon, 26 Mar 2007)
New Revision: 168
Modified:
trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuSeparator.jspx
trunk/richfaces/tabPanel/src/main/templates/tabPanel.jspx
Log:
Extra name="#{clientId}" attributes removed from DIVs
Modified: trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-03-26 19:24:34 UTC (rev 167)
+++ trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-03-26 20:02:55 UTC (rev 168)
@@ -25,7 +25,7 @@
onmouseover="this.className='dr-menu-label dr-menu-label-select rich-menu-label rich-menu-label-select'"
onmouseout="this.className='dr-menu-label dr-menu-label-unselect rich-menu-label rich-menu-label-unselect'">
<span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
- <div id="#{clientId}" name="#{clientId}"
+ <div id="#{clientId}"
style="width: #{component.attributes['popupWidth']};"
class="dr-menu-list-border dr-menu-list-position rich-menu-list-border rich-menu-list-position">
<div class="dr-menu-list-bg rich-menu-list-bg">
Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuSeparator.jspx
===================================================================
--- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuSeparator.jspx 2007-03-26 19:24:34 UTC (rev 167)
+++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuSeparator.jspx 2007-03-26 20:02:55 UTC (rev 168)
@@ -13,7 +13,7 @@
<f:clientid var="clientId"/>
- <div id="#{clientId}" name="#{clientId}" class="dr-menu-separator rich-menu-separator">
+ <div id="#{clientId}" class="dr-menu-separator rich-menu-separator">
</div>
</f:root>
\ No newline at end of file
Modified: trunk/richfaces/tabPanel/src/main/templates/tabPanel.jspx
===================================================================
--- trunk/richfaces/tabPanel/src/main/templates/tabPanel.jspx 2007-03-26 19:24:34 UTC (rev 167)
+++ trunk/richfaces/tabPanel/src/main/templates/tabPanel.jspx 2007-03-26 20:02:55 UTC (rev 168)
@@ -47,7 +47,7 @@
</table>
<c:if test="#{clientSide}">
<div style="display: none;"><input type="hidden"
- id="#{clientId}_input" name="#{clientId}"
+ id="#{clientId}_input"
value="#{this:getValueAsString(context, component)}" /> <f:call
name="encodeTabsScript" /></div>
</c:if> <f:call name="utils.encodeEndFormIfNessesary" /></td>
17 years, 1 month
JBoss Rich Faces SVN: r167 - in trunk: richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-26 15:24:34 -0400 (Mon, 26 Mar 2007)
New Revision: 167
Modified:
trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java
trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js
trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx
Log:
http://jira.jboss.com/jira/browse/RF-32 fixed
Sample app. updated
Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java
===================================================================
--- trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-03-26 15:55:04 UTC (rev 166)
+++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-03-26 19:24:34 UTC (rev 167)
@@ -35,6 +35,7 @@
import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase;
import org.richfaces.component.UIDragIndicator;
+import org.richfaces.component.nsutils.NSUtils;
import org.richfaces.org.apache.commons.lang.StringEscapeUtils;
/**
@@ -179,4 +180,12 @@
//surround by CDATAs
responseWriter.write("/*]]>*/");
}
+
+ public void encodeNamespace(FacesContext context, UIDragIndicator component) throws IOException {
+ NSUtils.writeNameSpace(context, component);
+ }
+
+ public void encodeDnDParams(FacesContext context, UIDragIndicator component) throws IOException {
+ DnDParametersEncoder.getInstance().doEncode(context, component);
+ }
}
Modified: trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js
===================================================================
--- trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-03-26 15:55:04 UTC (rev 166)
+++ trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-03-26 19:24:34 UTC (rev 167)
@@ -10,6 +10,8 @@
params = {};
}
+ Object.extend(params, DnD.getDnDDefaultParams(this));
+
if (!params['marker']) {
if (params[name]) {
params['marker'] = params[name];
Modified: trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx
===================================================================
--- trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx 2007-03-26 15:55:04 UTC (rev 166)
+++ trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx 2007-03-26 19:24:34 UTC (rev 167)
@@ -14,6 +14,7 @@
<h:scripts>
new org.ajax4jsf.framework.resource.PrototypeScript(),
new org.ajax4jsf.framework.ajax.AjaxScript(),
+ /org/richfaces/renderkit/html/scripts/dnd/dnd-common.js,
scripts/drag-indicator.js
</h:scripts>
<h:styles>css/dragIndicator.xcss</h:styles>
@@ -21,6 +22,9 @@
<f:clientId var="clientId" />
<div id="#{clientId}" class="drgind_fly drgind_default drag_indicator #{component.attributes['styleClass']}" style="display: none; #{component.attributes['style']}">
+ <f:call name="encodeNamespace" />
+ <f:call name="encodeDnDParams" />
+
<script type="text/javascript">
/*<![CDATA[*/
var elt = $("#{clientId}");
Modified: trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-03-26 15:55:04 UTC (rev 166)
+++ trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-03-26 19:24:34 UTC (rev 167)
@@ -67,6 +67,14 @@
{marker} <b>{testDrag}</b> {label}
</f:verbatim>
</f:facet>
+
+ <dnd:dndParam name="accept" value="ACCEPT:" />
+
+ <dnd:dndParam name="reject">
+ <f:verbatim>
+ <i style="text-decoration: line-through;">REJECT:</i>
+ </f:verbatim>
+ </dnd:dndParam>
</dnd:dragIndicator>
<h:panelGrid columns="1" style="position: relative; left: 140px;">
17 years, 1 month
JBoss Rich Faces SVN: r166 - trunk/richfaces/datascroller/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-03-26 11:55:04 -0400 (Mon, 26 Mar 2007)
New Revision: 166
Modified:
trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
Log:
Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
===================================================================
--- trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-03-26 15:26:30 UTC (rev 165)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-03-26 15:55:04 UTC (rev 166)
@@ -356,9 +356,12 @@
int pageCount;
if (rows > 0) {
pageCount = rows <= 0 ? 1 : getRowCount() / rows;
- if (getRowCount() % rows >= 0) {
+ if (getRowCount() % rows > 0) {
pageCount++;
}
+ if (pageCount==0){
+ pageCount=1;
+ }
}
else {
rows = 1;
17 years, 1 month
JBoss Rich Faces SVN: r165 - trunk/richfaces/datascroller/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-26 11:26:30 -0400 (Mon, 26 Mar 2007)
New Revision: 165
Modified:
trunk/richfaces/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
Log:
http://jira.jboss.com/jira/browse/RF-36 fixed
Modified: trunk/richfaces/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
===================================================================
--- trunk/richfaces/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-03-26 14:59:57 UTC (rev 164)
+++ trunk/richfaces/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-03-26 15:26:30 UTC (rev 165)
@@ -21,7 +21,6 @@
<![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>
</jsp:scriptlet>
<div id="#{clientId}"
- name="#{clientId}"
x:passThruWithExclusions="value,name,type,id"
class="dr-dscr rich-datascr #{component.attributes['styleClass']}"
style="#{component.attributes['style']};">
17 years, 1 month
JBoss Rich Faces SVN: r164 - trunk/richfaces/menu-components/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-03-26 10:59:57 -0400 (Mon, 26 Mar 2007)
New Revision: 164
Modified:
trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
Log:
Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
===================================================================
--- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-03-26 14:58:47 UTC (rev 163)
+++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-03-26 14:59:57 UTC (rev 164)
@@ -5,6 +5,7 @@
xmlns:ui=" http://ajax4jsf.org/cdk/ui"
xmlns:u=" http://ajax4jsf.org/cdk/u"
xmlns:x=" http://ajax4jsf.org/cdk/x"
+ xmlns:vcp=" http://jsf.exadel.com/vcp"
baseclass="org.richfaces.renderkit.html.MenuGroupRendererBase"
class="org.richfaces.renderkit.html.MenuGroupRenderer"
component="org.richfaces.component.UIMenuGroup"
@@ -17,6 +18,42 @@
</h:scripts>
<f:clientid var="clientId"/>
- <div id="#{clientId}" name="#{clientId}">
- </div>
+ <jsp:scriptlet><![CDATA[
+ boolean disabled = ((Boolean) component.getAttributes().get("disabled")).booleanValue();
+ if (! disabled) {
+ ]]></jsp:scriptlet>
+ <div id="#{clientId}"
+ class="dr-menu-item dr-menu-item-unselect rich-menu-item rich-menu-item-unselect #{component.attributes['styleClass']}"
+ style="#{component.attributes['style']}"
+ onmouseout="this.className='dr-menu-item dr-menu-item-unselect rich-menu-item rich-menu-item-unselect'"
+ onmouseover="this.className='dr-menu-item dr-menu-item-select rich-menu-item rich-menu-item-select'">
+ <img class="dr-menu-ico #{component.attributes['iconClass']}"
+ width="16" height="16"
+ style="#{component.attributes['iconStyle']}"
+ src="#{component.attributes['icon']}"/>
+ <jsp:scriptlet><![CDATA[} else {]]></jsp:scriptlet>
+ <div id="#{clientId}"
+ class="dr-menu-item dr-menu-item-disabled rich-menu-item rich-menu-item-disabled #{component.attributes['styleClass']}"
+ style="#{component.attributes['style']}">
+ <img class="dr-menu-ico #{component.attributes['iconClass']}"
+ width="16" height="16"
+ style="#{component.attributes['iconStyle']}"
+ src="#{component.attributes['iconDisabled']}"/>
+ <jsp:scriptlet><![CDATA[}]]></jsp:scriptlet>
+
+ <a href="#">#{component.attributes['value']}</a>
+ <div class="dr-menu-node">
+ <div id="#{clientId}"
+ class="dr-menu-list-border dr-menu-sublist rich-menu-list-border rich-menu-sublist">
+ <div class="dr-menu-list-bg rich-menu-list-bg">
+ <vcp:body><f:call name="renderChildren"/></vcp:body>
+ </div>
+ </div>
+ </div>
+
+ <jsp:scriptlet><![CDATA[if (true) {]]></jsp:scriptlet>
+ </div>
+ <jsp:scriptlet><![CDATA[} else {]]></jsp:scriptlet>
+ </div>
+ <jsp:scriptlet><![CDATA[}]]></jsp:scriptlet>
</f:root>
\ No newline at end of file
17 years, 1 month
JBoss Rich Faces SVN: r163 - in trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html: images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-03-26 10:58:47 -0400 (Mon, 26 Mar 2007)
New Revision: 163
Added:
trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/
trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/menu_item_bg.gif
trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/menu_list_bg.gif
trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/node.gif
Log:
Added: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/menu_item_bg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/menu_item_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/menu_list_bg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/menu_list_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/node.gif
===================================================================
(Binary files differ)
Property changes on: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/node.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 1 month
JBoss Rich Faces SVN: r162 - trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-03-26 10:58:09 -0400 (Mon, 26 Mar 2007)
New Revision: 162
Modified:
trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
Log:
Modified: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
===================================================================
--- trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-03-26 14:50:29 UTC (rev 161)
+++ trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-03-26 14:58:09 UTC (rev 162)
@@ -70,9 +70,26 @@
border-right : 1px solid #e7f2fb;
background : url(menu_list_bg.gif) repeat-y left;
}
+
]]>
</f:verbatim>
+<u:selector name=".dr-menu-node">
+ <u:style name="background-image">
+ <f:resource f:key="/org/richfaces/renderkit/html/images/node.gif"/>
+ </u:style>
+</u:selector>
+<u:selector name=".dr-menu-item-select">
+ <u:style name="background-image">
+ <f:resource f:key="/org/richfaces/renderkit/html/images/menu_item_bg.gif"/>
+ </u:style>
+</u:selector>
+<u:selector name=".dr-menu-list-bg">
+ <u:style name="background-image">
+ <f:resource f:key="/org/richfaces/renderkit/html/images/menu_list_bg.gif"/>
+ </u:style>
+</u:selector>
+
</f:template>
17 years, 1 month
JBoss Rich Faces SVN: r161 - trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: F.antonov
Date: 2007-03-26 10:50:29 -0400 (Mon, 26 Mar 2007)
New Revision: 161
Modified:
trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
Log:
Modified: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
===================================================================
--- trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-03-26 14:50:14 UTC (rev 160)
+++ trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-03-26 14:50:29 UTC (rev 161)
@@ -29,7 +29,7 @@
border : 1px solid transparent;
cursor : default; color : #839eca;
}
-.dr-menu-ico {
+.dr-menu-icon {
vertical-align: middle;
margin-right : 10px;
}
@@ -70,7 +70,6 @@
border-right : 1px solid #e7f2fb;
background : url(menu_list_bg.gif) repeat-y left;
}
-
]]>
</f:verbatim>
17 years, 1 month
JBoss Rich Faces SVN: r160 - trunk/richfaces/menu-components/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: F.antonov
Date: 2007-03-26 10:50:14 -0400 (Mon, 26 Mar 2007)
New Revision: 160
Modified:
trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
Log:
Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
===================================================================
--- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-03-26 14:49:50 UTC (rev 159)
+++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-03-26 14:50:14 UTC (rev 160)
@@ -18,36 +18,31 @@
<f:call name="initializeResources" />
- <f:clientid var="clientId"/>
+ <f:clientid var="clientId"/>
<div id="#{clientId}"
- class="menu_item menu_item_unselect #{component.attributes['styleClass']}"
- onmouseout="this.className='menu_item menu_item_unselect'; component.attributes['onmouseout']}"
- onmouseover="this.className='menu_item menu_item_select'; component.attributes['onmouseover']}"
+ class="#{class}"
+ onmouseout="#{onmouseout}"
+ onmouseover="#{onmouseover}"
style="cursor: pointer; #{component.attributes['style']}"
+ onclick="#{component.attributes['onclick']} #{onclick}"
>
<!-- f:call name="encodeAttributeParameters" / -->
- <jsp:scriptlet>
- <![CDATA[
- if (null != variables.getVariable("icon")) {
- ]]>
- </jsp:scriptlet>
- <img class="menu_ico #{component.attributes['iconClass']}"
- width="16"
- height="16"
- style="#{component.attributes['iconStyle']}"
- src="#{icon}"/>
- <jsp:scriptlet>
- <![CDATA[
+ <jsp:scriptlet><![CDATA[
+ if (null != variables.getVariable("icon")) {
+ ]]></jsp:scriptlet>
+ <img class="dr-menu-icon rich-menu-item-icon #{component.attributes['iconClass']}"
+ width="16"
+ height="16"
+ style="#{component.attributes['iconStyle']}"
+ src="#{icon}" />
+ <jsp:scriptlet><![CDATA[
}
- ]]>
- </jsp:scriptlet>
+ ]]></jsp:scriptlet>
- <a href="">
- <f:verbatim>
- #{component.attributes['value']}
- </f:verbatim>
- <vcp:body />
- </a>
+ <f:verbatim>
+ #{component.attributes['value']}
+ </f:verbatim>
+ <vcp:body />
</div>
</f:root>
\ No newline at end of file
17 years, 1 month