[richfaces-svn-commits] JBoss Rich Faces SVN: r20054 - in sandbox/trunk/ui/fileupload/ui/src/main: templates and 1 other directory.
Author: konstantin.mishin
Date: 2010-11-15 14:38:06 -0500 (Mon, 15 Nov 2010)
New Revision: 20054
Modified:
sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss
sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml
Log:
RF-9496
Modified:
sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss
===================================================================
---
sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss 2010-11-15
18:54:38 UTC (rev 20053)
+++
sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss 2010-11-15
19:38:06 UTC (rev 20054)
@@ -37,7 +37,7 @@
width: 34%;
}
-.rf-fu-btn-add, .rf-fu-btn {
+.rf-fu-btn {
background-color: '#{richSkin.trimColor}';
background-image:
url("#{resource['org.richfaces.images:fuBtnGrad.png']}");
background-position:left top;
@@ -45,38 +45,36 @@
border-color: '#{richSkin.panelBorderColor}';
border-style: solid;
border-width: 1px;
+ cursor: default;
display: inline-block;
margin: 4px;
- padding: 1px 3px 1px 3px;
vertical-align: top;
}
/*TODO Add disabled state for buttons*/
-.rf-fu-btn-add {
- position: relative;
- overflow: hidden;
-}
-
-.rf-fu-btn-cnt-add, .rf-fu-btn-cnt-uld, .rf-fu-btn-cnt-clr {
+.rf-fu-btn-add, .rf-fu-btn-uld, .rf-fu-btn-clr {
+ background-position: 2px 2px;
background-repeat: no-repeat;
color: '#{richSkin.generalTextColor}';
display: inline-block;
font-family: '#{richSkin.generalFamilyFont}';
font-size: '#{richSkin.generalSizeFont}';
- padding: 2px 2px 2px 19px;
+ padding: 3px 5px 3px 21px;
}
-.rf-fu-btn-cnt-add {
+.rf-fu-btn-add {
background-image: url("#{resource['org.richfaces:fu-add.gif']}");
+ overflow: hidden;
+ position: relative;
}
-.rf-fu-btn-cnt-uld {
+.rf-fu-btn-uld {
background-image: url("#{resource['org.richfaces:fu-uld.gif']}");
font-weight: bold;
}
-.rf-fu-btn-cnt-clr {
+.rf-fu-btn-clr {
background-image: url("#{resource['org.richfaces:fu-clr.gif']}");
}
@@ -91,6 +89,7 @@
.rf-fu-inp {
filter: "alpha(opacity=0)";
font-size: 10em;
+ margin: 0;
opacity: 0;
position: absolute;
right: 0;
Modified: sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml
===================================================================
--- sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml 2010-11-15
18:54:38 UTC (rev 20053)
+++ sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml 2010-11-15
19:38:06 UTC (rev 20054)
@@ -38,19 +38,21 @@
<div id="#{clientId}" class="rf-fu">
<div class="rf-fu-hdr">
<span class="rf-fu-btns-lft">
- <span class="rf-fu-btn-add">
- <span class="rf-fu-inp-cntr"> <!-- This span is needed for IE7
only. -->
- <input type="file" class="rf-fu-inp" />
+ <span class="rf-fu-btn">
+ <span class="rf-fu-btn-add">
+ <span class="rf-fu-inp-cntr"> <!-- This span is needed for IE7
only. -->
+ <input type="file" class="rf-fu-inp" />
+ </span>
+ Add...
</span>
- <span class="rf-fu-btn-cnt-add">Add...</span>
</span>
<span class="rf-fu-btn">
- <span class="rf-fu-btn-cnt-uld">Upload</span>
+ <span class="rf-fu-btn-uld">Upload</span>
</span>
</span>
<span class="rf-fu-btns-rgh">
<span class="rf-fu-btn">
- <span class="rf-fu-btn-cnt-clr">Clear All</span>
+ <span class="rf-fu-btn-clr">Clear All</span>
</span>
</span>
</div>