details: /erp/stable/2.50/rev/c276dc66b62e
changeset: 9369:c276dc66b62e
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Apr 14 01:07:19 2011 +0200
summary: Fixed issue 16802: Now generateSprites=yes works ok with skin modules
diffstat:
src-trl/src/org/openbravo/translate/RTLSkin.java | 17 ++++++++---------
src/build.xml | 3 +--
2 files changed, 9 insertions(+), 11 deletions(-)
diffs (60 lines):
diff -r cdb1c5b274c3 -r c276dc66b62e
src-trl/src/org/openbravo/translate/RTLSkin.java
--- a/src-trl/src/org/openbravo/translate/RTLSkin.java Wed Apr 13 16:38:08
2011 +0200
+++ b/src-trl/src/org/openbravo/translate/RTLSkin.java Thu Apr 14 01:07:19
2011 +0200
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2008 Openbravo SLU
+ * All portions are Copyright (C) 2001-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -85,6 +85,7 @@
File fImagesToFlip;
BufferedReader in;
String line;
+ File fileLTRSrcDeep, fileRTLSrcDeep;
for (int i = 0; i < files.length; i++) {
String pathModule = "";
@@ -125,20 +126,18 @@
vImagesToFlip.add(line.toLowerCase());
}
in.close();
- if (pathModule != "") {
- log4j.info("It is a module skin.");
- runFolders(new File(pathModule), files[i], "", "RTL");
- pathModule = "";
- } else {
- runFolders(fileRTLSrc, files[i], "", "RTL");
- }
+ log4j.info("Processing RTL skin " + files[i]);
+ fileRTLSrcDeep = new File(srcDirRTLSkin + "/" + files[i], "");
+ runFolders(fileRTLSrcDeep, files[i], "", "RTL");
}
files = fileLTRSrc.list();
+
for (int i = 0; i < files.length; i++) {
log4j.info("Processing LTR skin " + files[i]);
- runFolders(fileLTRSrc, files[i], "", "LTR");
+ fileLTRSrcDeep = new File(srcDirLTRSkin + "/" + files[i], "");
+ runFolders(fileLTRSrcDeep, files[i], "", "LTR");
}
log4j.info("Modified files: " + count);
diff -r cdb1c5b274c3 -r c276dc66b62e src/build.xml
--- a/src/build.xml Wed Apr 13 16:38:08 2011 +0200
+++ b/src/build.xml Thu Apr 14 01:07:19 2011 +0200
@@ -688,8 +688,7 @@
<smartsprites rootdir="${skins.location}"
documentrootdir="${skins.location}" outputdir="${skins.location}"
cssfilesuffix="-sprite" csspropertyindent=" " loglevel="WARN"
spritepngdepth="DIRECT" spritepngie6="false" />
<move todir="${skins.location}">
<fileset dir="${skins.location}">
- <include name="*/*-sprite.css" />
- <include name="*/*/*-sprite.css" />
+ <include name="**/*-sprite.css" />
</fileset>
<mapper type="glob" from="*-sprite.css" to="*.css" />
</move>
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
