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/07/20 12:06:00 UTC
svn commit: r965782 [4/4] - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/config/
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-core/sr...
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=965782&r1=965781&r2=965782&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 Jul 20 10:05:56 2010
@@ -54,16 +54,12 @@
white-space: nowrap;
}
-.tobago-box-header-toolbar-div {
+.tobago-box-headerToolbar {
position: absolute;
top: 0;
right: -1px;
}
-.tobago-box-header-toolbar-label_off {
- top: -1px;
-}
-
/* button ------------------------------------------------------------------ */
.tobago-button {
@@ -74,7 +70,7 @@
height: 20px;
}
-.tobago-button-disabled {
+.tobago-button-markup-disabled {
color: GrayText;
}
@@ -88,12 +84,12 @@
font: 12px arial, helvetica, sans-serif;
}
-.tobago-calendar-day-disabled {
+.tobago-calendar-day-markup-disabled {
font: 12px arial, helvetica, sans-serif;
color: #333333;
}
-.tobago-calendar-day-selected {
+.tobago-calendar-day-markup-selected {
font: bold 12px arial, helvetica, sans-serif;
color: #660000;
border: 1px dotted #660000;
@@ -101,7 +97,7 @@
height: 18px;
}
-.tobago-calendar-inner-header {
+.tobago-calendar-headerInner {
font: bold 14px arial, helvetica, sans-serif;
color: #660000;
}
@@ -125,7 +121,7 @@
/* date ---------------------------------------------------------------------- */
-.tobago-date {
+.tobago-date {
border: 1px #000000 solid;
height: 20px;
font: 12px arial, helvetica, sans-serif;
@@ -133,49 +129,49 @@
padding-right: 2px;
}
-.tobago-date-readonly {
+.tobago-date-markup-readonly {
background-color: #E8E8E8;
}
-.tobago-date-disabled {
+.tobago-date-markup-disabled {
color: #808080;
background-color: #E8E8E8;
}
-.tobago-date-error {
+.tobago-date-markup-error, .tobago-date-markup-fatal {
border: 1px solid #FF0000;
}
/* file ------------------------------------------------------------------- */
-.tobago-file {
+.tobago-file {
height: 20px;
}
/* in ---------------------------------------------------------------------- */
-.tobago-in {
+.tobago-in {
border: 1px #000000 solid;
height: 14px;
font: 12px arial, helvetica, sans-serif;
}
-.tobago-in-readonly {
+.tobago-in-markup-readonly {
background-color: #E8E8E8;
}
-.tobago-in-disabled {
+.tobago-in-markup-disabled {
color: #808080;
background-color: #E8E8E8;
}
-.tobago-in-error {
+.tobago-in-markup-error, .tobago-in-markup-fatal {
border: 1px solid #FF0000;
}
/* label ------------------------------------------------------------------- */
-div.tobago-label {
+div.tobago-label {
background: #E8E8E8;
border: 0 solid transparent;
vertical-align: top;
@@ -183,11 +179,11 @@ div.tobago-label {
margin: 0;
padding-top: 0;
}
-a.tobago-label {
+a.tobago-label {
padding-top: 3px;
}
-label.tobago-label {
+label.tobago-label {
font: bold 12px arial, helvetica, sans-serif;
/*height: 19px;*/
/*height: auto;*/
@@ -200,7 +196,7 @@ label.tobago-label {
background-color: transparent;
}
-.tobago-label-td {
+.tobago-label-td {
border: 0 solid transparent;
/* border-bottom: 0px solid #E2E2E2;*/ /* see workaround in mozilla style! */
vertical-align: top;
@@ -218,22 +214,22 @@ label.tobago-label {
height: 1px;
}
-label.tobago-label-disabled {
+label.tobago-label-markup-disabled {
color: #808080;
}
-.tobago-label-inline {
+.tobago-label-inline {
padding-top: 5px; /* see workaround in mozilla style! */
padding-left: 0;
margin-top: 1px;
width: auto;
}
-label.tobago-label-inline {
+label.tobago-label-inline {
padding-left: 0;
}
-label.tobago-label-error {
+label.tobago-label-markup-error {
background: url(../image/label-error-bg.gif) no-repeat bottom left;
color: #FF0000;
}
@@ -246,7 +242,7 @@ label.tobago-label-error {
text-decoration: none;
}
-.tobago-link-disabled {
+.tobago-link-markup-disabled {
color: #888888;
}
@@ -274,22 +270,20 @@ li.tobago-menu-selected {
/* messages --------------------------------------------------------------- */
-/* todo rename */
-.tobago-validation-message {
- color: #FF0000;
+.tobago-messages {
font: bold 12px arial, helvetica, sans-serif;
}
/* out -------------------------------------------------------------------- */
-.tobago-out {
+.tobago-out {
font-family: arial, helvetica, sans-serif;
font-size: 12px;
}
/* page -------------------------------------------------------------------- */
-.tobago-page {
+.tobago-page {
background: #E2E2E2;
font: 12px arial, helvetica, sans-serif;
margin-bottom: 0px;
@@ -305,7 +299,7 @@ li.tobago-menu-selected {
/* popup ------------------------------------------------------------------ */
-.tobago-popup {
+.tobago-popup {
background: #E2E2E2;
}
@@ -341,19 +335,19 @@ img.tobago-progress-color2 {
margin-bottom: 0px;
}
-.tobago-selectBooleanCheckbox-disabled {
+.tobago-selectBooleanCheckbox-markup-disabled {
color: #808080;
}
/* selectManyCheckbox ---------------------------------------------------------- */
-.tobago-selectManyCheckbox-disabled {
+.tobago-selectManyCheckbox-markup-disabled {
color: #808080;
}
/* selectManyListbox ------------------------------------------------------- */
-.tobago-selectManyListbox {
+.tobago-selectManyListbox {
border: 1px solid #000000;
font: 12px arial, helvetica, sans-serif;
padding-top: -1px;
@@ -362,59 +356,59 @@ img.tobago-progress-color2 {
}
-.tobago-selectManyListbox-disabled {
+.tobago-selectManyListbox-markup-disabled {
background-color: #E8E8E8;
color: #808080;
}
-.tobago-selectManyListbox-readonly {
+.tobago-selectManyListbox-markup-readonly {
background-color: #E8E8E8;
}
/* selectOneChoice --------------------------------------------------------- */
-.tobago-selectOneChoice {
+.tobago-selectOneChoice {
border: 1px solid #000000;
font: 12px arial, helvetica, sans-serif;
color: #000000;
}
-tobago-selectOneChoice-readonly {
+tobago-selectOneChoice-markup-readonly {
background-color: #E8E8E8;
}
/* selectOneListbox -------------------------------------------------------- */
-.tobago-selectOneListbox {
+.tobago-selectOneListbox {
border: 1px solid #000000;
font-size: 12px;
}
-.tobago-selectOneListbox-disabled {
+.tobago-selectOneListbox-markup-disabled {
background-color: #E8E8E8;
color: #808080;
}
-.tobago-selectOneListbox-readonly {
+.tobago-selectOneListbox-markup-readonly {
background-color: #E8E8E8;
}
/* selectOneRadio --------------------------------------------------------- */
-.tobago-selectOneRadio-disabled {
+.tobago-selectOneRadio-markup-disabled {
color: #808080;
}
/* separator ------------------------------------------------------------------- */
-hr.tobago-separator {
+.tobago-separator hr {
border: 0 solid #000000;
border-bottom-width: 1px;
}
/* sheet -------------------------------------------------------- */
-.tobago-sheet-header-div {
+.tobago-sheet-headerDiv {
left: 1px;
height: 20px;
border-bottom: 1px solid #ffffff;
@@ -428,32 +422,32 @@ hr.tobago-separator {
text-align: left;
}
-.tobago-sheet-body-table {
+.tobago-sheet-bodyTable {
table-layout: fixed;
}
-.tobago-sheet-body-div {
+.tobago-sheet-body {
padding-top: 20px;
background: #D7D7D7;
border: 1px solid #CCCCCC;
}
-.tobago-sheet-row-odd {
+.tobago-sheet-row-markup-odd {
font: 12px arial, helvetica, sans-serif;
background: #ffffff;
}
-.tobago-sheet-row-even {
+.tobago-sheet-row-markup-even {
font: 12px arial, helvetica, sans-serif;
background: #ffffff;
}
-.tobago-sheet-row-selected {
+.tobago-sheet-row-markup-selected {
background: #EBEAEA;
color: #000000;
}
-.tobago-sheet-cell-td {
+.tobago-sheet-cell {
border-bottom: 1px solid #E2E2E2;
}
@@ -467,26 +461,26 @@ hr.tobago-separator {
padding-top: 1px;
}
-.tobago-sheet-paging-span-left {
+.tobago-sheet-pagingOuter-markup-left {
left: 2px;
}
-.tobago-sheet-paging-span-right {
+.tobago-sheet-pagingOuter-markup-right {
right: 2px;
}
-.tobago-sheet-paging-input {
+.tobago-sheet-pagingInput {
height: 11px;
width: 25px;
font: bold 10px arial, helvetica, sans-serif;
border: 1px solid black;
}
-.tobago-sheet-paging-pages-text {
- padding-right: 0px;
+.tobago-sheet-pagingText {
+ padding-right: 0;
}
-.tobago-sheet-selector-menu {
+.tobago-sheet-selectorMenu {
margin-top: 1px;
margin-left: 0px;
}
@@ -498,7 +492,7 @@ hr.tobago-separator {
color: #660000;
}
-.tobago-tab-disabled {
+.tobago-tab-link-markup-disabled {
color: #808080;
}
@@ -507,36 +501,32 @@ hr.tobago-separator {
height: 100%;
}
-.tobago-tab-header {
+.tobago-tabGroup-header {
position: relative;
}
-.tobago-tab-selected-outer {
+.tobago-tab-outer {
+ display: inline-block;
border-color: #000000;
+ background: url(../image/tab-header-unselected-bg.gif) repeat-x top;
+}
+
+.tobago-tab-outer-markup-selected {
padding: 0 0 0 0;
- display: inline-block;
background: url(../image/tab-header-selected-bg.gif) repeat-x top;
height: 18px;
}
-.tobago-tab-selected-inner {
+.tobago-tab-inner {
font: 12px arial, helvetica, sans-serif;
color: #660000;
- display: inline-block;
}
-.tobago-tab-unselected-outer {
+.tobago-tab-inner-markup-selected {
display: inline-block;
- border-color: #000000;
- background: url(../image/tab-header-unselected-bg.gif) repeat-x top;
}
-.tobago-tab-unselected-inner {
- font: 12px arial, helvetica, sans-serif;
- color: #660000;
-}
-
-span.tobago-tab-fulfill {
+span.tobago-tabGroup-fulfill {
border-color: #000000;
display: inline-block;
border-bottom: 1px solid;
@@ -561,16 +551,9 @@ div.tobago-tabGroup-toolBar {
border-color: #000000;
}
-a:link.tab, a:visited.tab, a:active.tab {
- font-family: arial, helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: #660000;
-}
-
/* textArea ---------------------------------------------------------------- */
-.tobago-textArea {
+.tobago-textArea {
font: 12px arial, helvetica, sans-serif;
background: #ffffff;
color: #000000;
@@ -579,24 +562,19 @@ a:link.tab, a:visited.tab, a:active.tab
padding: 0 0 0 2px;
}
-.tobago-textArea-readonly {
+.tobago-textArea-markup-readonly {
background-color: #E8E8E8;
}
-.tobago-textArea-disabled {
+.tobago-textArea-markup-disabled {
color: #808080;
background-color: #E8E8E8;
}
-.tobago-textArea-error {
+.tobago-textArea-markup-error, .tobago-textArea-markup-fatal {
border: 1px solid #FF0000;
}
-.tobago-textArea-spacer-custom {
- border-bottom-width: 1px;
- border-bottom-style: solid;
-}
-
/* time -------------------------------------------------------------------- */
.tobago-time-borderDiv {
@@ -605,7 +583,7 @@ a:link.tab, a:visited.tab, a:active.tab
width: 53px;
}
-.tobago-time-borderDiv-seconds {
+.tobago-time-borderDiv-markup-seconds {
width: 81px;
}
@@ -616,18 +594,15 @@ a:link.tab, a:visited.tab, a:active.tab
color: #000000;
}
-.tobago-time-input-selected {
+.tobago-time-input-markup-selected {
border-color: #E8E8E8;
background: #E8E8E8;
}
-.tobago-time-inc-image {
- left: 60px;
-}
-.tobago-time-dec-image {
+.tobago-time-incImage, .tobago-time-decImage {
left: 60px;
}
-.tobago-time-image-seconds {
+.tobago-time-incImage-markup-seconds, .tobago-time-decImage-markup-seconds {
left: 88px;
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java?rev=965782&r1=965781&r2=965782&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java Tue Jul 20 10:05:56 2010
@@ -26,10 +26,10 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.HtmlUtils;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
+import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -54,7 +54,7 @@ public class SeparatorRenderer extends L
writer.startElement(HtmlConstants.TABLE, component);
writer.writeIdAttribute(separator.getClientId(facesContext));
- writer.writeClassAttribute();
+ writer.writeClassAttribute(Classes.create(component));
Style style = new Style(facesContext, separator);
writer.writeStyleAttribute(style);
@@ -63,29 +63,19 @@ public class SeparatorRenderer extends L
writer.startElement(HtmlConstants.TR, component);
writer.startElement(HtmlConstants.TD, component);
- StyleClasses startClass = new StyleClasses();
- startClass.addAspectClass("separator", StyleClasses.Aspect.DEFAULT);
- startClass.addAspectClass("separator", "start", StyleClasses.Aspect.DEFAULT);
- writer.writeClassAttribute(startClass);
+ writer.writeClassAttribute(Classes.create(component, "start"));
writer.startElement(HtmlConstants.HR , component);
- writer.writeClassAttribute(startClass);
writer.endElement(HtmlConstants.HR);
writer.endElement(HtmlConstants.TD);
writer.startElement(HtmlConstants.TD, component);
- StyleClasses labelClass = new StyleClasses();
- labelClass.addAspectClass("separator", "label", StyleClasses.Aspect.DEFAULT);
- writer.writeClassAttribute(labelClass);
+ writer.writeClassAttribute(Classes.create(component, "label"));
writer.writeText(label);
writer.endElement(HtmlConstants.TD);
writer.startElement(HtmlConstants.TD, component);
- StyleClasses endClass = new StyleClasses();
- endClass.addAspectClass("separator", StyleClasses.Aspect.DEFAULT);
- endClass.addAspectClass("separator", "end", StyleClasses.Aspect.DEFAULT);
- writer.writeClassAttribute(endClass);
+ writer.writeClassAttribute(Classes.create(component, "end"));
writer.startElement(HtmlConstants.HR , component);
- writer.writeClassAttribute(endClass);
writer.endElement(HtmlConstants.HR);
writer.endElement(HtmlConstants.TD);
@@ -94,7 +84,7 @@ public class SeparatorRenderer extends L
} else {
writer.startElement(HtmlConstants.HR , component);
writer.writeIdAttribute(separator.getClientId(facesContext));
- writer.writeClassAttribute();
+ writer.writeClassAttribute(Classes.create(component));
Style style = new Style(facesContext, separator);
writer.writeStyleAttribute(style);
writer.endElement(HtmlConstants.HR);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java?rev=965782&r1=965781&r2=965782&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java Tue Jul 20 10:05:56 2010
@@ -23,6 +23,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UIPage;
import org.apache.myfaces.tobago.component.UISheet;
+import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
@@ -30,6 +31,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.webapp.TobagoResponseJsonWriterImpl;
import org.apache.myfaces.tobago.internal.webapp.TobagoResponseWriterWrapper;
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
+import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
@@ -385,19 +387,17 @@ public final class HtmlRendererUtils {
writer.writeStyleAttribute("background-image: url('" + imagePath + "')");
}
}
- if (item instanceof SupportsMarkup) {
- StyleClasses optionStyle = new StyleClasses();
- optionStyle.addMarkupClass((SupportsMarkup) item, getRendererName(facesContext, component), "option");
- if (!optionStyle.isEmpty()) {
- writer.writeClassAttribute(optionStyle);
- }
- }
+ Markup markup = item instanceof SupportsMarkup ? ((SupportsMarkup) item).getMarkup() : Markup.NULL;
if (RenderUtils.contains(values, itemValue)) {
writer.writeAttribute(HtmlAttributes.SELECTED, true);
+ markup = markup.add(Markup.SELECTED);
}
if (item.isDisabled()) {
writer.writeAttribute(HtmlAttributes.DISABLED, true);
+ markup = markup.add(Markup.DISABLED);
}
+ writer.writeClassAttribute(Classes.create(component, "option", markup));
+
writer.writeText(item.getLabel());
writer.endElement(HtmlConstants.OPTION);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-theme.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-theme.xml?rev=965782&r1=965781&r2=965782&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-theme.xml Tue Jul 20 10:05:56 2010
@@ -24,26 +24,196 @@
<resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<renderers>
<renderer>
- <name>Out</name>
+ <name>Button</name>
<supported-markup>
- <markup>strong</markup>
- <markup>deleted</markup>
- <markup>number</markup>
+ <markup>disabled</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>Calendar</name>
+ <supported-markup>
+ <markup>disabled</markup>
+ <markup>selected</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>Date</name>
+ <supported-markup>
+ <markup>disabled</markup>
+ <markup>readonly</markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>Image</name>
+ <supported-markup>
+ <markup>disabled</markup>
</supported-markup>
</renderer>
<renderer>
<name>In</name>
<supported-markup>
+ <markup>disabled</markup>
+ <markup>readonly</markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
<markup>number</markup>
</supported-markup>
</renderer>
<renderer>
<name>Label</name>
<supported-markup>
+ <markup>disabled</markup>
+ <markup>readonly</markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
+ <markup>number</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>Link</name>
+ <supported-markup>
+ <markup>disabled</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>Messages</name>
+ <supported-markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>Out</name>
+ <supported-markup>
+ <markup>deleted</markup>
+ <markup>strong</markup>
<markup>number</markup>
</supported-markup>
</renderer>
<renderer>
+ <name>Popup</name>
+ <supported-markup>
+ <markup>modal</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>SelectBooleanCheckbox</name>
+ <supported-markup>
+ <markup>disabled</markup>
+ <markup>readonly</markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
+ <markup>selected</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>SelectManyCheckbox</name>
+ <supported-markup>
+ <markup>disabled</markup>
+ <markup>readonly</markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
+ <markup>selected</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>SelectManyListbox</name>
+ <supported-markup>
+ <markup>disabled</markup>
+ <markup>readonly</markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
+ <markup>selected</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>SelectOneChoice</name>
+ <supported-markup>
+ <markup>disabled</markup>
+ <markup>readonly</markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
+ <markup>selected</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>SelectOneListbox</name>
+ <supported-markup>
+ <markup>disabled</markup>
+ <markup>readonly</markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
+ <markup>selected</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>SelectOneRadio</name>
+ <supported-markup>
+ <markup>disabled</markup>
+ <markup>readonly</markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
+ <markup>selected</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>Tab</name>
+ <supported-markup>
+ <markup>disabled</markup>
+ <markup>selected</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>Sheet</name>
+ <supported-markup>
+ <!-- for the header -->
+ <markup>resizable</markup>
+ <!-- for the rows -->
+ <markup>odd</markup>
+ <markup>even</markup>
+ <!-- for the cells -->
+ <markup>clickable</markup>
+ <markup>first</markup>
+ <!-- for the paging fields -->
+ <markup>left</markup>
+ <markup>center</markup>
+ <markup>right</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>TextArea</name>
+ <supported-markup>
+ <markup>disabled</markup>
+ <markup>readonly</markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
<name>TreeNode</name>
<supported-markup>
<markup>strong</markup>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/inputSuggest.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/inputSuggest.js?rev=965782&r1=965781&r2=965782&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/inputSuggest.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/inputSuggest.js Tue Jul 20 10:05:56 2010
@@ -16,11 +16,11 @@
*/
-Tobago.AutocompleterAjax = function(elementId, required, cssPrefix, options) {
+Tobago.AutocompleterAjax = function(elementId, required, requiredClass, options) {
LOG.debug("new Tobago.AutocompleterAjax " + elementId);
this.id = elementId;
this.required = required;
- this.cssPrefix = cssPrefix;
+ this.requiredClass = requiredClass;
this.setup();
this.options = {
@@ -307,7 +307,7 @@ Tobago.AutocompleterAjax.prototype.creat
div.style.top = (Tobago.getAbsoluteTop(input) + Tobago.getHeight(input)) + "px";
div.style.left = Tobago.getAbsoluteLeft(input) + "px";
div.style.width = Tobago.getWidth(input) + "px";
- div.className = "tobago-in-suggest-popup";
+ div.className = "tobago-in-suggestPopup";
div.id = this.id + "_suggestDiv";
Tobago.page.appendChild(div);
return div;
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tabgroup.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/tabgroup.js?rev=965782&r1=965781&r2=965782&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tabgroup.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tabgroup.js Tue Jul 20 10:05:56 2010
@@ -111,7 +111,7 @@ Tobago.TabGroup.prototype.next = functio
for (var i = (this.activeIndex * 1) + 1; i < this.size; i++) {
var id = idPrefix + i;
var span = Tobago.element(id);
- if (span && span.className.indexOf('tobago-tab-disabled') == -1) {
+ if (span && span.className.indexOf('tobago-tab-link-markup-disabled') == -1) {
this.activeIndex = i;
break;
}
@@ -157,7 +157,7 @@ Tobago.TabGroup.prototype.previous = fun
for (var i = this.activeIndex - 1; i >= 0; i--) {
var id = idPrefix + i;
var span = Tobago.element(id);
- if (span && span.className.indexOf('tobago-tab-disabled') == -1) {
+ if (span && span.className.indexOf('tobago-tab-link-markup-disabled') == -1) {
this.activeIndex = i;
break;
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.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-sheet.js?rev=965782&r1=965781&r2=965782&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js Tue Jul 20 10:05:56 2010
@@ -254,7 +254,7 @@ Tobago.Sheet.prototype.insertTarget = fu
input.type='text';
input.id=hiddenId;
input.name=hiddenId;
- input.className = "tobago-sheet-paging-input";
+ input.className = "tobago-sheet-pagingInput";
input.actionId = actionId;
Tobago.addBindEventListener(input, "blur", this, "delayedHideInput");
Tobago.addBindEventListener(input, "keydown", this, "doKeyEvent");
@@ -319,8 +319,8 @@ Tobago.Sheet.prototype.setupResizer = fu
var length = headerDiv.childNodes.length;
for (var i = 0; i < length; i++) {
- var resizer = Tobago.element(this.id + Tobago.SUB_COMPONENT_SEP + "header_resizer_" + i);
- if (resizer && resizer.className.match(/tobago-sheet-header-resize-cursor/)) {
+ var resizer = Tobago.element(this.id + Tobago.SUB_COMPONENT_SEP + "header_spacer_" + i);
+ if (resizer && resizer.className.match(/tobago-sheet-headerSpacer-markup-resizable/)) {
Tobago.addEventListener(resizer, "click", Tobago.stopEventPropagation);
Tobago.addBindEventListener(resizer, "mousedown", this, "beginResize");
}
@@ -649,7 +649,7 @@ Tobago.Sheet.prototype.selectRange = fun
*/
Tobago.Sheet.prototype.selectRow = function(selected, rowIndex, row, image) {
selected.value = selected.value + rowIndex + ",";
- row.className = row.className + " tobago-sheet-row-selected";
+ row.className = row.className + " tobago-sheet-row-markup-selected";
if (image != null) {
image.src = this.checkedImage;
}
@@ -664,7 +664,7 @@ Tobago.Sheet.prototype.selectRow = funct
Tobago.Sheet.prototype.deselectRow = function(selected, rowIndex, row, image) {
selected.value = selected.value.replace(new RegExp("," + rowIndex + ","), ",");
var c = " " + row.className + " ";
- c = c.replace(/ tobago-sheet-row-selected /, " ");
+ c = c.replace(/ tobago-sheet-row-markup-selected /, " ");
row.className = c.substring(1, c.length - 1);
if (image != null) {
image.src = this.uncheckedImage;
@@ -691,13 +691,13 @@ Tobago.Sheet.prototype.adjustResizer = f
if (window.opera) {
var position = 5;
var index = 0;
- var resizer = Tobago.element(this.id + Tobago.SUB_COMPONENT_SEP + "header_resizer_" + index);
+ var resizer = Tobago.element(this.id + Tobago.SUB_COMPONENT_SEP + "header_spacer_" + index);
while (resizer) {
resizer.style.right = - position;
var headerBox = Tobago.element(this.id + Tobago.SUB_COMPONENT_SEP + "header_box_" + index++);
var width = headerBox.style.width.replace(/px/, "") - 0;
position += width;
- resizer = Tobago.element(this.id + Tobago.SUB_COMPONENT_SEP + "header_resizer_" + index);
+ resizer = Tobago.element(this.id + Tobago.SUB_COMPONENT_SEP + "header_spacer_" + index);
}
}
};
@@ -758,7 +758,7 @@ Tobago.Sheet.prototype.beginResize = fun
};
Tobago.Sheet.prototype.getHeaderBox = function() {
- var boxId = this.resizerId.replace(/header_resizer_/, "header_box_");
+ var boxId = this.resizerId.replace(/header_spacer_/, "header_box_");
return Tobago.element(boxId);
};
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=965782&r1=965781&r2=965782&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 Jul 20 10:05:56 2010
@@ -865,7 +865,7 @@ var Tobago = {
// find highest modal popup
var maxZIndex = -Infinity;
var maxModalPopup = null;
- jQuery(".tobago-popup-modal").each(function() {
+ jQuery(".tobago-popup-markup-modal").each(function() {
var zIndex = jQuery(this).css("z-index");
if (zIndex >= maxZIndex) {
maxZIndex = zIndex;
@@ -1636,10 +1636,10 @@ var Tobago = {
}
};
-Tobago.In = function(inId, required, cssPrefix, maxLength) {
+Tobago.In = function(inId, required, requiredClass, maxLength) {
this.id = inId;
this.required = required;
- this.cssPrefix = cssPrefix;
+ this.requiredClass = requiredClass;
this.maxLength = maxLength;
this.setup();
};
@@ -1649,7 +1649,7 @@ Tobago.In.prototype.setup = function() {
if (this.required) {
ctrl = Tobago.element(this.id);
if (ctrl.value && ctrl.value.length > 0) {
- Tobago.removeCssClass(this.id, this.cssPrefix + "-required" );
+ Tobago.removeCssClass(this.id, this.requiredClass);
}
Tobago.addBindEventListener(ctrl, "focus", this, "enterRequired");
Tobago.addBindEventListener(ctrl, "blur", this, "leaveRequired");
@@ -1729,13 +1729,13 @@ Tobago.In.prototype.checkMaxLength = fun
};
Tobago.In.prototype.enterRequired = function(e) {
- Tobago.removeCssClass(this.id, this.cssPrefix + "-required");
+ Tobago.removeCssClass(this.id, this.requiredClass);
};
Tobago.In.prototype.leaveRequired = function (e) {
var ctrl = Tobago.element(this.id);
if (!ctrl.value || ctrl.value.length == 0) {
- Tobago.addCssClass(ctrl.id, this.cssPrefix + "-required");
+ Tobago.addCssClass(ctrl.id, this.requiredClass);
}
};
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/style.css
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/style/style.css?rev=965782&r1=965781&r2=965782&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/style.css Tue Jul 20 10:05:56 2010
@@ -41,7 +41,7 @@ html, body {
/* in ------------------------------------------------------------ */
-.tobago-in-suggest-popup a {
+.tobago-in-suggestPopup a {
text-decoration: none;
color: black;
}