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 2011/03/29 21:16:21 UTC
svn commit: r1086690 - in /myfaces/tobago/trunk: src/site/apt/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-example/tobago-example-addressbook-lib/src/main/resources/META-INF/resources/addressbook-resource/html/...
Author: lofwyr
Date: Tue Mar 29 19:16:20 2011
New Revision: 1086690
URL: http://svn.apache.org/viewvc?rev=1086690&view=rev
Log:
TOBAGO-985: Make Progress work with new LayoutManager
Added:
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Progress.java
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/progress/
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/progress/progress.xhtml
Modified:
myfaces/tobago/trunk/src/site/apt/guide.apt
myfaces/tobago/trunk/src/site/apt/migration-1.5.apt
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-lib/src/main/resources/META-INF/resources/addressbook-resource/html/scarborough/standard/style/style.css
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-lib/src/main/resources/META-INF/resources/addressbook-resource/html/speyside/standard/style/style.css
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
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/ProgressRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
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/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
Modified: myfaces/tobago/trunk/src/site/apt/guide.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/guide.apt?rev=1086690&r1=1086689&r2=1086690&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/guide.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/guide.apt Tue Mar 29 19:16:20 2011
@@ -586,15 +586,15 @@ mvn install -Pall-modules
styling of a control. In the progress example the following CSS is added to the Speyside theme:
+------------------------------------------+
-img.tobago-progress-color1-markup-ok {
+.tobago-progress-value-markup-ok {
background: green;
}
-img.tobago-progress-color1-markup-warn {
+.tobago-progress-value-markup-warn {
background: yellow;
}
-img.tobago-progress-color1-markup-error {
+.tobago-progress-value-markup-error {
background: red;
}
+------------------------------------------+
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=1086690&r1=1086689&r2=1086690&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/migration-1.5.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/migration-1.5.apt Tue Mar 29 19:16:20 2011
@@ -160,6 +160,10 @@ Themes and CSS
*--+--+--+--+
| renamed | <<<tobago-textArea->>>* | <<<tobago-textarea->>>* |
*--+--+--+--+
+| renamed | <<<tobago-progress-color1->>>* | <<<tobago-progress-value->>>* |
+*--+--+--+--+
+| deleted | <<<tobago-progress-color2->>>* | |
+*--+--+--+--+
JavaScript
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java?rev=1086690&r1=1086689&r2=1086690&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java Tue Mar 29 19:16:20 2011
@@ -29,6 +29,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
+import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
/**
* Renders a progress bar.
@@ -36,7 +37,7 @@ import org.apache.myfaces.tobago.interna
@Tag(name = "progress")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIProgress",
- uiComponentBaseClass = "javax.faces.component.UIOutput",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIOut",
rendererType = RendererTypes.PROGRESS,
allowedChildComponenents = "NONE",
facets = {@Facet(
@@ -45,7 +46,8 @@ import org.apache.myfaces.tobago.interna
"Contains an instance of UICommand (tc:command). The action is invoked if the full progress has reached",
allowedChildComponenents = "org.apache.myfaces.tobago.Command")})
-public interface ProgressTagDeclaration extends HasIdBindingAndRendered, HasTip, HasMarkup, HasCurrentMarkup {
+public interface ProgressTagDeclaration
+ extends HasIdBindingAndRendered, HasTip, HasMarkup, HasCurrentMarkup, IsGridLayoutComponent {
/**
* The current value of this component.
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-lib/src/main/resources/META-INF/resources/addressbook-resource/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-lib/src/main/resources/META-INF/resources/addressbook-resource/html/scarborough/standard/style/style.css?rev=1086690&r1=1086689&r2=1086690&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-lib/src/main/resources/META-INF/resources/addressbook-resource/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-lib/src/main/resources/META-INF/resources/addressbook-resource/html/scarborough/standard/style/style.css Tue Mar 29 19:16:20 2011
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-img.tobago-progress-color1-markup-ok {
+.tobago-progress-value-markup-ok {
background: green;
}
-img.tobago-progress-color1-markup-warn {
+.tobago-progress-value-markup-warn {
background: yellow;
}
-img.tobago-progress-color1-markup-error {
+.tobago-progress-value-markup-error {
background: red;
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-lib/src/main/resources/META-INF/resources/addressbook-resource/html/speyside/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-lib/src/main/resources/META-INF/resources/addressbook-resource/html/speyside/standard/style/style.css?rev=1086690&r1=1086689&r2=1086690&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-lib/src/main/resources/META-INF/resources/addressbook-resource/html/speyside/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-lib/src/main/resources/META-INF/resources/addressbook-resource/html/speyside/standard/style/style.css Tue Mar 29 19:16:20 2011
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-img.tobago-progress-color1-markup-ok {
+.tobago-progress-value-markup-ok {
background: green;
}
-img.tobago-progress-color1-markup-warn {
+.tobago-progress-value-markup-warn {
background: yellow;
}
-img.tobago-progress-color1-markup-error {
+.tobago-progress-value-markup-error {
background: red;
}
Added: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Progress.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Progress.java?rev=1086690&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Progress.java (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Progress.java Tue Mar 29 19:16:20 2011
@@ -0,0 +1,39 @@
+package org.apache.myfaces.tobago.example.test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.BoundedRangeModel;
+import javax.swing.DefaultBoundedRangeModel;
+
+public class Progress {
+
+ private static final Logger LOG = LoggerFactory.getLogger(Progress.class);
+
+ private BoundedRangeModel range;
+
+ public Progress() {
+ this.range = new DefaultBoundedRangeModel(60, 0, 0, 100);
+ }
+
+ public BoundedRangeModel getRange() {
+ return range;
+ }
+}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml?rev=1086690&r1=1086689&r2=1086690&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml Tue Mar 29 19:16:20 2011
@@ -131,6 +131,12 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>progress</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.tobago.example.test.Progress</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+
<navigation-rule>
<navigation-case>
<from-outcome>navigation</from-outcome>
Added: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/progress/progress.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/progress/progress.xhtml?rev=1086690&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/progress/progress.xhtml (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/progress/progress.xhtml Tue Mar 29 19:16:20 2011
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<f:view
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <tc:page>
+ <tc:gridLayoutConstraint width="1000px" height="100px"/>
+ <f:facet name="layout">
+ <tc:gridLayout margin="20px" />
+ </f:facet>
+
+ <tc:progress value="#{progress.range}"/>
+
+ </tc:page>
+</f:view>
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=1086690&r1=1086689&r2=1086690&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 Mar 29 19:16:20 2011
@@ -202,11 +202,11 @@ li.tobago-menu-markup-selected {
/* progress --------------------------------------------------------- */
-img.tobago-progress-color1 {
+.tobago-progress-value {
background-color: #3366cc;
}
-img.tobago-progress-color2 {
+.tobago-progress {
background-color: #6699ff;
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.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/ProgressRenderer.java?rev=1086690&r1=1086689&r2=1086690&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java Tue Mar 29 19:16:20 2011
@@ -20,9 +20,10 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UIProgress;
-import org.apache.myfaces.tobago.context.ResourceManagerUtils;
+import org.apache.myfaces.tobago.layout.Measure;
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.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
@@ -48,63 +49,42 @@ public class ProgressRenderer extends La
if (model == null) {
LOG.warn("'null' value found! Using dummy Model instead!");
- model = new DefaultBoundedRangeModel(40, 1, 0, 100);
+ model = new DefaultBoundedRangeModel(0, 1, 0, 100);
}
- String image = ResourceManagerUtils.getImageWithPath(facesContext, "image/1x1.gif");
-
- String value1 = Integer.toString(model.getValue());
- String value2 = Integer.toString(model.getMaximum() - model.getValue());
-
Object title = progress.getAttributes().get(Attributes.TIP);
if (title == null) {
title = Integer.toString(100 * model.getValue()
/ (model.getMaximum() - model.getMinimum())) + " %";
}
- Integer width = 100; // FIXME: make dynamic (was removed by changing the layouting
- LOG.error("100; // FIXME: make dynamic (was removed by changing the layouting");
-
- String width1 = value1;
- String width2 = value2;
-
- if (width != null) {
- int value = (width - 1) * model.getValue()
- / (model.getMaximum() - model.getMinimum());
- width1 = Integer.toString(value);
- width2 = Integer.toString((width - 2) - value);
- }
+ final Style style = new Style(facesContext, progress);
+ final Measure width = style.getWidth();
+ final Measure valueWidth = width.multiply(model.getValue()).divide(model.getMaximum() - model.getMinimum());
+
+ final Style valueStyle = new Style();
+ valueStyle.setHeight(style.getHeight());
+ valueStyle.setWidth(valueWidth);
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.SPAN, progress);
+ writer.startElement(HtmlElements.DIV, progress);
writer.writeClassAttribute(Classes.create(progress));
+ writer.writeStyleAttribute(style);
writer.writeAttribute(HtmlAttributes.TITLE, String.valueOf(title), true);
- writer.startElement(HtmlElements.IMG, null);
- writer.writeClassAttribute(Classes.create(progress, "color1"));
- writer.writeAttribute(HtmlAttributes.SRC, image, false);
- writer.writeAttribute(HtmlAttributes.ALT, String.valueOf(title), true);
- writer.writeAttribute(HtmlAttributes.WIDTH, width1, false);
- writer.writeAttribute(HtmlAttributes.BORDER, 0);
- writer.endElement(HtmlElements.IMG);
-
- writer.startElement(HtmlElements.IMG, null);
- writer.writeClassAttribute(Classes.create(progress, "color2"));
- writer.writeAttribute(HtmlAttributes.SRC, image, false);
- writer.writeAttribute(HtmlAttributes.ALT, String.valueOf(title), true);
- writer.writeAttribute(HtmlAttributes.WIDTH, width2, false);
- writer.writeAttribute(HtmlAttributes.BORDER, 0);
- writer.endElement(HtmlElements.IMG);
+ writer.startElement(HtmlElements.DIV, null);
+ writer.writeClassAttribute(Classes.create(progress, "value"));
+ writer.writeStyleAttribute(valueStyle);
+ writer.endElement(HtmlElements.DIV);
+
+ writer.endElement(HtmlElements.DIV);
- writer.endElement(HtmlElements.SPAN);
UIComponent facet = progress.getFacet("complete");
- if (model.getValue() == model.getMaximum() && facet != null
- && facet instanceof UICommand) {
+ if (model.getValue() == model.getMaximum() && facet instanceof UICommand) {
UICommand command = (UICommand) facet;
writer.writeJavascript("Tobago.submitAction(this, '" + command.getClientId(facesContext) + "');");
}
}
-
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
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/property/tobago-theme-config.properties?rev=1086690&r1=1086689&r2=1086690&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties Tue Mar 29 19:16:20 2011
@@ -128,6 +128,12 @@ Panel.headerHeight=0
Panel.minimumWidth=0
Panel.minimumHeight=0
+Progress.preferredHeight=25
+Progress.css.border-left-width=2
+Progress.css.border-top-width=2
+Progress.css.border-right-width=2
+Progress.css.border-bottom-width=2
+
RichTextEditor.headerHeight=28
SelectBooleanCheckbox.componentExtraWidth=21
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=1086690&r1=1086689&r2=1086690&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 Mar 29 19:16:20 2011
@@ -587,20 +587,16 @@ li.tobago-menu-markup-selected {
/* progress -------------------------------------------------------------- */
-img.tobago-progress-color1 {
+.tobago-progress-value {
background: #aabbcc;
- border-width: 1px 0 1px 1px;
- height: 1.4ex;
+ position: absolute;
+ left: 0;
+ top: 0;
}
-img.tobago-progress-color2 {
+.tobago-progress {
background: #ddeeff;
- border-width: 1px 1px 1px 0;
- height: 1.4ex;
-}
-
-span.tobago-progress {
- white-space: nowrap;
+ border: 2px inset #bbccdd;
}
/* selectBooleanCheckbox --------------------------------------------------- */
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
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/property/tobago-theme-config.properties?rev=1086690&r1=1086689&r2=1086690&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties Tue Mar 29 19:16:20 2011
@@ -77,6 +77,12 @@ Link.maximumHeight=14
Out.preferredHeight=20
+Progress.preferredHeight=20
+Progress.css.border-left-width=1
+Progress.css.border-top-width=1
+Progress.css.border-right-width=1
+Progress.css.border-bottom-width=1
+
SelectBooleanCheckbox.height=19
SelectManyListbox.minimumHeight=33
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=1086690&r1=1086689&r2=1086690&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 Mar 29 19:16:20 2011
@@ -331,12 +331,13 @@ li.tobago-menu-markup-selected {
/* progress --------------------------------------------------------- */
-img.tobago-progress-color1 {
+.tobago-progress-value {
background-color: #660000;
}
-img.tobago-progress-color2 {
+.tobago-progress {
background-color: #ffffff;
+ border: 1px solid #000000;
}
/* richTextEditor ---------------------------------------------------------- */