Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java =================================================================== diff -u -r6f83a091d62a4cf7d866c814cf47dfdb1ce61f92 -r94eb7bada81814941189436f343e9cf395e348f4 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java (.../CSSBundler.java) (revision 6f83a091d62a4cf7d866c814cf47dfdb1ce61f92) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java (.../CSSBundler.java) (revision 94eb7bada81814941189436f343e9cf395e348f4) @@ -46,17 +46,20 @@ import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HttpUrlConnectionUtil; +import org.lamsfoundation.lams.web.filter.LocaleFilter; public class CSSBundler { private static Logger log = Logger.getLogger(CSSBundler.class); + private static final String RTL_DIR = "rtl"; // right-to-left direction Map filesToCopy = null; List directoriesRequired = null; HttpServletRequest request = null; Cookie[] cookies = null; String outputDirectory = null; String centralPath = null; + boolean rtl = false; /** * @param centralPath the directory path to the lams-central.war. Assumes that it is an expanded war. @@ -74,6 +77,12 @@ } else { centralPath = centralPath + File.separator + "lams-central.war"; } + + String pageDirection = (String) request.getSession().getAttribute(LocaleFilter.DIRECTION); // RTL or LTR (default) + if(pageDirection != null) + if(pageDirection.toLowerCase().equals(RTL_DIR)) + this.rtl = true; + } /** Bundle the stylesheets. @@ -111,7 +120,7 @@ String cssDirectory = outputDirectory+File.separator+"css"; File cssDirectoryFile = new File(cssDirectory); cssDirectoryFile.mkdirs(); - + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort(); List themeList = CSSThemeUtil.getAllUserThemes(); @@ -122,11 +131,11 @@ { String theme = (String)i.next(); - String url = basePath + "/lams/css/" + theme + ".css"; - HttpUrlConnectionUtil.writeResponseToFile(url, cssDirectory, theme + ".css", cookies); //cookies aren't really needed here. + String url = (!rtl)? basePath + "/lams/css/" + theme + ".css" : basePath + "/lams/css/" + theme + "_" + RTL_DIR + ".css"; + HttpUrlConnectionUtil.writeResponseToFile(url, cssDirectory, (!rtl)? theme + ".css" : theme + "_" + RTL_DIR + ".css", cookies); //cookies aren't really needed here. - url = basePath + "/lams/css/" + theme + "_learner.css"; - HttpUrlConnectionUtil.writeResponseToFile(url, cssDirectory, theme + "_learner.css", cookies); //cookies aren't really needed here. + url = (!rtl)? basePath + "/lams/css/" + theme + "_learner.css" : basePath + "/lams/css/" + theme + "_" + RTL_DIR + "_learner.css" ; + HttpUrlConnectionUtil.writeResponseToFile(url, cssDirectory, (!rtl)? theme + "_learner.css" : theme + "_" + RTL_DIR + "_learner.css", cookies); //cookies aren't really needed here. } // include the special IE stylesheet @@ -169,10 +178,10 @@ { String theme = (String)i.next(); - String themeFilename = theme + ".css"; + String themeFilename = (!rtl) ? theme + ".css" : theme + "_" + RTL_DIR + ".css"; addThemeFile(cssDirectory, themeFilename); - themeFilename = theme + "_learner.css"; + themeFilename = theme + "_" + RTL_DIR + "_learner.css"; addThemeFile(cssDirectory, themeFilename); } Index: lams_tool_chat/web/pages/learning/notebook.jsp =================================================================== diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -r94eb7bada81814941189436f343e9cf395e348f4 --- lams_tool_chat/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040) +++ lams_tool_chat/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 94eb7bada81814941189436f343e9cf395e348f4) @@ -14,7 +14,7 @@ -
+
Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r94eb7bada81814941189436f343e9cf395e348f4 --- lams_tool_larsrc/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 94eb7bada81814941189436f343e9cf395e348f4) @@ -9,6 +9,7 @@ + <fmt:message key="export.title" /> Index: lams_tool_nb/web/exportPortfolio.jsp =================================================================== diff -u -rb73ea10c36c8939d404f95b6e39cbcb4efbd64ba -r94eb7bada81814941189436f343e9cf395e348f4 --- lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision b73ea10c36c8939d404f95b6e39cbcb4efbd64ba) +++ lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 94eb7bada81814941189436f343e9cf395e348f4) @@ -6,7 +6,8 @@ - + + <c:out value="${NbExportForm.title}"/> Index: lams_tool_sbmt/web/export/exportportfolio.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r94eb7bada81814941189436f343e9cf395e348f4 --- lams_tool_sbmt/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_sbmt/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 94eb7bada81814941189436f343e9cf395e348f4) @@ -11,6 +11,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> + <fmt:message key="activity.title" /> Index: lams_tool_vote/web/export/exportportfolio.jsp =================================================================== diff -u -r05f0776f9ed9f80ad24452e9d1718e8a24ed8e62 -r94eb7bada81814941189436f343e9cf395e348f4 --- lams_tool_vote/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 05f0776f9ed9f80ad24452e9d1718e8a24ed8e62) +++ lams_tool_vote/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 94eb7bada81814941189436f343e9cf395e348f4) @@ -26,6 +26,7 @@ + <fmt:message key="label.export"/>