Author: ilya_shaikovsky
Date: 2011-03-18 08:33:10 -0400 (Fri, 18 Mar 2011)
New Revision: 22263
Modified:
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml
Log:
https://issues.jboss.org/browse/RF-10778
Sent for approval to @Jay and @Nick prior to commit.
Modified:
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml
===================================================================
---
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml 2011-03-18
06:00:55 UTC (rev 22262)
+++
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml 2011-03-18
12:33:10 UTC (rev 22263)
@@ -7,13 +7,6 @@
xmlns:c="http://java.sun.com/jsp/jstl/core">
<ui:composition template="/templates/main.xhtml">
- <ui:define name="demoSampleParameters">
- <f:metadata>
- <f:viewParam name="sample" value="#{demoNavigator.sample}"
/>
- <f:viewParam name="demo"
value="#{demoNavigator.currentDemo.id}" />
- <f:viewParam name="skin" value="#{skinBean.skin}" />
- </f:metadata>
- </ui:define>
<ui:define name="body">
<style>
.navigation .rf-tab-hdr-brd,.navigation .rf-tab {
@@ -25,7 +18,7 @@
onbeforeitemchange="return false;">
<c:forEach items="#{demoNavigator.currentDemo.samples}"
var="s">
<rich:tab header="#{s.name}" name="#{s.id}"
- onheaderclick="document.location='#{facesContext.externalContext.requestContextPath}/richfaces/component-sample.jsf?demo=#{demoNavigator.currentDemo.id}&sample=#{s.id}&skin=#{skinBean.skin}'"
/>
+ onheaderclick="document.location.href='#{facesContext.externalContext.requestContextPath}/richfaces/component-sample.jsf?demo=#{demoNavigator.currentDemo.id}&sample=#{s.id}&skin=#{skinBean.skin}'"
/>
</c:forEach>
</rich:tabPanel>
<fieldset class="example-cnt"><ui:include
src="#{demoNavigator.sampleURI}" /></fieldset>
Modified:
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml
===================================================================
---
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml 2011-03-18
06:00:55 UTC (rev 22262)
+++
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml 2011-03-18
12:33:10 UTC (rev 22263)
@@ -14,7 +14,7 @@
<rich:panelMenuItem label="#{d.name}" action="#{d.id}"
mode="client" name="#{d.id}"
rightIcon="#{(d.newItems || gr.newItem) ?
'/images/icons/new-small-ic.gif' : null}"
- onclick="document.location='#{facesContext.externalContext.requestContextPath}/richfaces/component-sample.jsf?demo=#{d.id}&skin=#{skinBean.skin}'">
+ onclick="document.location.href='#{facesContext.externalContext.requestContextPath}/richfaces/component-sample.jsf?demo=#{d.id}&skin=#{skinBean.skin}'">
</rich:panelMenuItem>
</c:forEach>
</rich:panelMenuGroup>
Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml
===================================================================
---
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-03-18
06:00:55 UTC (rev 22262)
+++
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-03-18
12:33:10 UTC (rev 22263)
@@ -5,7 +5,6 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j">
<f:view contentType="text/html">
- <ui:insert name="demoSampleParameters"/>
<h:head>
<title>RichFaces Showcase</title>
<script type="text/javascript">