Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl Sat Mar 3 01:41:15 2007 @@ -22,87 +22,80 @@ <#else> <#assign title = uiLabelMap.PartyActive> </#if> - <div class="head1">${title} ${uiLabelMap.PartyVisitListing}</div> + <h1>${title} ${uiLabelMap.PartyVisitListing}</h1> <#if !partyId?exists && showAll?lower_case == "true"> - <a href="<@ofbizUrl>showvisits?showAll=false</@ofbizUrl>" class="buttontext">[${uiLabelMap.PartyShowActive}]</a> + <a href="<@ofbizUrl>showvisits?showAll=false</@ofbizUrl>" class="smallSubmit">[${uiLabelMap.PartyShowActive}]</a> <#elseif !partyId?exists> - <a href="<@ofbizUrl>showvisits?showAll=true</@ofbizUrl>" class="buttontext">[${uiLabelMap.PartyShowAll}]</a> + <a href="<@ofbizUrl>showvisits?showAll=true</@ofbizUrl>" class="smallSubmit">[${uiLabelMap.PartyShowAll}]</a> </#if> <br/> <#if visitList?has_content> - <table border="0" width="100%" cellpadding="2"> - <tr> - <td align="right"> - <b> - <#if 0 < viewIndex> - <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | - </#if> - <#if 0 < listSize> - <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize}</span> - </#if> - <#if highIndex < listSize> - | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> - </#if> - </b> - </td> - </tr> - </table> - <#else> - <br/> + <div class="align-float"> + <b> + <#if 0 < viewIndex> + <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | + </#if> + <#if 0 < listSize> + ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize} + </#if> + <#if highIndex < listSize> + | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> + </#if> + </b> + </div> + <br class="clear" /> </#if> + <br/> - <table width="100%" border="0" cellpadding="2" cellspacing="0"> - <tr> - <td><a href="<@ofbizUrl>showvisits?sort=visitId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyVisitId}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=visitorId&showAll=${showAll}<#if visitorId?has_content>&visitorId=${visitorId}</#if></@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyVisitorId}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=partyId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyPartyId}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=userLoginId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyUserLoginId}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=-userCreated&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyNewUser}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=webappName&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyWebApp}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=clientIpAddress&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyClientIP}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=fromDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonFromDate}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=thruDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonThruDate}</a></td> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td><a href="<@ofbizUrl>showvisits?sort=visitId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitId}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=visitorId&showAll=${showAll}<#if visitorId?has_content>&visitorId=${visitorId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitorId}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=partyId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyPartyId}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=userLoginId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyUserLoginId}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=-userCreated&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyNewUser}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=webappName&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyWebApp}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=clientIpAddress&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyClientIP}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=fromDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonFromDate}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=thruDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonThruDate}</a></td> </tr> - <tr><td colspan="9"><hr class="sepbar"></td></tr> <#-- set initial row color --> - <#assign rowClass = "viewManyTR2"> + <#assign rowClass = "2"> <#list visitList as visitObj> - <tr class="${rowClass}"> - <td><a href="<@ofbizUrl>visitdetail?visitId=${visitObj.visitId}</@ofbizUrl>" class="buttontext">${visitObj.visitId}</a></td> - <td><div class="tabletext">${visitObj.visitorId?if_exists}</div></td> - <td><a href="<@ofbizUrl>viewprofile?partyId=${visitObj.partyId?if_exists}</@ofbizUrl>" class="buttontext">${visitObj.partyId?if_exists}</a></td> - <td><div class="tabletext">${visitObj.userLoginId?if_exists}</div></td> - <td><div class="tabletext">${visitObj.userCreated?if_exists}</div></td> - <td><div class="tabletext">${visitObj.webappName?if_exists}</div></td> - <td><div class="tabletext">${visitObj.clientIpAddress?if_exists}</div></td> - <td><div class="tabletext">${(visitObj.fromDate?string)?if_exists}</div></td> - <td><div class="tabletext">${(visitObj.thruDate?string)?if_exists}</div></td> + <tr<#if rowClass == "1"> class="alternate-row"</#if>> + <td class="button-col"><a href="<@ofbizUrl>visitdetail?visitId=${visitObj.visitId}</@ofbizUrl>">${visitObj.visitId}</a></td> + <td>${visitObj.visitorId?if_exists}</td> + <td class="button-col"><a href="<@ofbizUrl>viewprofile?partyId=${visitObj.partyId?if_exists}</@ofbizUrl>">${visitObj.partyId?if_exists}</a></td> + <td>${visitObj.userLoginId?if_exists}</td> + <td>${visitObj.userCreated?if_exists}</td> + <td>${visitObj.webappName?if_exists}</td> + <td>${visitObj.clientIpAddress?if_exists}</td> + <td>${(visitObj.fromDate?string)?if_exists}</td> + <td>${(visitObj.thruDate?string)?if_exists}</td> </tr> <#-- toggle the row color --> - <#if rowClass == "viewManyTR2"> - <#assign rowClass = "viewManyTR1"> + <#if rowClass == "2"> + <#assign rowClass = "1"> <#else> - <#assign rowClass = "viewManyTR2"> + <#assign rowClass = "2"> </#if> </#list> </table> <#if visitList?has_content> - <table border="0" width="100%" cellpadding="2"> - <tr> - <td align="right"> - <b> - <#if 0 < viewIndex> - <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | - </#if> - <#if 0 < listSize> - <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize}</span> - </#if> - <#if highIndex < listSize> - | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> - </#if> - </b> - </td> - </tr> - </table> + <br /> + <div class="align-float"> + <b> + <#if 0 < viewIndex> + <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | + </#if> + <#if 0 < listSize> + ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize} + </#if> + <#if highIndex < listSize> + | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> + </#if> + </b> + </div> + <br class="clear" /> </#if> Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl Sat Mar 3 01:41:15 2007 @@ -17,164 +17,108 @@ under the License. --> - <div class="head1">${uiLabelMap.PartyVisitDetail}</div> +<!-- begin visitdetail.ftl --> + <h1>${uiLabelMap.PartyVisitDetail}</h1> <br/> - <table width="90%" border="0" cellpadding="2" cellspacing="0"> + <table class="basic-table" cellspacing="0"> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyVisitIDSessionID}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext">${visit.visitId?if_exists} / ${visit.sessionId?if_exists}</div> - </td> + <td class="label">${uiLabelMap.PartyVisitIDSessionID}</td> + <td>${visit.visitId?if_exists} / ${visit.sessionId?if_exists}</td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyVisitorId}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext"> - ${visit.visitorId?default("${uiLabelMap.CommonNot} ${uiLabelMap.CommonFound}")} - </div> - </td> + <td class="label">${uiLabelMap.PartyVisitorId}</td> + <td>${visit.visitorId?default("${uiLabelMap.CommonNot} ${uiLabelMap.CommonFound}")}</td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyPartyIDUserLoginID}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext"> - <a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId?if_exists}</@ofbizUrl>" class="buttontext">${visit.partyId?if_exists}</a> / <a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId?if_exists}</@ofbizUrl>" class="buttontext">${visit.userLoginId?if_exists}</a> - </div> - </td> + <td class="label">${uiLabelMap.PartyPartyIDUserLoginID}</td> + <td><a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId?if_exists}</@ofbizUrl>">${visit.partyId?if_exists}</a> / <a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId?if_exists}</@ofbizUrl>">${visit.userLoginId?if_exists}</a></td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyUserCreated}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext">${visit.userCreated?if_exists}</div> - </td> + <td class="label">${uiLabelMap.PartyUserCreated}</td> + <td>${visit.userCreated?if_exists}</td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyWebApp}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext">${visit.webappName?if_exists}</div> - </td> + <td class="label">${uiLabelMap.PartyWebApp}</td> + <td>${visit.webappName?if_exists}</td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyServer}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext"> - <a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" class="buttontext" target="_blank">${visit.serverIpAddress?if_exists}</a> / <a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" class="buttontext" target="_blank">${visit.serverHostName?if_exists}</a> - </div> - </td> + <td class="label">${uiLabelMap.PartyServer}</td> + <td><a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" target="_blank">${visit.serverIpAddress?if_exists}</a> / <a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" target="_blank">${visit.serverHostName?if_exists}</a></td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyClient}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext"> - <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=${visit.clientIpAddress?if_exists}" class="buttontext" target="_blank">${visit.clientIpAddress?if_exists}</a> / <a href="http://www.networksolutions.com/cgi-bin/whois/whois?STRING=${visit.clientHostName?if_exists}&SearchType=do" class="buttontext" target="_blank">${visit.clientHostName?if_exists}</a> - </div> - </td> + <td class="label">${uiLabelMap.PartyClient}</td> + <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=${visit.clientIpAddress?if_exists}" target="_blank">${visit.clientIpAddress?if_exists}</a> / <a href="http://www.networksolutions.com/cgi-bin/whois/whois?STRING=${visit.clientHostName?if_exists}&SearchType=do" target="_blank">${visit.clientHostName?if_exists}</a></td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyClientUser}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext">${visit.clientUser?if_exists}</div> - </td> + <td class="label">${uiLabelMap.PartyClientUser}</td> + <td>${visit.clientUser?if_exists}</td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyInitialLocale}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext">${visit.initialLocale?if_exists}</div> - </td> + <td class="label">${uiLabelMap.PartyInitialLocale}</td> + <td>${visit.initialLocale?if_exists}</td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyInitialRequest}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <a href="${visit.initialRequest?if_exists}" class="buttontext">${visit.initialRequest?if_exists}</a> - </td> + <td class="label">${uiLabelMap.PartyInitialRequest}</td> + <td><a href="${visit.initialRequest?if_exists}" >${visit.initialRequest?if_exists}</a></td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyInitialReferer}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <a href="${visit.initialReferrer?if_exists}" class="buttontext">${visit.initialReferrer?if_exists}</a> - </td> + <td class="label">${uiLabelMap.PartyInitialReferer}</td> + <td><a href="${visit.initialReferrer?if_exists}" >${visit.initialReferrer?if_exists}</a></td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyInitialUserAgent}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext">${visit.initialUserAgent?if_exists}</div> - </td> + <td class="label">${uiLabelMap.PartyInitialUserAgent}</td> + <td>${visit.initialUserAgent?if_exists}</td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.PartyCookie}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext">${visit.cookie?if_exists}</div> - </td> + <td class="label">${uiLabelMap.PartyCookie}</td> + <td>${visit.cookie?if_exists}</td> </tr> <tr> - <td width="26%" align="right"><div class="tableheadtext">${uiLabelMap.CommonFromDateThruDate}</div></td> - <td width="5">: </td> - <td width="74%" align="left"> - <div class="tabletext">${(visit.fromDate?string)?if_exists} / ${(visit.thruDate?string)?default("["+uiLabelMap.PartyStillActive+"]")}</div> - </td> + <td class="label">${uiLabelMap.CommonFromDateThruDate}</td> + <td>${(visit.fromDate?string)?if_exists} / ${(visit.thruDate?string)?default("["+uiLabelMap.PartyStillActive+"]")}</td> </tr> </table> <br/> - <div class="head1">${uiLabelMap.PartyHitTracker}</div> - <br/> + <h1>${uiLabelMap.PartyHitTracker}</h1> <#if serverHits?has_content> - <table border="0" width="100%" cellpadding="2"> - <tr> - <td align="right"> - <b> - <#if 0 < viewIndex> - <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | - </#if> - <#if 0 < listSize> - <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> - </#if> - <#if highIndex < listSize> - | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> - </#if> - </b> - </td> - </tr> - </table> + <div class="align-float"> + <b> + <#if 0 < viewIndex> + <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | + </#if> + <#if 0 < listSize> + ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize} + </#if> + <#if highIndex < listSize> + | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> + </#if> + </b> + </div> + <br class="clear" /> </#if> - <table width="100%" border="0" cellpadding="2" cellspacing="0"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.PartyContentId}</div></td> - <td><div class="tableheadtext">${uiLabelMap.PartyType}</div></td> - <td><div class="tableheadtext">${uiLabelMap.PartySize}</div></td> - <td><div class="tableheadtext">${uiLabelMap.PartyStartTime}</div></td> - <td><div class="tableheadtext">${uiLabelMap.PartyTime}</div></td> - <td><div class="tableheadtext">${uiLabelMap.PartyURI}</div></td> - </tr> - <tr> - <td colspan="6"><hr class="sepbar"></td> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.PartyContentId}</td> + <td>${uiLabelMap.PartyType}</td> + <td>${uiLabelMap.PartySize}</td> + <td>${uiLabelMap.PartyStartTime}</td> + <td>${uiLabelMap.PartyTime}</td> + <td>${uiLabelMap.PartyURI}</td> </tr> <#-- set initial row color --> - <#assign rowClass = "viewManyTR2"> + <#assign rowClass = "2"> <#list serverHits[lowIndex..highIndex-1] as hit> - <#assign serverHitType = hit.getRelatedOne("ServerHitType")?if_exists> - <tr class="${rowClass}"> - <td><div class="tabletext">${hit.contentId?if_exists}</div></td> - <td><div class="tabletext">${serverHitType.get("description",locale)?if_exists}</div></td> - <td><div class="tabletext"> ${hit.numOfBytes?default("?")}</div></td> - <td><div class="tabletext">${hit.hitStartDateTime?string?if_exists}</div></td> - <td><div class="tabletext"> ${hit.runningTimeMillis?if_exists}</div></td> + <#assign serverHitType = hit.getRelatedOne("ServerHitType")?if_exists> + <tr<#if rowClass == "1"> class="alternate-row"</#if>> + <td>${hit.contentId?if_exists}</td> + <td>${serverHitType.get("description",locale)?if_exists}</td> + <td> ${hit.numOfBytes?default("?")}</td> + <td>${hit.hitStartDateTime?string?if_exists}</td> + <td>${hit.runningTimeMillis?if_exists}</td> <td> <#assign url = (hit.requestUrl)?if_exists> <#if url?exists> @@ -183,67 +127,64 @@ <#assign url = url[0..45] + "..."> </#if> </#if> - <a href="${hit.requestUrl?if_exists}" class="buttontext" target="_blank">${url}</a> + <a href="${hit.requestUrl?if_exists}" target="_blank">${url}</a> </td> </tr> <#-- toggle the row color --> - <#if rowClass == "viewManyTR2"> - <#assign rowClass = "viewManyTR1"> + <#if rowClass == "2"> + <#assign rowClass = "1"> <#else> - <#assign rowClass = "viewManyTR2"> + <#assign rowClass = "2"> </#if> </#list> </table> <#if serverHits?has_content> - <table border="0" width="100%" cellpadding="2"> - <tr> - <td align="right"> - <b> - <#if 0 < viewIndex> - <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | - </#if> - <#if 0 < listSize> - <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> - </#if> - <#if highIndex < listSize> - | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> - </#if> - </b> - </td> - </tr> - </table> + <div class="align-float"> + <b> + <#if 0 < viewIndex> + <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | + </#if> + <#if 0 < listSize> + ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize} + </#if> + <#if highIndex < listSize> + | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> + </#if> + </b> + </div> + <br class="clear" /> </#if> <#if security.hasPermission("SEND_CONTROL_APPLET", session)> <br/> - <div class="head1">${uiLabelMap.PartyPagePushFollowing}</div> + <h1>${uiLabelMap.PartyPagePushFollowing}</h1> <br/> <table border="0" cellpadding="5" cellspacing="5"> <form name="pushPage" method="get" action="<@ofbizUrl>pushPage</@ofbizUrl>"> <tr> - <td><div class="tableheadtext">${uiLabelMap.PartyPushURL}</div></td> + <th>${uiLabelMap.PartyPushURL}</th> <td> <input type="hidden" name="followerSid" value="${visit.sessionId}"> <input type="hidden" name="visitId" value="${visit.visitId}"> - <input type="input" name="pageUrl" class="inputBox"> + <input type="input" name="pageUrl"> </td> - <td><input type="submit" value="${uiLabelMap.CommonSubmit}" class="smallSubmit"></td> + <td><input type="submit" value="${uiLabelMap.CommonSubmit}"></td> </tr> <tr> - <td colspan="3"><hr class="sepbar"></td> + <td colspan="3"><hr/></td> </tr> </form> <form name="setFollower" method="get" action="<@ofbizUrl>setAppletFollower</@ofbizUrl>"> <tr> - <td><div class="tableheadtext">${uiLabelMap.PartyFollowSession}</div></td> + <th>${uiLabelMap.PartyFollowSession}</th> <td> <input type="hidden" name="followerSid" value="${visit.sessionId}"> <input type="hidden" name="visitId" value="${visit.visitId}"> - <input type="text" name="followSid" class="inputBox"> + <input type="text" name="followSid"> </td> - <td><input type="submit" value="${uiLabelMap.CommonSubmit}" class="smallSubmit"></td> + <td><input type="submit" value="${uiLabelMap.CommonSubmit}"></td> </tr> </form> </table> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sat Mar 3 01:41:15 2007 @@ -35,6 +35,9 @@ <set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/> <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> --> <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> --> + <!-- TODO: Use transform to specify component URI --> + <set field="layoutSettings.javaScripts[]" value="/partymgr/static/partymgr.js" global="true"/> + <set field="layoutSettings.styleSheets[]" value="/partymgr/static/partymgr.css" global="true"/> <set field="activeApp" value="partymgr" global="true"/> <set field="appheaderTemplate" value="component://party/webapp/partymgr/includes/appheader.ftl" global="true"/> </actions> @@ -66,32 +69,32 @@ <widgets> <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/> - <container> + <container style="button-bar button-style-2"> <link target="/accounting/control/FindBillingAccount?partyId=${partyId}" url-mode="inter-app" - text="${uiLabelMap.AccountingBillingAccount}" style="buttontext"/> + text="${uiLabelMap.AccountingBillingAccount}"/> <section> <condition><if-has-permission permission="ORDERMGR" action="_VIEW"/></condition> <widgets> <link target="/ordermgr/control/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}&externalLoginKey=${externalLoginKey}" url-mode="inter-app" - text="${uiLabelMap.OrderOrders}" style="buttontext"/> + text="${uiLabelMap.OrderOrders}"/> <link target="/ordermgr/control/FindRequest?lookupFlag=Y&fromPartyId=${partyId}&externaLoginKey=${externalLoginKey}" url-mode="inter-app" - text="${uiLabelMap.PartyPartyRequests}" style="buttontext"/> + text="${uiLabelMap.PartyPartyRequests}"/> </widgets> </section> <section> <condition><if-has-permission permission="ORDERMGR" action="_CREATE"/></condition> <widgets> <link target="/ordermgr/control/checkinits?partyId=${partyId}&externaLoginKey=${externalLoginKey}" url-mode="inter-app" - text="${uiLabelMap.OrderNewOrder}" style="buttontext"/> + text="${uiLabelMap.OrderNewOrder}"/> </widgets> </section> <section> <condition><if-has-permission permission="ACCOUNTING" action="_VIEW"/></condition> <widgets> <link target="/accounting/control/findPayments?lookupFlag=Y&hideFields=Y&partyIdTo=${partyId}&externaLoginKey=${externalLoginKey}" url-mode="inter-app" - text="${uiLabelMap.AccountingPaymentsSent}" style="buttontext"/> + text="${uiLabelMap.AccountingPaymentsSent}"/> <link target="/accounting/control/findPayments?lookupFlag=Y&hideFields=Y&partyIdFrom=${partyId}&externaLoginKey=${externalLoginKey}" url-mode="inter-app" - text="${uiLabelMap.AccountingPaymentsReceived}" style="buttontext"/> + text="${uiLabelMap.AccountingPaymentsReceived}"/> </widgets> </section> </container> @@ -153,8 +156,8 @@ <container> <label style="head1" text="${uiLabelMap.${labelTitleProperty}} [${groupId}]"/> </container> - <container> - <link target="EditSecurityGroup" style="buttontext" text="[${uiLabelMap.PartyNewSecurityGroup}]"/> + <container style="button-bar"> + <link target="EditSecurityGroup" style="smallSubmit" text="${uiLabelMap.PartyNewSecurityGroup}"/> </container> <decorator-section-include name="body"/> @@ -207,30 +210,30 @@ </condition> <widgets> <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/> - <container> + <container style="button-bar button-style-2"> <link target="/accounting/control/FindBillingAccount?partyId=${partyId}" url-mode="inter-app" - text="${uiLabelMap.AccountingBillingAccount}" style="buttontext"/> + text="${uiLabelMap.AccountingBillingAccount}"/> <section> <condition><if-has-permission permission="ORDERMGR" action="_VIEW"/></condition> <widgets> <link target="/ordermgr/control/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}" url-mode="inter-app" - text="${uiLabelMap.OrderOrders}" style="buttontext"/> + text="${uiLabelMap.OrderOrders}"/> </widgets> </section> <section> <condition><if-has-permission permission="ORDERMGR" action="_CREATE"/></condition> <widgets> <link target="/ordermgr/control/checkinits?partyId=${partyId}" url-mode="inter-app" - text="${uiLabelMap.OrderNewOrder}" style="buttontext"/> + text="${uiLabelMap.OrderNewOrder}"/> </widgets> </section> <section> <condition><if-has-permission permission="ACCOUNTING" action="_VIEW"/></condition> <widgets> <link target="/accounting/control/findPayments?lookupFlag=Y&hideFields=Y&partyIdTo=${partyId}" url-mode="inter-app" - text="${uiLabelMap.AccountingPaymentsSent}" style="buttontext"/> + text="${uiLabelMap.AccountingPaymentsSent}"/> <link target="/accounting/control/findPayments?lookupFlag=Y&hideFields=Y&partyIdFrom=${partyId}" url-mode="inter-app" - text="${uiLabelMap.AccountingPaymentsReceived}" style="buttontext"/> + text="${uiLabelMap.AccountingPaymentsReceived}"/> </widgets> </section> </container> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Sat Mar 3 01:41:15 2007 @@ -49,7 +49,7 @@ </section> <include-menu location="component://party/webapp/partymgr/communication/CommMenus.xml" name="CommFindTabBar"/> <container><label style="head1" text="${uiLabelMap.PartyPendingCommunicationEvents}"/></container> - <container><link style="buttontext" target="viewCommunicationEvent?partyId=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/></container> + <container><link style="smallSubmit" target="viewCommunicationEvent?partyId=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/></container> <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listPendingCommEvents"/> </widgets> <fail-widgets> @@ -85,7 +85,7 @@ </condition> <widgets> <container><label style="head1" text="${uiLabelMap.PartyFoundCommunicationEvents}"/></container> - <container><link style="buttontext" target="EditCommunicationEvent?partyId=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/></container> + <container><link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/></container> <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListPartyCommEvents"/> </widgets> <fail-widgets> @@ -129,9 +129,9 @@ </widgets> </section> <container><label style="head1" text="${uiLabelMap.PartyFoundCommunicationEvents}"/></container> - <container> - <link style="buttontext" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/> - <link style="buttontext" target="FindCommunicationEvents" text="${uiLabelMap.PartyNewFind}"/> + <container style="button-bar"> + <link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/> + <link style="smallSubmit" target="FindCommunicationEvents" text="${uiLabelMap.PartyNewFind}"/> </container> <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListLookupCommEvents"/> </widgets> @@ -172,7 +172,7 @@ </widgets> </section> <container><label style="head1" text="${uiLabelMap.PartyFindCommunicationEvents}"/></container> - <container><link style="buttontext" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/></container> + <container><link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/></container> <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="findCommEvents"/> </widgets> <fail-widgets> @@ -286,8 +286,8 @@ <section> <widgets> <container> - <link style="buttontext" target="EditCommunicationEvent?partyId=${partyId}&partyIdFrom=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/> - <link style="buttontext" target="EditCommunicationEvent?partyId=${partyId}&partyIdTo=${partyId}" text="${uiLabelMap.PartyReply}"/> + <link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}&partyIdFrom=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/> + <link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}&partyIdTo=${partyId}" text="${uiLabelMap.PartyReply}"/> </container> </widgets> </section> @@ -412,7 +412,7 @@ <if-compare field-name="okayToUpdate" operator="equals" type="Boolean" value="true"/> </condition> <widgets> - <container><link style="buttontext" target="AddCommEventWorkEffort?communicationEventId=${communicationEventId}&partyId=${partyId}" text="${uiLabelMap.PartyNewCommWorkEffort}"/></container> + <container><link style="smallSubmit" target="AddCommEventWorkEffort?communicationEventId=${communicationEventId}&partyId=${partyId}" text="${uiLabelMap.PartyNewCommWorkEffort}"/></container> </widgets> </section> <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListCommWorkEfforts"/> @@ -490,7 +490,7 @@ <if-compare field-name="okayToUpdate" operator="equals" type="Boolean" value="true"/> </condition> <widgets> - <container><link style="buttontext" target="AddCommContent?communicationEventId=${communicationEventId}&partyId=${partyId}" text="${uiLabelMap.PartyAddCommContent}"/></container> + <container><link style="smallSubmit" target="AddCommContent?communicationEventId=${communicationEventId}&partyId=${partyId}" text="${uiLabelMap.PartyAddCommContent}"/></container> </widgets> </section> <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listCommContent"/> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml Sat Mar 3 01:41:15 2007 @@ -20,9 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd"> - <form name="ListPartyClassifications" type="list" - target="updatePartyClassification" title="" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + + <form name="ListPartyClassifications" type="list" target="updatePartyClassification"> <actions> <entity-and entity-name="PartyClassification"> <field-map field-name="partyId"/> @@ -33,16 +32,15 @@ <display-entity entity-name="PartyClassificationGroup" key-field-name="partyClassificationGroupId" description="${description}&nbsp;[${partyClassificationGroupId}]"/> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> - <field name="thruDate" title="${uiLabelMap.CommonThruDate}" widget-style="inputBox"><date-time/></field> - <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> - <field name="deleteLink" title="" widget-style="buttontext"> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> + <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> + <field name="deleteLink" title="" widget-style="smallSubmit"> <hyperlink target="deletePartyClassification?partyClassificationGroupId=${partyClassificationGroupId}&partyId=${partyId}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="ListPartyClassificationGroups" type="list" - target="" title="" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + + <form name="ListPartyClassificationGroups" type="list"> <actions> <entity-condition entity-name="PartyClassificationGroup"/> </actions> @@ -55,21 +53,17 @@ </field> <field name="parentGroupId" title="${uiLabelMap.ParentGroupId}"><display/></field> <field name="description" title="${uiLabelMap.Description}"><display/></field> - <field name="deleteLink" title="" widget-style="buttontext"> + <field name="deleteLink" title="" widget-style="smallSubmit"> <hyperlink target="deletePartyClassificationGroup?partyClassificationGroupId=${partyClassificationGroupId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="EditPartyClassificationGroup" type="single" - target="updatePartyClassificationGroup" title="" - default-map-name="partyClassificationGroup" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> - <alt-target use-when="partyClassificationGroup==null" target="createPartyClassificationGroup"/> + <form name="EditPartyClassificationGroup" type="single" target="updatePartyClassificationGroup" default-map-name="partyClassificationGroup"> + <alt-target use-when="partyClassificationGroup==null" target="createPartyClassificationGroup"/> <field use-when="partyClassificationGroup!=null" name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="partyClassificationGroup==null&&partyClassificationGroupId==null" name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}"><ignored/></field> <field use-when="partyClassificationGroup==null&&partyClassificationGroupId!=null" name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${partyClassificationGroupId}]"><display/></field> - <field name="partyClassificationTypeId"> <drop-down> <entity-options description="${description}" entity-name="PartyClassificationType" key-field-name="partyClassificationTypeId"> @@ -79,12 +73,10 @@ </field> <field name="parentGroupId" title="${uiLabelMap.ParentGroupId}"><lookup target-form-name="LookupPartyClassificationGroup"/></field> <field name="description" title="${uiLabelMap.Description}"><text size="55"/></field> - <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> + <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> </form> - <form name="AddPartyClassification" type="single" - target="createPartyClassification" title="" default-map-name="partyClassification" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + <form name="AddPartyClassification" type="single" target="createPartyClassification" default-map-name="partyClassification"> <field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field> <field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}"> <drop-down> @@ -95,46 +87,42 @@ </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> - - <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> - <!-- <field name="cancelLink" title="" widget-style="buttontext"><hyperlink target="${donePage}?segmentGroupId=${segmentGroupId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> --> + <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> + <!-- <field name="cancelLink" title="" widget-style="smallSubmit"><hyperlink target="${donePage}?segmentGroupId=${segmentGroupId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> --> </form> - <form name="AddPartyClassificationParty" type="single" - target="createPartyClassificationParty" title="" default-map-name="partyClassification" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + <form name="AddPartyClassificationParty" type="single" target="createPartyClassificationParty" default-map-name="partyClassification"> <field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}"> <display-entity entity-name="PartyClassificationGroup" description="${description}" key-field-name="partyClassificationGroupId"/> </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> - - <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> - <!-- <field name="cancelLink" title="" widget-style="buttontext"><hyperlink target="${donePage}?segmentGroupId=${segmentGroupId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> --> + <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> + <!-- <field name="cancelLink" title="" widget-style="smallSubmit"><hyperlink target="${donePage}?segmentGroupId=${segmentGroupId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> --> </form> - <form name="ListPartyClassificationGroupParties" type="list" - target="updatePartyClassificationParty" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + + <form name="ListPartyClassificationGroupParties" type="list" target="updatePartyClassificationParty"> <actions> <entity-and entity-name="PartyClassification"> <field-map field-name="partyClassificationGroupId"/> </entity-and> </actions> - <field name="partyClassificationGroupId" title="${uiLabelMap.Description} [${uiLabelMap.PartyClassificationGroupId}]" widget-style="tabletext"> + <field name="partyClassificationGroupId" title="${uiLabelMap.Description} [${uiLabelMap.PartyClassificationGroupId}]"> <display-entity entity-name="PartyClassificationGroup" key-field-name="partyClassificationGroupId" description="${description}&nbsp;[${partyClassificationGroupId}]"/> </field> - <field name="partyId" title="${uiLabelMap.Party}" widget-style="tabletext"> + <field name="partyId" title="${uiLabelMap.Party}"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${lastName} ${groupName}"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" description="${partyId}" link-style="buttontext"/> + <sub-hyperlink target="viewprofile?partyId=${partyId}" description="${partyId}" link-style="smallSubmit"/> </display-entity> </field> - <field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-style="tabletext"><display/></field> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> - <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> - <field name="deleteLink" title="" widget-style="buttontext"> + <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> + <field name="deleteLink" title="" widget-style="smallSubmit"> <hyperlink target="deletePartyClassification?partyClassificationGroupId=${partyClassificationGroupId}&partyId=${partyId}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> + </forms> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml Sat Mar 3 01:41:15 2007 @@ -36,7 +36,7 @@ <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> + <container style="screenlet" id="screenlet"> <container style="screenlet-header"> <label style="boxhead" text="${uiLabelMap.PartyClassifications}"/> </container> @@ -65,14 +65,14 @@ <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> + <container style="screenlet" id="screenlet"> <container style="screenlet-header"> <label style="boxhead" text="${uiLabelMap.PartyClassificationGroups}"/> </container> - <platform-specific> - <html><html-template location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html> - </platform-specific> <container style="screenlet-body"> + <platform-specific> + <html><html-template location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html> + </platform-specific> <include-form name="ListPartyClassificationGroupParties" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> <include-form name="AddPartyClassificationParty" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> </container> @@ -97,11 +97,11 @@ <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> + <container style="screenlet" id="screenlet"> <container style="screenlet-header"> <label style="boxhead" text="${uiLabelMap.PartyClassificationGroups}"/> </container> - <container><link target="EditPartyClassificationGroup" style="buttontextbig" text="${uiLabelMap.PartyCreateNewPartyClassificationGroup}"></link></container> + <container><link target="EditPartyClassificationGroup" style="smallSubmit" text="${uiLabelMap.PartyCreateNewPartyClassificationGroup}"></link></container> <container style="screenlet-body"> <include-form name="ListPartyClassificationGroups" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> </container> @@ -127,15 +127,14 @@ <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> + <container style="screenlet" id="screenlet"> <container style="screenlet-header"> <label style="boxhead" text="${uiLabelMap.PartyClassificationGroup}"/> </container> - <platform-specific> - <html><html-template location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html> - </platform-specific> - <container style="screenlet-body"> + <platform-specific> + <html><html-template location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html> + </platform-specific> <include-form name="EditPartyClassificationGroup" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> </container> </container> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sat Mar 3 01:41:15 2007 @@ -19,9 +19,9 @@ --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd"> - <menu name="ProfileTabBar" default-menu-item-name="viewprofile" default-selected-style="tabButtonSelected" - default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton" - orientation="horizontal" type="simple"> + + <menu name="ProfileTabBar" default-menu-item-name="viewprofile" default-selected-style="selected" + type="simple" menu-container-style="button-bar button-style-1"> <menu-item name="viewprofile" title="${uiLabelMap.PartyProfile}"> <link target="viewprofile?partyId=${partyId}"/> </menu-item> @@ -62,4 +62,23 @@ <link target="EditPartyContents?partyId=${partyId}"/> </menu-item> </menu> + + <menu name="create-new-party" type="simple" menu-container-style="head1"> + <menu-item name="create-party-group" title="${uiLabelMap.PartyCreateNewPartyGroup}"> + <link target="editpartygroup?create_new=Y"/> + </menu-item> + <menu-item name="create-person" title="${uiLabelMap.PartyCreateNewPerson}"> + <link target="editperson?create_new=Y"/> + </menu-item> + <menu-item name="create-customer" title="${uiLabelMap.PartyCreateNewCustomer}"> + <link target="NewCustomer"/> + </menu-item> + <menu-item name="create-prospect" title="${uiLabelMap.PartyCreateNewProspect}"> + <link target="NewProspect"/> + </menu-item> + <menu-item name="create-employee" title="${uiLabelMap.PartyCreateNewEmployee}" > + <link target="NewEmployee"/> + </menu-item> + </menu> + </menus> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sat Mar 3 01:41:15 2007 @@ -325,7 +325,7 @@ <label style="head3">${uiLabelMap.PartyMsgContactNotBelongToYou}</label> </container> <container> - <link target="authview/${donePage}" text="[${uiLabelMap.CommonBack}]" style="buttontext"/> + <link target="authview/${donePage}" text="[${uiLabelMap.CommonBack}]" style="smallSubmit"/> </container> </fail-widgets> </section> @@ -538,11 +538,7 @@ <label style="boxhead" text="${uiLabelMap.PartyCreateNewParty}"/> </container> <container style="screenlet-body"> - <container><link target="editpartygroup?create_new=Y" style="buttontextbig" text="[*] ${uiLabelMap.PartyCreateNewPartyGroup}"></link></container> - <container><link target="editperson?create_new=Y" style="buttontextbig" text="[*] ${uiLabelMap.PartyCreateNewPerson}"></link></container> - <container><link target="NewCustomer" style="buttontextbig" text="[*] ${uiLabelMap.PartyCreateNewCustomer}"></link></container> - <container><link target="NewProspect" style="buttontextbig" text="[*] ${uiLabelMap.PartyCreateNewProspect}"></link></container> - <container><link target="NewEmployee" style="buttontextbig" text="[*] ${uiLabelMap.PartyCreateNewEmployee}"></link></container> + <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="create-new-party"/> </container> </container> </widgets> @@ -704,7 +700,7 @@ <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><link target="EditPartyContents?partyId=${partyId}" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container> + <container><link target="EditPartyContents?partyId=${partyId}" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit"/></container> <container><label style="head1" text="${uiLabelMap.PageTitleListContent}"/></container> <include-form name="ListPartyContents" location="component://party/webapp/partymgr/party/PartyForms.xml"/> <label style="head1">${uiLabelMap.PageTitleAddPartyContent}</label> Modified: ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml Sat Mar 3 01:41:15 2007 @@ -20,12 +20,12 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd"> - <form name="EditAvsOverride" type="single" - target="updateAvsOverride" title="" default-map-name="avsOverride" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + + <form name="EditAvsOverride" type="single" target="updateAvsOverride" default-map-name="avsOverride"> <field name="partyId"><hidden/></field> <field name="avsDeclineString" title="${uiLabelMap.PartyAvsString}"><text size="60" maxlength="250"/></field> - <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"><submit button-type="text-link"/></field> - <field name="cancelLink" title="" widget-style="buttontext"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field> + <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="smallSubmit"><submit button-type="text-link"/></field> + <field name="cancelLink" title="" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field> </form> + </forms> Modified: ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml Sat Mar 3 01:41:15 2007 @@ -45,7 +45,7 @@ <label style="head3">${uiLabelMap.AccountingCardInfoNotBelongToYou}</label> </container> <container> - <link target="authview/${donePage}" text="[${uiLabelMap.CommonBack}]" style="buttontext"/> + <link target="authview/${donePage}" text="[${uiLabelMap.CommonBack}]" style="smallSubmit"/> </container> </fail-widgets> </section> Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml Sat Mar 3 01:41:15 2007 @@ -20,55 +20,48 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd"> - <form name="ListSecurityGroups" type="list" list-name="securityGroups" paginate-target="FindSecurityGroup" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + + <form name="ListSecurityGroups" type="list" list-name="securityGroups" + paginate-target="FindSecurityGroup"> <actions> <entity-condition entity-name="SecurityGroup"> <order-by field-name="description"/> </entity-condition> </actions> - - <field name="groupId" title="${uiLabelMap.PartySecurityGroupId}" widget-style="buttontext"> + <field name="groupId" title="${uiLabelMap.PartySecurityGroupId}" widget-style="smallSubmit"> <hyperlink also-hidden="false" description="[${groupId}]" target="EditSecurityGroup?groupId=${groupId}"/> </field> - <field name="description" title="${uiLabelMap.CommonDescription}" widget-style="tabletext"><display/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> </form> - <form name="EditSecurityGroup" type="single" - target="updateSecurityGroup" title="" default-map-name="securityGroup" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + + <form name="EditSecurityGroup" type="single" target="updateSecurityGroup" default-map-name="securityGroup"> <alt-target use-when="securityGroup==null" target="createSecurityGroup"/> <auto-fields-service service-name="updateSecurityGroup" map-name="securityGroup"/> - <field use-when="securityGroup!=null" name="groupId" title="${uiLabelMap.PartySecurityGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="securityGroup==null&&groupId==null" name="groupId" title="${uiLabelMap.PartySecurityGroupId}"><text size="20" maxlength="20"/></field> <field use-when="securityGroup==null&&groupId!=null" name="groupId" title="${uiLabelMap.PartySecurityGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${groupId}]"><text size="20" maxlength="20"/></field> - <field name="description" title="${uiLabelMap.CommonDescription}"><text size="60" maxlength="250"/></field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> <!-- SecurityGroupPermission --> - <form name="ListSecurityGroupPermissions" type="list" list-name="securityGroupPermissions" target="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + <form name="ListSecurityGroupPermissions" type="list" list-name="securityGroupPermissions"> <actions> <entity-condition entity-name="SecurityGroupPermission"> <condition-expr field-name="groupId" env-name="groupId"/> <order-by field-name="permissionId"/> </entity-condition> </actions> - <field name="groupId"><hidden/></field> - <field name="permissionId" title="${uiLabelMap.PartyPermissionId}" widget-style="tabletext"><display-entity entity-name="SecurityPermission" description="[${permissionId}] ${description}"/></field> - <field name="deleteLink" title="" widget-style="buttontext"> + <field name="permissionId" title="${uiLabelMap.PartyPermissionId}"><display-entity entity-name="SecurityPermission" description="[${permissionId}] ${description}"/></field> + <field name="deleteLink" title="" widget-style="smallSubmit"> <hyperlink target="removeSecurityPermissionFromSecurityGroup?permissionId=${permissionId}&groupId=${groupId}" - description="[${uiLabelMap.CommonRemove}]" also-hidden="false"/> + description="${uiLabelMap.CommonRemove}" also-hidden="false"/> </field> </form> - <form name="AddSecurityGroupPermission" type="single" - target="addSecurityPermissionToSecurityGroup" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> - <auto-fields-service service-name="addSecurityPermissionToSecurityGroup"/> + <form name="AddSecurityGroupPermission" type="single" target="addSecurityPermissionToSecurityGroup"> + <auto-fields-service service-name="addSecurityPermissionToSecurityGroup"/> <field name="groupId"><hidden/></field> <field name="permissionId" title="${uiLabelMap.PartyPermissionId}"> <drop-down allow-empty="false"> @@ -77,51 +70,44 @@ </entity-options> </drop-down> </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - <form name="AddSecurityGroupPermissionManual" type="single" - target="addSecurityPermissionToSecurityGroup" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + + <form name="AddSecurityGroupPermissionManual" type="single" target="addSecurityPermissionToSecurityGroup"> <auto-fields-service service-name="addSecurityPermissionToSecurityGroup"/> - <field name="groupId"><hidden/></field> <field name="permissionId" title="${uiLabelMap.PartyPermissionId}"/> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> <!-- SecurityGroupUserLogin --> - <form name="ListSecurityGroupUserLogins" type="list" list-name="userLoginSecurityGroups" target="updateUserLoginToSecurityGroup" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + <form name="ListSecurityGroupUserLogins" type="list" list-name="userLoginSecurityGroups" target="updateUserLoginToSecurityGroup"> <actions> <entity-condition entity-name="UserLoginAndSecurityGroup"> <condition-expr field-name="groupId" env-name="groupId"/> <order-by field-name="userLoginId"/> </entity-condition> </actions> - <field name="groupId"><hidden/></field> - <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}" widget-style="tabletext"><display/></field> + <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}"><display/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> - <field name="thruDate" title="${uiLabelMap.CommonThruDate}" widget-style="inputBox"><date-time/></field> - <field name="partyId" title="${uiLabelMap.PartyParty}" widget-style="tabletext"> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> + <field name="partyId" title="${uiLabelMap.PartyParty}"> <display-entity entity-name="PartyNameView" also-hidden="false" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" description="[${partyId}]" link-style="buttontext"/> + <sub-hyperlink target="viewprofile?partyId=${partyId}" description="[${partyId}]" link-style="smallSubmit"/> </display-entity> </field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink description="[${uiLabelMap.CommonRemove}]" target="removeUserLoginFromSecurityGroup?userLoginId=${userLoginId}&groupId=${groupId}&fromDate=${fromDate}" also-hidden="false"/> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> + <field name="deleteLink" title="" widget-style="smallSubmit"> + <hyperlink description="${uiLabelMap.CommonRemove}" target="removeUserLoginFromSecurityGroup?userLoginId=${userLoginId}&groupId=${groupId}&fromDate=${fromDate}" also-hidden="false"/> </field> </form> - <form name="AddSecurityGroupUserLogin" type="single" - target="addUserLoginToSecurityGroup" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + + <form name="AddSecurityGroupUserLogin" type="single" target="addUserLoginToSecurityGroup"> <auto-fields-service service-name="addUserLoginToSecurityGroup"/> - <field name="groupId"><hidden/></field> <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}"><lookup target-form-name="LookupUserLoginAndPartyDetails" size="30"></lookup></field> - - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> <form name="ListUserLoginSecurityGroups" type="list" extends="ListSecurityGroupUserLogins" @@ -132,25 +118,23 @@ <order-by field-name="groupId"/> </entity-condition> </actions> - <field name="partyId"><hidden value="${partyId}"/></field> - <field name="groupId" title="${uiLabelMap.CommonGroup}" widget-style="tabletext"> + <field name="groupId" title="${uiLabelMap.CommonGroup}"> <display-entity entity-name="SecurityGroup"> - <sub-hyperlink target="EditSecurityGroup?groupId=${groupId}" description="[${groupId}]" link-style="buttontext"/> + <sub-hyperlink target="EditSecurityGroup?groupId=${groupId}" description="[${groupId}]" link-style="smallSubmit"/> </display-entity> </field> <field name="userLoginId"><hidden/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> - <field name="thruDate" title="${uiLabelMap.CommonThruDate}" widget-style="inputBox"><date-time/></field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink description="[${uiLabelMap.CommonRemove}]" target="userLogin_removeUserLoginFromSecurityGroup?partyId=${partyId}&userLoginId=${userLoginId}&groupId=${groupId}&fromDate=${fromDate}" also-hidden="false"/> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> + <field name="deleteLink" title="" widget-style="smallSubmit"> + <hyperlink description="${uiLabelMap.CommonRemove}" target="userLogin_removeUserLoginFromSecurityGroup?partyId=${partyId}&userLoginId=${userLoginId}&groupId=${groupId}&fromDate=${fromDate}" also-hidden="false"/> </field> </form> - <form name="AddUserLoginSecurityGroup" type="single" target="userLogin_addUserLoginToSecurityGroup" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + + <form name="AddUserLoginSecurityGroup" type="single" target="userLogin_addUserLoginToSecurityGroup"> <auto-fields-service service-name="addUserLoginToSecurityGroup"/> - <field name="partyId"><hidden value="${partyId}"/></field> <field name="userLoginId"><hidden/></field> <field name="groupId" title="${uiLabelMap.CommonGroup}"> @@ -160,7 +144,7 @@ </entity-options> </drop-down> </field> - - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> + </forms> Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml Sat Mar 3 01:41:15 2007 @@ -42,8 +42,8 @@ <container> <label style="head1" text="${uiLabelMap.PartySecurityGroupsList}"/> </container> - <container> - <link target="EditSecurityGroup" style="buttontext" text="[${uiLabelMap.PartyNewSecurityGroup}]"/> + <container style="button-bar"> + <link target="EditSecurityGroup" style="smallSubmit" text="${uiLabelMap.PartyNewSecurityGroup}"/> </container> <include-form name="ListSecurityGroups" location="component://party/widget/partymgr/SecurityForms.xml"/> </widgets> |
Free forum by Nabble | Edit this page |