You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/08/28 18:00:04 UTC
svn commit: r1621157 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-example/tobago-example-demo/src/main/webapp/content/60-command/
tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/
Author: lofwyr
Date: Thu Aug 28 16:00:04 2014
New Revision: 1621157
URL: http://svn.apache.org/r1621157
Log:
Merged from trunk
TOBAGO-648: Target attribute has no effect in tc:button with link attribute [from revision 1621134]
TOBAGO-1418: Possibly leave out the file extension of images and icons
fix context path [from revision 1621156]
Modified:
myfaces/tobago/branches/tobago-3.0.x/ (props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/command.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java
Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk:r1621134,1621156
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/command.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/command.xhtml?rev=1621157&r1=1621156&r2=1621157&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/command.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/command.xhtml Thu Aug 28 16:00:04 2014
@@ -94,7 +94,7 @@
<tc:out value="Are you sure?"/>
</f:facet>
</tc:link>
- <tc:link label="On Click xxx" omit="true">
+ <tc:link label="On Click" omit="true">
<f:facet name="confirmation">
<tc:out value="Are you sure?"/>
</f:facet>
@@ -118,10 +118,10 @@
<tc:gridLayoutConstraint rowSpan="2"/>
</tc:label>
- <tc:button label="Action" action="#{command.action}" target="_blank"/>
+ <tc:button label="Action" action="#{command.action}" target="Command Target"/>
<tc:button label="N/A" disabled="true"/>
- <tc:button label="N/A yet" disabled="true"/>
- <tc:button label="N/A yet" disabled="true"/>
+ <tc:button label="Link" link="http://www.apache.org/" target="Command Target"/>
+ <tc:button label="Resource" resource="content/60-command/sample.html" target="Command Target"/>
<tc:panel/>
<tc:link label="Action" action="#{command.action}" target="Command Target"/>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java?rev=1621157&r1=1621156&r2=1621157&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java Thu Aug 28 16:00:04 2014
@@ -624,7 +624,7 @@ public abstract class ToolBarRendererBas
}
}
- return facesContext.getExternalContext().getRequestContextPath() + image;
+ return image;
}
public static void renderDropDownMenu(