Added: wflow-consoleweb - RTL support (#252)

git-svn-id: http://dev.joget.org/svn/jw-community/trunk@33 1bff935d-2fe2-40b7-b00f-c2aca69a7612
jogetworkflow · Jul 12, 2011 · 8602e9a · 8602e9a
1 parent 31d8d43
commit 8602e9a
Show file tree

Hide file tree

Showing 33 changed files with 579 additions and 33 deletions.
diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/client/app/formView.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/client/app/formView.jsp
@@ -1,9 +1,19 @@
 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ page import="org.joget.workflow.util.WorkflowUtil"%>
+
+<%
+    String rightToLeft = WorkflowUtil.getSystemSetupValue("rightToLeft");
+    pageContext.setAttribute("rightToLeft", rightToLeft);
+%>
 
         <script type="text/javascript" src="${pageContext.request.contextPath}/js/jquery/jquery-1.4.4.min.js"></script>
         <script type="text/javascript" src="${pageContext.request.contextPath}/js/jquery/ui/jquery-ui-1.8.6.min.js"></script>
         <link rel="stylesheet" href="${pageContext.request.contextPath}/css/form.css" />
 
+        <c:if test="${rightToLeft == 'true'}">
+            <link rel="stylesheet" href="${pageContext.request.contextPath}/css/form_rtl.css" />
+        </c:if>
+
         <script type="text/javascript">
             $(document).ready(function() {
                 // add toggle json link

diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/console/apps/appTitle.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/console/apps/appTitle.jsp
@@ -1,7 +1,7 @@
 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 
 <p><fmt:message key="console.app.common.label.name"/>: <input id="appNameValue" type="hidden" value="${appDefinition.name}"><span id="appName" class="nav-subtitle">${appDefinition.name}</span></p>
-<p><fmt:message key="console.app.common.label.version"/>: <span class="nav-subtitle">v${appDefinition.version} <a href="#" onclick="version()"><c:choose><c:when test="${appDefinition.published}"><fmt:message key="console.app.common.label.published"/></c:when><c:otherwise><fmt:message key="console.app.common.label.notPublished"/></c:otherwise></c:choose></a> | <a href="#" onclick="version();"><fmt:message key="console.app.common.label.versions"/></a></span></p>
+<p><fmt:message key="console.app.common.label.version"/>: <span class="nav-subtitle"><font class="ftl_label">v${appDefinition.version} </font> <a href="#" onclick="version()"><c:choose><c:when test="${appDefinition.published}"><fmt:message key="console.app.common.label.published"/></c:when><c:otherwise><fmt:message key="console.app.common.label.notPublished"/></c:otherwise></c:choose></a> | <a href="#" onclick="version();"><fmt:message key="console.app.common.label.versions"/></a></span></p>
 
 <script type="text/javascript" src="${pageContext.request.contextPath}/js/jquery/jquery.jeditable.js"></script>
 

diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/console/apps/processView.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/console/apps/processView.jsp
@@ -28,7 +28,7 @@
         </ul>
     </div>
     <div id="main-body">
-        <p><fmt:message key="console.app.process.common.label.name"/>: &nbsp;&nbsp; <strong>${process.name}&nbsp;</strong></p>
+        <p><font class="ftl_label"><fmt:message key="console.app.process.common.label.name"/>:</font> &nbsp;&nbsp; <strong>${process.name}&nbsp;</strong></p>
 
         <div id="main-body-content">
 
@@ -86,7 +86,7 @@
                                     ${participant.name}
                                 </span>
                                 <span class="row-content id">
-                                    <fmt:message key="console.process.config.label.id"/> : ${participant.id}
+                                    <font class="ftl_label"><fmt:message key="console.process.config.label.id"/> :</font> ${participant.id}
                                 </span>
                                 <span class="row-button">
                                     <input type="button" value="<fmt:message key="console.process.config.label.mapParticipants.addEditMapping"/>" onclick="addEditParticipant('${participant.id}')"/>
@@ -130,13 +130,13 @@
                                                             <a href="${pageContext.request.contextPath}/web/console/directory/dept/view/${participantMap[participantUid].value}">${participantDisplayName}</a>
                                                         </c:when>
                                                         <c:when test="${participantMap[participantUid].type eq 'workflowVariable'}">
-                                                            <fmt:message key="console.app.process.common.label.variableId"/> : <c:out value="${fn:substring(participantMap[participantUid].value, 0, fn:indexOf(participantMap[participantUid].value, ','))}"/><br/>
+                                                            <font class="ftl_label"><fmt:message key="console.app.process.common.label.variableId"/> :</font> <c:out value="${fn:substring(participantMap[participantUid].value, 0, fn:indexOf(participantMap[participantUid].value, ','))}"/><br/>
                                                             <fmt:message key="console.process.config.label.mapParticipants.variable.${fn:substring(participantMap[participantUid].value, fn:indexOf(participantMap[participantUid].value, ',')+1, -1)}"/>
                                                         </c:when>
                                                         <c:when test="${participantMap[participantUid].type eq 'requester' || participantMap[participantUid].type eq 'requesterHod' || participantMap[participantUid].type eq 'requesterSubordinates' || participantMap[participantUid].type eq 'requesterDepartment'}">
                                                             <c:choose>
                                                                 <c:when test="${participantMap[participantUid].value ne ''}">
-                                                                    <fmt:message key="console.app.activity.common.label.definitionId"/> :
+                                                                    <font class="ftl_label"><fmt:message key="console.app.activity.common.label.definitionId"/> :</font>
                                                                     <a href="${pageContext.request.contextPath}/web/console/app/${appId}/${appVersion}/processes/${process.encodedId}?tab=activityList&activityDefId=${participantMap[participantUid].value}">${participantMap[participantUid].value}</a>
                                                                 </c:when>
                                                                 <c:otherwise>
@@ -195,7 +195,7 @@
                                         ${activityDisplayName} <c:if test="${activity.type ne 'normal'}">(${activity.type})</c:if>
                                     </span>
                                     <span class="row-content id">
-                                        <fmt:message key="console.process.config.label.id"/> : ${activity.id}
+                                        <font class="ftl_label"><fmt:message key="console.process.config.label.id"/> :</font> ${activity.id}
                                     </span>
                                     <span class="row-button">
                                         <input type="button" value="<fmt:message key="console.process.config.label.mapActivities.addEditFormMapping"/>" onclick="addEditForm('${activity.id}')"/>
@@ -258,7 +258,7 @@
                                         ${activityDisplayName}
                                     </span>
                                     <span class="row-content id">
-                                        <fmt:message key="console.process.config.label.id"/> : ${activity.id}
+                                        <font class="ftl_label"><fmt:message key="console.process.config.label.id"/> :</font> ${activity.id}
                                     </span>
                                     <span class="row-button">
                                         <input type="button" value="<fmt:message key="console.process.config.label.mapTools.addEditMapping"/>" onclick="addEditPlugin('${activity.id}')"/>

diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/console/plugin/pluginConfig.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/console/plugin/pluginConfig.jsp
@@ -1,4 +1,10 @@
 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ page import="org.joget.workflow.util.WorkflowUtil"%>
+
+<%
+    String rightToLeft = WorkflowUtil.getSystemSetupValue("rightToLeft");
+    pageContext.setAttribute("rightToLeft", rightToLeft);
+%>
 <commons:popupHeader />
 
 <c:if test="${!empty propertyEditable}">
@@ -8,6 +14,9 @@
     <script type="text/javascript" src="${pageContext.request.contextPath}/web/console/i18n/peditor"></script>
     <script type="text/javascript" src="${pageContext.request.contextPath}/js/jquery/jquery.propertyeditor.js"></script>
     <link href="${pageContext.request.contextPath}/css/jquery.propertyeditor.css" rel="stylesheet" type="text/css" />
+    <c:if test="${rightToLeft == 'true'}">
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/jquery.propertyeditor_rtl.css">
+    </c:if>
 </c:if>
 
 <div id="main-body-header">

diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/console/setting/general.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/console/setting/general.jsp
@@ -47,7 +47,7 @@
                         <label for="css"><fmt:message key="console.setting.general.label.css"/></label>
                         <span class="form-input">
                             <input id="css" type="text" name="css" value="${settingMap['css']}"/>
-                            <i><span><fmt:message key="console.setting.general.label.default"/></span> ${pageContext.request.contextPath}/css/new.css</i>
+                            <i><span class="ftl_label"><fmt:message key="console.setting.general.label.default"/></span> ${pageContext.request.contextPath}/css/new.css</i>
                         </span>
                     </div>
                 </span>
@@ -75,7 +75,7 @@
                                 </c:forEach>
                             </select>
                             <br>
-                            <i><span><fmt:message key="console.setting.general.label.default"/></span> en_US</i>
+                            <i><span class="ftl_label"><fmt:message key="console.setting.general.label.default"/></span> en_US</i>
                         </span>
                     </div>
                 </span>
@@ -101,7 +101,7 @@
                         <label for="deadlineCheckerInterval"><fmt:message key="console.setting.general.label.deadlineCheckerInterval"/></label>
                         <span class="form-input">
                             <input id="deadlineCheckerInterval" type="text" name="deadlineCheckerInterval" value="${settingMap['deadlineCheckerInterval']}"/>
-                            <i><span><fmt:message key="console.setting.general.label.default"/></span> 0</i>
+                            <i><span class="ftl_label"><fmt:message key="console.setting.general.label.default"/></span> 0</i>
                         </span>
                     </div>
                 </span>
@@ -112,7 +112,7 @@
                         <label for="welcomeMessageDelay"><fmt:message key="console.setting.general.label.welcomeMessageDelay"/></label>
                         <span class="form-input">
                             <input id="welcomeMessageDelay" type="text" name="welcomeMessageDelay" value="${settingMap['welcomeMessageDelay']}"/>
-                            <i><span><fmt:message key="console.setting.general.label.default"/></span> 3</i>
+                            <i><span class="ftl_label"><fmt:message key="console.setting.general.label.default"/></span> 3</i>
                         </span>
                     </div>
                 </span>
@@ -136,7 +136,7 @@
                         <label for="masterLoginPassword"><fmt:message key="console.setting.general.label.masterLoginPassword"/></label>
                         <span class="form-input">
                             <input id="masterLoginPassword" type="password" name="masterLoginPassword" value="${settingMap['masterLoginPassword']}"/>
-                            <i><fmt:message key="console.setting.general.label.masterLoginHash"/><span id="masterLoginHash">-</span></i>
+                            <i><span class="ftl_label"><fmt:message key="console.setting.general.label.masterLoginHash"/></span><span id="masterLoginHash">-</span></i>
                         </span>
                     </div>
                 </span>
@@ -147,7 +147,7 @@
                         <label for="dataFileBasePath"><fmt:message key="console.setting.general.label.dataFileBasePath"/></label>
                         <span class="form-input">
                             <input id="dataFileBasePath" type="text" name="dataFileBasePath" value="${settingMap['dataFileBasePath']}"/>
-                            <i><span><fmt:message key="console.setting.general.label.default"/></span> <%= new java.io.File(SetupManager.getBaseDirectory()).getAbsolutePath() %></i>
+                            <i><span class="ftl_label"><fmt:message key="console.setting.general.label.default"/></span> <%= new java.io.File(SetupManager.getBaseDirectory()).getAbsolutePath() %></i>
                         </span>
                     </div>
                 </span>
@@ -158,7 +158,7 @@
                         <label for="designerwebBaseUrl"><fmt:message key="console.setting.general.label.designerwebBaseUrl"/></label>
                         <span class="form-input">
                             <input id="designerwebBaseUrl" type="text" name="designerwebBaseUrl" value="${settingMap['designerwebBaseUrl']}"/>
-                            <i><span><fmt:message key="console.setting.general.label.default"/></span> http://${pageContext.request.serverName}:${pageContext.request.serverPort}</i>
+                            <i><span class="ftl_label"><fmt:message key="console.setting.general.label.default"/></span> http://${pageContext.request.serverName}:${pageContext.request.serverPort}</i>
                         </span>
                     </div>
                 </span>
@@ -181,7 +181,7 @@
                         <label for="mediumWarningLevel"><fmt:message key="console.setting.general.label.mediumWarningLevel"/></label>
                         <span class="form-input">
                             <input id="mediumWarningLevel" type="text" name="mediumWarningLevel" value="${settingMap['mediumWarningLevel']}"/>
-                            <i><span><fmt:message key="console.setting.general.label.default"/></span> 20</i>
+                            <i><span class="ftl_label"><fmt:message key="console.setting.general.label.default"/></span> 20</i>
                         </span>
                     </div>
                 </span>
@@ -192,7 +192,7 @@
                         <label for="criticalWarningLevel"><fmt:message key="console.setting.general.label.criticalWarningLevel"/></label>
                         <span class="form-input">
                             <input id="criticalWarningLevel" type="text" name="criticalWarningLevel" value="${settingMap['criticalWarningLevel']}"/>
-                            <i><span><fmt:message key="console.setting.general.label.default"/></span> 50</i>
+                            <i><span class="ftl_label"><fmt:message key="console.setting.general.label.default"/></span> 50</i>
                         </span>
                     </div>
                 </span>

diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/dbuilder/builder.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/dbuilder/builder.jsp
@@ -1,4 +1,11 @@
 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ page import="org.joget.workflow.util.WorkflowUtil"%>
+
+<%
+    String rightToLeft = WorkflowUtil.getSystemSetupValue("rightToLeft");
+    pageContext.setAttribute("rightToLeft", rightToLeft);
+%>
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
@@ -18,6 +25,10 @@
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/js/boxy/stylesheets/boxy.css" />
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/dbuilder.css"  />
 
+        <c:if test="${rightToLeft == 'true'}">
+            <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/jquery.propertyeditor_rtl.css">
+            <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/builder_rtl.css">
+        </c:if>
         <script type="text/javascript">
 
             var updateList = function() {
@@ -74,7 +85,7 @@
             });
         </script>
     </head>
-    <body>
+    <body id="datalistbuilder">
 
         <div id="builder-container">
             <div id="builder-header">

diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/fbuilder/formBuilder.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/fbuilder/formBuilder.jsp
@@ -1,4 +1,11 @@
 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ page import="org.joget.workflow.util.WorkflowUtil"%>
+
+<%
+    String rightToLeft = WorkflowUtil.getSystemSetupValue("rightToLeft");
+    pageContext.setAttribute("rightToLeft", rightToLeft);
+%>
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
@@ -16,6 +23,12 @@
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/jquery.propertyeditor.css" />
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/js/boxy/stylesheets/boxy.css" />
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/fbuilder.css" />
+
+        <c:if test="${rightToLeft == 'true'}">
+            <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/jquery.propertyeditor_rtl.css">
+            <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/builder_rtl.css">
+        </c:if>
+
         <script type="text/javascript">
             var viewForm = function() {
                 // get form row id
@@ -102,7 +115,7 @@
             </c:forEach>
         </script>
     </head>
-    <body>
+    <body id="formbuilder">
 
         <div id="builder-container">
             <div id="builder-header">

diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/fbuilder/previewForm.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/fbuilder/previewForm.jsp
@@ -1,9 +1,20 @@
 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ page import="org.joget.workflow.util.WorkflowUtil"%>
+
+<%
+    String rightToLeft = WorkflowUtil.getSystemSetupValue("rightToLeft");
+    pageContext.setAttribute("rightToLeft", rightToLeft);
+%>
 <html>
     <head>
         <script type="text/javascript" src="${pageContext.request.contextPath}/js/jquery/jquery-1.4.4.min.js"></script>
         <script type="text/javascript" src="${pageContext.request.contextPath}/js/jquery/ui/jquery-ui-1.8.6.min.js"></script>
         <link rel="stylesheet" href="${pageContext.request.contextPath}/css/form.css" />
+
+        <c:if test="${rightToLeft == 'true'}">
+            <link rel="stylesheet" href="${pageContext.request.contextPath}/css/form_rtl.css" />
+        </c:if>
+
         <script type="text/javascript">
             var reloadForm = function() {
                 $('#form-preview').submit();

diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/includes/rtl.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/includes/rtl.jsp
@@ -5,9 +5,9 @@
     String rightToLeft = WorkflowUtil.getSystemSetupValue("rightToLeft");
     pageContext.setAttribute("rightToLeft", rightToLeft);
 %>
-
+    
 <c:if test="${rightToLeft == 'true'}">
-    <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/rightToLeft.css">
+    <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/rtl.css">
     <script type="text/javascript">
         $(document).ready(function(){
             $(".row-content").append("<div style=\"clear:both\"></div>");