svn commit: r926987 [3/26] - in /ofbiz/branches/multitenant201
Locked
svn commit: r926987 [3/26] - in /ofbiz/branches/multitenant201
 
|
Modified: ofbiz/branches/multitenant20100310/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/config/MarketingUiLabels.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/config/MarketingUiLabels.xml Wed Mar 24 09:23:07 2010 @@ -184,7 +184,7 @@ <value xml:lang="en">Create Marketing Campaign</value> <value xml:lang="es">Crear campaña de marketing</value> <value xml:lang="fr">Nouvelle campagne marketing</value> - <value xml:lang="it">Creare Campagna Vendita</value> + <value xml:lang="it">Nuova campagna di vendita</value> <value xml:lang="nl">Nieuwe Marketing Campagne</value> <value xml:lang="pt_BR">Criar Campanha de Marketing</value> <value xml:lang="ro">Creare Campanie Vanzare</value> @@ -196,7 +196,7 @@ <value xml:lang="en">Marketing Campaign Id</value> <value xml:lang="es">Campaña</value> <value xml:lang="fr">Réf. de campagne marketing</value> - <value xml:lang="it">Codice Campagna Vendita</value> + <value xml:lang="it">Codice campagna vendita</value> <value xml:lang="nl">ID Campagne</value> <value xml:lang="pt_BR">ID de Campanha de Marketing</value> <value xml:lang="ro">Cod Campanie Vanzare</value> @@ -230,7 +230,7 @@ <value xml:lang="en">Marketing Campaign Report</value> <value xml:lang="es">Informe de campañas de marketing</value> <value xml:lang="fr">Rapport des campagnes de marketing</value> - <value xml:lang="it">Stampe Campagne di Vendita</value> + <value xml:lang="it">Report campagne di vendita</value> <value xml:lang="nl">Campaigne Rapport</value> <value xml:lang="pt_BR">Relatório de campanha de marketing</value> <value xml:lang="ro">Tiparire Campanie de Vanzare</value> @@ -294,7 +294,7 @@ <value xml:lang="en">Contact List</value> <value xml:lang="es">Lista de contactos</value> <value xml:lang="fr">Liste de contacts</value> - <value xml:lang="it">Lista Contatto</value> + <value xml:lang="it">Lista contatti</value> <value xml:lang="nl">Contactenlijst</value> <value xml:lang="pt_BR">Lista de contatos</value> <value xml:lang="ro">Lista Contact</value> @@ -305,7 +305,7 @@ <value xml:lang="en">Create New Contact List Comm Event</value> <value xml:lang="es">Crear evento de comunicación</value> <value xml:lang="fr">Nouvel évènement de communication de la liste de contact</value> - <value xml:lang="it">Creare Nuova Lista Contatto Evento Comunicazione</value> + <value xml:lang="it">Nuovo evento comunicazione della lista contatti</value> <value xml:lang="nl">Nieuwe contactenlijst Comm Event</value> <value xml:lang="pt_BR">Criar envento de comunicação</value> <value xml:lang="ro">Creare Noua Lista Contact Eveniment Comunicatie</value> @@ -342,7 +342,7 @@ <value xml:lang="en">Contact List Id</value> <value xml:lang="es">Código de lista</value> <value xml:lang="fr">Réf. de la liste de contact</value> - <value xml:lang="it">Codice Lista Contatto</value> + <value xml:lang="it">Codice lista contatti</value> <value xml:lang="nl">ID Contactenlijst</value> <value xml:lang="pt_BR">ID de lista de contatos</value> <value xml:lang="ro">Cod Lista Contact</value> @@ -353,7 +353,7 @@ <value xml:lang="en">Contact List Name</value> <value xml:lang="es">Nombre de lista</value> <value xml:lang="fr">Nom de la liste de contact</value> - <value xml:lang="it">Nome Lista Contatto</value> + <value xml:lang="it">Nome lista contatti</value> <value xml:lang="nl">Naam Contactenlijst</value> <value xml:lang="pt_BR">Nome da lista de contatos</value> <value xml:lang="ro">Nume Lista Contact</value> @@ -364,7 +364,7 @@ <value xml:lang="en">Contact List Type Id</value> <value xml:lang="es">Tipo de lista</value> <value xml:lang="fr">Réf. du type de liste de contact</value> - <value xml:lang="it">Tipo Lista Contatto</value> + <value xml:lang="it">Tipo lista contatti</value> <value xml:lang="nl">ID Soort Contactenlijst</value> <value xml:lang="pt_BR">ID do tipo de lista de contato</value> <value xml:lang="ro">Tip Lista Contact</value> @@ -375,7 +375,7 @@ <value xml:lang="en">Contact Mechanism Type Id</value> <value xml:lang="es">Mecanismo de contacto</value> <value xml:lang="fr">Type de mécanisme de contact </value> - <value xml:lang="it">Tipo Contatto</value> + <value xml:lang="it">Tipo di contatti</value> <value xml:lang="nl">ID Soort Contact Mechanism</value> <value xml:lang="pt_BR">ID do tipo de mecanismo de contato</value> <value xml:lang="ro">Tip Contact</value> @@ -386,7 +386,7 @@ <value xml:lang="en">Create New Contact List</value> <value xml:lang="es">Crear nueva lista de contactos</value> <value xml:lang="fr">Nouvelle liste de contact</value> - <value xml:lang="it">Creare Nuova Lista Contatto</value> + <value xml:lang="it">Nuova lista contatti</value> <value xml:lang="nl">Nieuwe Contactenlijst</value> <value xml:lang="pt_BR">Criar nova lista de contatos</value> <value xml:lang="ro">Creare Noua Lista Contact</value> @@ -396,7 +396,7 @@ <property key="MarketingContactListFindContactLists"> <value xml:lang="en">Find Contact Lists</value> <value xml:lang="fr">Rechercher les listes de contact</value> - <value xml:lang="it">Ricerca Liste Contatto</value> + <value xml:lang="it">Ricerca liste contatti</value> <value xml:lang="nl">Zoek Contactenlijst</value> <value xml:lang="pt_BR">Encontrar lista de contato</value> <value xml:lang="ro">Cauta Liste Contact</value> @@ -408,7 +408,7 @@ <value xml:lang="en">Is Public ?</value> <value xml:lang="es">Es pública ?</value> <value xml:lang="fr">Est publique ?</value> - <value xml:lang="it">E' Pubblico ?</value> + <value xml:lang="it">E' pubblica ?</value> <value xml:lang="nl">Openbaar?</value> <value xml:lang="pt_BR">à pública ?</value> <value xml:lang="ro">Este Public ?</value> @@ -419,7 +419,7 @@ <value xml:lang="de">Einmalige Nutzung ?</value> <value xml:lang="en">Is Single Use ?</value> <value xml:lang="fr">Est à usage unique ?</value> - <value xml:lang="it">E' Uso Singolo ?</value> + <value xml:lang="it">E' a singolo uso ?</value> <value xml:lang="nl">Single Use?</value> <value xml:lang="pt_BR">à de uso único ?</value> <value xml:lang="ro">Este pentru un unic utilizatir?</value> @@ -453,7 +453,7 @@ <value xml:lang="en">Owner Party Id</value> <value xml:lang="es">Propietario</value> <value xml:lang="fr">Réf. d'acteur propriétaire</value> - <value xml:lang="it">Codice Soggetto Proprietario</value> + <value xml:lang="it">Codice soggetto proprietario</value> <value xml:lang="nl">ID Manager Contactenlijst</value> <value xml:lang="pt_BR">ID do proprietário</value> <value xml:lang="ro">Cod Subiect Proprietar</value> @@ -464,7 +464,7 @@ <value xml:lang="en">Contact List Party</value> <value xml:lang="es">Participantes</value> <value xml:lang="fr">Abonné à la liste de contact</value> - <value xml:lang="it">Lista Contatti Soggetti</value> + <value xml:lang="it">Membro lista contatti</value> <value xml:lang="nl">Partij Contactlijst</value> <value xml:lang="pt_BR">Participante de Lista de contatos</value> <value xml:lang="ro">Lista Contacte Subiecti</value> @@ -475,7 +475,7 @@ <value xml:lang="en">Create New Contact List Party</value> <value xml:lang="es">Asociar participante</value> <value xml:lang="fr">Créer un nouvel abonné à la liste de contact</value> - <value xml:lang="it">Creare Nuova Lista Contatto Soggetto</value> + <value xml:lang="it">Nuovo membro lista contatti</value> <value xml:lang="nl">Nieuwe Partij Contactenlijst</value> <value xml:lang="pt_BR">Criar novo participante de lista de contatos</value> <value xml:lang="ro">Creare Noua Lista Contact Subiect</value> @@ -487,7 +487,7 @@ <value xml:lang="en">Party Id</value> <value xml:lang="es">Código de participante</value> <value xml:lang="fr">Réf. d'abonné à la liste de contact</value> - <value xml:lang="it">Codice Soggetto</value> + <value xml:lang="it">Codice membro lista contatti</value> <value xml:lang="nl">ID Deelnemer</value> <value xml:lang="pt_BR">ID de participante</value> <value xml:lang="ro">Cod Subiect</value> @@ -498,7 +498,7 @@ <value xml:lang="en">Preferred Contact Mechanism</value> <value xml:lang="es">Mecanismo de contacto</value> <value xml:lang="fr">Mécanisme de contact favori</value> - <value xml:lang="it">Contatto Preferito</value> + <value xml:lang="it">Modo di contatto preferito</value> <value xml:lang="nl">Voorkeur Contact Mechanism</value> <value xml:lang="pt_BR">Mecanismo de contato preferencial</value> <value xml:lang="ro">Contact Preferit</value> @@ -510,7 +510,7 @@ <value xml:lang="en">Verify Email From</value> <value xml:lang="es">E-mail de verificación</value> <value xml:lang="fr">Adresse courriel de vérification</value> - <value xml:lang="it">Verifica Email Da</value> + <value xml:lang="it">Verifica Email da</value> <value xml:lang="nl">Verifieer email van</value> <value xml:lang="pt_BR">Verificação de e-mail de origem</value> <value xml:lang="ro">Verifica Email De la</value> @@ -522,7 +522,7 @@ <value xml:lang="en">Verify Email Screen</value> <value xml:lang="es">Pantalla de verificación</value> <value xml:lang="fr">Ecran de vérification du courriel</value> - <value xml:lang="it">Verifica Email Videata</value> + <value xml:lang="it">Schermo di verifica Email</value> <value xml:lang="nl">Verificatiescherm email</value> <value xml:lang="pt_BR">Tela de verificação de e-mail</value> <value xml:lang="ro">Verifica Email Videata</value> @@ -579,6 +579,7 @@ <property key="MarketingEmailStatusReport"> <value xml:lang="de">E-Mail Statusbericht</value> <value xml:lang="en">Email Status Report</value> + <value xml:lang="it">Report stato e-mail</value> <value xml:lang="pt_BR">Relatório de estado de e-mail</value> </property> <property key="MarketingFindAccounts"> @@ -683,6 +684,7 @@ </property> <property key="MarketingPartyStatusReport"> <value xml:lang="en">Party Status Report</value> + <value xml:lang="it">Report stato soggetti</value> <value xml:lang="pt_BR">Relatório de estado de participante</value> </property> <property key="MarketingReports"> @@ -690,7 +692,7 @@ <value xml:lang="en">Reports</value> <value xml:lang="es">Informes</value> <value xml:lang="fr">Rapports</value> - <value xml:lang="it">Stampe</value> + <value xml:lang="it">Report</value> <value xml:lang="nl">Rapporten</value> <value xml:lang="pt_BR">Relatórios</value> <value xml:lang="ro">Tiparire</value> @@ -740,7 +742,7 @@ <value xml:lang="en">Create New Segment Group</value> <value xml:lang="es">Nuevo segmento</value> <value xml:lang="fr">Créer un nouveau groupe de segment</value> - <value xml:lang="it">Creare Nuovo Gruppo Segmento</value> + <value xml:lang="it">Nuovo gruppo di segmento</value> <value xml:lang="nl">Nieuwe Segmentgroep</value> <value xml:lang="pt_BR">Criar novo grupo de segmento</value> <value xml:lang="ro">Creare Nou Grup Segment</value> @@ -1015,7 +1017,7 @@ <value xml:lang="en">Create Tracking Code</value> <value xml:lang="es">Crear seguimiento</value> <value xml:lang="fr">Nouveau code de suivi</value> - <value xml:lang="it">Creare Codice Tracciatura</value> + <value xml:lang="it">Nuovo codice tracciatura</value> <value xml:lang="nl">Nieuwe Tracking Code</value> <value xml:lang="pt_BR">Criar código de rastreio</value> <value xml:lang="ro">Creare Cod Traseu</value> @@ -1159,7 +1161,7 @@ <value xml:lang="en">Tracking Code Report</value> <value xml:lang="es">Informe de seguimientos</value> <value xml:lang="fr">Rapport de code de suivi</value> - <value xml:lang="it">Stampe Codice Tracciatura</value> + <value xml:lang="it">Report codici tracciatura</value> <value xml:lang="pt_BR">Relatório de código de rastreio</value> <value xml:lang="ro">Tiparire Cod Traseu</value> <value xml:lang="th">รหัส Tracking</value> @@ -1209,7 +1211,7 @@ <value xml:lang="en">Tracking Code Type</value> <value xml:lang="es">Tipo de seguimiento</value> <value xml:lang="fr">Type de code de suivi</value> - <value xml:lang="it">Tipo Codice Tracciatura</value> + <value xml:lang="it">Tipo tracciatura</value> <value xml:lang="pt_BR">Tipo de código de rastreio</value> <value xml:lang="ro">Tip Cod Traseu</value> <value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸£à¸«à¸±à¸ª Tracking</value> @@ -1219,7 +1221,7 @@ <value xml:lang="en">Create Tracking Code Type</value> <value xml:lang="es">Crear tipo de seguimiento</value> <value xml:lang="fr">Nouveau type de code de suivi</value> - <value xml:lang="it">Creare Tipo Tracciatura</value> + <value xml:lang="it">Nuovo tipo tracciatura</value> <value xml:lang="pt_BR">Criar tipo de código de rastreio</value> <value xml:lang="ro">Creare Tip Traseu</value> <value xml:lang="th">สรà¹à¸²à¸à¸à¸£à¸°à¹à¸ à¸à¸£à¸«à¸±à¸ª Tracking</value> @@ -1396,7 +1398,7 @@ <value xml:lang="en">Add New Marketing Campaign</value> <value xml:lang="es">Nueva campaña de marketing</value> <value xml:lang="fr">Ajouter une nouvelle campagne de marketing</value> - <value xml:lang="it">Aggiungi Nuova Campagna Vendita</value> + <value xml:lang="it">Aggiungi nuova campagna di vendita</value> <value xml:lang="pt_BR">Adicionar nova Campanha de Marketing</value> <value xml:lang="ro">Adauga Noua Campanie Marketing</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¹à¸à¸à¸à¸²à¸£à¸à¸¥à¸²à¸à¹à¸«à¸¡à¹</value> @@ -1416,7 +1418,7 @@ <value xml:lang="en">Add New Tracking Code Type</value> <value xml:lang="es">Nuevo tipo de código</value> <value xml:lang="fr">Ajouter un nouveau type de code de suivi</value> - <value xml:lang="it">Aggiungi Nuovo Tipo Tracciatura</value> + <value xml:lang="it">Aggiungi nuovo tipo tracciatura</value> <value xml:lang="pt_BR">Adicionar novo tipo de código de rastreio</value> <value xml:lang="ro">Adauga Noul Tip Traseu</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸£à¸°à¹à¸ à¸à¸£à¸«à¸±à¸ª Tracking à¹à¸«à¸¡à¹</value> @@ -1483,7 +1485,7 @@ <value xml:lang="en">Edit Contact List</value> <value xml:lang="es">Editar lista de contactos</value> <value xml:lang="fr">Modifier la liste de contact</value> - <value xml:lang="it">Aggiorna lista contatto</value> + <value xml:lang="it">Aggiorna lista contatti</value> <value xml:lang="pt_BR">Editar lista de contatos</value> <value xml:lang="ro">Editeaza Lista Contacte</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value> @@ -1503,7 +1505,7 @@ <value xml:lang="en">Edit Contact List Party</value> <value xml:lang="es">Añadir participante</value> <value xml:lang="fr">Modifier l'abonné à la liste de contact</value> - <value xml:lang="it">Aggiorna Lista Contatto Soggetto</value> + <value xml:lang="it">Aggiorna membro lista contatti</value> <value xml:lang="pt_BR">Editar participante de lista de contatos</value> <value xml:lang="ro">Editeaza Lista Contacte Parteneri</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> @@ -1547,7 +1549,7 @@ <value xml:lang="en">Edit Segment Group</value> <value xml:lang="es">Editar segmento</value> <value xml:lang="fr">Modifier le groupe de segment</value> - <value xml:lang="it">Aggiorna Gruppo Segmento</value> + <value xml:lang="it">Aggiorna gruppo segmento</value> <value xml:lang="pt_BR">Editar Grupo de Segmento</value> <value xml:lang="ro">Editeaza Grup Segment</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¹à¸à¹à¸à¸à¸¥à¸¸à¹à¸¡</value> @@ -1607,7 +1609,7 @@ <value xml:lang="en">Edit Tracking Code Type</value> <value xml:lang="es">Editar tipo de seguimiento</value> <value xml:lang="fr">Modifier le type de code de suivi</value> - <value xml:lang="it">Aggiorna Tipo Tracciatura</value> + <value xml:lang="it">Aggiorna tipo tracciatura</value> <value xml:lang="pt_BR">Editar tipo de código de rastreio</value> <value xml:lang="ro">Editeaza Tip Traseu</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸£à¸°à¹à¸ à¸à¸£à¸«à¸±à¸ª Tracking</value> @@ -1637,7 +1639,7 @@ <value xml:lang="en">Find Associated CommEvents</value> <value xml:lang="es">Buscar eventos asociados</value> <value xml:lang="fr">Rechercher les évènements de communication associés</value> - <value xml:lang="it">Ricerca Associazioni Eventi Comunicazioni</value> + <value xml:lang="it">Ricerca eventi comunicazione associati</value> <value xml:lang="pt_BR">Buscar Eventos de comunicação associados</value> <value xml:lang="ro">Cauta Asociatii Evenimente de Comunicare</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸µà¹à¸ªà¸±à¸¡à¸à¸±à¸à¸à¹à¸à¸±à¸</value> @@ -1647,7 +1649,7 @@ <value xml:lang="en">Find Contact List Parties</value> <value xml:lang="es">Buscar participantes</value> <value xml:lang="fr">Rechercher les abonnés à la liste de contact</value> - <value xml:lang="it">Ricerca Lista Contatto Soggetti</value> + <value xml:lang="it">Ricerca membri della lista contatti</value> <value xml:lang="pt_BR">Buscar participantes na lsita de contatos</value> <value xml:lang="ro">Cauta Lista Contact Parteneri</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> @@ -1742,7 +1744,7 @@ <value xml:lang="en">List Contact List Parties</value> <value xml:lang="es">Mostrar participantes</value> <value xml:lang="fr">Liste des abonnés à la liste de contact</value> - <value xml:lang="it">Visualizza Lista Contatti Soggetti</value> + <value xml:lang="it">Elenco membri della lista contatti</value> <value xml:lang="pt_BR">Listar participantes da lista de contatos</value> <value xml:lang="ro">Visualizeaza Lista Contacte Subiecti</value> <value xml:lang="th">ลà¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> @@ -1752,7 +1754,7 @@ <value xml:lang="en">List Marketing Campaign</value> <value xml:lang="es">Mostrar campañas de marketing</value> <value xml:lang="fr">Liste des campagnes marketing</value> - <value xml:lang="it">Lista Campagna Vendita</value> + <value xml:lang="it">Lista campagne di vendita</value> <value xml:lang="pt_BR">Listar Campanhas de Marketing</value> <value xml:lang="ro">Lista Campanie Marketing</value> <value xml:lang="th">รายà¸à¸²à¸£à¹à¸à¸à¸à¸²à¸£à¸à¸¥à¸²à¸</value> @@ -1792,7 +1794,7 @@ <value xml:lang="en">List Tracking Code</value> <value xml:lang="es">Mostrar seguimientos</value> <value xml:lang="fr">Liste des codes de suivi</value> - <value xml:lang="it">Lista Codice Tracciatura</value> + <value xml:lang="it">Lista codici tracciatura</value> <value xml:lang="pt_BR">Listar códigos de rastreio</value> <value xml:lang="ro">Lista Cod Traseu</value> <value xml:lang="th">รายà¸à¸²à¸£à¸£à¸«à¸±à¸ª Tracking</value> @@ -1832,7 +1834,7 @@ <value xml:lang="en">List Tracking Code Type</value> <value xml:lang="es">Editar tipo de seguimiento</value> <value xml:lang="fr">Liste des types de code de suivi</value> - <value xml:lang="it">Lista Tipo Tracciatura</value> + <value xml:lang="it">Lista tipi tracciatura</value> <value xml:lang="pt_BR">Listar tipo de código de rastreio</value> <value xml:lang="ro">Lista Tip Traseu</value> <value xml:lang="th">รายà¸à¸²à¸£à¸£à¸«à¸±à¸ª Tracking à¸à¸£à¸°à¹à¸ à¸</value> @@ -1908,7 +1910,7 @@ <value xml:lang="en">Lookup Tracking Code Type</value> <value xml:lang="es">Buscar tipo de seguimiento</value> <value xml:lang="fr">Consulter le type de code de suivi</value> - <value xml:lang="it">Ricerca Tipo Tracciatura</value> + <value xml:lang="it">Ricerca tipo tracciatura</value> <value xml:lang="pt_BR">Buscar por tipo de código de rastreio</value> <value xml:lang="ro">Cauta Tip Traseu</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¹à¸à¸¡à¸¹à¸¥à¸£à¸«à¸±à¸ª Tracking à¸à¸£à¸°à¹à¸ à¸</value> Modified: ofbiz/branches/multitenant20100310/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl Wed Mar 24 09:23:07 2010 @@ -26,7 +26,7 @@ under the License. From: ${(contactMech.infoString)!} Subject: ${(communicationEvent.subject)!} </pre> - <hr/> + <hr /> ${StringUtil.wrapString(communicationEvent.content)!} </body> Modified: ofbiz/branches/multitenant20100310/applications/marketing/webapp/sfa/contact/mergeContacts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/webapp/sfa/contact/mergeContacts.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/webapp/sfa/contact/mergeContacts.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/webapp/sfa/contact/mergeContacts.ftl Wed Mar 24 09:23:07 2010 @@ -37,10 +37,10 @@ under the License. <table > <tr width="100%"> <td width="20%" ></td> - <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br/></b></td> - <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br/></b></td> + <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br /></b></td> + <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br /></b></td> <td width="20%"><h2>${uiLabelMap.CommonSelect}</h2></td> - <br/><br/> + <br /><br /> </tr> <tr width="100%"> <td width="20%">${uiLabelMap.PartyFirstName}</td> @@ -53,9 +53,9 @@ under the License. <td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td> <td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td> <td width="20%"></td> - </tr><br/> + </tr><br /> <tr> - <td width="30"><br/><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td> + <td width="30"><br /><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td> <td width="30"></td> <tr> <td width="20%" >${uiLabelMap.PartyAddressLine1}</td> @@ -94,8 +94,8 @@ under the License. <td width="30%">${contactInfo1.country?if_exists}</td> <td width="30%">${contactInfo2.country?if_exists}</td> <td width="20%"></td> - </tr><br/> - <tr><td><br/><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr> + </tr><br /> + <tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr> <tr> <td width="20%">${uiLabelMap.PartyCountryCode}</td> <td width="30%">${contactInfo1.countryCode?if_exists}</td> @@ -121,7 +121,7 @@ under the License. <td width="10%"><input type="checkbox" name="useEmail2" value="Y"/></td> </tr> <tr> - <td colspan="4" align="center"><br/> + <td colspan="4" align="center"><br /> <input type="submit" value="${uiLabelMap.CommonSubmit}"/> </td> </tr> Modified: ofbiz/branches/multitenant20100310/applications/marketing/webapp/sfa/lead/mergeLeads.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Wed Mar 24 09:23:07 2010 @@ -41,10 +41,10 @@ under the License. <table > <tr width="100%"> <td width="20%" ></td> - <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br/></b></td> - <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br/></b></td> + <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br /></b></td> + <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br /></b></td> <td width="20%"><h2>${uiLabelMap.CommonSelect}</h2></td> - <br/><br/> + <br /><br /> </tr> <tr width="100%"> <td width="20%">${uiLabelMap.PartyFirstName}</td> @@ -57,9 +57,9 @@ under the License. <td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td> <td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td> <td width="20%"></td> - </tr><br/> + </tr><br /> <tr> - <td width="30"><br/><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td> + <td width="30"><br /><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td> <td width="30"></td> <tr> <td width="20%" >${uiLabelMap.PartyAddressLine1}</td> @@ -98,8 +98,8 @@ under the License. <td width="30%">${contactInfo1.country?if_exists}</td> <td width="30%">${contactInfo2.country?if_exists}</td> <td width="20%"></td> - </tr><br/> - <tr><td><br/><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr> + </tr><br /> + <tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr> <tr> <td width="20%">${uiLabelMap.PartyCountryCode}</td> <td width="30%">${contactInfo1.countryCode?if_exists}</td> @@ -125,7 +125,7 @@ under the License. <td width="10%"><input type="checkbox" name="useEmail2" value="Y"/></td> </tr> <tr> - <td colspan="4" align="center"><br/> + <td colspan="4" align="center"><br /> <input type="submit" value="${uiLabelMap.CommonSubmit}"/> </td> </tr> Modified: ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListForms.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListForms.xml (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListForms.xml Wed Mar 24 09:23:07 2010 @@ -81,10 +81,10 @@ under the License. <!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> --> </form> - <form name="FindContactLists" target="ListContactLists" title="" type="single" + <form name="FindContactLists" target="FindContactLists" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text size="20" maxlength="20"/></field> + <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text-find ignore-case="true"/></field> <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text-find/></field> <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"> <drop-down allow-empty="true"> @@ -173,7 +173,7 @@ under the License. </form> - <form name="FindContactListParties" type="single" target="ListContactListParties" title="" + <form name="FindContactListParties" type="single" target="FindContactListParties" title="" header-row-style="header-row" default-table-style="basic-table"> <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text-find/></field> <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field> Modified: ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListMenus.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListMenus.xml (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListMenus.xml Wed Mar 24 09:23:07 2010 @@ -22,17 +22,17 @@ under the License. <menu name="ContactListTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="ContactList" selected-menuitem-context-field-name="contactListTabButtonItem"> <menu-item name="ContactList" title="${uiLabelMap.MarketingContactList}"> - <link target="/EditContactList"> + <link target="EditContactList"> <parameter param-name="contactListId"/> </link> </menu-item> <menu-item name="ContactListParty" title="${uiLabelMap.PartyParties}"> - <link target="/FindContactListParties"> + <link target="FindContactListParties"> <parameter param-name="contactListId"/> </link> </menu-item> <menu-item name="ContactListCommEvent" title="${uiLabelMap.PartyCommEvents}"> - <link target="/FindContactListCommEvents"> + <link target="FindContactListCommEvents"> <parameter param-name="contactListId"/> </link> </menu-item> Modified: ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListScreens.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListScreens.xml Wed Mar 24 09:23:07 2010 @@ -25,21 +25,30 @@ under the License. <section> <actions> <set field="titleProperty" value="MarketingContactListFindContactLists"/> + <set field="headerItem" value="ContactList"/> + <set field="tabButtonItem" value="ContactList"/> <set field="contactListTabButtonItem" value="ContactList"/> <set field="labelTitleProperty" value="PageTitleFindContactLists"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/FindContactList"/> </actions> <widgets> - <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.MarketingContactListFindContactLists}"> - <container> - <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="FindContactLists" location="component://marketing/widget/ContactListForms.xml"/> - </screenlet> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="menu-bar"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext create"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> + </container> + </decorator-section> + <decorator-section name="search-options"> + <include-form name="FindContactLists" location="component://marketing/widget/ContactListForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListContactLists" location="component://marketing/widget/ContactListForms.xml"/> + </decorator-section> + </decorator-screen> </decorator-section> </decorator-screen> </widgets> @@ -66,8 +75,8 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleEditContactList}"> - <container> - <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext create"> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> </container> @@ -143,8 +152,8 @@ under the License. <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditContactListParty}"> - <container> - <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty" style="buttontext create"> <parameter param-name="contactListId"/> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> @@ -209,15 +218,22 @@ under the License. <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleFindContactListParty}"> - <container> - <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty"> - <parameter param-name="contactListId"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="FindContactListParties" location="component://marketing/widget/ContactListForms.xml"/> - </screenlet> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="menu-bar"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty" style="buttontext create"> + <parameter param-name="contactListId"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> + </container> + </decorator-section> + <decorator-section name="search-options"> + <include-form name="FindContactListParties" location="component://marketing/widget/ContactListForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListContactListParties" location="component://marketing/widget/ContactListForms.xml"/> + </decorator-section> + </decorator-screen> </decorator-section> </decorator-screen> </widgets> @@ -252,8 +268,8 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditContactList}"> <include-menu location="component://marketing/widget/ContactListMenus.xml" name="ContactListCommBar"/> - <container> - <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent" style="buttontext create"> <parameter param-name="contactListId"/> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> @@ -310,8 +326,8 @@ under the License. <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleFindContactListCommEvents}"> - <container> - <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent" style="buttontext create"> <parameter param-name="contactListId"/> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> Modified: ofbiz/branches/multitenant20100310/applications/marketing/widget/DataSourceMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/widget/DataSourceMenus.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/widget/DataSourceMenus.xml (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/widget/DataSourceMenus.xml Wed Mar 24 09:23:07 2010 @@ -22,10 +22,10 @@ under the License. <menu name="DataSourceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="DataSource" selected-menuitem-context-field-name="dataSourceTabButtonItem"> <menu-item name="DataSource" title="${uiLabelMap.DataSource}"> - <link target="/FindDataSource"/> + <link target="FindDataSource"/> </menu-item> <menu-item name="DataSourceType" title="${uiLabelMap.DataSourceType}"> - <link target="/FindDataSourceType"/> + <link target="FindDataSourceType"/> </menu-item> </menu> </menus> Modified: ofbiz/branches/multitenant20100310/applications/marketing/widget/DataSourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/widget/DataSourceScreens.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/widget/DataSourceScreens.xml (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/widget/DataSourceScreens.xml Wed Mar 24 09:23:07 2010 @@ -80,8 +80,8 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleEditDataSource}"> - <container> - <link text="${uiLabelMap.DataSourceCreate}" target="/EditDataSource" style="buttontext"> + <container style="button-bar"> + <link text="${uiLabelMap.DataSourceCreate}" target="EditDataSource" style="buttontext create"> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> </container> @@ -115,8 +115,8 @@ under the License. <decorator-screen name="CommonDataSourceDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleListDataSource}"> - <container> - <link text="${uiLabelMap.DataSourceCreate}" target="/EditDataSource" style="buttontext"> + <container style="button-bar"> + <link text="${uiLabelMap.DataSourceCreate}" target="EditDataSource" style="buttontext create"> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> </container> @@ -148,8 +148,8 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleEditDataSourceType}"> - <container> - <link text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType" style="buttontext"> + <container style="button-bar"> + <link text="${uiLabelMap.DataSourceTypeCreate}" target="EditDataSourceType" style="buttontext create"> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> </container> @@ -184,8 +184,8 @@ under the License. <decorator-screen name="CommonDataSourceDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleListDataSourceType}"> - <container> - <link text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType" style="buttontext"> + <container style="button-bar"> + <link text="${uiLabelMap.DataSourceTypeCreate}" target="EditDataSourceType" style="buttontext create"> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> </container> Modified: ofbiz/branches/multitenant20100310/applications/marketing/widget/MarketingCampaignMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/widget/MarketingCampaignMenus.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/widget/MarketingCampaignMenus.xml (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/widget/MarketingCampaignMenus.xml Wed Mar 24 09:23:07 2010 @@ -22,12 +22,12 @@ under the License. <menu name="MarketingCampaignTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="MarketingCampaign" selected-menuitem-context-field-name="campaignTabButtonItem"> <menu-item name="MarketingCampaign" title="${uiLabelMap.MarketingCampaign}"> - <link target="/EditMarketingCampaign"> + <link target="EditMarketingCampaign"> <parameter param-name="marketingCampaignId"/> </link> </menu-item> <menu-item name="MarketingCampaignRole" title="${uiLabelMap.PartyRoles}"> - <link target="/ListMarketingCampaignRoles"> + <link target="ListMarketingCampaignRoles"> <parameter param-name="marketingCampaignId"/> </link> </menu-item> Modified: ofbiz/branches/multitenant20100310/applications/marketing/widget/MarketingCampaignScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/widget/MarketingCampaignScreens.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/widget/MarketingCampaignScreens.xml (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/widget/MarketingCampaignScreens.xml Wed Mar 24 09:23:07 2010 @@ -84,8 +84,8 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleEditMarketingCampaign}"> - <container> - <link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign" style="buttontext"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingCampaignCreate}" target="EditMarketingCampaign" style="buttontext create"> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> </container> @@ -118,8 +118,8 @@ under the License. <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleListMarketingCampaign}"> - <container> - <link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign" style="buttontext"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingCampaignCreate}" target="EditMarketingCampaign" style="buttontext create"> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> </container> @@ -148,8 +148,8 @@ under the License. <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditMarketingCampaignRole}"> - <container> - <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="EditMarketingCampaignRoles" style="buttontext create"> <parameter param-name="marketingCampaignId"/> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> @@ -176,8 +176,8 @@ under the License. <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleListMarketingCampaignRole}"> - <container> - <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="EditMarketingCampaignRoles" style="buttontext create"> <parameter param-name="marketingCampaignId"/> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> Modified: ofbiz/branches/multitenant20100310/applications/marketing/widget/SegmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/widget/SegmentScreens.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/widget/SegmentScreens.xml (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/widget/SegmentScreens.xml Wed Mar 24 09:23:07 2010 @@ -49,7 +49,9 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleFindSegmentGroup}"> - <container><link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext create"/> + </container> <include-form name="FindSegmentGroup" location="component://marketing/widget/SegmentForms.xml"/> </screenlet> </widgets> @@ -98,7 +100,9 @@ under the License. <section> <condition><not><if-empty field="segmentGroupId"/></not></condition> <widgets> - <container><link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext create"/> + </container> </widgets> </section> <decorator-section-include name="body"/> Modified: ofbiz/branches/multitenant20100310/applications/marketing/widget/TrackingCodeMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/widget/TrackingCodeMenus.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/widget/TrackingCodeMenus.xml (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/widget/TrackingCodeMenus.xml Wed Mar 24 09:23:07 2010 @@ -22,7 +22,7 @@ under the License. <menu name="TrackingCodeTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="TrackingCode" selected-menuitem-context-field-name="trackingCodeTabButtonItem"> <menu-item name="TrackingCode" title="${uiLabelMap.MarketingTrackingCode}"> - <link target="/FindTrackingCode"/> + <link target="FindTrackingCode"/> </menu-item> <menu-item name="TrackingCodeOrder" title="${uiLabelMap.MarketingTrackingCodeOrder}"> <condition> @@ -30,7 +30,7 @@ under the License. <if-empty field="trackingCodeId"/> </not> </condition> - <link target="/FindTrackingCodeOrders"> + <link target="FindTrackingCodeOrders"> <parameter param-name="trackingCodeId"/> </link> </menu-item> @@ -40,12 +40,12 @@ under the License. <if-empty field="trackingCodeId"/> </not> </condition> - <link target="/FindTrackingCodeVisits"> + <link target="FindTrackingCodeVisits"> <parameter param-name="trackingCodeId"/> </link> </menu-item> <menu-item name="TrackingCodeType" title="${uiLabelMap.MarketingTrackingCodeType}"> - <link target="/FindTrackingCodeType"/> + <link target="FindTrackingCodeType"/> </menu-item> </menu> </menus> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/applications/marketing/widget/TrackingCodeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/marketing/widget/TrackingCodeScreens.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/marketing/widget/TrackingCodeScreens.xml (original) +++ ofbiz/branches/multitenant20100310/applications/marketing/widget/TrackingCodeScreens.xml Wed Mar 24 09:23:07 2010 @@ -30,7 +30,7 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> + <decorator-section name="pre-body"> <section> <!-- do check for MARKETING, _VIEW permission --> <condition> @@ -42,7 +42,16 @@ under the License. <include-menu name="TrackingCodeTabBar" location="component://marketing/widget/TrackingCodeMenus.xml"/> </widgets> </section> - + </widgets> + </section> + </decorator-section> + <decorator-section name="body"> + <section> + <!-- do check for MARKETING, _VIEW permission --> + <condition> + <if-has-permission permission="MARKETING" action="_VIEW"/> + </condition> + <widgets> <decorator-section-include name="body"/> </widgets> <fail-widgets> @@ -109,8 +118,8 @@ under the License. <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleListTrackingCode}"> - <container> - <link text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode" style="buttontext"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode" style="buttontext create"> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> </container> @@ -346,8 +355,8 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleEditTrackingCodeType}"> - <container> - <link text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType" style="buttontext"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType" style="buttontext create"> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> </container> @@ -381,8 +390,8 @@ under the License. <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleListTrackingCodeType}"> - <container> - <link text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType" style="buttontext"> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType" style="buttontext create"> <parameter param-name="DONE_PAGE" from-field="donePage"/> </link> </container> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |