Author: amarkhel
Date: 2010-09-22 13:06:22 -0400 (Wed, 22 Sep 2010)
New Revision: 19318
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/progressBar.ecss
trunk/ui/output/ui/src/main/templates/progressBar.template.xml
Log:
Fix styles for progressbar
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java
===================================================================
---
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java 2010-09-22
14:57:41 UTC (rev 19317)
+++
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java 2010-09-22
17:06:22 UTC (rev 19318)
@@ -278,8 +278,8 @@
}
public String getShellStyle(FacesContext context, UIComponent component){
- return (!isSimpleMarkup(component)) ? "rich-progress-bar-shell-dig "
- : "rich-progress-bar-shell ";
+ return (!isSimpleMarkup(component)) ? "rf-pb-shl-dig "
+ : "rf-pb-shl ";
}
public String getWidth(UIComponent component){
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/progressBar.ecss
===================================================================
---
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/progressBar.ecss 2010-09-22
14:57:41 UTC (rev 19317)
+++
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/progressBar.ecss 2010-09-22
17:06:22 UTC (rev 19318)
@@ -1,36 +1,44 @@
-.rich-progress-bar-height{height : 13px;}
-.rich-progress-bar-width{width : 200px}
-.rich-progress-bar-block{white-space : nowrap;}
-.rich-progress-bar-uploaded{
+.rf-pb-cnt{
+height : 13px;
+white-space : nowrap;
+width : 200px;
+}
+.rf-pb-upl{
background-repeat : repeat-x;
background-image :
"url(#{resource['org.richfaces.renderkit.html.images.ProgressBarAnimatedBg']})";
background-color : '#{richSkin.selectControlColor}';
+height : 13px;
}
-.rich-progress-bar-uploaded-dig{
+.rf-pb-upl-dig{
overflow : hidden; position : absolute; top : 0px; left : 0px;
border-color : '#{richSkin.panelBorderColor}';
}
-.rich-progress-bar-shell{
+.rf-pb-shl{
margin-bottom : 2px; border : 1px solid;
background-color : '#{richSkin.controlBackgroundColor}';
border-color : '#{richSkin.panelBorderColor}';
}
-.rich-progress-bar-shell-dig{
+.rf-pb-shl-dig{
position : relative; margin-bottom : 2px; border : 1px solid; overflow: hidden;
border-color : '#{richSkin.panelBorderColor}';
color : '#{richSkin.controlTextColor}';
font-family : '#{richSkin.generalFamilyFont}';
font-size : '#{richSkin.generalSizeFont}';
}
-.rich-progress-bar-remained{
+.rf-pb-rmnd{
text-align : center; font-weight : bold; position : relative;
background-color : '#{richSkin.controlBackgroundColor}';
text-color : '#{richSkin.controlTextColor}';
+height : 13px;
+width : 200px;
+padding: 0px;
}
-.rich-progress-bar-completed{
+.rf-pb-cmpltd{
text-align : center; font-weight : bold; background-repeat : repeat-x;
background-color : '#{richSkin.selectControlColor}';
text-color : '#{richSkin.controlBackgroundColor}';
+height : 13px;
+width : 200px;
+padding: 0px;
background-image :
"url(#{resource['org.richfaces.renderkit.html.images.ProgressBarAnimatedBg']})";
}
-.rich-progress-bar-padding{padding: 0px}
\ No newline at end of file
Modified: trunk/ui/output/ui/src/main/templates/progressBar.template.xml
===================================================================
--- trunk/ui/output/ui/src/main/templates/progressBar.template.xml 2010-09-22 14:57:41 UTC
(rev 19317)
+++ trunk/ui/output/ui/src/main/templates/progressBar.template.xml 2010-09-22 17:06:22 UTC
(rev 19318)
@@ -30,15 +30,15 @@
</c:if>
<c:if test="#{state eq 'progressState'}">
<cdk:object type="java.lang.String" name="shellStyle"
value="#{getShellStyle(facesContext, component)}" />
- <div cdk:passThroughWithExclusions="onclick, ondblclick, onmouseup,
onmousedown, onmousemove, onmouseover, onmouseout" id="#{clientId}"
class="rich-progress-bar-block rich-progress-bar-width #{shellStyle}
#{component.attributes['styleClass']}"
style="#{component.attributes['style']}">
+ <div cdk:passThroughWithExclusions="onclick, ondblclick, onmouseup,
onmousedown, onmousemove, onmouseover, onmouseout" id="#{clientId}"
class="rf-pb-cnt #{shellStyle} #{component.attributes['styleClass']}"
style="#{component.attributes['style']}">
<c:if test="#{!isSimpleMarkup(component)}">
- <div class="rich-progress-bar-width rich-progress-bar-height
rich-progress-bar-remained rich-progress-bar-padding
#{component.attributes['remainClass']}" id="#{clientId}:remain"
style="#{component.attributes['style']}"/>
- <div class="rich-progress-bar-uploaded-dig"
id="#{clientId}:upload" style="#{component.attributes['style']};
width:#{getWidth(component)}%;">
- <div class="rich-progress-bar-height rich-progress-bar-width
rich-progress-bar-completed rich-progress-bar-padding
#{component.attributes['completeClass']}" id="#{clientId}:complete"
style="#{component.attributes['style']}"/>
+ <div class="rf-pb-rmnd #{component.attributes['remainClass']}"
id="#{clientId}:remain"
style="#{component.attributes['style']}"/>
+ <div class="rf-pb-upl-dig" id="#{clientId}:upload"
style="#{component.attributes['style']};
width:#{getWidth(component)}%;">
+ <div class="rf-pb-cmpltd
#{component.attributes['completeClass']}" id="#{clientId}:complete"
style="#{component.attributes['style']}"/>
</div>
</c:if>
<c:if test="#{isSimpleMarkup(component)}">
- <div class="rich-progress-bar-height rich-progress-bar-uploaded
#{component.attributes['completeClass']}" id="#{clientId}:upload"
style="#{component.attributes['style']};
width:#{getWidth(component)}%;"/>
+ <div class="rf-pb-upl #{component.attributes['completeClass']}"
id="#{clientId}:upload" style="#{component.attributes['style']};
width:#{getWidth(component)}%;"/>
</c:if>
<script type="text/javascript">
#{getInitialScript(facesContext, component, 'progressState')}
@@ -54,15 +54,15 @@
<cdk:call expression="renderInitialFacet(facesContext, component)"/>
</div>
<cdk:object type="java.lang.String" name="shellStyle"
value="#{getShellStyle(facesContext, component)}" />
- <div cdk:passThroughWithExclusions="onclick, ondblclick, onmouseup,
onmousedown, onmousemove, onmouseover, onmouseout"
id="#{clientId}:progressState" class="rich-progress-bar-block
rich-progress-bar-height rich-progress-bar-width #{shellStyle}
#{component.attributes['styleClass']}"
style="#{component.attributes['style']} display:none;">
+ <div cdk:passThroughWithExclusions="onclick, ondblclick, onmouseup,
onmousedown, onmousemove, onmouseover, onmouseout"
id="#{clientId}:progressState" class="rf-pb-cnt #{shellStyle}
#{component.attributes['styleClass']}"
style="#{component.attributes['style']} display:none;">
<c:if test="#{!isSimpleMarkup(component)}">
- <div class="rich-progress-bar-width rich-progress-bar-remained
rich-progress-bar-padding #{component.attributes['remainClass']}"
id="#{clientId}:remain"
style="#{component.attributes['style']}"/>
- <div class="rich-progress-bar-uploaded-dig"
id="#{clientId}:upload" style="#{component.attributes['style']};
width=#{getWidth(component)}%;">
- <div class="rich-progress-bar-height rich-progress-bar-width
rich-progress-bar-completed rich-progress-bar-padding
#{component.attributes['completeClass']}" id="#{clientId}:complete"
style="#{component.attributes['style']}"/>
+ <div class="rf-pb-rmnd #{component.attributes['remainClass']}"
id="#{clientId}:remain"
style="#{component.attributes['style']}"/>
+ <div class="rf-pb-upl-dig" id="#{clientId}:upload"
style="#{component.attributes['style']};
width=#{getWidth(component)}%;">
+ <div class="rf-pb-cmpltd
#{component.attributes['completeClass']}" id="#{clientId}:complete"
style="#{component.attributes['style']}"/>
</div>
</c:if>
<c:if test="#{isSimpleMarkup(component)}">
- <div class="rich-progress-bar-height rich-progress-bar-uploaded
#{component.attributes['completeClass']}" id="#{clientId}:upload"
style="#{component.attributes['style']};
width=#{getWidth(component)}%;"/>
+ <div class="rf-pb-upl #{component.attributes['completeClass']}"
id="#{clientId}:upload" style="#{component.attributes['style']};
width=#{getWidth(component)}%;"/>
</c:if>
</div>
<div id="#{clientId}:completeState"
class="#{component.attributes['finishClass']}"
style="#{component.attributes['style']} display:none;">
Show replies by date