svn commit: r1025485 [3/3] - in /ofbiz/branches/jquery: ./ applications/accounting/ applications/accounting/config
Locked
svn commit: r1025485 [3/3] - in /ofbiz/branches/jquery: ./ applications/accounting/ applications/accounting/config
 
|
Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original) +++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Wed Oct 20 10:47:53 2010 @@ -47,6 +47,7 @@ import org.ofbiz.entity.condition.Entity import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entityext.permission.EntityPermissionChecker; import org.ofbiz.widget.WidgetWorker; +import org.ofbiz.widget.PortalPageWorker; import org.w3c.dom.Element; import org.xml.sax.SAXException; @@ -284,24 +285,26 @@ public class ModelMenuItem { ModelMenuAction.runSubActions(this.actions, context); String parentPortalPageId = this.getParentPortalPageId(context); if (UtilValidate.isNotEmpty(parentPortalPageId)) { - List<GenericValue> portalPages = this.getPortalPages(context); - for (GenericValue portalPage : portalPages) { - if (UtilValidate.isNotEmpty(portalPage.getString("portalPageName"))) { - ModelMenuItem localItem = new ModelMenuItem(this.getModelMenu()); - localItem.name = portalPage.getString("portalPageId"); - localItem.setTitle((String) portalPage.get("portalPageName", locale)); - localItem.link = new Link(this); - List<WidgetWorker.Parameter> linkParams = localItem.link.getParameterList(); - linkParams.add(new WidgetWorker.Parameter("portalPageId", portalPage.getString("portalPageId"), false)); - linkParams.add(new WidgetWorker.Parameter("parentPortalPageId", parentPortalPageId, false)); - if (link != null) { - localItem.link.setTarget(link.targetExdr.getOriginal()); - linkParams.addAll(link.parameterList); - } else { - localItem.link.setTarget("showPortalPage"); + List<GenericValue> portalPages = PortalPageWorker.getPortalPages(parentPortalPageId, context); + if (UtilValidate.isNotEmpty(portalPages)) { + for (GenericValue portalPage : portalPages) { + if (UtilValidate.isNotEmpty(portalPage.getString("portalPageName"))) { + ModelMenuItem localItem = new ModelMenuItem(this.getModelMenu()); + localItem.name = portalPage.getString("portalPageId"); + localItem.setTitle((String) portalPage.get("portalPageName", locale)); + localItem.link = new Link(this); + List<WidgetWorker.Parameter> linkParams = localItem.link.getParameterList(); + linkParams.add(new WidgetWorker.Parameter("portalPageId", portalPage.getString("portalPageId"), false)); + linkParams.add(new WidgetWorker.Parameter("parentPortalPageId", parentPortalPageId, false)); + if (link != null) { + localItem.link.setTarget(link.targetExdr.getOriginal()); + linkParams.addAll(link.parameterList); + } else { + localItem.link.setTarget("showPortalPage"); + } + localItem.link.setText((String)portalPage.get("portalPageName", locale)); + menuStringRenderer.renderMenuItem(writer, context, localItem); } - localItem.link.setText((String)portalPage.get("portalPageName", locale)); - menuStringRenderer.renderMenuItem(writer, context, localItem); } } } else { @@ -406,51 +409,6 @@ public class ModelMenuItem { return this.parentPortalPageId.expandString(context); } - public List<GenericValue> getPortalPages(Map<String, Object> context) { - List<GenericValue> portalPages = null; - String parentPortalPageId = this.getParentPortalPageId(context); - if (UtilValidate.isNotEmpty(parentPortalPageId)) { - Delegator delegator = WidgetWorker.getDelegator(context); - try { - // first get public pages - EntityCondition cond = - EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, "_NA_"), - EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition("portalPageId", EntityOperator.EQUALS, parentPortalPageId), - EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, parentPortalPageId)), - EntityOperator.OR)), - EntityOperator.AND); - portalPages = delegator.findList("PortalPage", cond, null, null, null, false); - if (UtilValidate.isNotEmpty(context.get("userLogin"))) { // check if a user is logged in - String userLoginId = ((GenericValue)context.get("userLogin")).getString("userLoginId"); - // replace with private pages - for (GenericValue portalPage : portalPages) { - cond = EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, userLoginId), - EntityCondition.makeCondition("originalPortalPageId", EntityOperator.EQUALS, portalPage.getString("portalPageId"))), - EntityOperator.AND); - List <GenericValue> privatePortalPages = delegator.findList("PortalPage", cond, null, null, null, false); - if (UtilValidate.isNotEmpty(privatePortalPages)) { - portalPages.remove(portalPage); - portalPages.add(privatePortalPages.get(0)); - } - } - // add any other created private pages - cond = EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, userLoginId), - EntityCondition.makeCondition("originalPortalPageId", EntityOperator.EQUALS, null), - EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, parentPortalPageId)), - EntityOperator.AND); - portalPages.addAll(delegator.findList("PortalPage", cond, null, null, null, false)); - } - portalPages = EntityUtil.orderBy(portalPages, UtilMisc.toList("sequenceNum")); - } catch (GenericEntityException e) { - Debug.logError("Could not retrieve portalpages in the menu:" + e.getMessage(), module); - } - } - return portalPages; - } public String getWidgetStyle() { if (UtilValidate.isNotEmpty(this.widgetStyle)) { return this.widgetStyle; Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original) +++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Wed Oct 20 10:47:53 2010 @@ -59,7 +59,6 @@ import org.ofbiz.widget.html.HtmlScreenR import org.ofbiz.widget.menu.MenuStringRenderer; import org.ofbiz.widget.screen.ModelScreenWidget; import org.ofbiz.widget.screen.ScreenStringRenderer; -import org.ofbiz.widget.WidgetPortalPageWorker; import freemarker.core.Environment; import freemarker.template.Template; @@ -781,9 +780,19 @@ public class MacroScreenRenderer impleme } public void renderPortalPageBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage) throws GeneralException, IOException { - String portalPageId = portalPage.getId(context); + String portalPageId = portalPage.getActualPortalPageId(); String originalPortalPageId = portalPage.getOriginalPortalPageId(); - String editMode = portalPage.getEditMode(context); + String confMode = portalPage.getConfMode(context); + + Map<String, String> uiLabelMap = UtilGenerics.cast(context.get("uiLabelMap")); + String addColumnLabel = ""; + String addColumnHint = ""; + if (uiLabelMap == null) { + Debug.logWarning("Could not find uiLabelMap in context", module); + } else { + addColumnLabel = (String) uiLabelMap.get("CommonAddColumn"); + addColumnHint = (String) uiLabelMap.get("CommonAddAColumnToThisPortalPage"); + } StringWriter sr = new StringWriter(); sr.append("<@renderPortalPageBegin "); @@ -791,44 +800,49 @@ public class MacroScreenRenderer impleme sr.append(originalPortalPageId); sr.append("\" portalPageId=\""); sr.append(portalPageId); - sr.append("\" editMode=\""); - sr.append(editMode); + sr.append("\" confMode=\""); + sr.append(confMode); + sr.append("\" addColumnLabel=\""); + sr.append(addColumnLabel); + sr.append("\" addColumnHint=\""); + sr.append(addColumnHint); sr.append("\" />"); executeMacro(writer, sr.toString()); } public void renderPortalPageEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage) throws GeneralException, IOException { - String editMode = portalPage.getEditMode(context); - HttpServletRequest request = (HttpServletRequest) context.get("request"); - - String actualRequest = request.getRequestURL().toString(); - if (actualRequest.indexOf("?") < 0) { - actualRequest += "?"; - } else if (!actualRequest.endsWith("?")) { - actualRequest += "&"; - } - String editOnURL = actualRequest+"editmode=true"; - String editOffURL = actualRequest+"editmode=false"; - StringWriter sr = new StringWriter(); - sr.append("<@renderPortalPageEnd "); - sr.append("editMode=\""); - sr.append(editMode); - sr.append("\" editOnURL=\""); - sr.append(editOnURL); - sr.append("\" editOffURL=\""); - sr.append(editOffURL); - sr.append("\" />"); + sr.append("<@renderPortalPageEnd/>"); executeMacro(writer, sr.toString()); } public void renderPortalPageColumnBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue portalPageColumn) throws GeneralException, IOException { - String portalPageId = portalPage.getId(context); + String portalPageId = portalPage.getActualPortalPageId(); String originalPortalPageId = portalPage.getOriginalPortalPageId(); String columnSeqId = portalPageColumn.getString("columnSeqId"); String columnWidthPercentage = portalPageColumn.getString("columnWidthPercentage"); String columnWidthPixels = portalPageColumn.getString("columnWidthPixels"); - String editMode = portalPage.getEditMode(context); + String confMode = portalPage.getConfMode(context); + + Map<String, String> uiLabelMap = UtilGenerics.cast(context.get("uiLabelMap")); + String delColumnLabel = ""; + String delColumnHint = ""; + String addPortletLabel = ""; + String addPortletHint = ""; + String colWidthLabel = ""; + String setColumnSizeHint = ""; + + if (uiLabelMap == null) { + Debug.logWarning("Could not find uiLabelMap in context", module); + } else { + delColumnLabel = (String) uiLabelMap.get("CommonDeleteColumn"); + delColumnHint = (String) uiLabelMap.get("CommonDeleteThisColumn"); + + addPortletLabel = (String) uiLabelMap.get("CommonAddAPortlet"); + addPortletHint = (String) uiLabelMap.get("CommonAddPortletToPage"); + colWidthLabel = (String) uiLabelMap.get("CommonWidth"); + setColumnSizeHint = (String) uiLabelMap.get("CommonSetColumnWidth"); + } StringWriter sr = new StringWriter(); sr.append("<@renderPortalPageColumnBegin "); @@ -848,8 +862,20 @@ public class MacroScreenRenderer impleme sr.append(columnWidthPercentage); sr.append("%\""); } - sr.append(" editMode=\""); - sr.append(editMode); + sr.append(" confMode=\""); + sr.append(confMode); + sr.append("\" delColumnLabel=\""); + sr.append(delColumnLabel); + sr.append("\" delColumnHint=\""); + sr.append(delColumnHint); + sr.append("\" addPortletLabel=\""); + sr.append(addPortletLabel); + sr.append("\" addPortletHint=\""); + sr.append(addPortletHint); + sr.append("\" colWidthLabel=\""); + sr.append(colWidthLabel); + sr.append("\" setColumnSizeHint=\""); + sr.append(setColumnSizeHint); sr.append("\" />"); executeMacro(writer, sr.toString()); } @@ -861,13 +887,30 @@ public class MacroScreenRenderer impleme } public void renderPortalPagePortletBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue portalPortlet) throws GeneralException, IOException { - String portalPageId = portalPage.getId(context); + String portalPageId = portalPage.getActualPortalPageId(); String originalPortalPageId = portalPage.getOriginalPortalPageId(); String portalPortletId = portalPortlet.getString("portalPortletId"); String portletSeqId = portalPortlet.getString("portletSeqId"); - String editMode = portalPage.getEditMode(context); + String confMode = portalPage.getConfMode(context); String editFormName = portalPortlet.getString("editFormName"); String editFormLocation = portalPortlet.getString("editFormLocation"); + + String prevPortletId = (String) context.get("prevPortletId"); + String prevPortletSeqId = (String) context.get("prevPortletSeqId"); + String nextPortletId = (String) context.get("nextPortletId"); + String nextPortletSeqId = (String) context.get("nextPortletSeqId"); + String prevColumnSeqId = (String) context.get("prevColumnSeqId"); + String nextColumnSeqId = (String) context.get("nextColumnSeqId"); + + Map<String, String> uiLabelMap = UtilGenerics.cast(context.get("uiLabelMap")); + String delPortletHint = ""; + String editAttributeHint = ""; + if (uiLabelMap == null) { + Debug.logWarning("Could not find uiLabelMap in context", module); + } else { + delPortletHint = (String) uiLabelMap.get("CommonDeleteThisPortlet"); + editAttributeHint = (String) uiLabelMap.get("CommonEditPortletAttributes"); + } StringWriter sr = new StringWriter(); sr.append("<@renderPortalPagePortletBegin "); @@ -879,8 +922,24 @@ public class MacroScreenRenderer impleme sr.append(portalPortletId); sr.append("\" portletSeqId=\""); sr.append(portletSeqId); - sr.append("\" editMode=\""); - sr.append(editMode); + sr.append("\" prevPortletId=\""); + sr.append(prevPortletId); + sr.append("\" prevPortletSeqId=\""); + sr.append(prevPortletSeqId); + sr.append("\" nextPortletId=\""); + sr.append(nextPortletId); + sr.append("\" nextPortletSeqId=\""); + sr.append(nextPortletSeqId); + sr.append("\" prevColumnSeqId=\""); + sr.append(prevColumnSeqId); + sr.append("\" nextColumnSeqId=\""); + sr.append(nextColumnSeqId); + sr.append("\" delPortletHint=\""); + sr.append(delPortletHint); + sr.append("\" editAttributeHint=\""); + sr.append(editAttributeHint); + sr.append("\" confMode=\""); + sr.append(confMode); sr.append("\""); if (UtilValidate.isNotEmpty(editFormName) && UtilValidate.isNotEmpty(editFormLocation)) { sr.append(" editAttribute=\"true\""); @@ -890,12 +949,12 @@ public class MacroScreenRenderer impleme } public void renderPortalPagePortletEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue portalPortlet) throws GeneralException, IOException { - String editMode = portalPage.getEditMode(context); + String confMode = portalPage.getConfMode(context); StringWriter sr = new StringWriter(); sr.append("<@renderPortalPagePortletEnd "); - sr.append(" editMode=\""); - sr.append(editMode); + sr.append(" confMode=\""); + sr.append(confMode); sr.append("\" />"); executeMacro(writer, sr.toString()); } Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original) +++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Wed Oct 20 10:47:53 2010 @@ -49,6 +49,7 @@ import org.ofbiz.widget.ModelWidget; import org.ofbiz.widget.ModelWidgetAction; import org.ofbiz.widget.WidgetFactory; import org.ofbiz.widget.WidgetWorker; +import org.ofbiz.widget.PortalPageWorker; import org.ofbiz.widget.form.FormFactory; import org.ofbiz.widget.form.FormStringRenderer; import org.ofbiz.widget.form.ModelForm; @@ -1585,13 +1586,16 @@ public abstract class ModelScreenWidget public static class PortalPage extends ModelScreenWidget { public static final String TAG_NAME = "include-portal-page"; protected FlexibleStringExpander idExdr; - protected FlexibleStringExpander editModeExdr; + protected FlexibleStringExpander confModeExdr; protected String originalPortalPageId; + protected String actualPortalPageId; + protected Boolean usePrivate; public PortalPage(ModelScreen modelScreen, Element portalPageElement) { super(modelScreen, portalPageElement); this.idExdr = FlexibleStringExpander.getInstance(portalPageElement.getAttribute("id")); - this.editModeExdr = FlexibleStringExpander.getInstance(portalPageElement.getAttribute("edit-mode")); + this.confModeExdr = FlexibleStringExpander.getInstance(portalPageElement.getAttribute("conf-mode")); + this.usePrivate = !("false".equals(portalPageElement.getAttribute("use-private"))); } @Override @@ -1606,62 +1610,106 @@ public abstract class ModelScreenWidget String expandedPortalPageId = getId(context); if (UtilValidate.isNotEmpty(expandedPortalPageId)) { - portalPage = delegator.findByPrimaryKeyCache("PortalPage", UtilMisc.toMap("portalPageId", expandedPortalPageId)); + if (usePrivate) { + portalPage = PortalPageWorker.getPortalPage(expandedPortalPageId, context); + } + else { + portalPage = delegator.findByPrimaryKeyCache("PortalPage", UtilMisc.toMap("portalPageId", expandedPortalPageId)); + } if (portalPage == null) { String errMsg = "Could not find PortalPage with portalPageId [" + expandedPortalPageId + "] "; Debug.logError(errMsg, module); throw new RuntimeException(errMsg); } else { + actualPortalPageId = portalPage.getString("portalPageId"); originalPortalPageId = portalPage.getString("originalPortalPageId"); portalPageColumns = delegator.getRelatedCache("PortalPageColumn", portalPage); - portalPagePortlets = delegator.findByAndCache("PortalPagePortletView", UtilMisc.toMap("portalPageId", expandedPortalPageId), UtilMisc.toList("sequenceNum")); } } else { String errMsg = "portalPageId is empty."; Debug.logError(errMsg, module); return; } + // Renders the portalPage header screenStringRenderer.renderPortalPageBegin(writer, context, this); + // First column has no previous column + String prevColumnSeqId = ""; + + // Iterates through the PortalPage columns ListIterator <GenericValue>columnsIterator = portalPageColumns.listIterator(); while(columnsIterator.hasNext()) { GenericValue columnValue = columnsIterator.next(); - + String columnSeqId = columnValue.getString("columnSeqId"); + // Renders the portalPageColumn header screenStringRenderer.renderPortalPageColumnBegin(writer, context, this, columnValue); + + // Get the Portlets located in the current column + portalPagePortlets = delegator.findByAnd("PortalPagePortletView", UtilMisc.toMap("portalPageId", portalPage.getString("portalPageId"), "columnSeqId", columnSeqId), UtilMisc.toList("sequenceNum")); + + // First Portlet in a Column has no previous Portlet + String prevPortletId = ""; + String prevPortletSeqId = ""; + + // If this is not the last column, get the next columnSeqId + String nextColumnSeqId = ""; + if (columnsIterator.hasNext()) { + nextColumnSeqId = portalPageColumns.get(columnsIterator.nextIndex()).getString("columnSeqId"); + } + // Iterates through the Portlets in the Column ListIterator <GenericValue>portletsIterator = portalPagePortlets.listIterator(); while(portletsIterator.hasNext()) { GenericValue portletValue = portletsIterator.next(); - String portletColumnSeqId = portletValue.getString("columnSeqId"); - String columnSeqId = columnValue.getString("columnSeqId"); - - if ((columnSeqId != null) && (portletColumnSeqId != null)) { - if (columnSeqId.equals(portletColumnSeqId)) { - // Retrieves portlet's attributes - portletAttributes = delegator.findList("PortletAttribute", - EntityCondition.makeCondition(UtilMisc.toMap("portalPageId", portletValue.get("portalPageId"), "portalPortletId", portletValue.get("portalPortletId"), "portletSeqId", portletValue.get("portletSeqId"))), - null, null, null, false); - - - ListIterator <GenericValue>attributesIterator = portletAttributes.listIterator(); - - while (attributesIterator.hasNext()) { - GenericValue attribute = attributesIterator.next(); - context.put(attribute.getString("attrName"), attribute.getString("attrValue")); - } - - // Renders the portalPagePortlet - screenStringRenderer.renderPortalPagePortletBegin(writer, context, this, portletValue); - screenStringRenderer.renderPortalPagePortletBody(writer, context, this, portletValue); - screenStringRenderer.renderPortalPagePortletEnd(writer, context, this, portletValue); - } + // If not the last portlet in the column, get the next nextPortletId and nextPortletSeqId + String nextPortletId = ""; + String nextPortletSeqId = ""; + if (portletsIterator.hasNext()) { + nextPortletId = portalPagePortlets.get(portletsIterator.nextIndex()).getString("portalPortletId"); + nextPortletSeqId = portalPagePortlets.get(portletsIterator.nextIndex()).getString("portletSeqId"); + } + + // Set info to allow portlet movement in the page + context.put("prevPortletId", prevPortletId); + context.put("prevPortletSeqId", prevPortletSeqId); + context.put("nextPortletId", nextPortletId); + context.put("nextPortletSeqId", nextPortletSeqId); + context.put("prevColumnSeqId", prevColumnSeqId); + context.put("nextColumnSeqId", nextColumnSeqId); + + // Get portlet's attributes + portletAttributes = delegator.findList("PortletAttribute", + EntityCondition.makeCondition(UtilMisc.toMap("portalPageId", portletValue.get("portalPageId"), "portalPortletId", portletValue.get("portalPortletId"), "portletSeqId", portletValue.get("portletSeqId"))), + null, null, null, false); + ListIterator <GenericValue>attributesIterator = portletAttributes.listIterator(); + while (attributesIterator.hasNext()) { + GenericValue attribute = attributesIterator.next(); + context.put(attribute.getString("attrName"), attribute.getString("attrValue")); } + + // Renders the portalPagePortlet + screenStringRenderer.renderPortalPagePortletBegin(writer, context, this, portletValue); + screenStringRenderer.renderPortalPagePortletBody(writer, context, this, portletValue); + screenStringRenderer.renderPortalPagePortletEnd(writer, context, this, portletValue); + + // Remove the portlet's attributes so that these are not available for other portlets + while (attributesIterator.hasPrevious()) { + GenericValue attribute = attributesIterator.previous(); + context.remove(attribute.getString("attrName")); + } + + // Uses the actual portlet as prevPortlet for next iteration + prevPortletId = (String) portletValue.get("portalPortletId"); + prevPortletSeqId = (String) portletValue.get("portletSeqId"); } // Renders the portalPageColumn footer screenStringRenderer.renderPortalPageColumnEnd(writer, context, this, columnValue); + + // Uses the actual columnSeqId as prevColumnSeqId for next iteration + prevColumnSeqId = columnSeqId; } // Renders the portalPage footer screenStringRenderer.renderPortalPageEnd(writer, context, this); @@ -1684,8 +1732,16 @@ public abstract class ModelScreenWidget return this.originalPortalPageId; } - public String getEditMode(Map<String, Object> context) { - return this.editModeExdr.expandString(context); + public String getActualPortalPageId() { + return this.actualPortalPageId; + } + + public String getConfMode(Map<String, Object> context) { + return this.confModeExdr.expandString(context); + } + + public String getUsePrivate() { + return Boolean.toString(this.usePrivate); } @Override Modified: ofbiz/branches/jquery/framework/widget/templates/htmlScreenMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/templates/htmlScreenMacroLibrary.ftl (original) +++ ofbiz/branches/jquery/framework/widget/templates/htmlScreenMacroLibrary.ftl Wed Oct 20 10:47:53 2010 @@ -159,10 +159,9 @@ ${menuString} <li class="${paginateFirstStyle?default("nav-first")}<#if !firstLinkUrl?has_content> disabled</#if>"><#if firstLinkUrl?has_content><a href="${firstLinkUrl}">${paginateFirstLabel}</a><#else>${paginateFirstLabel}</#if></li> </#macro> -<#macro renderPortalPageBegin originalPortalPageId portalPageId editMode="false" addColumnLabel="Add column" addColumnHint="Add a new column to this portal"> - <#if editMode == "true"> - <script src="/images/myportal.js" type="text/javascript"></script> - <a class="buttontext" href="javascript:document.addColumn_${portalPageId}.submit()" title="${addColumnHint}">${addColumnLabel}</a> PortalPageId: ${portalPageId} +<#macro renderPortalPageBegin originalPortalPageId portalPageId confMode="false" addColumnLabel="Add column" addColumnHint="Add a new column to this portal"> + <#if confMode == "true"> + <a class="buttontext" href="javascript:document.addColumn_${portalPageId}.submit()" title="${addColumnHint}">${addColumnLabel}</a> <b>PortalPageId: ${portalPageId}</b> <form method="post" action="addPortalPageColumn" name="addColumn_${portalPageId}"> <input name="portalPageId" value="${portalPageId}" type="hidden"/> </form> @@ -171,21 +170,16 @@ ${menuString} <tr> </#macro> -<#macro renderPortalPageEnd editMode="false" editOnURL="#" editOffURL="#" editOnLabel="Edit ON" editOffLabel="Edit OFF" editOnHint="Enable portal page editing" editOffHint="Disable portal page editing"> +<#macro renderPortalPageEnd> </tr> </table> - <#if editMode == "true"> - <a class="buttontext" href="${editOffURL}" title="${editOffHint}">${editOffLabel}</a> - <#else> - <a class="buttontext" href="${editOnURL}" title="${editOnHint}">${editOnLabel}</a> - </#if> </#macro> -<#macro renderPortalPageColumnBegin originalPortalPageId portalPageId columnSeqId editMode="false" width="auto" delColumnLabel="Remove column" delColumnHint="Delete this column" addPortletLabel="Add portlet" addPortletHint="Add a new portlet to this column" setColumnSizeHint="Set column size"> +<#macro renderPortalPageColumnBegin originalPortalPageId portalPageId columnSeqId confMode="false" width="auto" delColumnLabel="Delete column" delColumnHint="Delete this column" addPortletLabel="Add portlet" addPortletHint="Add a new portlet to this column" colWidthLabel="Col. width:" setColumnSizeHint="Set column size"> <#assign columnKey = portalPageId+columnSeqId> <#assign columnKeyFields = '<input name="portalPageId" value="' + portalPageId + '" type="hidden"/><input name="columnSeqId" value="' + columnSeqId + '" type="hidden"/>'> - <td style="vertical-align: top; <#if width?has_content> width:${width};</#if>" id="portalColumn_${columnSeqId}"> - <#if editMode == "true"> + <td class="portal-column<#if confMode == "true">-config</#if>" style="vertical-align: top; <#if width?has_content> width:${width};</#if>" id="portalColumn_${columnSeqId}"> + <#if confMode == "true"> <div class="portal-column-config-title-bar"> <ul> <li> @@ -204,10 +198,11 @@ ${menuString} <form method="post" action="editPortalPageColumnWidth" name="setColumnSize_${columnKey}"> ${columnKeyFields} </form> - <a class="buttontext" href="javascript:document.setColumnSize_${columnKey}.submit()" title="${setColumnSizeHint}">${width}</a> + <a class="buttontext" href="javascript:document.setColumnSize_${columnKey}.submit()" title="${setColumnSizeHint}">${colWidthLabel}: ${width}</a> </li> </ul> </div> + <br class="clear"/> </#if> </#macro> @@ -215,11 +210,11 @@ ${menuString} </td> </#macro> -<#macro renderPortalPagePortletBegin originalPortalPageId portalPageId portalPortletId portletSeqId editMode="false" delPortletHint="Remove this portlet" editAttribute="false" editAttributeHint="Edit portlet parameters"> +<#macro renderPortalPagePortletBegin originalPortalPageId portalPageId portalPortletId portletSeqId prevPortletId="" prevPortletSeqId="" nextPortletId="" nextPortletSeqId="" prevColumnSeqId="" nextColumnSeqId="" confMode="false" delPortletHint="Remove this portlet" editAttribute="false" editAttributeHint="Edit portlet parameters"> <#assign portletKey = portalPageId+portalPortletId+portletSeqId> <#assign portletKeyFields = '<input name="portalPageId" value="' + portalPageId + '" type="hidden"/><input name="portalPortletId" value="' + portalPortletId + '" type="hidden"/><input name="portletSeqId" value="' + portletSeqId + '" type="hidden"/>'> <div id="PP_${portletKey}" name="portalPortlet" class="noClass"> - <#if editMode == "true"> + <#if confMode == "true"> <div class="portlet-config" id="PPCFG_${portletKey}"> <div class="portlet-config-title-bar"> <ul> @@ -238,15 +233,63 @@ ${menuString} <a href="javascript:document.editPortlet_${portletKey}.submit()" title="${editAttributeHint}"> </a> </li> </#if> + <#if prevColumnSeqId?has_content> + <li class="move-left"> + <form method="post" action="updatePortletSeqDragDrop" name="movePortletLeft_${portletKey}"> + <input name="o_portalPageId" value="${portalPageId}" type="hidden"/> + <input name="o_portalPortletId" value="${portalPortletId}" type="hidden"/> + <input name="o_portletSeqId" value="${portletSeqId}" type="hidden"/> + <input name="destinationColumn" value="${prevColumnSeqId}" type="hidden"/> + <input name="mode" value="DRAGDROPBOTTOM" type="hidden"/> + </form> + <a href="javascript:document.movePortletLeft_${portletKey}.submit()"> </a></li> + </#if> + <#if nextColumnSeqId?has_content> + <li class="move-right"> + <form method="post" action="updatePortletSeqDragDrop" name="movePortletRight_${portletKey}"> + <input name="o_portalPageId" value="${portalPageId}" type="hidden"/> + <input name="o_portalPortletId" value="${portalPortletId}" type="hidden"/> + <input name="o_portletSeqId" value="${portletSeqId}" type="hidden"/> + <input name="destinationColumn" value="${nextColumnSeqId}" type="hidden"/> + <input name="mode" value="DRAGDROPBOTTOM" type="hidden"/> + </form> + <a href="javascript:document.movePortletRight_${portletKey}.submit()"> </a></li> + </#if> + <#if prevPortletId?has_content> + <li class="move-up"> + <form method="post" action="updatePortletSeqDragDrop" name="movePortletUp_${portletKey}"> + <input name="o_portalPageId" value="${portalPageId}" type="hidden"/> + <input name="o_portalPortletId" value="${portalPortletId}" type="hidden"/> + <input name="o_portletSeqId" value="${portletSeqId}" type="hidden"/> + <input name="d_portalPageId" value="${portalPageId}" type="hidden"/> + <input name="d_portalPortletId" value="${prevPortletId}" type="hidden"/> + <input name="d_portletSeqId" value="${prevPortletSeqId}" type="hidden"/> + <input name="mode" value="DRAGDROPBEFORE" type="hidden"/> + </form> + <a href="javascript:document.movePortletUp_${portletKey}.submit()"> </a></li> + </#if> + <#if nextPortletId?has_content> + <li class="move-down"> + <form method="post" action="updatePortletSeqDragDrop" name="movePortletDown_${portletKey}"> + <input name="o_portalPageId" value="${portalPageId}" type="hidden"/> + <input name="o_portalPortletId" value="${portalPortletId}" type="hidden"/> + <input name="o_portletSeqId" value="${portletSeqId}" type="hidden"/> + <input name="d_portalPageId" value="${portalPageId}" type="hidden"/> + <input name="d_portalPortletId" value="${nextPortletId}" type="hidden"/> + <input name="d_portletSeqId" value="${nextPortletSeqId}" type="hidden"/> + <input name="mode" value="DRAGDROPAFTER" type="hidden"/> + </form> + <a href="javascript:document.movePortletDown_${portletKey}.submit()"> </a></li> + </#if> </ul> <br class="clear"/> </div> </#if> </#macro> -<#macro renderPortalPagePortletEnd editMode="false"> +<#macro renderPortalPagePortletEnd confMode="false"> </div> - <#if editMode == "true"> + <#if confMode == "true"> </div> </#if> </#macro> Modified: ofbiz/branches/jquery/specialpurpose/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/build.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/build.xml (original) +++ ofbiz/branches/jquery/specialpurpose/build.xml Wed Oct 20 10:47:53 2010 @@ -31,8 +31,8 @@ ebay/build.xml, ebaystore/build.xml, projectmgr/build.xml, - crowd/build.xml, ldap/build.xml, + crowd/build.xml, googlecheckout/build.xml"/> <!-- For the Web POS add "webpos/build.xml" to the list above --> <!-- For the old OFBiz Workflow Engine add "workflow/build.xml" to the list above --> Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 20 10:47:53 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1022407 +/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1024561 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 20 10:47:53 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1022407 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1024561 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 20 10:47:53 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1022407 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1024561 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 20 10:47:53 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1022407 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1024561 Modified: ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml (original) +++ ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml Wed Oct 20 10:47:53 2010 @@ -19,26 +19,6 @@ under the License. --> <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <property key="FormFieldTitle_originalPortalPageId"> - <value xml:lang="en">original page</value> - <value xml:lang="fr">Page d'orig.</value> - </property> - <property key="FormFieldTitle_ownerUserLoginId"> - <value xml:lang="en">Owner</value> - <value xml:lang="fr">Propri.</value> - </property> - <property key="FormFieldTitle_parentPortalPageId"> - <value xml:lang="en">Parent page</value> - <value xml:lang="fr">Page père</value> - </property> - <property key="FormFieldTitle_portalPageName"> - <value xml:lang="en">Portal page name</value> - <value xml:lang="fr">Nom de page</value> - </property> - <property key="FormFieldTitle_sequenceNum"> - <value xml:lang="en">Seq.</value> - <value xml:lang="fr">Seq.</value> - </property> <property key="MyPortalAppBar"> <value xml:lang="en">My Page App Bar</value> <value xml:lang="fr">Menu des applications</value> @@ -56,53 +36,6 @@ <value xml:lang="th">รหัสà¸à¸±à¸§à¹à¸¥à¸à¸à¸µà¹à¸à¹à¸²à¸à¸à¸£à¸à¸à¸¡à¸µà¸à¹à¸à¸à¸´à¸à¸à¸¥à¸²à¸</value> <value xml:lang="zh">缺å°éªè¯ç æéªè¯ç é误</value> </property> - <property key="MyPortalCommunicationEventId"> - <value xml:lang="en">Communication Event id:</value> - <value xml:lang="fr">Réf. d'évènement de comm.</value> - <value xml:lang="it">Evento comunicazione:</value> - <value xml:lang="th">à¹à¸«à¸à¸¸à¸à¸²à¸£à¸à¹à¸à¸µà¹à¸à¸³à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value> - <value xml:lang="zh">æ²éäºä»¶æ è¯ï¼</value> - </property> - <property key="MyPortalCommunications"> - <value xml:lang="en">My Communications</value> - <value xml:lang="fr">Mes communications</value> - <value xml:lang="it">Mie comunicazioni</value> - <value xml:lang="th">à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸±à¸</value> - <value xml:lang="zh">æçæ²é</value> - </property> - <property key="MyPortalCommunicationsOfParty"> - <value xml:lang="en">Communications Of Party</value> - <value xml:lang="it">Comunicazioni dai soggetti</value> - <value xml:lang="zh">ä¼åçæ²é</value> - </property> - <property key="MyPortalCompanyComms"> - <value xml:lang="en">Company communications</value> - <value xml:lang="fr">Communications de l'entreprise</value> - <value xml:lang="it">Comunicazioni aziendali</value> - <value xml:lang="th">à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸£à¸´à¸©à¸±à¸</value> - <value xml:lang="zh">å ¬å¸æ²é</value> - </property> - <property key="MyPortalCompletedCustomerRequests"> - <value xml:lang="en">My Completed Customer Requests</value> - <value xml:lang="fr">Mes demandes de clients achevées</value> - <value xml:lang="it">Mie richieste cliente completate</value> - <value xml:lang="th">à¸à¸²à¸à¸à¸µà¹à¹à¸à¹à¹à¸à¹à¸«à¹à¸¥à¸¹à¸à¸à¹à¸²à¹à¸£à¸µà¸¢à¸¢à¸£à¹à¸à¸¢à¹à¸¥à¹à¸§</value> - <value xml:lang="zh">æå®æç客æ·è¯·æ±</value> - </property> - <property key="MyPortalCustRequests"> - <value xml:lang="en">My customer requests</value> - <value xml:lang="fr">Mes demandes utilisateur</value> - <value xml:lang="it">Mie richieste cliente</value> - <value xml:lang="th">ลูà¸à¸à¹à¸²à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸</value> - <value xml:lang="zh">æç客æ·è¯·æ±</value> - </property> - <property key="MyPortalDashboard"> - <value xml:lang="en">My Portal</value> - <value xml:lang="fr">Mon portail</value> - <value xml:lang="it">Mio portale</value> - <value xml:lang="th">สà¹à¸§à¸à¸à¸±à¸§</value> - <value xml:lang="zh">æçé¨æ·</value> - </property> <property key="MyPortalEndUserCustomer"> <value xml:lang="en">End User Customer</value> </property> @@ -130,23 +63,6 @@ <property key="MyPortalMyOrders"> <value xml:lang="en">My Orders</value> </property> - <property key="MyPortalMyTasks"> - <value xml:lang="en">myTasks</value> - <value xml:lang="it">Miei compiti</value> - <value xml:lang="zh">æçä»»å¡</value> - </property> - <property key="MyPortalMyTime"> - <value xml:lang="en">myTime</value> - <value xml:lang="it">Mio tempo</value> - <value xml:lang="zh">æçæ¶é´</value> - </property> - <property key="MyPortalNewMessage"> - <value xml:lang="en">New Message</value> - <value xml:lang="fr">Nouveau message</value> - <value xml:lang="it">Nuovo messaggio</value> - <value xml:lang="th">à¸à¹à¸à¸à¸§à¸²à¸¡à¹à¸«à¸¡à¹</value> - <value xml:lang="zh">æ°æ¶æ¯</value> - </property> <property key="MyPortalNewRegistration"> <value xml:lang="en">New Registration </value> <value xml:lang="fr">Nouvel enregistrement</value> @@ -154,57 +70,6 @@ <value xml:lang="th">ลà¸à¸à¸°à¹à¸à¸µà¸¢à¸ </value> <value xml:lang="zh">æ°æ³¨å</value> </property> - <property key="MyPortalNoAccess1"> - <value xml:lang="en">No Access priviledges has been setup.</value> - <value xml:lang="fr">Aucun accès privilégié n'a été paramétré.</value> - <value xml:lang="it">Non è stato configurato nessun accesso privilegiato.</value> - <value xml:lang="th">à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸à¹à¸²à¹à¸à¸à¸´à¸à¸à¸±à¹à¸à¸£à¸°à¸à¸</value> - <value xml:lang="zh">没æ设置访é®æéã</value> - </property> - <property key="MyPortalNoAccess2"> - <value xml:lang="en">You do not have access to any functions in the MyPortal subsystem, please contact your system admin</value> - <value xml:lang="fr">Vous n'avez accès à aucune fonction dans l'application "Mon portail", contactez votre administrateur système SVP.</value> - <value xml:lang="it">Non hai l'accesso alle funzioni nel sottosistam Mia pagina, per favore contatta l'amministratore del sistema</value> - <value xml:lang="th">à¸à¹à¸²à¸à¹à¸¡à¹à¹à¸à¹à¸²à¸à¸¶à¸à¸à¸±à¸à¸à¹à¸à¸±à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¸ªà¹à¸§à¸à¸à¸·à¹à¸à¹à¹à¸ MyPortal à¹à¸à¹, - à¸à¸£à¸¸à¸à¸²à¸à¸´à¸à¸à¹à¸à¸à¸¹à¹à¸à¸¹à¹à¸¥à¸£à¸°à¸à¸à¸à¸à¸à¸à¹à¸²à¸</value> - <value xml:lang="zh">ä½ æ²¡ææé访é®æçé¨æ·åç³»ç»ä¸çä»»ä½åè½ï¼è¯·ä¸ä½ çç³»ç»ç®¡çåèç³»</value> - </property> - <property key="MyPortalNoAccess3"> - <value xml:lang="en">At least MyPortal_CUSTOMER or MyPortal_EMPLOYEE permission is required</value> - <value xml:lang="fr">Au moins une autorisation MyPortal_CUSTOMER ou MyPortal_EMPLOYEE est nécessaire</value> - <value xml:lang="it">E' richiesto almeno il permesso MyPortal_CUSTOMER o MyPortal_EMPLOYEE</value> - <value xml:lang="th">à¸à¸¢à¹à¸²à¸à¸à¹à¸à¸¢à¸à¸µà¹à¸ªà¸¸à¸ MyPortal_CUSTOMER หรืภMyPortal_EMPLOYEE - à¸à¸¹à¸à¸à¸³à¸«à¸à¸à¸à¸²à¸£à¹à¸à¹à¸ªà¸´à¸à¸à¸´à¹ </value> - <value xml:lang="zh">éè¦è³å°MyPortal_CUSTOMERæMyPortal_EMPLOYEEæé</value> - </property> - <property key="MyPortalNoAccess4"> - <value xml:lang="en">Use the demo userLogin id's 'DemoCustomer' and 'DemoEmployee' for a demo.</value> - <value xml:lang="fr">Utilisez l'identifiant de connexion 'DemoCustomer' ou 'DemoEmployee'pour une démonstration.</value> - <value xml:lang="it">Usare l'utente 'DemoCustomer' o 'DemoEmployee' per una dimostrazione.</value> - <value xml:lang="th">à¸à¸³à¸¥à¸à¸à¸à¸¹à¹à¹à¸à¹à¹à¸à¹à¸ DemoCustomer à¹à¸¥à¸° DemoEmployee à¹à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸</value> - <value xml:lang="zh">使ç¨æ¼ç¤ºç»å½ç¨æ·'DemoCustomer'å'DemoEmployee'æ¥åæ¼ç¤ºã</value> - </property> - <property key="MyPortalOtherCommunications"> - <value xml:lang="en">Other Communications</value> - <value xml:lang="fr">Autres communications</value> - <value xml:lang="it">Altre comunicazioni</value> - <value xml:lang="th">à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸£à¸¹à¸à¹à¸à¸à¸à¹à¸²à¸à¹</value> - <value xml:lang="zh">å ¶å®æ²é</value> - </property> - <property key="MyPortalOtherCompanyCustomerRequests"> - <value xml:lang="en">Customer Requests from other contacts of my company</value> - <value xml:lang="fr">Demandes client depuis d'autres contacts de mon entreprise</value> - <value xml:lang="it">Richieste cliente da altri contatti della mia azienda</value> - <value xml:lang="th">ลูà¸à¸à¹à¸²à¸à¹à¸à¸à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸£à¸¹à¸à¹à¸à¸à¸à¸·à¹à¸à¸à¸²à¸à¸à¸£à¸´à¸©à¸±à¸à¸à¸à¸à¹à¸£à¸²</value> - <value xml:lang="zh">æ¥èªæçå ¬å¸çå ¶ä»èç³»ç客æ·è¯·æ±</value> - </property> - <property key="MyPortalPagesVisible"> - <value xml:lang="en">pages visible on the main screen.</value> - <value xml:lang="fr">Pages visibles sur l'écran principal.</value> - <value xml:lang="it">pagine visibili dalla pagina principale.</value> - <value xml:lang="th">สามารà¸à¹à¸«à¹à¸à¸«à¸à¹à¸²à¸à¸·à¹à¸à¸à¸à¸«à¸à¹à¸²à¸«à¸¥à¸±à¸à¹à¸à¹</value> - <value xml:lang="zh">页é¢å¨é¦é¡µä¸å¯è§ã</value> - </property> <property key="MyPortalPicCaptcha"> <value xml:lang="en">Code Captcha</value> <value xml:lang="fr">Code captcha</value> @@ -212,13 +77,6 @@ <value xml:lang="th">รหัสà¸à¸£à¸§à¸à¸ªà¸à¸</value> <value xml:lang="zh">éªè¯ç </value> </property> - <property key="MyPortalProfile"> - <value xml:lang="en">My Profile</value> - <value xml:lang="fr">Mon Profil</value> - <value xml:lang="it">Mio profilo</value> - <value xml:lang="th">à¸à¸£à¸°à¸§à¸±à¸à¸´à¸ªà¹à¸§à¸à¸à¸±à¸§à¸à¸à¸à¸à¸±à¸</value> - <value xml:lang="zh">æç个人信æ¯</value> - </property> <property key="MyPortalPlacingCustomer"> <value xml:lang="en">Placing Customer</value> </property> @@ -229,29 +87,11 @@ <value xml:lang="th">à¸à¸²à¸£à¸¥à¸à¸à¸°à¹à¸à¸µà¸¢à¸à¹à¸«à¸¡à¹à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸¸à¸à¸à¸¥à¹à¸à¹à¸à¸³à¸à¸²à¸£à¹à¸ªà¸£à¹à¸à¸ªà¸´à¹à¸à¸ªà¸¡à¸à¸¹à¸£à¸à¹à¹à¸¥à¹à¸§...สามารà¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸£à¸°à¸à¸à¹à¸à¹ </value> <value xml:lang="zh">å®ææ°äººå注å...请</value> </property> - <property key="MyPortalRegisterForCustomer"> - <value xml:lang="en">Register for customer</value> - <value xml:lang="fr">Enregistrement pour le client</value> - <value xml:lang="it">Registrazione per cliente</value> - <value xml:lang="th">ลà¸à¸à¸°à¹à¸à¸µà¸¢à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸¥à¸¹à¸à¸à¹à¸²</value> - <value xml:lang="zh">客æ·æ³¨å</value> - </property> - <property key="MyPortalRefresh"> - <value xml:lang="en">Reload page</value> - <value xml:lang="fr">Rafraîchir</value> - </property> <property key="MyPortalReloadImage"> <value xml:lang="en">reload image</value> <value xml:lang="it">Ricarica immagine</value> <value xml:lang="zh">å·æ°å¾ç</value> </property> - <property key="MyPortalSendMailEveryCust"> - <value xml:lang="en">Send Email To Every Customer Request Change</value> - <value xml:lang="fr">Envoyer le courriel à chaque demande de changement d'un client</value> - <value xml:lang="it">Invia email ad ogni modifica della richiesta cliente</value> - <value xml:lang="th">สà¹à¸à¸à¸µà¹à¸¡à¸¥à¹à¸à¸¶à¸à¸¥à¸¹à¸à¸à¹à¸²à¸à¸µà¹à¹à¸à¸¥à¸µà¹à¸¢à¸à¸à¸§à¸²à¸¡à¸à¹à¸à¸à¸à¸²à¸£</value> - <value xml:lang="zh">åéçµåé®ä»¶ç»æ¯ä¸ªå®¢æ·è¯·æ±åæ´</value> - </property> <property key="MyPortalShipToCustomer"> <value xml:lang="en">Ship To Customer</value> </property> @@ -297,18 +137,6 @@ <value xml:lang="th">à¸à¸²à¸à¸à¸à¸à¸à¸±à¸</value> <value xml:lang="zh">æçä»»å¡</value> </property> - <property key="MyPortalTimeSheets"> - <value xml:lang="en">My Time Sheets</value> - <value xml:lang="fr">Mes feuilles d'activité</value> - <value xml:lang="it">Mie timbrature</value> - <value xml:lang="th">à¸à¸²à¸£à¸²à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¸à¸à¸à¸à¸±à¸</value> - <value xml:lang="zh">æçå·¥æ¶å</value> - </property> - <property key="MyPortalToComplete"> - <value xml:lang="en">To Complete</value> - <value xml:lang="it">Da completare</value> - <value xml:lang="zh">è¦å®æ</value> - </property> <property key="MyPortalUserLogin"> <value xml:lang="en">User Login</value> <value xml:lang="fr">Identifiant de connexion</value> Modified: ofbiz/branches/jquery/specialpurpose/myportal/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/myportal/widget/CommonScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/myportal/widget/CommonScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/myportal/widget/CommonScreens.xml Wed Oct 20 10:47:53 2010 @@ -50,26 +50,6 @@ under the License. </section> </screen> - <screen name="uiLabelDecorator"> - <section> - <actions> - <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - </actions> - <widgets> - <decorator-section-include name="body"/> - </widgets> - </section> - </screen> - <screen name="CommonPartyDecorator"> <section> <actions> Modified: ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css (original) +++ ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css Wed Oct 20 10:47:53 2010 @@ -2084,14 +2084,11 @@ color: #000000; /* == Portlet configuration screenlet == */ .portlet-config { -background-color: #FFEC6F; -border: 2px solid #FFEC6F; +background-color: #FFFF99; margin-bottom: 5px; } .portlet-config-title-bar .title { -color: #555555; -background-color: #CFC05A; float: left; } @@ -2171,6 +2168,17 @@ font-weight: bold; float: right; } +.portal-column-config-title-bar { +padding-left: 5px; +} + +.portal-column-config-title-bar ul li { +float: left; +} +.portal-column-config { +background: #FFFFFF; +} + /*********************************************** Webtools ***********************************************/ |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |