how about the entities that support the login. if you don't load party they don't get loaded. UserLogin, UserLoginHistory, Visits
========================= BJ Freeman Strategic Power Office with Supplier Automation <http://www.businessesnetwork.com/automation/viewforum.php?f=52> Specialtymarket.com <http://www.specialtymarket.com/> Systems Integrator-- Glad to Assist Chat Y! messenger: bjfr33man adri...@apache.org sent the following on 12/18/2010 10:07 PM:
Author: adrianc Date: Sun Dec 19 06:07:53 2010 New Revision: 1050766 URL: http://svn.apache.org/viewvc?rev=1050766&view=rev Log: Moved user login UI artifacts from the Party component to the Common component. Added: ofbiz/trunk/framework/common/config/SecurityUiLabels.xml (with props) ofbiz/trunk/framework/common/widget/SecurityForms.xml (with props) ofbiz/trunk/framework/common/widget/SecurityScreens.xml (with props) Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=1050766&r1=1050765&r2=1050766&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sun Dec 19 06:07:53 2010 @@ -256,36 +256,6 @@ <value xml:lang="zh">å½å®¶</value> <value xml:lang="zh_TW">å家</value> </property> -<property key="FormFieldTitle_currentPassword"> -<value xml:lang="de">Aktuelles Passwort</value> -<value xml:lang="en">Current Password</value> -<value xml:lang="es">Clave actual</value> -<value xml:lang="fr">Mot de passe actuel</value> -<value xml:lang="hi_IN">वरà¥à¤¤à¤®à¤¾à¤¨ पासवरà¥à¤¡</value> -<value xml:lang="it">Password Attuale</value> -<value xml:lang="nl">Huidig wachtwoord</value> -<value xml:lang="pt_BR">Senha atual</value> -<value xml:lang="ro">Parola Actuala</value> -<value xml:lang="ru">ÐейÑÑвÑÑÑий паÑолÑ</value> -<value xml:lang="th">รหัสà¸à¹à¸²à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸</value> -<value xml:lang="zh">å½åå¯ç </value> -<value xml:lang="zh_TW">ç®åå¯ç¢¼</value> -</property> -<property key="FormFieldTitle_currentPasswordVerify"> -<value xml:lang="de">Ãberprüfung des aktuellen Passworts</value> -<value xml:lang="en">Current Password Verify</value> -<value xml:lang="es">Verificar clave actual</value> -<value xml:lang="fr">Vérification du mot de passe actuel</value> -<value xml:lang="hi_IN">वरà¥à¤¤à¤®à¤¾à¤¨ पासवरà¥à¤¡ सतà¥à¤¯à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤</value> -<value xml:lang="it">Password Attuale Verifica</value> -<value xml:lang="nl">Verificatie huidig wachtwoord</value> -<value xml:lang="pt_BR">Verificação da senha atual</value> -<value xml:lang="ro">Verifica Parola Actuala</value> -<value xml:lang="ru">ÐейÑÑвÑÑÑий паÑÐ¾Ð»Ñ Ð¿Ð¾Ð²ÑоÑно</value> -<value xml:lang="th">ยืà¸à¸¢à¸±à¸à¸£à¸«à¸±à¸ªà¸à¹à¸²à¸</value> -<value xml:lang="zh">å½åå¯ç éªè¯</value> -<value xml:lang="zh_TW">ç®åå¯ç¢¼é©è¨¼</value> -</property> <property key="FormFieldTitle_deceasedDate"> <value xml:lang="en">Deceased Date</value> <value xml:lang="fr">Date de décès</value> @@ -726,35 +696,6 @@ <value xml:lang="zh">æ¯äº²æªå©æ¶åå</value> <value xml:lang="zh_TW">æ¯è¦ªå¨å®¶å§æ°</value> </property> -<property key="FormFieldTitle_newPassword"> -<value xml:lang="de">Neues Passwort</value> -<value xml:lang="en">New Password</value> -<value xml:lang="es">Nueva clave</value> -<value xml:lang="fr">Nouveau mot de passe</value> -<value xml:lang="hi_IN">नया पासवरà¥à¤¡</value> -<value xml:lang="it">Password Nuova</value> -<value xml:lang="nl">Nieuw wachtwoord</value> -<value xml:lang="pt_BR">Nova senha</value> -<value xml:lang="ro">Parola Noua</value> -<value xml:lang="ru">ÐовÑй паÑолÑ</value> -<value xml:lang="th">รหัสà¸à¹à¸²à¸à¹à¸«à¸¡à¹</value> -<value xml:lang="zh">æ°å¯ç </value> -<value xml:lang="zh_TW">æ°å¯ç¢¼</value> -</property> -<property key="FormFieldTitle_newPasswordVerify"> -<value xml:lang="de">Ãberprüfung neues Passwort</value> -<value xml:lang="en">New Password Verify</value> -<value xml:lang="es">Validar nueva clave</value> -<value xml:lang="fr">Vérification du nouveau mot de passe</value> -<value xml:lang="hi_IN">नया पासवरà¥à¤¡ सतà¥à¤¯à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤</value> -<value xml:lang="it">Verifica Password Nuova</value> -<value xml:lang="pt_BR">Verificação da nova senha</value> -<value xml:lang="ro">Verifica Parola Noua</value> -<value xml:lang="ru">ÐовÑй паÑÐ¾Ð»Ñ Ð¿Ð¾Ð²ÑоÑно</value> -<value xml:lang="th">ยืà¸à¸¢à¸±à¸à¸£à¸«à¸±à¸ªà¸à¹à¸²à¸à¹à¸«à¸¡à¹</value> -<value xml:lang="zh">æ°å¯ç éªè¯</value> -<value xml:lang="zh_TW">æ°å¯ç¢¼é©è¨¼</value> -</property> <property key="FormFieldTitle_nickname"> <value xml:lang="de">Spitzname</value> <value xml:lang="en">Nickname</value> @@ -1307,15 +1248,6 @@ <value xml:lang="zh">ç¨é缺çéé¢</value> <value xml:lang="zh_TW">ç¨ éé è¨éé¡</value> </property> -<property key="FormFieldTitle_requirePasswordChange"> -<value xml:lang="en">Require Password Change</value> -<value xml:lang="fr">Changement mot de passe obligatoire</value> -<value xml:lang="hi_IN">पासवरà¥à¤¡ परिवरà¥à¤¤à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤¨à¤¾ à¤à¤¾à¤¹à¤¿à¤</value> -<value xml:lang="it">Richiesto cambio password</value> -<value xml:lang="pt_BR">Pedir alteração de senha</value> -<value xml:lang="zh">å¿ é¡»ä¿®æ¹å¯ç </value> -<value xml:lang="zh_TW">å¿ é ä¿®æ¹å¯ç¢¼</value> -</property> <property key="FormFieldTitle_residenceStatusEnumId"> <value xml:lang="de">Wohnsitzstatus Aufzählung ID</value> <value xml:lang="en">Residence Status Enum Id</value> @@ -1610,33 +1542,6 @@ <value xml:lang="zh">å·¥ä½ç»åå¹´æ°å计</value> <value xml:lang="zh_TW">å·¥ä½å¹´è³</value> </property> -<property key="FormFieldTitle_userLdapDn"> -<value xml:lang="de">LDAP Distinguished Name</value> -<value xml:lang="en">LDAP Distinguished Name</value> -<value xml:lang="es">Nombre distinguido LDAP</value> -<value xml:lang="fr">Nom LDAP distinct</value> -<value xml:lang="hi_IN">à¤à¤²à¤¡à¥à¤à¤ªà¥(LDAP) विशिषà¥à¤ नाम</value> -<value xml:lang="it">Nome distinto LDAP</value> -<value xml:lang="nl">LDAP Distinguished Name</value> -<value xml:lang="pt_BR">Nome único de LDAP</value> -<value xml:lang="zh">LDAPä¸æå</value> -<value xml:lang="zh_TW">LDAPå°æå</value> -</property> -<property key="FormFieldTitle_userLoginId"> -<value xml:lang="de">Benutzeranmeldung ID</value> -<value xml:lang="en">User Login Id</value> -<value xml:lang="es">Código de usuario para conexión</value> -<value xml:lang="fr">Identifiant de connexion</value> -<value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ लà¥à¤à¤¿à¤¨ à¤à¥à¤°à¤®à¤¾à¤à¤</value> -<value xml:lang="it">Utente login</value> -<value xml:lang="nl">Loginnaam gebruiker</value> -<value xml:lang="pt_BR">Id de login do usuário</value> -<value xml:lang="ro">Utilizator Login</value> -<value xml:lang="ru">Ðод имени полÑзоваÑелÑ</value> -<value xml:lang="th">รหัสà¸à¸¹à¹à¹à¸à¹à¸à¸µà¹à¹à¸à¹à¸²à¸ªà¸¹à¹à¸£à¸°à¸à¸</value> -<value xml:lang="zh">ç¨æ·ç»å½æ è¯</value> -<value xml:lang="zh_TW">使ç¨è ç»å ¥ID</value> -</property> <property key="FormFieldTitle_viewContent"> <value xml:lang="de">Inhalt anzeigen</value> <value xml:lang="en">View Content</value> @@ -5126,21 +5031,6 @@ <value xml:lang="zh">ä»æ²éäºä»¶å建客æ·éæ±</value> <value xml:lang="zh_TW">å¾éè¨äºä»¶å»ºç«å®¢è¨´</value> </property> -<property key="PartyCreateUserLogin"> -<value xml:lang="de">Benutzeranmeldung erstellen</value> -<value xml:lang="en">Create UserLogin</value> -<value xml:lang="es">Crear usuario</value> -<value xml:lang="fr">Création d'un identifiant de connexion</value> -<value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨ बनाà¤à¤</value> -<value xml:lang="it">Creare Utente</value> -<value xml:lang="nl">Nieuwe gebruiker</value> -<value xml:lang="pt_BR">Criar nome usuário</value> -<value xml:lang="ro">Creare Utilizator</value> -<value xml:lang="ru">СоздаÑÑ Ð¸Ð¼Ñ Ð²Ñ Ð¾Ð´Ð°</value> -<value xml:lang="th">สรà¹à¸²à¸à¸à¸¹à¹à¹à¸à¹à¸£à¸°à¸à¸</value> -<value xml:lang="zh">å建ç¨æ·ç»å½</value> -<value xml:lang="zh_TW">建ç«ä½¿ç¨è ç»å ¥</value> -</property> <property key="PartyCreateVendorPermissionError"> <value xml:lang="de">Sicherheitsfehler: um createVendor auszuführen müssen Sie die Berechtigung PARTYMGR_CREATE oder PARTYMGR_ADMIN besitzen</value> <value xml:lang="en">Security Error: to run createVendor you must have the PARTYMGR_CREATE or PARTYMGR_ADMIN permission</value> @@ -10050,22 +9940,6 @@ <value xml:lang="zh">å®å ¨ç»</value> <value xml:lang="zh_TW">å®å ¨ç¾¤çµ</value> </property> -<property key="PartySecurityGroups"> -<value xml:lang="de">Sicherheitsgruppen</value> -<value xml:lang="en">Security Groups</value> -<value xml:lang="es">Grupos de seguridad</value> -<value xml:lang="fr">Groupes de sécurité</value> -<value xml:lang="hi_IN">सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹</value> -<value xml:lang="it">Gruppi Sicurezza</value> -<value xml:lang="nl">Beveiligingsgroepen</value> -<value xml:lang="pt_BR">Grupos de segurança</value> -<value xml:lang="pt_PT">Grupos de Segurança</value> -<value xml:lang="ro">Grupuri De Siguranta</value> -<value xml:lang="ru">ÐÑÑÐ¿Ð¿Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи</value> -<value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัย</value> -<value xml:lang="zh">å®å ¨ç»</value> -<value xml:lang="zh_TW">å®å ¨ç¾¤çµ</value> -</property> <property key="PartySecurityGroupsList"> <value xml:lang="de">Liste der Sicherheitsgruppen</value> <value xml:lang="en">SecurityGroups List</value> @@ -11242,21 +11116,6 @@ <value xml:lang="zh">ç¨æ·ç»å½</value> <value xml:lang="zh_TW">ç¨æ¶ç»é</value> </property> -<property key="PartyUserLoginChangePassword"> -<value xml:lang="de">Passwort der Benutzeranmeldung ändern</value> -<value xml:lang="en">Change UserLogin Password</value> -<value xml:lang="es">Cambiar clave de conexión</value> -<value xml:lang="fr">Changer le mot de passe de connexion</value> -<value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨ à¤à¤¾ पासवरà¥à¤¡ बदलà¥à¤</value> -<value xml:lang="it">Cambio Password Utente Login</value> -<value xml:lang="nl">Wachtwoord wijzigen</value> -<value xml:lang="pt_BR">Alterar senha do nome de usuário</value> -<value xml:lang="ro">Schimb Parola Utilizator Login</value> -<value xml:lang="ru">Ðзменение паÑÐ¾Ð»Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ</value> -<value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¸£à¸«à¸±à¸ªà¸à¹à¸²à¸à¸à¸¹à¹à¹à¸à¹à¸²à¹à¸à¹à¸£à¸°à¸à¸</value> -<value xml:lang="zh">ä¿®æ¹ç¨æ·ç»å½å¯ç </value> -<value xml:lang="zh_TW">ä¿®æ¹ç¨æ¶ç»éå¯ç¢¼</value> -</property> <property key="PartyUserLoginId"> <value xml:lang="de">Benutzeranmeldung ID</value> <value xml:lang="en">User Login Id</value> @@ -11291,20 +11150,6 @@ <value xml:lang="zh">æ¾ä¸å°ç¨æ·å</value> <value xml:lang="zh_TW">æ¾ä¸å°ä½¿ç¨è å稱</value> </property> -<property key="PartyUserLoginUpdateSecuritySettings"> -<value xml:lang="de">Benutzeranmeldung Sicherheitsberechtigungen aktualisieren</value> -<value xml:lang="en">Update UserLogin Security Settings</value> -<value xml:lang="fr">Mise à jour des paramètres de sécurité pour l'identifiant de connexion</value> -<value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ लà¥à¤à¤¿à¤¨ सà¥à¤°à¤à¥à¤·à¤¾ सà¥à¤à¤¿à¤à¤à¥à¤¸ नवà¥à¤¨à¤¤à¤® à¤à¤°à¥</value> -<value xml:lang="it">Aggiorna Impostazioni Sicurezza Utente Login</value> -<value xml:lang="nl">UserLogin Security Settings wijzigen</value> -<value xml:lang="pt_BR">Atualizar configurações de segurança do nome de usuário</value> -<value xml:lang="ro">Actualizare Setari De Siguranta Utilizator Login</value> -<value xml:lang="ru">Ðбновление наÑÑÑоек безопаÑноÑÑи полÑзоваÑелÑ</value> -<value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸à¸²à¸£à¸à¸±à¹à¸à¸à¹à¸²à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸à¸à¸à¸¹à¹à¹à¸à¹à¸²à¹à¸à¹à¸£à¸°à¸à¸</value> -<value xml:lang="zh">æ´æ°ç¨æ·ç»å½å®å ¨è®¾ç½®</value> -<value xml:lang="zh_TW">æ´æ°ç¨æ¶ç»éå®å ¨è¨ç½®</value> -</property> <property key="PartyUserLogins"> <value xml:lang="de">Benutzeranmeldungen</value> <value xml:lang="en">User Logins</value> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl?rev=1050766&r1=1050765&r2=1050766&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl Sun Dec 19 06:07:53 2010 @@ -51,7 +51,7 @@ under the License. <a href="<@ofbizUrl>editlogin?partyId=${party.partyId}&userLoginId=${userUserLogin.userLoginId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> </#if> <#if security.hasEntityPermission("SECURITY", "_VIEW", session)> -<a href="<@ofbizUrl>EditUserLoginSecurityGroups?partyId=${party.partyId}&userLoginId=${userUserLogin.userLoginId}</@ofbizUrl>">${uiLabelMap.PartySecurityGroups}</a> +<a href="<@ofbizUrl>EditUserLoginSecurityGroups?partyId=${party.partyId}&userLoginId=${userUserLogin.userLoginId}</@ofbizUrl>">${uiLabelMap.SecurityGroups}</a> </#if> </td> </tr> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=1050766&r1=1050765&r2=1050766&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sun Dec 19 06:07:53 2010 @@ -58,7 +58,7 @@ under the License. <screen name="CommonPartyDecorator"> <section> <actions> - +<property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/> <set field="partyId" from-field="parameters.partyId"/> <entity-one entity-name="Party" value-field="party"/> <entity-one entity-name="Person" value-field="lookupPerson"/> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=1050766&r1=1050765&r2=1050766&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sun Dec 19 06:07:53 2010 @@ -39,7 +39,7 @@ <menu name="SecurityGroupTabBar" default-menu-item-name="EditSecurityGroup" default-selected-style="selected" menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem"> -<menu-item name="EditSecurityGroup" title="${uiLabelMap.PartySecurityGroups}"> +<menu-item name="EditSecurityGroup" title="${uiLabelMap.SecurityGroups}"> <link target="EditSecurityGroup"> <parameter param-name="groupId"/> </link> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1050766&r1=1050765&r2=1050766&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sun Dec 19 06:07:53 2010 @@ -504,24 +504,16 @@ under the License. <screen name="EditUserLogin"> <section> <actions> -<set field="titleProperty" value="PageTitleEditGroupInformation"/> +<set field="titleProperty" value="UserLoginUpdateSecuritySettings"/> <set field="tabButtonItem" value="viewprofile"/> -<set field="labelTitleProperty" value="PageTitleEditGroupInformation"/> - +<set field="labelTitleProperty" value="UserLoginUpdateSecuritySettings"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/> <set field="partyId" from-field="parameters.partyId"/> -<set field="userLoginId" from-field="parameters.userLoginId"/> -<entity-one entity-name="UserLogin" value-field="editUserLogin"/> </actions> <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> -<screenlet title="${uiLabelMap.PartyUserLoginChangePassword}"> -<include-form name="updatePassword" location="component://party/widget/partymgr/PartyForms.xml"/> -</screenlet> -<screenlet title="${uiLabelMap.PartyUserLoginUpdateSecuritySettings}"> -<include-form name="updateUserLoginSecurity" location="component://party/widget/partymgr/PartyForms.xml"/> -</screenlet> +<include-screen name="EditUserLogin" location="component://common/widget/SecurityScreens.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -530,19 +522,16 @@ under the License. <screen name="CreateUserLogin"> <section> <actions> -<set field="titleProperty" value="PartyCreateUserLogin"/> +<set field="titleProperty" value="CreateUserLogin"/> <set field="tabButtonItem" value="viewprofile"/> -<set field="labelTitleProperty" value="PartyCreateUserLogin"/> - +<set field="labelTitleProperty" value="CreateUserLogin"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/> <set field="partyId" from-field="parameters.partyId"/> </actions> <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> -<screenlet title="${uiLabelMap.PartyCreateUserLogin}"> -<include-form name="AddUserLogin" location="component://party/widget/partymgr/PartyForms.xml"/> -</screenlet> +<include-screen name="CreateUserLogin" location="component://common/widget/SecurityScreens.xml"/> </decorator-section> </decorator-screen> </widgets> Added: ofbiz/trunk/framework/common/config/SecurityUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/SecurityUiLabels.xml?rev=1050766&view=auto ============================================================================== --- ofbiz/trunk/framework/common/config/SecurityUiLabels.xml (added) +++ ofbiz/trunk/framework/common/config/SecurityUiLabels.xml Sun Dec 19 06:07:53 2010 @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + +<property key="CreateUserLogin"> +<value xml:lang="de">Benutzeranmeldung erstellen</value> +<value xml:lang="en">Create User Login</value> +<value xml:lang="es">Crear usuario</value> +<value xml:lang="fr">Création d'un identifiant de connexion</value> +<value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨ बनाà¤à¤</value> +<value xml:lang="it">Creare Utente</value> +<value xml:lang="nl">Nieuwe gebruiker</value> +<value xml:lang="pt_BR">Criar nome usuário</value> +<value xml:lang="ro">Creare Utilizator</value> +<value xml:lang="ru">СоздаÑÑ Ð¸Ð¼Ñ Ð²Ñ Ð¾Ð´Ð°</value> +<value xml:lang="th">สรà¹à¸²à¸à¸à¸¹à¹à¹à¸à¹à¸£à¸°à¸à¸</value> +<value xml:lang="zh">å建ç¨æ·ç»å½</value> +<value xml:lang="zh_TW">建ç«ä½¿ç¨è ç»å ¥</value> +</property> +<property key="FormFieldTitle_currentPassword"> +<value xml:lang="de">Aktuelles Passwort</value> +<value xml:lang="en">Current Password</value> +<value xml:lang="es">Clave actual</value> +<value xml:lang="fr">Mot de passe actuel</value> +<value xml:lang="hi_IN">वरà¥à¤¤à¤®à¤¾à¤¨ पासवरà¥à¤¡</value> +<value xml:lang="it">Password Attuale</value> +<value xml:lang="nl">Huidig wachtwoord</value> +<value xml:lang="pt_BR">Senha atual</value> +<value xml:lang="ro">Parola Actuala</value> +<value xml:lang="ru">ÐейÑÑвÑÑÑий паÑолÑ</value> +<value xml:lang="th">รหัสà¸à¹à¸²à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸</value> +<value xml:lang="zh">å½åå¯ç </value> +<value xml:lang="zh_TW">ç®åå¯ç¢¼</value> +</property> +<property key="FormFieldTitle_currentPasswordVerify"> +<value xml:lang="de">Ãberprüfung des aktuellen Passworts</value> +<value xml:lang="en">Current Password Verify</value> +<value xml:lang="es">Verificar clave actual</value> +<value xml:lang="fr">Vérification du mot de passe actuel</value> +<value xml:lang="hi_IN">वरà¥à¤¤à¤®à¤¾à¤¨ पासवरà¥à¤¡ सतà¥à¤¯à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤</value> +<value xml:lang="it">Password Attuale Verifica</value> +<value xml:lang="nl">Verificatie huidig wachtwoord</value> +<value xml:lang="pt_BR">Verificação da senha atual</value> +<value xml:lang="ro">Verifica Parola Actuala</value> +<value xml:lang="ru">ÐейÑÑвÑÑÑий паÑÐ¾Ð»Ñ Ð¿Ð¾Ð²ÑоÑно</value> +<value xml:lang="th">ยืà¸à¸¢à¸±à¸à¸£à¸«à¸±à¸ªà¸à¹à¸²à¸</value> +<value xml:lang="zh">å½åå¯ç éªè¯</value> +<value xml:lang="zh_TW">ç®åå¯ç¢¼é©è¨¼</value> +</property> +<property key="FormFieldTitle_newPassword"> +<value xml:lang="de">Neues Passwort</value> +<value xml:lang="en">New Password</value> +<value xml:lang="es">Nueva clave</value> +<value xml:lang="fr">Nouveau mot de passe</value> +<value xml:lang="hi_IN">नया पासवरà¥à¤¡</value> +<value xml:lang="it">Password Nuova</value> +<value xml:lang="nl">Nieuw wachtwoord</value> +<value xml:lang="pt_BR">Nova senha</value> +<value xml:lang="ro">Parola Noua</value> +<value xml:lang="ru">ÐовÑй паÑолÑ</value> +<value xml:lang="th">รหัสà¸à¹à¸²à¸à¹à¸«à¸¡à¹</value> +<value xml:lang="zh">æ°å¯ç </value> +<value xml:lang="zh_TW">æ°å¯ç¢¼</value> +</property> +<property key="FormFieldTitle_newPasswordVerify"> +<value xml:lang="de">Ãberprüfung neues Passwort</value> +<value xml:lang="en">Verify New Password</value> +<value xml:lang="es">Validar nueva clave</value> +<value xml:lang="fr">Vérification du nouveau mot de passe</value> +<value xml:lang="hi_IN">नया पासवरà¥à¤¡ सतà¥à¤¯à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤</value> +<value xml:lang="it">Verifica Password Nuova</value> +<value xml:lang="pt_BR">Verificação da nova senha</value> +<value xml:lang="ro">Verifica Parola Noua</value> +<value xml:lang="ru">ÐовÑй паÑÐ¾Ð»Ñ Ð¿Ð¾Ð²ÑоÑно</value> +<value xml:lang="th">ยืà¸à¸¢à¸±à¸à¸£à¸«à¸±à¸ªà¸à¹à¸²à¸à¹à¸«à¸¡à¹</value> +<value xml:lang="zh">æ°å¯ç éªè¯</value> +<value xml:lang="zh_TW">æ°å¯ç¢¼é©è¨¼</value> +</property> +<property key="FormFieldTitle_requirePasswordChange"> +<value xml:lang="en">Require Password Change</value> +<value xml:lang="fr">Changement mot de passe obligatoire</value> +<value xml:lang="hi_IN">पासवरà¥à¤¡ परिवरà¥à¤¤à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤¨à¤¾ à¤à¤¾à¤¹à¤¿à¤</value> +<value xml:lang="it">Richiesto cambio password</value> +<value xml:lang="pt_BR">Pedir alteração de senha</value> +<value xml:lang="zh">å¿ é¡»ä¿®æ¹å¯ç </value> +<value xml:lang="zh_TW">å¿ é ä¿®æ¹å¯ç¢¼</value> +</property> +<property key="FormFieldTitle_userLdapDn"> +<value xml:lang="de">LDAP Distinguished Name</value> +<value xml:lang="en">LDAP Distinguished Name</value> +<value xml:lang="es">Nombre distinguido LDAP</value> +<value xml:lang="fr">Nom LDAP distinct</value> +<value xml:lang="hi_IN">à¤à¤²à¤¡à¥à¤à¤ªà¥(LDAP) विशिषà¥à¤ नाम</value> +<value xml:lang="it">Nome distinto LDAP</value> +<value xml:lang="nl">LDAP Distinguished Name</value> +<value xml:lang="pt_BR">Nome único de LDAP</value> +<value xml:lang="zh">LDAPä¸æå</value> +<value xml:lang="zh_TW">LDAPå°æå</value> +</property> +<property key="FormFieldTitle_userLoginId"> +<value xml:lang="de">Benutzeranmeldung ID</value> +<value xml:lang="en">User Login ID</value> +<value xml:lang="es">Código de usuario para conexión</value> +<value xml:lang="fr">Identifiant de connexion</value> +<value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ लà¥à¤à¤¿à¤¨ à¤à¥à¤°à¤®à¤¾à¤à¤</value> +<value xml:lang="it">Utente login</value> +<value xml:lang="nl">Loginnaam gebruiker</value> +<value xml:lang="pt_BR">Id de login do usuário</value> +<value xml:lang="ro">Utilizator Login</value> +<value xml:lang="ru">Ðод имени полÑзоваÑелÑ</value> +<value xml:lang="th">รหัสà¸à¸¹à¹à¹à¸à¹à¸à¸µà¹à¹à¸à¹à¸²à¸ªà¸¹à¹à¸£à¸°à¸à¸</value> +<value xml:lang="zh">ç¨æ·ç»å½æ è¯</value> +<value xml:lang="zh_TW">使ç¨è ç»å ¥ID</value> +</property> +<property key="SecurityGroups"> +<value xml:lang="de">Sicherheitsgruppen</value> +<value xml:lang="en">Security Groups</value> +<value xml:lang="es">Grupos de seguridad</value> +<value xml:lang="fr">Groupes de sécurité</value> +<value xml:lang="hi_IN">सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹</value> +<value xml:lang="it">Gruppi Sicurezza</value> +<value xml:lang="nl">Beveiligingsgroepen</value> +<value xml:lang="pt_BR">Grupos de segurança</value> +<value xml:lang="pt_PT">Grupos de Segurança</value> +<value xml:lang="ro">Grupuri De Siguranta</value> +<value xml:lang="ru">ÐÑÑÐ¿Ð¿Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи</value> +<value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัย</value> +<value xml:lang="zh">å®å ¨ç»</value> +<value xml:lang="zh_TW">å®å ¨ç¾¤çµ</value> +</property> +<property key="UserLoginChangePassword"> +<value xml:lang="de">Passwort der Benutzeranmeldung ändern</value> +<value xml:lang="en">Change User Login Password</value> +<value xml:lang="es">Cambiar clave de conexión</value> +<value xml:lang="fr">Changer le mot de passe de connexion</value> +<value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨ à¤à¤¾ पासवरà¥à¤¡ बदलà¥à¤</value> +<value xml:lang="it">Cambio Password Utente Login</value> +<value xml:lang="nl">Wachtwoord wijzigen</value> +<value xml:lang="pt_BR">Alterar senha do nome de usuário</value> +<value xml:lang="ro">Schimb Parola Utilizator Login</value> +<value xml:lang="ru">Ðзменение паÑÐ¾Ð»Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ</value> +<value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¸£à¸«à¸±à¸ªà¸à¹à¸²à¸à¸à¸¹à¹à¹à¸à¹à¸²à¹à¸à¹à¸£à¸°à¸à¸</value> +<value xml:lang="zh">ä¿®æ¹ç¨æ·ç»å½å¯ç </value> +<value xml:lang="zh_TW">ä¿®æ¹ç¨æ¶ç»éå¯ç¢¼</value> +</property> +<property key="UserLoginUpdateSecuritySettings"> +<value xml:lang="de">Benutzeranmeldung Sicherheitsberechtigungen aktualisieren</value> +<value xml:lang="en">Update User Login Security Settings</value> +<value xml:lang="fr">Mise à jour des paramètres de sécurité pour l'identifiant de connexion</value> +<value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ लà¥à¤à¤¿à¤¨ सà¥à¤°à¤à¥à¤·à¤¾ सà¥à¤à¤¿à¤à¤à¥à¤¸ नवà¥à¤¨à¤¤à¤® à¤à¤°à¥</value> +<value xml:lang="it">Aggiorna Impostazioni Sicurezza Utente Login</value> +<value xml:lang="nl">UserLogin Security Settings wijzigen</value> +<value xml:lang="pt_BR">Atualizar configurações de segurança do nome de usuário</value> +<value xml:lang="ro">Actualizare Setari De Siguranta Utilizator Login</value> +<value xml:lang="ru">Ðбновление наÑÑÑоек безопаÑноÑÑи полÑзоваÑелÑ</value> +<value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸à¸²à¸£à¸à¸±à¹à¸à¸à¹à¸²à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸à¸à¸à¸¹à¹à¹à¸à¹à¸²à¹à¸à¹à¸£à¸°à¸à¸</value> +<value xml:lang="zh">æ´æ°ç¨æ·ç»å½å®å ¨è®¾ç½®</value> +<value xml:lang="zh_TW">æ´æ°ç¨æ¶ç»éå®å ¨è¨ç½®</value> +</property> + +</resource> Propchange: ofbiz/trunk/framework/common/config/SecurityUiLabels.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/common/config/SecurityUiLabels.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/framework/common/config/SecurityUiLabels.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/framework/common/widget/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/SecurityForms.xml?rev=1050766&view=auto ============================================================================== --- ofbiz/trunk/framework/common/widget/SecurityForms.xml (added) +++ ofbiz/trunk/framework/common/widget/SecurityForms.xml Sun Dec 19 06:07:53 2010 @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd";> + +<form name="AddUserLogin" type="single" target="createUserLogin" + focus-field-name="userLoginId" header-row-style="header-row" default-table-style="basic-table"> +<auto-fields-service service-name="createUserLogin"/> +<field name="partyId"><hidden/></field> +<field name="enabled"><hidden/></field> +<field name="currentPassword"><password/></field> +<field name="currentPasswordVerify"><password/></field> +<field name="requirePasswordChange"> +<drop-down allow-empty="false" no-current-selected-key="N"> +<option key="Y" description="${uiLabelMap.CommonY}"/> +<option key="N" description="${uiLabelMap.CommonN}"/> +</drop-down> +</field> +<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> +<field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="backHome" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> +</form> + +<form name="updatePassword" type="single" target="updatePassword" + focus-field-name="currentPassword" header-row-style="header-row" default-table-style="basic-table"> +<actions> +<set field="passwordHint" from-field="editUserLogin.passwordHint"/> +</actions> +<auto-fields-service service-name="updatePassword"/> +<field name="partyId"><hidden/></field> +<field name="userLoginId"><hidden/></field> +<field name="currentPassword"><password/></field> +<field name="newPassword"><password/></field> +<field name="newPasswordVerify"><password/></field> +<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> +<field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> +<hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> +<parameter param-name="userLoginId"/> +<parameter param-name="partyId"/> +</hyperlink> +</field> +</form> + +<form name="updateUserLoginSecurity" type="single" target="updateUserLoginSecurity" default-map-name="editUserLogin" + header-row-style="header-row" default-table-style="basic-table"> +<actions> +<property-to-field field="ldapEnabled" resource="security" property="security.ldap.enable"/> +</actions> +<auto-fields-service service-name="updateUserLoginSecurity"/> +<field name="partyId"><hidden/></field> +<field name="userLoginId"><hidden/></field> +<field name="userLdapDn" use-when=""true".equals(ldapEnabled)"><text/></field> +<field name="userLdapDn" use-when="!"true".equals(ldapEnabled)"><ignored/></field> +<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> +<field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> +<hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> +<parameter param-name="userLoginId"/> +<parameter param-name="partyId"/> +</hyperlink> +</field> +</form> + +</forms> Propchange: ofbiz/trunk/framework/common/widget/SecurityForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/common/widget/SecurityForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/framework/common/widget/SecurityForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/framework/common/widget/SecurityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/SecurityScreens.xml?rev=1050766&view=auto ============================================================================== --- ofbiz/trunk/framework/common/widget/SecurityScreens.xml (added) +++ ofbiz/trunk/framework/common/widget/SecurityScreens.xml Sun Dec 19 06:07:53 2010 @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";> + +<screen name="CreateUserLogin"> +<section> +<actions> +</actions> +<widgets> +<screenlet title="${uiLabelMap.CreateUserLogin}"> +<include-form name="AddUserLogin" location="component://common/widget/SecurityForms.xml"/> +</screenlet> +</widgets> +</section> +</screen> + +<screen name="EditUserLogin"> +<section> +<actions> +<set field="userLoginId" from-field="parameters.userLoginId"/> +<entity-one entity-name="UserLogin" value-field="editUserLogin"/> +</actions> +<widgets> +<screenlet title="${uiLabelMap.UserLoginChangePassword}"> +<include-form name="updatePassword" location="component://common/widget/SecurityForms.xml"/> +</screenlet> +<screenlet title="${uiLabelMap.UserLoginUpdateSecuritySettings}"> +<include-form name="updateUserLoginSecurity" location="component://common/widget/SecurityForms.xml"/> +</screenlet> +</widgets> +</section> +</screen> + +</screens> Propchange: ofbiz/trunk/framework/common/widget/SecurityScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/common/widget/SecurityScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/framework/common/widget/SecurityScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=1050766&r1=1050765&r2=1050766&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sun Dec 19 06:07:53 2010 @@ -295,6 +295,7 @@ under the License. <screen name="CommonPartyDecorator"> <section> <actions> +<property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/> <set field="headerItem" value="resources"/> <set field="partyId" from-field="parameters.partyId"/> <entity-one entity-name="Party" value-field="party"/>
