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 2007/02/12 11:33:00 UTC
svn commit: r506407 - in /myfaces/tobago/trunk:
example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/
example/sandbox/src/main/webapp/ example/sandbox/src/main/webapp/WEB-INF/
sandbox/src/main/java/org/apache/myfaces/tobago/component...
Author: lofwyr
Date: Mon Feb 12 02:32:58 2007
New Revision: 506407
URL: http://svn.apache.org/viewvc?view=rev&rev=506407
Log:
TOBAGO-280
Modified:
myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java
myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Node.java
myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/tobago-config.xml
myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-menu.jsp
myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-sel.jsp
myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-tree.js
myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js
myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml
Modified: myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java Mon Feb 12 02:32:58 2007
@@ -27,6 +27,8 @@
private static final Log LOG = LogFactory.getLog(Controller.class);
+ private static final String STRONG = "strong";
+
private DefaultMutableTreeNode tree;
private TreeState state;
@@ -40,8 +42,8 @@
tree.insert(music, 0);
tree.insert(new DefaultMutableTreeNode(new Node("Games")), 0);
DefaultMutableTreeNode temp = new DefaultMutableTreeNode(new Node("Science"));
- temp.insert(new DefaultMutableTreeNode(new Node("Geography")), 0);
- temp.insert(new DefaultMutableTreeNode(new Node("Mathematics")), 0);
+ temp.insert(new DefaultMutableTreeNode(new Node("Geography", STRONG)), 0);
+ temp.insert(new DefaultMutableTreeNode(new Node("Mathematics", STRONG)), 0);
DefaultMutableTreeNode temp2 = new DefaultMutableTreeNode(new Node("Astronomy"));
temp2.insert(new DefaultMutableTreeNode(new Node("Education")), 0);
temp2.insert(new DefaultMutableTreeNode(new Node("Pictures")), 0);
@@ -79,7 +81,6 @@
public void setTree(DefaultMutableTreeNode tree) {
this.tree = tree;
}
-
public TreeState getState() {
return state;
Modified: myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Node.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Node.java?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Node.java (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Node.java Mon Feb 12 02:32:58 2007
@@ -25,11 +25,17 @@
private static final Log LOG = LogFactory.getLog(Node.class);
private String name;
+ private String markup;
public Node(String name) {
this.name = name;
}
+ public Node(String name, String markup) {
+ this.name = name;
+ this.markup = markup;
+ }
+
public String action() {
LOG.info("action: name='" + name + "'");
return null;
@@ -41,5 +47,13 @@
public void setName(String name) {
this.name = name;
+ }
+
+ public String getMarkup() {
+ return markup;
+ }
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
}
}
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/tobago-config.xml?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/tobago-config.xml Mon Feb 12 02:32:58 2007
@@ -23,7 +23,7 @@
<tobago-config>
<theme-config>
- <default-theme>scarborough</default-theme>
+ <default-theme>speyside</default-theme>
</theme-config>
<resource-dir>tobago-resource</resource-dir>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-menu.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-menu.jsp?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-menu.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-menu.jsp Mon Feb 12 02:32:58 2007
@@ -37,6 +37,7 @@
<tcs:treeNode label="Root" id="root">
<tcs:treeNodes value="#{controller.tree}" var="node" id="data">
<tcs:treeNode label="#{node.userObject.name}" id="template"
+ markup="#{node.userObject.markup}"
action="#{node.userObject.action}" value="#{node}"/>
</tcs:treeNodes>
<tcs:treeNode label="Action 1" action="#{controller.action1}" id="action1"/>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-sel.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-sel.jsp?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-sel.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-sel.jsp Mon Feb 12 02:32:58 2007
@@ -36,7 +36,9 @@
selectable="single">
<tcs:treeNode label="Root">
<tcs:treeNodes value="#{controller.tree}" var="node">
- <tcs:treeNode label="#{node.userObject.name}"/>
+ <tcs:treeNode label="#{node.userObject.name}"
+ markup="#{node.userObject.markup}"
+ />
</tcs:treeNodes>
<tcs:treeNode label="Sub 1"/>
<tcs:treeNode label="Sub 2"/>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp Mon Feb 12 02:32:58 2007
@@ -32,6 +32,7 @@
<tcs:treeNode label="Root">
<tcs:treeNodes value="#{controller.tree}" var="node" id="data">
<tcs:treeNode label="#{node.userObject.name}" id="template"
+ markup="#{node.userObject.markup}"
action="#{node.userObject.action}" value="#{node}"/>
</tcs:treeNodes>
<tcs:treeNode label="Action 1" action="#{controller.action1}" id="action1"/>
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java Mon Feb 12 02:32:58 2007
@@ -24,17 +24,31 @@
import javax.faces.context.FacesContext;
import javax.faces.component.UIComponent;
-public class UITreeNode extends UICommand {
+public class UITreeNode extends UICommand implements SupportsMarkup {
private static final Log LOG = LogFactory.getLog(UITreeNode.class);
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.TreeNode";
+ private String[] markup;
+
+ public String[] getMarkup() {
+ if (markup != null) {
+ return markup;
+ }
+ return ComponentUtil.getMarkupBinding(getFacesContext(), this);
+ }
+
+ public void setMarkup(String[] markup) {
+ this.markup = markup;
+ }
+
@Override
public boolean getRendersChildren() {
return true;
}
+ @Override
public Object getValue() {
DefaultMutableTreeNode value = (DefaultMutableTreeNode) super.getValue();
if (value == null) { // XXX: hack!
@@ -66,6 +80,21 @@
component = component.getParent();
}
return null;
+ }
+
+ @Override
+ public void restoreState(FacesContext context, Object state) {
+ Object[] values = (Object[]) state;
+ super.restoreState(context, values[0]);
+ markup = (String[]) values[1];
+ }
+
+ @Override
+ public Object saveState(FacesContext context) {
+ Object[] values = new Object[2];
+ values[0] = super.saveState(context);
+ values[1] = markup;
+ return values;
}
}
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Mon Feb 12 02:32:58 2007
@@ -33,6 +33,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SELECTABLE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE_CLASS;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UITree;
import org.apache.myfaces.tobago.component.UITreeNode;
@@ -40,6 +41,7 @@
import org.apache.myfaces.tobago.model.TreeState;
import org.apache.myfaces.tobago.renderkit.CommandRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
+import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
@@ -227,8 +229,7 @@
writer.writeText(Boolean.toString(ComponentUtil.getBooleanAttribute(root,
ATTR_MUTABLE)), null);
writer.writeText(",'", null);
- writer.writeText(
- ComponentUtil.findPage(treeNode).getFormId(facesContext), null);
+ writer.writeText(ComponentUtil.findPage(treeNode).getFormId(facesContext), null);
writer.writeText("',", null);
if (treeNode.getChildCount() == 0
|| (selectable != null && !selectable.endsWith("LeafOnly"))) {
@@ -247,7 +248,10 @@
}
}
writer.writeText(",", null);
- writer.writeText(Boolean.toString(treeState.isMarked(modelNode)), null);
+
+ // marked
+ boolean marked = treeState.isMarked(modelNode);
+ writer.writeText(Boolean.toString(marked), null);
writer.writeText(",", null);
// expanded
@@ -306,9 +310,10 @@
// open folder icon (not implemented)
writer.writeText("null", null);
- writer.writeText(", '", null);
+ writer.writeText(", ", null);
// width
+ writer.writeText("'", null);
Integer width = null;
HtmlStyleMap style = (HtmlStyleMap) root.getAttributes().get(ATTR_STYLE);
if (style != null) {
@@ -319,8 +324,31 @@
} else {
writer.writeText("100%", null);
}
+ writer.writeText("', ", null);
+
+ // css class
+ writer.writeText("'", null);
+ if ("menu".equals(root.getMode())) { // todo: clean up: think about composition of the style-class names
+ HtmlRendererUtil.addCssClass(treeNode, "tobago-treeNode-menu");
+ if (marked) {
+ HtmlRendererUtil.addCssClass(treeNode, "tobago-treeNode-marker");
+ }
+ }
+ StringBuilder treeNodeClass = new StringBuilder((String) treeNode.getAttributes().get(ATTR_STYLE_CLASS));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("styleClass='" + treeNodeClass + "'");
+ }
+ writer.writeText(treeNodeClass, null);
+ writer.writeText("', ", null);
+
+ // css class label
+ writer.writeText("'", null);
+ if (marked) {
+ writer.writeText("tobago-treeNode-marker", null);
+ }
+ writer.writeText("'", null);
- writer.writeText("');\n", null);
+ writer.writeText(");\n", null);
/*
if (jsParentClientId != null) { // if not the root node
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java Mon Feb 12 02:32:58 2007
@@ -27,6 +27,7 @@
public class TreeNodeTag extends AbstractCommandTag implements TreeNodeTagDeclaration {
private String value;
+ private String markup;
@Override
public String getComponentType() {
@@ -38,12 +39,14 @@
super.setProperties(component);
ComponentUtil.setStringProperty(component, ATTR_VALUE, value);
+ ComponentUtil.setMarkup(component, markup);
}
@Override
public void release() {
super.release();
value = null;
+ markup = null;
}
public String getValue() {
@@ -54,4 +57,12 @@
this.value = value;
}
+
+ public String getMarkup() {
+ return markup;
+ }
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
+ }
}
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java Mon Feb 12 02:32:58 2007
@@ -23,6 +23,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
import org.apache.myfaces.tobago.taglib.decl.HasValue;
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
import org.apache.myfaces.tobago.taglib.component.AbstractCommandTagDeclaration;
/**
@@ -34,6 +35,5 @@
uiComponent = "org.apache.myfaces.tobago.component.UITreeNode",
rendererType = "TreeNode")
public interface TreeNodeTagDeclaration
- extends HasIdBindingAndRendered, HasLabel, HasValue,
- AbstractCommandTagDeclaration {
+ extends HasIdBindingAndRendered, HasLabel, HasValue, HasMarkup, AbstractCommandTagDeclaration {
}
Modified: myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-tree.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-tree.js?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-tree.js (original)
+++ myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-tree.js Mon Feb 12 02:32:58 2007
@@ -305,7 +305,7 @@
hideRoot, treeHiddenId, selectable, mutable,
formId, selected, marked,
expanded, required, disabled, treeResources,
- action, onclick, parent, icon, openIcon, width) {
+ action, onclick, parent, icon, openIcon, width, cssClass, cssClassLabel) {
this.label = label;
this.tip = tip;
this.id = id;
@@ -333,6 +333,8 @@
this.openIcon = openIcon
|| treeResources.getImage("openfoldericon.gif");
this.width = width;
+ this.cssClass = cssClass;
+ this.cssClassLabel = cssClassLabel;
this.childNodes = [];
this.onfocus = "storeMarker(this.parentNode, '" + treeHiddenId + "')";
@@ -359,17 +361,7 @@
var str = '';
if (! this.hideRoot || depth > 0) {
- var treeItemClasses = "tobago-tree-node";
- if (this.mode == "menu") {
- treeItemClasses += " tobago-tree-menu"
- if (this.marked) {
- treeItemClasses += " tobago-tree-marker";
- }
- }
- if (this.disabled) {
- treeItemClasses += " tobago-tree-disabled";
- }
- str += '<div id="' + this.id + '" class="' + treeItemClasses + '" '
+ str += '<div id="' + this.id + '" class="' + this.cssClass + '" '
+ 'style="width: ' + this.width + ';">';
if (this.mode == "menu") {
if (this.isFolder) {
@@ -447,11 +439,7 @@
str += '<img class="tree-icon" id="' + this.id
+ '-markIcon" src="' + markIcon + '" ' + markIconOnClickFunction + ' alt="">';
}
- var itemStyle = "";
- if (this.marked) {
- itemStyle += " tobago-tree-marker";
- }
- str += '<a class="' + itemStyle + '"';
+ str += '<a class="' + this.cssClassLabel + '"';
if (this.tip) {
str += ' title="' + this.tip + '"';
}
Modified: myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js (original)
+++ myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js Mon Feb 12 02:32:58 2007
@@ -52,11 +52,11 @@
if (node) {
node = node.firstChild;
while (node) {
- if (node.className && node.className.indexOf("tobago-tree-node") > -1) {
+ if (node.className && node.className.indexOf("tobago-treeNode-default") > -1) {
if (add) {
- Tobago.addCssClass(node, "tree-item-marker");
+ Tobago.addCssClass(node, "tobago-treeNode-marker");
} else {
- Tobago.removeCssClass(node, "tree-item-marker");
+ Tobago.removeCssClass(node, "tobago-treeNode-marker");
}
}
node = node.nextSibling;
Modified: myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css (original)
+++ myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css Mon Feb 12 02:32:58 2007
@@ -71,12 +71,12 @@
/* - Tree ------------------------------------------------------------------- */
-a.tobago-tree-node a:hover {
+a.tobago-treeNode-default a:hover {
color: #6699ff;
text-decoration: underline;
}
-a.tobago-tree-node a:focus {
+a.tobago-treeNode-default a:focus {
background: #d6ebff;
color: #3366cc;
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css Mon Feb 12 02:32:58 2007
@@ -168,40 +168,44 @@
white-space: nowrap;
}
-.tobago-tree-node img {
+.tobago-treeNode-default img {
vertical-align: middle;
border: 0px;
}
-.tobago-tree-node a, .tobago-tree-node a:active, .tobago-tree-node a:hover {
+.tobago-treeNode-default a, .tobago-treeNode-default a:active, .tobago-treeNode-default a:hover {
margin-left: 3px;
padding: 1px 2px 1px 2px;
}
-.tobago-tree-node a {
+.tobago-treeNode-default a {
color: black;
text-decoration: none;
}
-.tobago-tree-node a:hover {
+.tobago-treeNode-default a:hover {
color: blue;
text-decoration: underline;
}
-.tobago-tree-node a:focus {
+.tobago-treeNode-default a:focus {
background: #445566;
color: highlighttext;
text-decoration: none;
}
-.tobago-tree-disabled, .tobago-tree-disabled a:hover {
+.tobago-treeNode-disabled, .tobago-treeNode-disabled a:hover {
color: #888888;
text-decoration: none;
cursor: pointer;
}
-.tobago-tree-marker, .tobago-tree-marker:focus, .tobago-tree-marker a, .tobago-tree-marker:focus a {
+.tobago-treeNode-marker, .tobago-treeNode-marker:focus, .tobago-treeNode-marker a, .tobago-treeNode-marker:focus a {
background-color: #d8e9fb;
+}
+
+.tobago-treeNode-markup-strong {
+ font-weight: bold;
}
/* treeListbox -------------------------------------------------------------------- */
Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css Mon Feb 12 02:32:58 2007
@@ -232,44 +232,45 @@
/* Tree ------------------------------------------------------------------- */
-.tobago-tree-menu {
+.tobago-treeNode-menu {
border: 1px solid #CCCCCC;
width: 200px; /* default */
height: 16px;
}
-.tobago-tree-node img {
+.tobago-treeNode-default img {
vertical-align: top;
border: 0px;
}
-.tobago-tree-node a {
- font: 12px arial, helvetica, sans-serif;
+.tobago-treeNode-default a {
+ font-size: 12px;
+ font-family: arial, helvetica, sans-serif;
}
-.tobago-tree-disabled {
+.tobago-treeNode-disabled {
color: #888888;
text-decoration: none;
cursor: pointer;
}
-.tobago-tree-node a:hover {
+.tobago-treeNode-default a:hover {
color: #000000;
text-decoration: underline;
}
-.tobago-tree-disabled a:hover {
+.tobago-treeNode-disabled a:hover {
color: #888888;
text-decoration: none;
cursor: pointer;
}
-.tobago-tree-node a:focus {
+.tobago-treeNode-default a:focus {
background: transparent;
color: #000000;
}
-.tobago-tree-marker, .tobago-tree-marker:focus, .tobago-tree-marker a, .tobago-tree-marker:focus a {
+.tobago-treeNode-marker, .tobago-treeNode-marker:focus, .tobago-treeNode-marker a, .tobago-treeNode-marker:focus a {
background-color: lightgray;
}
Modified: myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml?view=diff&rev=506407&r1=506406&r2=506407
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml Mon Feb 12 02:32:58 2007
@@ -36,5 +36,11 @@
<markup>number</markup>
</supported-markup>
</renderer>
+ <renderer>
+ <name>TreeNode</name>
+ <supported-markup>
+ <markup>strong</markup>
+ </supported-markup>
+ </renderer>
</renderers>
</tobago-theme>