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 2010/05/04 17:25:20 UTC

svn commit: r940907 - in /myfaces/tobago/trunk: src/site/apt/ tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/ tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/ tobago-extens...

Author: lofwyr
Date: Tue May  4 15:25:19 2010
New Revision: 940907

URL: http://svn.apache.org/viewvc?rev=940907&view=rev
Log:
TOBAGO-880: Rename the default CSS class name for tobago components from tobago-<tag-name>-default to tobago-<tag-name>

Modified:
    myfaces/tobago/trunk/src/site/apt/migration-1.5.apt
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
    myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
    myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css
    myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css
    myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
    myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css
    myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
    myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js

Modified: myfaces/tobago/trunk/src/site/apt/migration-1.5.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/migration-1.5.apt?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/migration-1.5.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/migration-1.5.apt Tue May  4 15:25:19 2010
@@ -80,3 +80,9 @@ Other API Classes
 *--+--+--+--+                                                                                                                                                                   
 | ... |  |                                                                  
 *--+--+--+--+                                                                                                                                                            
+
+CSS style classes
+
+  The default class of an HTML tag has been changed from tobago-<tagName>-default to tobago-<tagName>.
+  This effects your application only, when you've written your own theme, or using this classes in a
+  separate style file.

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java Tue May  4 15:25:19 2010
@@ -18,8 +18,6 @@ package org.apache.myfaces.tobago.render
  */
 
 import org.apache.commons.collections.set.ListOrderedSet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsMarkup;
 import org.apache.myfaces.tobago.context.Markup;
@@ -27,6 +25,8 @@ import org.apache.myfaces.tobago.context
 import org.apache.myfaces.tobago.internal.util.Deprecation;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.util.VariableResolverUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
@@ -260,7 +260,7 @@ public class StyleClasses implements Ser
     private String aspect;
 
     Aspect() {
-      aspect = '-' + name().toLowerCase(Locale.ENGLISH);
+      aspect = name().equals("DEFAULT") ? "" : '-' + name().toLowerCase(Locale.ENGLISH);
     }
 
     @Override

Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java Tue May  4 15:25:19 2010
@@ -118,10 +118,10 @@ public class NumberSliderRenderer extend
     // the input field starts here
     writer.startElement(HtmlConstants.TD, null);
     writer.writeAttribute("rowspan", "2", false);
-    writer.writeClassAttribute("tobago-numberSlider-input-default");
+    writer.writeClassAttribute("tobago-numberSlider-input");
 
     writer.startElement(HtmlConstants.INPUT, null);
-    writer.writeClassAttribute("tobago-in-default");
+    writer.writeClassAttribute("tobago-in");
     widthStyle.setWidth(Measure.valueOf(inputWidth));
     writer.writeStyleAttribute(widthStyle);
     String inputIdAndName = getIdForInputField(facesContext, slider);
@@ -143,7 +143,7 @@ public class NumberSliderRenderer extend
 
     //track
     writer.startElement(HtmlConstants.DIV, null);
-    writer.writeClassAttribute("tobago-numberSlider-slider-default");
+    writer.writeClassAttribute("tobago-numberSlider-slider");
     writer.writeIdAttribute(getIdForSliderTrack(facesContext, slider));
 
     // handle

Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css Tue May  4 15:25:19 2010
@@ -17,30 +17,30 @@
 
 /* number Slider --------------------------------------------------------------- */
 
-.tobago-numberSlider-default {
+.tobago-numberSlider {
 }
 
-.tobago-numberSlider-min-default {
+.tobago-numberSlider-min {
   text-align: left;
 }
 
-.tobago-numberSlider-min-default {
+.tobago-numberSlider-min {
   font: bold 11px arial, helvetica, sans-serif;
 }
 
-.tobago-numberSlider-max-default {
+.tobago-numberSlider-max {
   text-align: right;
 }
 
-.tobago-numberSlider-max-default {
+.tobago-numberSlider-max {
   font: bold 11px arial, helvetica, sans-serif;
 }
 
-.tobago-numberSlider-input-default {
+.tobago-numberSlider-input {
 }
 
-.tobago-numberSlider-slider-default {
+.tobago-numberSlider-slider {
   width: 100%;
   height: 3px;
   background-color: #660000;
-}
\ No newline at end of file
+}

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css Tue May  4 15:25:19 2010
@@ -22,7 +22,7 @@
 
 /* box ----------------------------------------------------------------- */
 
-.tobago-box-default {
+.tobago-box {
   background: #FFEECF;
   border: 1px solid #FECB66;
 }
@@ -35,7 +35,7 @@
 
 /* button ------------------------------------------------------------------ */
 
-.tobago-button-default  {
+.tobago-button  {
   background: #FADC9F;
   color: #660000;
 }
@@ -46,7 +46,7 @@
 
 /* label ------------------------------------------------------------------- */
 
-div.tobago-label-default  {
+div.tobago-label  {
   background: #FADC9F;
 }
 
@@ -55,7 +55,7 @@ div.tobago-label-default  {
 }
 
 /* page -------------------------------------------------------------------- */
-.tobago-page-default  {
+.tobago-page  {
   background: #FFEECF;
 }
 
@@ -102,7 +102,7 @@ a:link.tab, a:visited.tab, a:active.tab 
 
 /* Menu ---------------------------------------------------------------------- */
 
-.tobago-menuBar-default li {
+.tobago-menuBar li {
   background-color: #FFEECF;
 }
 
@@ -110,12 +110,12 @@ li.tobago-menu-selected {
   background-color: #FADC9F;
 }
 
-.tobago-menuBar-default {
+.tobago-menuBar {
   border-bottom-color: #FECB66;
   background-color: #FFEECF;
 }
 
-.tobago-menuBar-default ol {
+.tobago-menuBar ol {
   border-color: #FECB66;
 }
 

Modified: myfaces/tobago/trunk/tobago-theme/tobago-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/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css Tue May  4 15:25:19 2010
@@ -20,7 +20,7 @@
  * agent: standard
  */
 
-.tobago-link-default {
+.tobago-link {
   font: bold 12px arial, helvetica, sans-serif;
   color: #3366cc;
   text-decoration: none;
@@ -30,7 +30,7 @@
   color:#888888
 }
 
-a:link.tobago-link-default, a:visited.tobago-link-default, a:active.tobago-link-default {
+a:link.tobago-link, a:visited.tobago-link, a:active.tobago-link {
   color: #3366cc;
 }
 
@@ -76,12 +76,12 @@ a.tree-folder-label:focus, a.tree-item-l
 
 /* - Tree ------------------------------------------------------------------- */
 
-a.tobago-treeNode-default a:hover {
+a.tobago-treeNode a:hover {
   color: #6699ff;
   text-decoration: underline;
 }
 
-a.tobago-treeNode-default a:focus {
+a.tobago-treeNode a:focus {
   background: #d6ebff;
   color: #3366cc;
 }
@@ -99,13 +99,13 @@ img.tobago-progress-color2 {
 
 /* - File Upload ------------------------------------------------------------ */
 
-.tobago-file-default  {
+.tobago-file  {
   height: 20px;
 }
 
 
 /* page --------------------------------------------------------------------- */
-.tobago-page-default  {
+.tobago-page  {
   background: #ffffff;
   font: 11px arial, helvetica, sans-serif;
   color: #3366CC;
@@ -122,7 +122,7 @@ img.tobago-progress-color2 {
 
 /* box ----------------------------------------------------------------- */
 
-.tobago-box-default {
+.tobago-box {
   background: #E6E6E6;
   border: 1px solid #FF9900;
 }
@@ -135,7 +135,7 @@ img.tobago-progress-color2 {
 
 /* button ------------------------------------------------------------ */
 
-.tobago-button-default  {
+.tobago-button  {
   border: 1px #FF7D00 solid;
   background: #FFCC66;
   font: 11px arial, helvetica, sans-serif;
@@ -148,7 +148,7 @@ img.tobago-progress-color2 {
 
 /* date ---------------------------------------------------------------------- */
 
-.tobago-date-default  {
+.tobago-date  {
   border: 1px #3366CC solid;
   height: 20px;
   font: 12px arial, helvetica, sans-serif;
@@ -172,11 +172,11 @@ img.tobago-progress-color2 {
 
 /* label ------------------------------------------------------------ */
 
-div.tobago-label-default  {
+div.tobago-label  {
   background: #99ccff;
 }
 
-label.tobago-label-default {
+label.tobago-label {
   color: #3366cc;
 }
 
@@ -253,7 +253,7 @@ a:link.tab, a:visited.tab, a:active.tab 
 
 /* textArea -------------------------------------------------------------- */
 
-.tobago-textArea-default  {
+.tobago-textArea  {
   font: 12px arial, helvetica, sans-serif;
   color: #3366CC;
   border: 1px solid #3366CC;
@@ -274,7 +274,7 @@ a:link.tab, a:visited.tab, a:active.tab 
 
 /* in ---------------------------------------------------------------------- */
 
-.tobago-in-default  {
+.tobago-in  {
   border: 1px #3366CC solid;
   font: 12px arial, helvetica, sans-serif;
   color: #3366CC;
@@ -309,7 +309,7 @@ a:link.tab, a:visited.tab, a:active.tab 
 }
 
 /* toolbar ----------------------------------------------------------------- */
-.tobago-toolBar-default  {
+.tobago-toolBar  {
   height: 20px;
   border: 1px solid #FF9900;
   box-sizing: border-box;
@@ -394,7 +394,7 @@ a:link.tab, a:visited.tab, a:active.tab 
 
 /* menuBar ----------------------------------------------------------------- */
 
-.tobago-menuBar-default li {
+.tobago-menuBar li {
   background-color: #FFCC66;
 }
 
@@ -402,12 +402,12 @@ li.tobago-menu-selected {
   background-color: #FF9900;
 }
 
-.tobago-menuBar-default {
+.tobago-menuBar {
   border-bottom-color: #FF9900;
   background-color: #FFCC66;
 }
 
-.tobago-menuBar-default ol {
+.tobago-menuBar ol {
   border-color: #000000;
 }
 

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Tue May  4 15:25:19 2010
@@ -17,10 +17,6 @@ package org.apache.myfaces.tobago.render
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.context.ResourceManagerUtils;
-import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.CreateComponentUtils;
 import org.apache.myfaces.tobago.component.Facets;
@@ -35,6 +31,7 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.context.ClientProperties;
 import org.apache.myfaces.tobago.context.ResourceManager;
 import org.apache.myfaces.tobago.context.ResourceManagerFactory;
+import org.apache.myfaces.tobago.context.ResourceManagerUtils;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
 import org.apache.myfaces.tobago.event.PageAction;
 import org.apache.myfaces.tobago.internal.util.StringUtils;
@@ -53,10 +50,13 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
 import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
+import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.util.LayoutInfo;
 import org.apache.myfaces.tobago.util.VariableResolverUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.faces.application.Application;
 import javax.faces.component.UIColumn;
@@ -836,7 +836,7 @@ public class SheetRenderer extends Layou
           "Tobago.Sheets.get('" + sheetId + "').toggleAll()", "t_toggleAll");
 
       writer.startElement(HtmlConstants.OL, menu);
-      writer.writeClassAttribute("tobago-menuBar-default");
+      writer.writeClassAttribute("tobago-menuBar");
       writer.writeStyleAttribute("position:absolute;");  // FIXME: may use a different style class
       RenderUtils.encode(facesContext, menu);
       writer.endElement(HtmlConstants.OL);

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java Tue May  4 15:25:19 2010
@@ -17,10 +17,6 @@ package org.apache.myfaces.tobago.render
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.context.ResourceManagerUtils;
-import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.CreateComponentUtils;
 import org.apache.myfaces.tobago.component.Facets;
@@ -31,6 +27,7 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.component.UIToolBar;
 import org.apache.myfaces.tobago.context.ResourceManager;
 import org.apache.myfaces.tobago.context.ResourceManagerFactory;
+import org.apache.myfaces.tobago.context.ResourceManagerUtils;
 import org.apache.myfaces.tobago.internal.component.UICommandBase;
 import org.apache.myfaces.tobago.internal.util.AccessKeyMap;
 import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
@@ -39,8 +36,11 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
 import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
+import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIPanel;
@@ -324,7 +324,7 @@ public abstract class ToolBarRendererBas
   }
 
   protected String getIconClass(String iconSize) {
-    return "tobago-image-default tobago-toolBar-button-image tobago-toolBar-button-image-" + iconSize;
+    return "tobago-image tobago-toolBar-button-image tobago-toolBar-button-image-" + iconSize;
   }
 
   protected abstract String getHoverClasses(boolean first, boolean last);
@@ -458,7 +458,7 @@ public abstract class ToolBarRendererBas
       popupMenu.getAttributes().put(Attributes.IMAGE, image);
       popupMenu.getAttributes().put(Attributes.LABEL, "\u00a0\u00a0"); // non breaking space
       writer.startElement(HtmlConstants.OL, popupMenu);
-      writer.writeClassAttribute("tobago-menuBar-default");
+      writer.writeClassAttribute("tobago-menuBar");
       writer.writeStyleAttribute("position:relative;");  // FIXME: use a different style class
       RenderUtils.encode(facesContext, popupMenu);
       writer.endElement(HtmlConstants.OL);

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css Tue May  4 15:25:19 2010
@@ -20,7 +20,7 @@
  * agent: msie
  */
 
-fieldset.tobago-box-default {
+fieldset.tobago-box {
   padding: 0px;
   padding-left: 10px;
 }
@@ -40,7 +40,7 @@ fieldset.tobago-box-default {
   padding-bottom: 0px;
 }
 
-.tobago-date-default {
+.tobago-date {
   margin-top: -1px;
   margin-bottom: -1px;
 }
@@ -50,15 +50,15 @@ textarea.tobago-richTextEditor-body {
   margin-bottom: -1px;
 }
 
-.tobago-label-default {
+.tobago-label {
   margin-top: -2px;
 }
 
-.tobago-file-default {
+.tobago-file {
   height: 23px;
 }
 
-.tobago-toolBar-default {
+.tobago-toolBar {
   height: 31px;
 }
 .tobago-toolBar-button-hover-first {

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js Tue May  4 15:25:19 2010
@@ -21,7 +21,7 @@
  <html>
    <body>
      <form>
-       <ol class="tobago-menuBar-default">
+       <ol class="tobago-menuBar">
          <li class="tobago-menu-top">
            <a id="m1">Menu 1</a>
          </li>
@@ -30,7 +30,7 @@
          </li>
          ...
        </ol>
-       <div class="tobago-page-default">
+       <div class="tobago-page">
          // page content     
        </div>
        <span ... </span>
@@ -164,7 +164,7 @@ function xxx_tobagoMenuOpen(event) {
 }
 
 function xxx_tobagoMenuCloseAll() {
-  jQuery(".tobago-menuBar-default").each(function() {
+  jQuery(".tobago-menuBar").each(function() {
     xxx_tobagoMenuSwitchOff(jQuery(this));
   });
   return false;

Modified: myfaces/tobago/trunk/tobago-theme/tobago-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/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css Tue May  4 15:25:19 2010
@@ -168,7 +168,7 @@ span.tobago-progress {
 
 /* Tree ------------------------------------------------------------------- */
 
-.tobago-tree-default {
+.tobago-tree {
   overflow: auto;
   padding: 0;
   margin: 0;
@@ -177,27 +177,27 @@ span.tobago-progress {
   white-space: nowrap;
 }
 
-.tobago-treeNode-default img {
+.tobago-treeNode img {
   vertical-align: middle;
   border: 0;
 }
 
-.tobago-treeNode-default a, .tobago-treeNode-default a:active, .tobago-treeNode-default a:hover {
+.tobago-treeNode a, .tobago-treeNode a:active, .tobago-treeNode a:hover {
   margin-left: 3px;
   padding: 1px 2px 1px 2px;
 }
 
-.tobago-treeNode-default a {
+.tobago-treeNode a {
   color: black;
   text-decoration: none;
 }
 
-.tobago-treeNode-default a:hover {
+.tobago-treeNode a:hover {
   color: blue;
   text-decoration: underline;
 }
 
-.tobago-treeNode-default a:focus {
+.tobago-treeNode a:focus {
   background: #445566;
   color: highlighttext;
   text-decoration: none;
@@ -219,12 +219,12 @@ span.tobago-progress {
 
 /* TreeListbox ------------------------------------------------------------------- */
 
-.tobago-treeListbox-default {
+.tobago-treeListbox {
   overflow-x: auto;
 }
 
 .tobago-treeListbox-level {
-/* without ie6 support we can use: .tobago-treeListbox-default > div > div */
+/* without ie6 support we can use: .tobago-treeListbox > div > div */
   width: 160px;
   height: 100%;
   position: absolute;
@@ -232,7 +232,7 @@ span.tobago-progress {
 }
 
 .tobago-treeListbox-select {
-/* without ie6 support we can use: .tobago-treeListbox-default > div > div > select */
+/* without ie6 support we can use: .tobago-treeListbox > div > div > select */
   position: absolute;
   width: 100%;
   height: 100%;
@@ -242,7 +242,7 @@ span.tobago-progress {
 
 /* Calendar ------------------------------------------------------------------- */
 
-table.tobago-calendar-default {
+table.tobago-calendar {
   width: 100%;
 }
 
@@ -295,7 +295,7 @@ td.tobago-calendar-day-selected {
 
 /* button ------------------------------------------------------------------ */
 
-.tobago-button-default {
+.tobago-button {
   border-left: 1px solid #ddeeff;
   border-right: 1px solid #6688aa;
   border-top: 1px solid #ddeeff;
@@ -311,14 +311,14 @@ td.tobago-calendar-day-selected {
   cursor: default;
 }
 
-.tobago-button-default img {
+.tobago-button img {
   margin-right: 5px;
   vertical-align: middle;
 }
 
 /* file -------------------------------------------------------------------- */
 
-.tobago-file-default {
+.tobago-file {
   height: 25px;
 }
 
@@ -328,13 +328,13 @@ td.tobago-calendar-day-selected {
 
 /* formatted --------------------------------------------------------------- */
 
-.tobago-formatted-default {
+.tobago-formatted {
   font-family: arial, helvetica, sans-serif;
 }
 
 /* gridLayout -------------------------------------------------------------- */
 
-.tobago-gridLayout-default {
+.tobago-gridLayout {
   border-spacing: 0;
   padding: 0;
   margin: 0;
@@ -346,7 +346,7 @@ td.tobago-calendar-day-selected {
   margin: 0;
 }
 
-div.tobago-gridLayout-default {
+div.tobago-gridLayout {
   padding: 0;
   overflow: hidden;
 }
@@ -361,13 +361,13 @@ div.tobago-gridLayout-first-column {
 
 /* box ---------------------------------------------------------------- */
 
-fieldset.tobago-box-default {
+fieldset.tobago-box {
   border: 2px groove #ddeeff;
   margin: 0;
 /*  padding: 20px 10px 10px 10px;*/
 }
 
-legend.tobago-box-default {
+legend.tobago-box {
   color: black; /*  font-size: 14px;*/
 }
 
@@ -406,16 +406,16 @@ a.tobago-label-markup-number {
   
 }
 
-div.tobago-label-default {
+div.tobago-label {
 
 }
 
-a.tobago-label-default {
+a.tobago-label {
   padding-top: 4px;
   display: -moz-box;
 }
 
-label.tobago-label-default {
+label.tobago-label {
   height: 23px;
   padding: 0 0 0 2px;
   margin: 0;
@@ -440,7 +440,7 @@ label.tobago-label-inline {
 
 /* selectBooleanCheckbox --------------------------------------------------- */
 
-.tobago-selectBooleanCheckbox-default {
+.tobago-selectBooleanCheckbox {
   background: transparent;
   margin-top: 2px;
   margin-bottom: 2px;
@@ -456,7 +456,7 @@ label.tobago-label-inline {
 
 /* selectManyCheckbox ----------------------------------------------------------- */
 
-.tobago-selectManyCheckbox-default {
+.tobago-selectManyCheckbox {
   background: transparent;
   list-style: none;
   padding: 0;
@@ -477,7 +477,7 @@ label.tobago-label-inline {
 
 /* selectManyListbox ------------------------------------------------------- */
 
-.tobago-selectManyListbox-default {
+.tobago-selectManyListbox {
   font-family: arial, helvetica, sans-serif;
   color: #000000;
   background: #ffffff;
@@ -500,7 +500,7 @@ label.tobago-label-inline {
 
 /* selectOneChoice --------------------------------------------------------- */
 
-.tobago-selectOneChoice-default {
+.tobago-selectOneChoice {
   font-family: arial, helvetica, sans-serif;
   background: #ffffff;
 }
@@ -520,7 +520,7 @@ label.tobago-label-inline {
 
 /* selectOneListbox --------------------------------------------------- */
 
-.tobago-selectOneListbox-default {
+.tobago-selectOneListbox {
   font-family: arial, helvetica, sans-serif;
   color: #000000;
 }
@@ -541,7 +541,7 @@ label.tobago-label-inline {
 
 /* selectOneRadio ---------------------------------------------------------- */
 
-.tobago-selectOneRadio-default {
+.tobago-selectOneRadio {
   background: transparent;
   list-style: none;
   padding: 0;
@@ -562,7 +562,7 @@ label.tobago-label-inline {
 
 /* page -------------------------------------------------------------------- */
 
-.tobago-page-default {
+.tobago-page {
   background: #bbccdd;
   font-family: arial, helvetica, sans-serif; /*  font-size: 14px;*/
   padding: 0;
@@ -605,7 +605,7 @@ label.tobago-label-inline {
 
 /* richTextEditor ---------------------------------------------------------- */
 
-.tobago-richTextEditor-default {
+.tobago-richTextEditor {
   box-sizing: border-box;
   -moz-box-sizing: border-box;
 }
@@ -665,7 +665,7 @@ div.tobago-richTextEditor-body {
 
 /* text -------------------------------------------------------------------- */
 
-.tobago-out-default {
+.tobago-out {
   font-family: arial, helvetica, sans-serif;
 }
 
@@ -684,7 +684,7 @@ div.tobago-richTextEditor-body {
 
 /* textArea ---------------------------------------------------------------- */
 
-.tobago-textArea-default {
+.tobago-textArea {
   border-color: #bbccdd;
   border-style: inset;
   border-width: 2px;
@@ -717,7 +717,7 @@ div.tobago-richTextEditor-body {
 
 /* in ---------------------------------------------------------------------- */
 
-.tobago-in-default {
+.tobago-in {
   font-family: arial, helvetica, sans-serif;
   font-size: 16px;
   background: #ffffff;
@@ -780,7 +780,7 @@ div.tobago-richTextEditor-body {
 
 /* date ---------------------------------------------------------------------- */
 
-.tobago-date-default {
+.tobago-date {
   font-family: arial, helvetica, sans-serif;
   font-size: 16px;
   background: #ffffff;
@@ -820,34 +820,34 @@ div.tobago-richTextEditor-body {
 
 /* object ------------------------------------------------------------------ */
 
-.tobago-object-default {
+.tobago-object {
   border: 0 solid black;
 }
 
 /* separator ------------------------------------------------------------------- */
 
-.tobago-separator-default {
+.tobago-separator {
   position: absolute;
 }
 
-hr.tobago-separator-default {
+hr.tobago-separator {
   border: 1px inset #000000;
   margin: 0;
 }
 
-.tobago-separator-start-default {
+.tobago-separator-start {
   width: 20px;
   position: static;
 }
 
-.tobago-separator-label-default {
+.tobago-separator-label {
   font: bold 12px arial, helvetica, sans-serif;
   padding-left: 5px;
   padding-right: 5px;
   white-space: nowrap;
 }
 
-.tobago-separator-end-default {
+.tobago-separator-end {
   width: 100%;
   position: static;
 }
@@ -906,7 +906,7 @@ hr.tobago-separator-default {
 
 /* Toolbar ----------------------------------------------------------------- */
 
-.tobago-toolBar-default {
+.tobago-toolBar {
   border: 2px groove #f6faff;
   position: relative;
   overflow: hidden;
@@ -1055,7 +1055,7 @@ a:link.tobago-toolBar-button-link, a:vis
 
 /* MenuBar, Menu, etc. ------------------------------------------------------------------ */
 
-.tobago-menuBar-default, .tobago-menuBar-default a:link, .tobago-menuBar-default a:visited, .tobago-menuBar-default a:active, 
+.tobago-menuBar, .tobago-menuBar a:link, .tobago-menuBar a:visited, .tobago-menuBar a:active,
 .tobago-page-menuStore, .tobago-page-menuStore a:link, .tobago-page-menuStore a:visited, .tobago-page-menuStore a:active {
   color: black;
   font-family: arial, helvetica, sans-serif;
@@ -1069,7 +1069,7 @@ a:link.tobago-toolBar-button-link, a:vis
 }
 
 
-.tobago-menuBar-default li, 
+.tobago-menuBar li,
 .tobago-page-menuStore li {
   background-color: #aabbcc;
   list-style: none outside none;
@@ -1079,7 +1079,7 @@ li.tobago-menu-selected {
   background-color: #d8e9fb;
 }
 
-.tobago-menuBar-default {
+.tobago-menuBar {
   padding: 0;
   margin: 0;
   border-bottom-width: 1px;
@@ -1102,7 +1102,7 @@ li.tobago-menu-selected {
   z-index: 1000;
 }
 
-.tobago-menuBar-default ol, 
+.tobago-menuBar ol,
 .tobago-page-menuStore ol {
   padding: 0;
   margin: 0;
@@ -1129,13 +1129,13 @@ li.tobago-menu-selected {
   background-position: 5px center;
 }
 
-.tobago-menuSeparator-default {
+.tobago-menuSeparator {
   padding: 2px 3px 2px 5px;
   display: block;
   position: static;
 }
 
-.tobago-menuSeparator-default hr {
+.tobago-menuSeparator hr {
   margin: 3px 0;
   border-width: 1px 0 0 0;
   border-style: solid;

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Tue May  4 15:25:19 2010
@@ -48,7 +48,7 @@ public class BoxRenderer extends BoxRend
   
 with shadow
   
-<div class="tobago-box-default" style="width: 100px; height: 100px">
+<div class="tobago-box" style="width: 100px; height: 100px">
   <div class="tobago-box-shadow" style="width: 99px; height: 99px">
     <div class="tobago-box-border" style="width: 97px; height: 97px">
       <div class="tobago-box-header">Label</div>
@@ -62,7 +62,7 @@ with shadow
 
 without shadow
 
-<div class="tobago-box-default" style="width: 100px; height: 100px">
+<div class="tobago-box" style="width: 100px; height: 100px">
   <span class="tobago-box-header">Label</span>
 
   <div style="position: absolute; top: 26px; left: 6px; width: 87px; height: 67px; background-color: blue;">

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css Tue May  4 15:25:19 2010
@@ -22,13 +22,13 @@
 
 /* date ---------------------------------------------------------------------- */
 
-.tobago-date-default  {
+.tobago-date  {
   margin-top: 0px;
 }
 
 /* label ------------------------------------------------------------------ */
 
-label.tobago-label-default  {
+label.tobago-label  {
   margin-top: 0px;
 }
 
@@ -37,7 +37,7 @@ label.tobago-label-default  {
   border-bottom: 0px solid transparent;
 }
 
-.tobago-label-default  {
+.tobago-label  {
   padding-top: 0px;
 }
 
@@ -47,7 +47,7 @@ label.tobago-label-default  {
 
 /* selectOneChoice --------------------------------------------------------- */
 
-.tobago-selectOneChoice-default  {
+.tobago-selectOneChoice  {
   margin-bottom: -1px;
 }
 

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css Tue May  4 15:25:19 2010
@@ -20,7 +20,7 @@
  * agent: msie
  */
 
-label.tobago-label-default  {
+label.tobago-label  {
   margin-top: 2px;
 }
 

Modified: myfaces/tobago/trunk/tobago-theme/tobago-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/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css Tue May  4 15:25:19 2010
@@ -20,7 +20,7 @@
  * agent: standard
  */
 
-.tobago-link-default {
+.tobago-link {
   font: bold 12px arial, helvetica, sans-serif;
   color: #000000;
   text-decoration: none;
@@ -55,7 +55,7 @@ table {
 }
 
 /*-- Popup ------------------------------------------------------------------ */
-.tobago-popup-default  {
+.tobago-popup  {
   background: #E2E2E2;
 }
 
@@ -242,12 +242,12 @@ reason they are not defined as a:link
   height: 16px;
 }
 
-.tobago-treeNode-default img {
+.tobago-treeNode img {
   vertical-align: top;
 	border: 0px;
 }
 
-.tobago-treeNode-default a {
+.tobago-treeNode a {
   font-size: 12px;
   font-family: arial, helvetica, sans-serif;
 }
@@ -258,7 +258,7 @@ reason they are not defined as a:link
   cursor: pointer;
 }
 
-.tobago-treeNode-default a:hover {
+.tobago-treeNode a:hover {
   color: #000000;
   text-decoration: underline;
 }
@@ -269,7 +269,7 @@ reason they are not defined as a:link
   cursor: pointer;
 }
 
-.tobago-treeNode-default a:focus {
+.tobago-treeNode a:focus {
   background: transparent;
   color: #000000;
 }
@@ -287,7 +287,7 @@ reason they are not defined as a:link
 
 /* button ------------------------------------------------------------------ */
 
-.tobago-button-default  {
+.tobago-button  {
   border: 1px #000000 solid;
   background: #ffffff;
   font: bold 12px arial, helvetica, sans-serif;
@@ -319,7 +319,7 @@ reason they are not defined as a:link
 
 /* selectBooleanCheckbox --------------------------------------------------- */
 
-.tobago-selectBooleanCheckbox-default {
+.tobago-selectBooleanCheckbox {
   margin-top: 0px;
   margin-bottom: 0px;
 }
@@ -330,13 +330,13 @@ reason they are not defined as a:link
 
 /* file  ------------------------------------------------------------------- */
 
-.tobago-file-default  {
+.tobago-file  {
   height: 20px;
 }
 
 /* box ----------------------------------------------------------------- */
 
-.tobago-box-default {
+.tobago-box {
   position: absolute;
 }
 
@@ -381,7 +381,7 @@ reason they are not defined as a:link
 
 /* label ------------------------------------------------------------------- */
 
-div.tobago-label-default  {
+div.tobago-label  {
   background: #E8E8E8;
   border: 0 solid transparent;
   vertical-align: top;
@@ -389,11 +389,11 @@ div.tobago-label-default  {
   margin: 0;
   padding-top: 0;
 }
-a.tobago-label-default  {
+a.tobago-label  {
   padding-top: 3px;
 }
 
-label.tobago-label-default  {
+label.tobago-label  {
   font: bold 12px arial, helvetica, sans-serif;
   /*height: 19px;*/
   /*height: auto;*/
@@ -445,7 +445,7 @@ label.tobago-label-error {
 }
 
 /* page -------------------------------------------------------------------- */
-.tobago-page-default  {
+.tobago-page  {
   background: #E2E2E2;
   font: 12px arial, helvetica, sans-serif;
   margin-bottom: 0px;
@@ -469,14 +469,14 @@ label.tobago-label-error {
 
 /* text -------------------------------------------------------------------- */
 
-.tobago-out-default  {
+.tobago-out  {
   font-family: arial, helvetica, sans-serif;
   font-size: 12px;
 }
 
 /* textArea ---------------------------------------------------------------- */
 
-.tobago-textArea-default  {
+.tobago-textArea  {
   font: 12px arial, helvetica, sans-serif;
   background: #ffffff;
   color: #000000;
@@ -500,7 +500,7 @@ label.tobago-label-error {
 
 /* in ---------------------------------------------------------------------- */
 
-.tobago-in-default  {
+.tobago-in  {
   border: 1px #000000 solid;
   height: 14px;
   font: 12px arial, helvetica, sans-serif;
@@ -522,7 +522,7 @@ label.tobago-label-error {
 
 /* date ---------------------------------------------------------------------- */
 
-.tobago-date-default  {
+.tobago-date  {
   border: 1px #000000 solid;
   height: 20px;
   font: 12px arial, helvetica, sans-serif;
@@ -551,7 +551,7 @@ label.tobago-label-error {
 
 /* selectManyListbox ------------------------------------------------------- */
 
-.tobago-selectManyListbox-default  {
+.tobago-selectManyListbox  {
   border: 1px solid #000000;
   font: 12px arial, helvetica, sans-serif;
   padding-top: -1px;
@@ -571,7 +571,7 @@ label.tobago-label-error {
 
 /* selectOneChoice --------------------------------------------------------- */
 
-.tobago-selectOneChoice-default  {
+.tobago-selectOneChoice  {
   border: 1px solid #000000;
   font: 12px arial, helvetica, sans-serif;
   color: #000000;
@@ -583,7 +583,7 @@ tobago-selectOneChoice-readonly {
 
 /* selectOneListbox -------------------------------------------------------- */
 
-.tobago-selectOneListbox-default  {
+.tobago-selectOneListbox  {
   border: 1px solid #000000;
   font-size: 12px;
 }
@@ -639,7 +639,7 @@ tobago-selectOneChoice-readonly {
 
 /* toolbar ----------------------------------------------------------------- */
 
-.tobago-toolBar-default {
+.tobago-toolBar {
   border: 1px solid #000000;
   box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -769,7 +769,7 @@ tobago-selectOneChoice-readonly {
 
 /* menuBar -------------------------------------------------------- */
 
-.tobago-menuBar-default li,
+.tobago-menuBar li,
 .tobago-page-menuStore li {
   background-color: #dddddd;
 }
@@ -778,20 +778,20 @@ li.tobago-menu-selected {
   background-color: #bbbbbb;
 }
 
-.tobago-menuBar-default,
+.tobago-menuBar,
 .tobago-page-menuStore {
   border-bottom-color: #808080;
   background-color: #dddddd;
 }
 
-.tobago-menuBar-default ol,
+.tobago-menuBar ol,
 .tobago-page-menuStore ol {
   border-color: #888888;
 }
 
 /* separator ------------------------------------------------------------------- */
 
-hr.tobago-separator-default {
+hr.tobago-separator {
   border: 0 solid #000000;
   border-bottom-width: 1px;
 }

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js Tue May  4 15:25:19 2010
@@ -52,7 +52,7 @@ Tobago.Tree.updateMarker = function(node
   if (node) {
     node = node.firstChild;
     while (node) {
-      if (node.className && node.className.indexOf("tobago-treeNode-default") > -1) {
+      if (node.className && node.className.indexOf("tobago-treeNode") > -1) {
         if (add) {
           Tobago.addCssClass(node, "tobago-treeNode-marker");
         } else {
@@ -130,7 +130,7 @@ $(document).ready(function () {
 
   // find all option tags and add the dedicated select tag in its data section.
 
-  $(".tobago-treeListbox-default > div > div > select > option").each(function() {
+  $(".tobago-treeListbox > div > div > select > option").each(function() {
     var option = $(this);
     var optionId = option.attr("id");
     var selectId = optionId + "::select";
@@ -146,7 +146,7 @@ $(document).ready(function () {
   // add on change on all select tag, all options that are not selected hide there dedicated
   // select tag, and the selected option show its dedicated select tag.
 
-  $(".tobago-treeListbox-default > div > div > select").each(function() {
+  $(".tobago-treeListbox > div > div > select").each(function() {
 
     $(this).change(function() {
       $(this).children("option:not(:selected)").each(function() {
@@ -168,11 +168,11 @@ $(document).ready(function () {
   });
 
 /*
-  $(".tobago-treeListbox-default > div > div > select > option:selected").change();
+  $(".tobago-treeListbox > div > div > select > option:selected").change();
 */
 
 /*
-  $(".tobago-treeListbox-default > div > div > select > option:selected").each(function() {
+  $(".tobago-treeListbox > div > div > select > option:selected").each(function() {
     $(this).change();
   });
 */

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=940907&r1=940906&r2=940907&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Tue May  4 15:25:19 2010
@@ -898,7 +898,7 @@ var Tobago = {
   setupPopup: function() {
 
     // TODO: remove later (after change AJAX, that they replace tags instead of fill them...)
-    jQuery(".tobago-popup-parent > .tobago-popup-default").unwrap();
+    jQuery(".tobago-popup-parent > .tobago-popup").unwrap();
 
     // The shield is a protection against clicking controls, which are not allowed to click in the modal case.
     // The shield also makes an optical effect (alpha blending).
@@ -1024,7 +1024,7 @@ var Tobago = {
    */
   closePopup: function(closeButton) {
     Tobago.unlockBehindPopup();
-    var popup = jQuery(closeButton).parents("div.tobago-popup-default:first");
+    var popup = jQuery(closeButton).parents("div.tobago-popup:first");
     popup.remove();
     Tobago.setupPopup();
   },
@@ -1064,7 +1064,7 @@ var Tobago = {
     var div = jQuery(Tobago.escapeClientId(popupId));
     if (div.size() == 0) {
       jQuery("form:first") // add the new div after the page and the popup divs.
-          .children("(.tobago-page-default,.tobago-popup-default):last")
+          .children("(.tobago-page,.tobago-popup):last")
           .after("<div id='" + popupId + "' />");
     }