From: Jacob P. <jpe...@us...> - 2006-10-27 12:06:43
|
Update of /cvsroot/compiere/webStore/src/web/WEB-INF/ifm In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24092/src/web/WEB-INF/ifm Modified Files: Tag: pbs_payment SelectionContactResult.jsp NewFile.jsp Search.jsp Log Message: Index: SelectionContactResult.jsp =================================================================== RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/SelectionContactResult.jsp,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -C2 -d -r1.1.2.14 -r1.1.2.15 *** SelectionContactResult.jsp 10 Oct 2005 11:05:13 -0000 1.1.2.14 --- SelectionContactResult.jsp 27 Oct 2006 12:06:39 -0000 1.1.2.15 *************** *** 58,62 **** <div id="tableHook"> <h:dataTable headerClass="list-header" id="dataTable1" rowClasses="list-row-even,list-row-odd" ! value="#{ContactList.contactListModel}" binding="#{SelectionDetail.contactsBinding}" var="currentRow"> <h:column> --- 58,62 ---- <div id="tableHook"> <h:dataTable headerClass="list-header" id="dataTable1" rowClasses="list-row-even,list-row-odd" ! value="#{ContactList.contactListModelCopy}" binding="#{SelectionDetail.contactsBinding}" var="currentRow"> <h:column> Index: NewFile.jsp =================================================================== RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/NewFile.jsp,v retrieving revision 1.1.2.27 retrieving revision 1.1.2.28 diff -C2 -d -r1.1.2.27 -r1.1.2.28 *** NewFile.jsp 26 Oct 2006 12:27:37 -0000 1.1.2.27 --- NewFile.jsp 27 Oct 2006 12:06:39 -0000 1.1.2.28 *************** *** 4,8 **** <%@ taglib uri="webStore.tld" prefix="cws" %> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> ! <br>TEST: ${webUser.name}<br> <f:view> --- 4,8 ---- <%@ taglib uri="webStore.tld" prefix="cws" %> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> ! <f:view> *************** *** 63,66 **** --- 63,81 ---- </tr> <tr > + + <%--Need to do this to remove double-quote, changing them to singel-quote --%> + <span id="firstname" STYLE="visibility:hidden;" ><h:outputText value="#{ContactDetail.contactDetail.firstname}" escape='false'/></span> + <span id="lastname" STYLE="visibility:hidden;"><h:outputText value="#{ContactDetail.contactDetail.lastname}" escape='false'/></span> + <span id="adr1" STYLE="visibility:hidden;"><h:outputText value="#{ContactDetail.contactDetail.primaryLocation.addressline1}" escape='false'/> </span> + <span id="adr2" STYLE="visibility:hidden;"><h:outputText value="#{ContactDetail.contactDetail.primaryLocation.addressline2}" escape='false'/> </span> + <span id="zip" STYLE="visibility:hidden;"><h:outputText value="#{ContactDetail.contactDetail.primaryLocation.zipcode}" escape='false'/> </span> + <span id="cityname" STYLE="visibility:hidden;"><h:outputText value="#{ContactDetail.contactDetail.primaryLocation.city}" escape='false'/></span> + <span id="employedAt" STYLE="visibility:hidden;"><h:outputText value="#{ContactDetail.contactDetail.employedat}" escape='false'/></span> + <span id="employedAtCompany" STYLE="visibility:hidden;"><h:outputText value="#{ContactDetail.contactDetail.employedAtCompany}" escape='false'/></span> + <span id="title" STYLE="visibility:hidden;"><h:outputText value="#{ContactDetail.contactDetail.title}" escape='false'/></span> + <span id="region" STYLE="visibility:hidden;"><h:outputText value="#{ContactDetail.contactDetail.primaryLocation.regionName}" escape='false'/></span> + <span id="country" STYLE="visibility:hidden;"><h:outputText value="#{ContactDetail.contactDetail.primaryLocation.countryName}" escape='false'/></span> + + <script language="JavaScript"> /*function create(){ *************** *** 80,83 **** --- 95,99 ---- function create(){ + if(document.form1['form1:type'].value==''|| document.form1['form1:desc'].value==''){ alert('Fill all fields'); *************** *** 85,108 **** } ! //macro in monitor needs firstname,lastname,adr1,adr2,zip,cityname) ! firstname="<h:outputText value="#{ContactDetail.contactDetail.firstname}" escape='false'/> "; ! lastname= "<h:outputText value="#{ContactDetail.contactDetail.lastname}" escape='false'/>"; ! adr1="<h:outputText value="#{ContactDetail.contactDetail.primaryLocation.addressline1}" escape='false'/>"; ! //adr2=<h:outputText value="#{ContactDetail.contactDetail.primaryLocation.addressline2}null" rendered="#{!ContactDetail.contactDetail.primaryLocation.addressline2}" />; ! adr2="<h:outputText value="#{ContactDetail.contactDetail.primaryLocation.addressline2}" escape='false' />"; ! zip="<h:outputText value="#{ContactDetail.contactDetail.primaryLocation.zipcode}" escape='false'/>"; ! cityname= "<h:outputText value="#{ContactDetail.contactDetail.primaryLocation.city}" escape='false'/>"; ! ! employedAt = "<h:outputText value="#{ContactDetail.contactDetail.employedat}" escape='false'/>"; ! employedAtCompany = "<h:outputText value="#{ContactDetail.contactDetail.employedAtCompany}" escape='false'/>"; ! title= "<h:outputText value="#{ContactDetail.contactDetail.title}" escape='false'/>"; ! region= "<h:outputText value="#{ContactDetail.contactDetail.primaryLocation.regionName}" escape='false'/>"; ! country= "<h:outputText value="#{ContactDetail.contactDetail.primaryLocation.countryName}" escape='false'/>"; ! document.getElementById('fileTransferApplet').create(<h:outputText value="#{ContactDetail.contactDetail.IFM_Contacts_ID}"/>, ! document.form1['form1:type'].value, ! document.form1['form1:desc'].value,firstname,lastname,adr1,adr2,zip,cityname,employedAt,title,region,country); ! document.getElementById('txtSelect').innerHTML="Creating new file. Description: "+document.form1['form1:desc'].value; goBack(); } --- 101,126 ---- } ! /* Macro in monitor needs firstname,lastname,adr1,adr2,zip,cityname, etc) ! Cleans out double quote, because javascript string and Open Office freak out, ! if you give them " in a variable*/ ! var double_quoteCleaner = new RegExp('"',"g"); ! firstname=document.getElementById('firstname').innerHTML.replace(double_quoteCleaner ,"'"); ! lastname=document.getElementById('lastname').innerHTML.replace(double_quoteCleaner ,"'"); ! adr1=document.getElementById('adr1').innerHTML.replace(double_quoteCleaner ,"'"); ! adr2=document.getElementById('adr2').innerHTML.replace(double_quoteCleaner ,"'"); ! zip=document.getElementById('zip').innerHTML.replace(double_quoteCleaner ,"'"); ! cityname=document.getElementById('cityname').innerHTML.replace(double_quoteCleaner ,"'"); ! employedAt=document.getElementById('employedAt').innerHTML.replace(double_quoteCleaner ,"'"); ! employedAtCompany=document.getElementById('employedAtCompany').innerHTML.replace(double_quoteCleaner ,"'"); ! title=document.getElementById('title').innerHTML.replace(double_quoteCleaner ,"'"); ! region=document.getElementById('region').innerHTML.replace(double_quoteCleaner ,"'"); ! country=document.getElementById('country').innerHTML.replace(double_quoteCleaner ,"'"); ! //str2=str.replace(double_quoteCleaner ,"'"); ! document.getElementById('fileTransferApplet').create(<h:outputText value="#{ContactDetail.contactDetail.IFM_Contacts_ID}"/>, ! document.form1['form1:type'].value,document.form1['form1:desc'].value, ! firstname,lastname,adr1,adr2,zip,cityname,employedAt,title,region,country); ! document.getElementById('txtSelect').innerHTML="Creating new file. Description: "+document.form1['form1:desc'].value; goBack(); } Index: Search.jsp =================================================================== RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/Search.jsp,v retrieving revision 1.1.2.27 retrieving revision 1.1.2.28 diff -C2 -d -r1.1.2.27 -r1.1.2.28 *** Search.jsp 4 Jan 2006 12:20:30 -0000 1.1.2.27 --- Search.jsp 27 Oct 2006 12:06:39 -0000 1.1.2.28 *************** *** 4,7 **** --- 4,8 ---- <%@ taglib uri="webStore.tld" prefix="cws" %> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> + <f:view> <html> |