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 2015/12/10 09:37:19 UTC
svn commit: r1719027 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/
tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough...
Author: lofwyr
Date: Thu Dec 10 08:37:19 2015
New Revision: 1719027
URL: http://svn.apache.org/viewvc?rev=1719027&view=rev
Log:
TOBAGO-1516: Using Font Awesome as icon library
- replacing PNG with Font Awesome
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/treeCopy.png
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/treeCut.png
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/treeDelete.png
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/treeEdit.png
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/treeMoveDown.png
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/treeMoveUp.png
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/treeNew.png
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml?rev=1719027&r1=1719026&r2=1719027&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml Thu Dec 10 08:37:19 2015
@@ -19,52 +19,50 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core">
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
<ui:param name="title" value="Tree - Editor"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="auto;*"/>
- </f:facet>
-
- <tc:toolBar>
- <tc:toolBarCommand label="New" action="#{treeEditor.create}" image="image/treeNew"/>
- <tc:toolBarCommand label="Delete" action="#{treeEditor.delete}" image="image/treeDelete"/>
- <tc:toolBarCommand label="Edit" omit="true" image="image/treeEdit">
- <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
- </tc:toolBarCommand>
- <tc:toolBarCommand label="Cut" omit="true" image="image/treeCut">
- <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
- </tc:toolBarCommand>
- <tc:toolBarCommand label="Copy" omit="true" image="image/treeCopy">
- <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
- </tc:toolBarCommand>
- <tc:toolBarCommand label="Paste" omit="true" image="image/treePaste">
- <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
- </tc:toolBarCommand>
- <tc:toolBarCommand label="Up" omit="true" image="image/treeMoveUp">
- <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
- </tc:toolBarCommand>
- <tc:toolBarCommand label="Down" omit="true" image="image/treeMoveDown">
- <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
- </tc:toolBarCommand>
- </tc:toolBar>
-
- <tc:tree id="tree"
- showRootJunction="true"
- showRoot="true"
- value="#{treeEditor.categoryTree}"
- var="node"
- selectable="single">
- <tc:treeNode id="template"
- markup="#{node.userObject.markup}"
- tip="#{node.userObject.tip}"
- disabled="#{node.userObject.disabled}">
- <tc:treeIndent showJunctions="true"/>
- <tc:treeIcon value="image/feather.png"/>
- <tc:treeSelect value="#{node.userObject.selected}" label="#{node.userObject.name}"/>
- </tc:treeNode>
- </tc:tree>
- </tc:panel>
+ This is a sample for an editable tree. (Not all functions are implemented).
+ Try to select a node an click "New" or "Delete")
+
+ <tc:toolBar>
+ <tc:toolBarCommand label="New" action="#{treeEditor.create}" image="fa-file-o"/>
+ <tc:toolBarCommand label="Delete" action="#{treeEditor.delete}" image="fa-trash-o"/>
+ <tc:toolBarCommand label="Edit" omit="true" image="fa-edit">
+ <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
+ </tc:toolBarCommand>
+ <tc:toolBarCommand label="Cut" omit="true" image="fa-cut">
+ <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
+ </tc:toolBarCommand>
+ <tc:toolBarCommand label="Copy" omit="true" image="fa-copy">
+ <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
+ </tc:toolBarCommand>
+ <tc:toolBarCommand label="Paste" omit="true" image="fa-paste">
+ <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
+ </tc:toolBarCommand>
+ <tc:toolBarCommand label="Up" omit="true" image="fa-level-up">
+ <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
+ </tc:toolBarCommand>
+ <tc:toolBarCommand label="Down" omit="true" image="fa-level-down">
+ <tc:dataAttribute name="alert-text" value="Not implemented yet"/>
+ </tc:toolBarCommand>
+ </tc:toolBar>
+
+ <tc:tree id="tree"
+ showRootJunction="true"
+ showRoot="true"
+ value="#{treeEditor.categoryTree}"
+ var="node"
+ selectable="single">
+ <tc:treeNode id="template"
+ markup="#{node.userObject.markup}"
+ tip="#{node.userObject.tip}"
+ disabled="#{node.userObject.disabled}">
+ <tc:treeIndent showJunctions="true"/>
+ <tc:treeIcon value="image/feather.png"/>
+ <tc:treeSelect value="#{node.userObject.selected}" label="#{node.userObject.name}"/>
+ </tc:treeNode>
+ </tc:tree>
+
</ui:composition>