Author: dmorozov
Date: 2008-08-29 14:08:43 -0400 (Fri, 29 Aug 2008)
New Revision: 10244
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss
trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:
https://jira.jboss.org/jira/browse/RF-4252
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss
===================================================================
---
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2008-08-29
15:56:54 UTC (rev 10243)
+++
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2008-08-29
18:08:43 UTC (rev 10244)
@@ -91,15 +91,12 @@
<u:style name="padding" value="2px" />
</u:selector>
-
-
-<u:selector name="a.rich-fileupload-button-selection">
+<u:selector name=".rich-fileupload-button-content">
<u:style name="color" skin="generalTextColor" />
<u:style name="text-decoration" value="none" />
<u:style name="display" value="block" />
</u:selector>
-
<u:selector name=".rich-fileupload-button">
<u:style name="background-repeat" value="repeat-x" />
<u:style name="background-position" value="top left" />
Modified: trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-08-29
15:56:54 UTC (rev 10243)
+++ trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-08-29
18:08:43 UTC (rev 10244)
@@ -83,8 +83,7 @@
<div class="rich-fileupload-button-border" style="
float:left;">
<div class="#{addButtonClass}"
onmouseover="this.className='rich-fileupload-button-light
rich-fileupload-font'"
onmousedown="this.className='rich-fileupload-button-press
rich-fileupload-font'" onmouseup="this.className='rich-fileupload-button
rich-fileupload-font'"
onmouseout="this.className='rich-fileupload-button
rich-fileupload-font'"
style="position: relative;"
- id="#{clientId}:add1"
- >
+ id="#{clientId}:add1">
<div class="#{addButtonClassContent}"
id="#{clientId}:add2"
style="position: relative;">#{addLabel}</div>
@@ -101,14 +100,13 @@
<div class="rich-fileupload-button-border" style=" float:left;
display: none;">
<div class="rich-file-upload-button rich-fileupload-font
#{component.attributes['uploadButtonClass']}"
onmouseover="this.className='rich-fileupload-button-light
rich-fileupload-font'"
onmousedown="this.className='rich-fileupload-button-press
rich-fileupload-font'" onmouseup="this.className='rich-fileupload-button
rich-fileupload-font'"
onmouseout="this.className='rich-fileupload-button
rich-fileupload-font'"
+ style="position: relative;"
id="#{clientId}:upload1"
onclick="return $('#{clientId}').component.upload();">
- <a href="#" class="rich-fileupload-button-selection">
<div class="rich-fileupload-button-content rich-fileupload-font
rich-fileupload-ico rich-fileupload-ico-start
#{component.attributes['uploadButtonClass']}"
id="#{clientId}:upload2">
#{uploadLabel}
</div>
- </a>
</div>
</div>
@@ -116,11 +114,10 @@
<div class="rich-fileupload-button rich-fileupload-font
#{component.attributes['cleanButtonClass']}"
onmouseover="this.className='rich-fileupload-button-light
rich-fileupload-font'"
onmousedown="this.className='rich-fileupload-button-press
rich-fileupload-font'" onmouseup="this.className='rich-fileupload-button
rich-fileupload-font'"
onmouseout="this.className='rich-fileupload-button
rich-fileupload-font'"
onclick="return $('#{clientId}').component.clear();"
+ style="position: relative;"
id="#{clientId}:clean1">
- <a href="#" class="rich-fileupload-button-selection">
<div class="rich-fileupload-button-content rich-fileupload-font
rich-fileupload-ico rich-fileupload-ico-clear-dis
#{component.attributes['cleanButtonClass']}"
id="#{clientId}:clean2">#{clearAllLabel}</div>
- </a>
</div>
</div>
</td>