Menu
▾
▴
[Compiere-cvslog] CVS: serverApps/src/main/servlet/org/compiere/www WAttachment.java,1.1,1.2 WHelp.java,1.2,1.3 WLogin.java,1.11,1.12 WMenu.java,1.9,1.10 WWindow.java,1.16,1.17
|
From: Jorg J. <jj...@us...> - 2004-10-31 06:43:37
|
Update of /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2186/main/servlet/org/compiere/www Modified Files: WAttachment.java WHelp.java WLogin.java WMenu.java WWindow.java Log Message: . Index: WAttachment.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WAttachment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WAttachment.java 30 Oct 2004 05:58:51 -0000 1.1 --- WAttachment.java 31 Oct 2004 06:43:24 -0000 1.2 *************** *** 63,67 **** { log.debug ("doGet"); - // WebEnv.dump(request); HttpSession sess = request.getSession(false); WWindowStatus ws = null; --- 63,66 ---- *************** *** 71,75 **** WebDoc doc = null; if (ws == null) ! doc = WebDoc.create ("Help - No Context"); else { --- 70,77 ---- WebDoc doc = null; if (ws == null) ! { ! doc = WebDoc.createPopup ("No Context"); ! doc.addPopupClose(); ! } else { *************** *** 133,140 **** int AD_Table_ID, int Record_ID, String error) { ! WebDoc doc = WebDoc.create(Msg.translate(ctx, "AD_Attachment_ID")); ! doc.getHead().addElement(new link("popup.css", link.REL_STYLESHEET, link.TYPE_CSS)); ! doc.getHead().addElement(new script((Element)null, "window.js")); ! doc.setClasses ("popupTable", "popupHeader"); table table = doc.getTable(); // --- 135,139 ---- int AD_Table_ID, int Record_ID, String error) { ! WebDoc doc = WebDoc.createPopup (Msg.translate(ctx, "AD_Attachment_ID")); table table = doc.getTable(); // *************** *** 195,206 **** tr.addElement(right); table.addElement(tr); // Footer ! tr = new tr() ! .addElement(new td("popupFooter", AlignType.LEFT, AlignType.TOP, false, null)) ! .addElement(new td("popupFooter", AlignType.RIGHT, AlignType.TOP, false, ! WebUtil.getClosePopUp())); ! table.addElement(tr); // ! System.out.println(doc); return doc; } // createPage --- 194,202 ---- tr.addElement(right); table.addElement(tr); + // Footer ! doc.addPopupClose(); // ! // System.out.println(doc); return doc; } // createPage *************** *** 275,279 **** Record_ID = upload.getParameterAsInt("Record_ID"); } ! WebEnv.dump(request); log.info("processPost - AD_Attachment_ID=" + AD_Attachment_ID + ", AD_Table_ID=" + AD_Table_ID + ", Record_ID=" + Record_ID --- 271,275 ---- Record_ID = upload.getParameterAsInt("Record_ID"); } ! // WebEnv.dump(request); log.info("processPost - AD_Attachment_ID=" + AD_Attachment_ID + ", AD_Table_ID=" + AD_Table_ID + ", Record_ID=" + Record_ID *************** *** 283,286 **** --- 279,285 ---- if (ws.curTab.getAD_AttachmentID() != AD_Attachment_ID) return "Your Attachment not found"; + // Check if we can save + if (AD_Attachment_ID != 0 && Record_ID == 0) + return "Need to save record first"; MAttachment attachment = null; *************** *** 298,302 **** attachment.addEntry(upload.getFileName(), upload.getData()); ! if (!attachment.save()) return "Attachment not saved"; --- 297,304 ---- attachment.addEntry(upload.getFileName(), upload.getData()); ! // Save and update ! if (attachment.save()) ! ws.curTab.loadAttachments(); // update Tab ! else return "Attachment not saved"; Index: WHelp.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WHelp.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WHelp.java 27 Oct 2004 06:37:10 -0000 1.2 --- WHelp.java 31 Oct 2004 06:43:24 -0000 1.3 *************** *** 58,62 **** WebDoc doc = null; if (ws == null) ! doc = WebDoc.create ("Help - No Context"); else doc = ws.mWindow.getHelpDoc(false); --- 58,65 ---- WebDoc doc = null; if (ws == null) ! { ! doc = WebDoc.createPopup("No Context"); ! doc.addPopupClose(); ! } else doc = ws.mWindow.getHelpDoc(false); *************** *** 72,76 **** throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WHelp - Post - Not Implemented"); WebUtil.createResponse(request, response, this, null, doc, false); } // doPost --- 75,79 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("Help - Post - Not Implemented"); WebUtil.createResponse(request, response, this, null, doc, false); } // doPost Index: WLogin.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WLogin.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** WLogin.java 30 Oct 2004 05:58:51 -0000 1.11 --- WLogin.java 31 Oct 2004 06:43:24 -0000 1.12 *************** *** 91,95 **** * @throws IOException */ ! public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { log.debug("doGet"); --- 91,96 ---- * @throws IOException */ ! public void doGet(HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException { log.debug("doGet"); *************** *** 118,122 **** * @throws IOException */ ! public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { log.debug("doPost"); --- 119,124 ---- * @throws IOException */ ! public void doPost(HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException { log.debug("doPost"); *************** *** 142,149 **** { String msg = Msg.getMsg(ctx, "WLoginNoDB"); - doc = WebDoc.create (msg); if (msg.equals("WLoginNoDB")) msg = "No Database Connection"; ! doc.getBody().addElement(new h1(msg)); } --- 144,150 ---- { String msg = Msg.getMsg(ctx, "WLoginNoDB"); if (msg.equals("WLoginNoDB")) msg = "No Database Connection"; ! doc = WebDoc.createWindow (msg); } *************** *** 273,282 **** String storeTxt = Msg.getMsg(AD_Language, "SaveCookie"); - // Document - WebDoc doc = WebDoc.create (windowTitle); - body b = doc.getBody(); - // Clear Menu Frame - b.addElement(WebUtil.getClearFrame(WebEnv.TARGET_MENU)); - // Form - post to same URL String action = request.getRequestURI(); --- 274,277 ---- *************** *** 354,361 **** // myForm.addElement(table); ! b.addElement(myForm); return doc; ! } // getUserPasswordPage --- 349,361 ---- // myForm.addElement(table); ! ! // Document ! WebDoc doc = WebDoc.createWindow (windowTitle); ! doc.addWindowCenter().addElement(myForm); ! // Clear Menu Frame ! doc.getBody().addElement(WebUtil.getClearFrame(WebEnv.TARGET_MENU)); return doc; ! } // createFirstPage *************** *** 374,380 **** String AD_Language = cProp.getProperty(P_LANGUAGE, Language.getAD_Language(request.getLocale())); String windowTitle = Msg.getMsg(AD_Language, "LoginSuccess"); - // Create Document - WebDoc doc = WebDoc.create (windowTitle); - body b = doc.getBody(); // Form - Get Menu --- 374,377 ---- *************** *** 448,466 **** line.addElement(new td().addElement(submit)); table.addElement(line); - - // Note - line = new tr(); - String note = Msg.getMsg(AD_Language, "WLoginBrowserNote"); - line.addElement(new td().addElement(note).setColSpan(2).setAlign(AlignType.CENTER)); - table.addElement(line); // myForm.addElement(table); ! b.addElement(myForm); // String script = "fieldUpdate(document.Login2." + P_ROLE + ");"; // init dependency updates ! b.addElement(new script(script)); return doc; ! } // getSecondPage } // WLogin --- 445,462 ---- line.addElement(new td().addElement(submit)); table.addElement(line); // myForm.addElement(table); ! ! // Create Document ! WebDoc doc = WebDoc.createWindow (windowTitle); ! doc.addWindowCenter().addElement(myForm); // String script = "fieldUpdate(document.Login2." + P_ROLE + ");"; // init dependency updates ! doc.getBody().addElement(new script(script)); ! // Note ! doc.addWindowFooter().addElement(new p(Msg.getMsg(AD_Language, "WLoginBrowserNote"))); return doc; ! } // createSecondPage } // WLogin Index: WMenu.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WMenu.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** WMenu.java 30 Oct 2004 05:58:51 -0000 1.9 --- WMenu.java 31 Oct 2004 06:43:24 -0000 1.10 *************** *** 333,340 **** Properties ctx, String loginInfo, int AD_Role_ID) { - String windowTitle = Msg.getMsg(ctx, "Menu"); - String statusMessage = Msg.getMsg(ctx, "SelectMenuItem"); - // Document WebDoc doc = WebDoc.create (windowTitle); head head = doc.getHead(); --- 333,338 ---- Properties ctx, String loginInfo, int AD_Role_ID) { // Document + String windowTitle = Msg.getMsg(ctx, "Menu"); WebDoc doc = WebDoc.create (windowTitle); head head = doc.getHead(); *************** *** 342,353 **** head.addElement(new base().setTarget(WebEnv.TARGET_WINDOW)); // Specific Menu Script/Stylesheet - head.addElement(new script((Element)null, WebEnv.getBaseDirectory("menu.js"))); head.addElement(new link(WebEnv.getBaseDirectory("menu.css"), link.REL_STYLESHEET, link.TYPE_CSS)); ! // Body body body = doc.getBody(); - String title = windowTitle + " - " + loginInfo; - body.addElement(new script("top.document.title='" + title + "';")); - body.addElement(new script("defaultStatus = '" + statusMessage + "';")); // Clear Window Frame body.addElement(WebUtil.getClearFrame(WebEnv.TARGET_WINDOW)); --- 340,353 ---- head.addElement(new base().setTarget(WebEnv.TARGET_WINDOW)); // Specific Menu Script/Stylesheet head.addElement(new link(WebEnv.getBaseDirectory("menu.css"), link.REL_STYLESHEET, link.TYPE_CSS)); ! head.addElement(new script((Element)null, WebEnv.getBaseDirectory("menu.js"))); ! // Scripts ! String statusMessage = Msg.getMsg(ctx, "SelectMenuItem"); ! String scriptTxt = "top.document.title='" + windowTitle + " - " + loginInfo + "'; " ! + "var defaultStatus='" + statusMessage + "';"; ! head.addElement(new script(scriptTxt)); ! // Body body body = doc.getBody(); // Clear Window Frame body.addElement(WebUtil.getClearFrame(WebEnv.TARGET_WINDOW)); *************** *** 355,363 **** // Header table table = doc.getTable(); ! table.setClass("menuTable"); ! doc.getTableRight().setClass("menuHeader"); ! td left = doc.getTableLeft(); ! left.setClass("menuHeader"); ! left.addElement(new cite(loginInfo)); // Load Menu Structure ---------------------- --- 355,360 ---- // Header table table = doc.getTable(); ! doc.setClasses ("menuTable", "menuHeader"); ! doc.getTopLeft().addElement(new cite(loginInfo)); // Load Menu Structure ---------------------- *************** *** 403,416 **** while (oldLevel < level) { ! if (level > 1) ! buf.append("<ul style=\"display:none\">\n");// start next level else ! buf.append("<ul>\n"); // start next level oldLevel++; } while (oldLevel > level) { - buf.append("</ul>"); // finish next level oldLevel--; } --- 400,416 ---- while (oldLevel < level) { ! if (level == 1) ! buf.append("<ul id=\"main\">\n"); // start first level else ! buf.append("<ul style=\"display:none\">\n");// start next level oldLevel++; } while (oldLevel > level) { oldLevel--; + if (oldLevel == 1) + buf.append("</ul>\n"); // finish last level + else + buf.append("</ul></li>\n"); // finish next level } *************** *** 418,425 **** buf.append(printNode(nd)); } while (oldLevel > 0) { - buf.append("</ul>"); // finish next level oldLevel--; } td td = new td().setColSpan(2).setNoWrap(true); --- 418,429 ---- buf.append(printNode(nd)); } + // Final while (oldLevel > 0) { oldLevel--; + if (oldLevel == 1) + buf.append("</ul>\n"); // finish last level + else + buf.append("</ul></li>\n"); // finish next level } td td = new td().setColSpan(2).setNoWrap(true); *************** *** 435,438 **** --- 439,443 ---- table.addElement(new tr().addElement(td)); // + System.out.println(doc); return doc; } // createPage *************** *** 488,493 **** servletName = "WError"; String description = node.getDescription().replace('\'',' ').replace('"',' '); ! sb.append("<li class=\"" + className + "\"><a href=\"") // url - /appl/servletName?AD_Menu_ID=x .append(WebEnv.getBaseDirectory(servletName)) --- 493,501 ---- servletName = "WError"; + String name = node.getName().replace('\'',' ').replace('"',' '); String description = node.getDescription().replace('\'',' ').replace('"',' '); ! sb.append("<li class=\"" + className ! + "\" id=\"" + node.getNode_ID() // debug ! + "\"><a href=\"") // url - /appl/servletName?AD_Menu_ID=x .append(WebEnv.getBaseDirectory(servletName)) *************** *** 495,500 **** .append(node.getNode_ID()) // ! .append("\" onMouseOver=\"status='" + description + "';return true;\" onclick=showLoadingWindow(\"" + WebEnv.getBaseDirectory("") + "\")>") ! .append(node.getName()) // language set in MTree.getNodeDetails based on ctx .append("</a></li>\n"); } --- 503,509 ---- .append(node.getNode_ID()) // ! .append("\" onMouseOver=\"status='" + description ! + "';\" onClick=\"showLoadingWindow('" + WebEnv.getBaseDirectory("") + "')\">") ! .append(name) // language set in MTree.getNodeDetails based on ctx .append("</a></li>\n"); } *************** *** 502,513 **** { /** ! * <li id="foldHeader">MenuEntry</li> * <ul style="display:none"> * .... ! * </ul> */ ! sb.append("\n<li id=\"menuHeader\">") // summary node ! .append(node.getName()) ! .append("</li>\n"); } return sb; --- 511,525 ---- { /** ! * <li class="foldHeader" onClick="changeMenu(this)">MenuEntry * <ul style="display:none"> * .... ! * </ul></li> */ ! String name = node.getName().replace('\'',' ').replace('"',' '); ! sb.append("\n<li class=\"menuSummary\"" ! + " id=\"" + node.getNode_ID() // debug ! + "\" onClick=\"changeMenu(event);\">") // summary node ! .append(name) ! .append("\n"); } return sb; Index: WWindow.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WWindow.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** WWindow.java 30 Oct 2004 05:58:51 -0000 1.16 --- WWindow.java 31 Oct 2004 06:43:24 -0000 1.17 *************** *** 863,909 **** String title = ws.mWindow.getName() + " - " + loginInfo; myForm.addElement(new script("top.document.title='" + title + "';")); ! ! ! ! // Buttons ! myForm.addElement(createImage(AD_Language, "Ignore", "reset();", true, false)); ! myForm.addElement(" "); ! myForm.addElement(createImage(AD_Language, "Help", ! "window.open('/compiere/WHelp?AD_Window_ID=" ! + ws.mWindow.getAD_Window_ID() ! + "','help','dependent=yes,scrollbars=yes,resizable=yes,width=600,height=300').focus();", true, false)); ! myForm.addElement(createImage(AD_Language, "New")); ! myForm.addElement(createImage(AD_Language, "Delete", "if (confirm(deleteText)) submit();", true, false)); ! myForm.addElement(createImage(AD_Language, "Save")); ! myForm.addElement(" "); ! myForm.addElement(createImage(AD_Language, "Find")); ! myForm.addElement(createImage(AD_Language, "Refresh")); ! myForm.addElement(createImage(AD_Language, "Attachment", ! "startAttachment();", ws.curTab.canHaveAttachment(), ws.curTab.hasAttachment())); ! myForm.addElement(createImage(AD_Language, "Multi", null, true, !ws.curTab.isSingleRow())); ! myForm.addElement(" "); ! myForm.addElement(createImage(AD_Language, "History", null, ws.mWindow.isTransaction()&&ws.curTab.getTabNo()==0, !ws.curTab.isOnlyCurrentRows())); ! myForm.addElement(" "); boolean isFirst = ws.curTab.getCurrentRow() < 1; ! myForm.addElement(createImage(AD_Language, "First", null, !isFirst, false)); ! myForm.addElement(createImage(AD_Language, "Previous", null, !isFirst, false)); boolean isLast = ws.curTab.getCurrentRow()+1 == ws.curTab.getRowCount(); ! myForm.addElement(createImage(AD_Language, "Next", null, !isLast, false)); ! myForm.addElement(createImage(AD_Language, "Last", null, !isLast, false)); ! myForm.addElement(" "); ! myForm.addElement(createImage(AD_Language, "Report")); ! myForm.addElement(createImage(AD_Language, "Print")); ! myForm.addElement(" "); ! myForm.addElement(createImage(AD_Language, "Exit")); ! // Tabs ! myForm.addElement(new br()); ! myForm.addElement(new br()); ! myForm.addElement(new input("hidden", P_Tab, "")); for (int i = 0; i < ws.mWindow.getTabCount(); i++) { --- 863,906 ---- String title = ws.mWindow.getName() + " - " + loginInfo; myForm.addElement(new script("top.document.title='" + title + "';")); ! ! // Buttons ! td toolbar = new td("windowCenter", AlignType.LEFT, AlignType.MIDDLE, true); ! // Toolbar ! toolbar.addElement(createImage(AD_Language, "Ignore", "reset();", true, false)); ! toolbar.addElement(" "); ! toolbar.addElement(createImage(AD_Language, "Help", ! "startPopup('WHelp?AD_Window_ID=" + ws.mWindow.getAD_Window_ID() + "');", true, false)); ! toolbar.addElement(createImage(AD_Language, "New")); ! toolbar.addElement(createImage(AD_Language, "Delete", "if (confirm(deleteText)) submit();", true, false)); ! toolbar.addElement(createImage(AD_Language, "Save")); ! toolbar.addElement(" "); ! toolbar.addElement(createImage(AD_Language, "Find")); ! toolbar.addElement(createImage(AD_Language, "Refresh")); ! toolbar.addElement(createImage(AD_Language, "Attachment", ! "startPopup('WAttachment');", ws.curTab.canHaveAttachment(), ws.curTab.hasAttachment())); ! toolbar.addElement(createImage(AD_Language, "Multi", null, true, !ws.curTab.isSingleRow())); ! toolbar.addElement(" "); ! toolbar.addElement(createImage(AD_Language, "History", null, ws.mWindow.isTransaction()&&ws.curTab.getTabNo()==0, !ws.curTab.isOnlyCurrentRows())); ! toolbar.addElement(" "); boolean isFirst = ws.curTab.getCurrentRow() < 1; ! toolbar.addElement(createImage(AD_Language, "First", null, !isFirst, false)); ! toolbar.addElement(createImage(AD_Language, "Previous", null, !isFirst, false)); boolean isLast = ws.curTab.getCurrentRow()+1 == ws.curTab.getRowCount(); ! toolbar.addElement(createImage(AD_Language, "Next", null, !isLast, false)); ! toolbar.addElement(createImage(AD_Language, "Last", null, !isLast, false)); ! toolbar.addElement(" "); ! toolbar.addElement(createImage(AD_Language, "Report")); ! toolbar.addElement(createImage(AD_Language, "Print")); ! toolbar.addElement(" "); ! toolbar.addElement(createImage(AD_Language, "Exit")); ! // Tabs ! td tabbar = new td("windowCenter", AlignType.LEFT, AlignType.MIDDLE, true); ! tabbar.addElement(new input(input.TYPE_HIDDEN, P_Tab, "")); for (int i = 0; i < ws.mWindow.getTabCount(); i++) { *************** *** 921,948 **** if (tab.getDescription().length() > 0) big.setOnMouseOver("status='" + tab.getDescription() + "';return true;"); ! myForm.addElement(big); } // Fields - myForm.addElement(new hr()); myForm.addElement(contentTable); // Status Line ! tr statusline = new tr(); ! statusline.addElement(new td().setWidth("85%") .addElement(statusInfo)); ! statusline.addElement(new td().setWidth("10%").setAlign("right") .addElement(new small(statusDB))); ! statusline.addElement(new td().setWidth("5%").setAlign("right") .addElement(createImage(AD_Language, "Save"))); // ! myForm.addElement(new hr()); ! myForm.addElement(new table().setWidth("100%").addElement(statusline)); // fini - myForm.addElement("\n"); /** @todo Dynamic Display */ ! myForm.addElement(new script("dynDisplay(); createWCmd();")); // initial Display & set Cmd Window ! WebDoc doc = createPage(ws); --- 918,950 ---- if (tab.getDescription().length() > 0) big.setOnMouseOver("status='" + tab.getDescription() + "';return true;"); ! tabbar.addElement(big); } + table topTable = new table ("0", "0", "5", "100%", null); + topTable.addElement(new tr() + .addElement(toolbar) + .addElement(tabbar)); + myForm.addElement(topTable); + // Fields myForm.addElement(contentTable); // Status Line ! tr statusLine = new tr(); ! statusLine.setClass("windowCenter"); ! statusLine.addElement(new td().setWidth("85%") .addElement(statusInfo)); ! statusLine.addElement(new td().setWidth("10%").setAlign("right") .addElement(new small(statusDB))); ! statusLine.addElement(new td().setWidth("5%").setAlign("right") .addElement(createImage(AD_Language, "Save"))); // ! table statusTable = new table ("0", "0", "0", "100%", null); ! statusTable.addElement(statusLine); ! myForm.addElement(statusTable); // fini /** @todo Dynamic Display */ ! // myForm.addElement(new script("dynDisplay(); createWCmd();")); // initial Display & set Cmd Window WebDoc doc = createPage(ws); *************** *** 964,974 **** private static WebDoc createPage (WWindowStatus ws) { ! WebDoc doc = WebDoc.create (ws.mWindow.getName()); ! head header = doc.getHead(); ! // add window.js & .css ! header.addElement(new script((Element)null, WebEnv.getBaseDirectory("window.js"))); ! header.addElement(new link().setRel("stylesheet").setHref(WebEnv.getBaseDirectory("window.css"))); ! // ! doc.setClasses("windowTable", "windowHeader"); // Set Variables doc.getBody().addElement( --- 966,970 ---- private static WebDoc createPage (WWindowStatus ws) { ! WebDoc doc = WebDoc.createWindow (ws.mWindow.getName()); // Set Variables doc.getBody().addElement( |