You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2010/12/19 20:10:51 UTC

svn commit: r1050936 [1/2] - in /ofbiz/trunk: applications/order/webapp/ordermgr/entry/ applications/order/webapp/ordermgr/order/ applications/party/config/ applications/party/webapp/partymgr/WEB-INF/ applications/party/webapp/partymgr/visit/ applicati...

Author: adrianc
Date: Sun Dec 19 19:10:50 2010
New Revision: 1050936

URL: http://svn.apache.org/viewvc?rev=1050936&view=rev
Log:
Moved remaining security UI artifacts to the common component. This commit introduces a minor dependency from framework/common to applications/party - which will be fixed in a future commit.

Added:
    ofbiz/trunk/framework/common/webcommon/includes/ViewCertificate.ftl
      - copied, changed from r1050650, ofbiz/trunk/applications/party/webapp/partymgr/security/ViewCertificate.ftl
    ofbiz/trunk/framework/common/widget/SecurityMenus.xml   (with props)
Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl
    ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/common/config/SecurityUiLabels.xml
    ofbiz/trunk/framework/common/widget/SecurityForms.xml
    ofbiz/trunk/framework/common/widget/SecurityScreens.xml

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Sun Dec 19 19:10:50 2010
@@ -97,7 +97,7 @@ under the License.
         </#if>
         <tr>
           <td>&nbsp;</td>
-          <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartyUserLoginId}</div></td>
+          <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.CommonUserLoginId}</div></td>
           <td>&nbsp;</td>
           <td valign='middle'>
             <div class='tabletext'>
@@ -164,7 +164,7 @@ under the License.
         <tr><td colspan="4">&nbsp;</td></tr>
         <tr>
           <td>&nbsp;</td>
-          <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartyUserLoginId}</div></td>
+          <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.CommonUserLoginId}</div></td>
           <td>&nbsp;</td>
           <td valign='middle'>
             <div class='tabletext'>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Sun Dec 19 19:10:50 2010
@@ -205,7 +205,7 @@ function toggleOrderIdList() {
                 </td>
               </tr>
               <tr>
-                <td width='25%' align='right' class='label'>${uiLabelMap.PartyUserLoginId}</td>
+                <td width='25%' align='right' class='label'>${uiLabelMap.CommonUserLoginId}</td>
                 <td width='5%'>&nbsp;</td>
                 <td align='left'><input type='text' name='userLoginId' value='${requestParameters.userLoginId?if_exists}'/></td>
               </tr>

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sun Dec 19 19:10:50 2010
@@ -1586,19 +1586,6 @@
         <value xml:lang="zh">年为雇主</value>
         <value xml:lang="zh_TW">受雇年數</value>
     </property>
-    <property key="PageTitleAddIssuerProvisions">
-        <value xml:lang="de">Aussteller Bestimmungen hinzufügen</value>
-        <value xml:lang="en">Add Issuer Provisions</value>
-        <value xml:lang="es">Añadir condiciones de emisor</value>
-        <value xml:lang="fr">Ajoutez les dispositions d'émetteur</value>
-        <value xml:lang="hi_IN">जारीकर्ता के प्रावधान जोड़ें</value>
-        <value xml:lang="it">Aggiorni Fornitore di Certificati</value>
-        <value xml:lang="nl">Provisies uitgever toevoegen</value>
-        <value xml:lang="pt_BR">Adicionar emissor de provisões</value>
-        <value xml:lang="th">เพิ่มการจำแนกเงื่อนไข</value>
-        <value xml:lang="zh">添加发行人信息</value>
-        <value xml:lang="zh_TW">添加發行人資訊</value>
-    </property>
     <property key="PageTitleAddPartyContent">
         <value xml:lang="de">Akteur Inhalt hinzufügen</value>
         <value xml:lang="en">Add Party Content</value>
@@ -1853,20 +1840,6 @@
         <value xml:lang="zh">编辑组信息</value>
         <value xml:lang="zh_TW">編輯組資訊</value>
     </property>
-    <property key="PageTitleEditIssuerProvisions">
-        <value xml:lang="de">Aussteller Bestimmungen bearbeiten</value>
-        <value xml:lang="en">Edit Issuer Provisions</value>
-        <value xml:lang="es">Editar condiciones de emisor</value>
-        <value xml:lang="fr">Modifier les dispositions d'émetteur</value>
-        <value xml:lang="hi_IN">निर्गमकर्ता प्रावधानों को संपादित करें</value>
-        <value xml:lang="it">Aggiorna Fornitore Certificati</value>
-        <value xml:lang="nl">Provisies uitgever wijzigen</value>
-        <value xml:lang="pt_BR">Editar emissor de provisões</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="PageTitleEditPartyAttribute">
         <value xml:lang="de">Akteur Attribute bearbeiten</value>
         <value xml:lang="en">Edit Party Attribute</value>
@@ -1997,38 +1970,6 @@
         <value xml:lang="zh">编辑人员信息</value>
         <value xml:lang="zh_TW">人員編輯</value>
     </property>
-    <property key="PageTitleEditSecurityGroup">
-        <value xml:lang="de">Sicherheitsgruppe bearbeiten</value>
-        <value xml:lang="en">Edit Security Group</value>
-        <value xml:lang="es">Editar grupo de seguridad</value>
-        <value xml:lang="fr">Modifier le groupe de sécurité</value>
-        <value xml:lang="hi_IN">सुरक्षा समूह को संपादित करें</value>
-        <value xml:lang="it">Aggiorna gruppo sicurezza</value>
-        <value xml:lang="nl">Beveiligingsgroepen wijzigen</value>
-        <value xml:lang="pt_BR">Editar grupo de segurança</value>
-        <value xml:lang="pt_PT">Editar Grupo de Segurança</value>
-        <value xml:lang="ro">Actualizare Grup 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="PageTitleEditSecurityGroupPermissions">
-        <value xml:lang="de">Sicherheitsgruppe Berechtigungen bearbeiten</value>
-        <value xml:lang="en">Edit Security Group Permissions</value>
-        <value xml:lang="es">Editar permisos</value>
-        <value xml:lang="fr">Modifier les autorisations du groupe de sécurité</value>
-        <value xml:lang="hi_IN">सुरक्षा समूह अनुमति को संपादित करें</value>
-        <value xml:lang="it">Aggiorna permessi gruppo sicurezza</value>
-        <value xml:lang="nl">Toegangsrechten beveiligingsgroep wijzigen</value>
-        <value xml:lang="pt_BR">Editar permissões de grupo de segurança</value>
-        <value xml:lang="pt_PT">Editar Permissões do Grupo de Segurança</value>
-        <value xml:lang="ro">Actualizare Permisuri Grup 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="PageTitleEditSecurityGroupUserLogins">
         <value xml:lang="de">Benutzeranmeldungen der Sicherheitsgruppe bearbeiten</value>
         <value xml:lang="en">Edit Security Group UserLogins</value>
@@ -2133,35 +2074,6 @@
         <value xml:lang="zh">查找会员邀请</value>
         <value xml:lang="zh_TW">查找成員邀請</value>
     </property>
-    <property key="PageTitleFindSecurityGroup">
-        <value xml:lang="de">Sicherheitsgruppe suchen</value>
-        <value xml:lang="en">Find Security Group</value>
-        <value xml:lang="es">Buscar grupo de seguridad</value>
-        <value xml:lang="fr">Recherche de groupes de sécurité</value>
-        <value xml:lang="hi_IN">सुरक्षा समूह खोजें</value>
-        <value xml:lang="it">Ricerca Gruppo Sicurezza</value>
-        <value xml:lang="nl">Beveiligingsgroep(en) vinden</value>
-        <value xml:lang="pt_BR">Procurar grupo de segurança</value>
-        <value xml:lang="ro">Cauta Grup 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="PageTitleImportCertificate">
-        <value xml:lang="de">Zertifikat importieren</value>
-        <value xml:lang="en">Import Certificate</value>
-        <value xml:lang="es">Importar certificado</value>
-        <value xml:lang="fr">Importer le certificat</value>
-        <value xml:lang="hi_IN">प्रमाणपत्र आयात करे</value>
-        <value xml:lang="it">Importa Certificato</value>
-        <value xml:lang="nl">Certificaat importeren</value>
-        <value xml:lang="pt_BR">Importar certificado</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="PageTitleListCommCustRequests">
         <value xml:lang="de">Liste der Kommunikation Kundenanfragen</value>
         <value xml:lang="en">List Comm Customer Requests</value>
@@ -2639,38 +2551,6 @@
         <value xml:lang="zh">添加其他会员关系</value>
         <value xml:lang="zh_TW">添加其他成員關系</value>
     </property>
-    <property key="PartyAddPermissionManuallyToSecurityGroup">
-        <value xml:lang="de">Berechtigung (durch Eingabe) zur Sicherheitsgruppe hinzufügen</value>
-        <value xml:lang="en">Add Permission (manually) to SecurityGroup</value>
-        <value xml:lang="es">Añadir permiso (manualmente) al grupo de seguridad</value>
-        <value xml:lang="fr">Ajouter une autorisation (manuellement) au groupe de sécurité</value>
-        <value xml:lang="hi_IN">सुरक्षा समूह में अनुमति(स्वयं) जोड़ें</value>
-        <value xml:lang="it">Aggiungi Permesso (manualmente) al Gruppo Sicurezza</value>
-        <value xml:lang="nl">Handmatig rechten aan deze beveiligingsgroep toevoegen</value>
-        <value xml:lang="pt_BR">Adicionar permissão (manualmente) ao SecurityGroup</value>
-        <value xml:lang="pt_PT">Adicionar Permissão (manualmente) ao Grupo de Segurança</value>
-        <value xml:lang="ro">Adauga Permis (manual) la Grupul Siguranta</value>
-        <value xml:lang="ru">Добавить права (вручную) в SecurityGroup</value>
-        <value xml:lang="th">เพิ่มการอนุมัติ(ด้วยมือ)ในกลุ่มความปลอดภัย</value>
-        <value xml:lang="zh">(手工)把权限添加到安全组</value>
-        <value xml:lang="zh_TW">(手工)把權限添加到安全組</value>
-    </property>
-    <property key="PartyAddPermissionToSecurityGroup">
-        <value xml:lang="de">Berechtigung (aus Liste) zur Sicherheitsgruppe hinzufügen</value>
-        <value xml:lang="en">Add Permission (from list) to SecurityGroup</value>
-        <value xml:lang="es">Añadir permiso (desde lista) a grupo de seguridad</value>
-        <value xml:lang="fr">Ajouter une autorisation (à partir de la liste) au groupe de sécurité</value>
-        <value xml:lang="hi_IN">सुरक्षा समूह में अनुमति(सूची से) जोड़ें</value>
-        <value xml:lang="it">Aggiungi Permesso (dalla lista) al Gruppo Sicurezza</value>
-        <value xml:lang="nl">Rechten vanaf lijst aan beveiligingsgroep toevoegen</value>
-        <value xml:lang="pt_BR">Adicionar permissão (da lista) ao SecurityGroup</value>
-        <value xml:lang="pt_PT">Adicionar Permissão (da lista)ao Grupo de Segurança</value>
-        <value xml:lang="ro">Adauga Permis (din lista) la Grupul Siguranta</value>
-        <value xml:lang="ru">Добавить права (из списка) в SecurityGroup</value>
-        <value xml:lang="th">เพิ่มการอนุมัติ(จากรายการ)ในกลุ่มความปลอดภัย</value>
-        <value xml:lang="zh">(从列表)把权限添加到安全组</value>
-        <value xml:lang="zh_TW">(從列表)把權限添加到安全組</value>
-    </property>
     <property key="PartyAddProductToList">
         <value xml:lang="de">Produkt zur Liste hinzufügen</value>
         <value xml:lang="en">Add Product To List</value>
@@ -2686,15 +2566,6 @@
         <value xml:lang="zh">把产品添加到列表</value>
         <value xml:lang="zh_TW">把產品添加到列表</value>
     </property>
-    <property key="PartyAddProtectedViewToSecurityGroup">
-        <value xml:lang="en">Add a Protected View to SecurityGroup</value>
-        <value xml:lang="fr">Ajouter une vue protégée à ce groupe de sécurité</value>
-        <value xml:lang="hi_IN">सुरक्षा समूह में सुरक्षित दृष्टिकोण जोड़ें</value>
-        <value xml:lang="it">Aggiungi una vista protetta al gruppo sicurezza</value>
-        <value xml:lang="pt_BR">Adicionar uma visão protegida ao SecurityGroup</value>
-        <value xml:lang="zh">添加一个受保护的视图到安全组</value>
-        <value xml:lang="zh_TW">添加一個受保護的視圖到安全組</value>
-    </property>
     <property key="PartyAddPurpose">
         <value xml:lang="cs">Přidat účel</value>
         <value xml:lang="de">Zweck hinzufügen</value>
@@ -2792,22 +2663,6 @@
         <value xml:lang="zh">添加到购物列表</value>
         <value xml:lang="zh_TW">添加到購物列表</value>
     </property>
-    <property key="PartyAddUserLoginToSecurityGroup">
-        <value xml:lang="de">Benutzeranmeldung zur Sicherheitsgruppe hinzufügen</value>
-        <value xml:lang="en">Add UserLogin to Security Group</value>
-        <value xml:lang="es">Añadir usuario a grupo de seguridad</value>
-        <value xml:lang="fr">Ajouter un identifiant de connexion à ce groupe de sécurité</value>
-        <value xml:lang="hi_IN">सुरक्षा समूह में प्रयोक्तालॉगिन जोड़ें</value>
-        <value xml:lang="it">Aggiungi Utente al Gruppo Sicurezza</value>
-        <value xml:lang="nl">Loginnaam gebruiker aan beveiligingsgroep toevoegen</value>
-        <value xml:lang="pt_BR">Adicionar usuário e senha ao Grupo de Segurança</value>
-        <value xml:lang="pt_PT">Adicionar Início de Utilizador a Este Grupo de Segurança</value>
-        <value xml:lang="ro">Adauga Utilizator la Grupul 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="PartyAdditionalPartyEntry">
         <value xml:lang="de">Zusätzlicher Akteureintrag</value>
         <value xml:lang="en">Additional Party Entry</value>
@@ -3446,137 +3301,6 @@
         <value xml:lang="zh">错误：不能更新指定的联系信息，因为它没有与指定的会员联系起来。</value>
         <value xml:lang="zh_TW">錯誤：不能更新指定的連絡資訊，因為它沒有與指定的成員關連起來。</value>
     </property>
-    <property key="PartyCertComponent">
-        <value xml:lang="de">Komponente</value>
-        <value xml:lang="en">Component</value>
-        <value xml:lang="es">Componente</value>
-        <value xml:lang="fr">Composant</value>
-        <value xml:lang="hi_IN">घटक</value>
-        <value xml:lang="it">Componente</value>
-        <value xml:lang="nl">Component</value>
-        <value xml:lang="pt_BR">Componente</value>
-        <value xml:lang="th">ส่วนประกอบ</value>
-        <value xml:lang="zh">组件</value>
-        <value xml:lang="zh_TW">元件</value>
-    </property>
-    <property key="PartyCertImportIssuer">
-        <value xml:lang="de">Aussteller importieren</value>
-        <value xml:lang="en">Import Issuer</value>
-        <value xml:lang="es">Imporar emisor</value>
-        <value xml:lang="fr">Émetteur d'importation</value>
-        <value xml:lang="hi_IN">जारीकर्ता आयात करे</value>
-        <value xml:lang="it">Importa Certificato</value>
-        <value xml:lang="nl">Uitgever importeren</value>
-        <value xml:lang="pt_BR">Importar emissor</value>
-        <value xml:lang="th">ปัญหา</value>
-        <value xml:lang="zh">导入发行人</value>
-        <value xml:lang="zh_TW">導入發行人</value>
-    </property>
-    <property key="PartyCertInvalid">
-        <value xml:lang="de">Ungültiges Zertifikat</value>
-        <value xml:lang="en">Invalid certificate</value>
-        <value xml:lang="es">Certificado inválido</value>
-        <value xml:lang="fr">Certificat irrecevable</value>
-        <value xml:lang="hi_IN">अमान्य प्रमाणपत्र</value>
-        <value xml:lang="it">Certificato Invalido</value>
-        <value xml:lang="nl">Ongeldig certificaat</value>
-        <value xml:lang="pt_BR">Certificado Inválido</value>
-        <value xml:lang="th">หนังสือรับรองไม่ถูกต้อง</value>
-        <value xml:lang="zh">无效的证书</value>
-        <value xml:lang="zh_TW">無效的証書</value>
-    </property>
-    <property key="PartyCertIssuers">
-        <value xml:lang="de">Zertifikatsersteller</value>
-        <value xml:lang="en">Cert Issuers</value>
-        <value xml:lang="es">Emisores de certificados</value>
-        <value xml:lang="fr">Émetteurs de certificat</value>
-        <value xml:lang="hi_IN">प्रमाणपत्र के प्रदाता</value>
-        <value xml:lang="it">Fornitori di certificati</value>
-        <value xml:lang="nl">Certificaat-uitgever</value>
-        <value xml:lang="pt_BR">Emissores de certificados</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="PartyCertKeyAlias">
-        <value xml:lang="de">Schlüssel Alias</value>
-        <value xml:lang="en">Key Alias</value>
-        <value xml:lang="es">Alias de clave</value>
-        <value xml:lang="fr">Clé d'alias</value>
-        <value xml:lang="hi_IN">कुंजी के उपनाम</value>
-        <value xml:lang="it">Chiave Alias</value>
-        <value xml:lang="nl">Key-alias</value>
-        <value xml:lang="pt_BR">Sinônimo de chave</value>
-        <value xml:lang="th">ใช้อีกชื่อหนึ่งว่า</value>
-        <value xml:lang="zh">密钥别名</value>
-        <value xml:lang="zh_TW">密鑰別名</value>
-    </property>
-    <property key="PartyCertKeyStore">
-        <value xml:lang="de">KeyStore</value>
-        <value xml:lang="en">Keystore</value>
-        <value xml:lang="es">Fondo de claves</value>
-        <value xml:lang="fr">Clé de magasin</value>
-        <value xml:lang="hi_IN">कुंजीस्टोर</value>
-        <value xml:lang="it">Keystore</value>
-        <value xml:lang="nl">Keystore</value>
-        <value xml:lang="pt_BR">Base de chaves</value>
-        <value xml:lang="th">รหัสการเก็บข้อมูล</value>
-        <value xml:lang="zh">密钥库</value>
-        <value xml:lang="zh_TW">密鑰庫</value>
-    </property>
-    <property key="PartyCertName">
-        <value xml:lang="de">Zertifikat Name</value>
-        <value xml:lang="en">Cert Name</value>
-        <value xml:lang="es">Nombre del certificado</value>
-        <value xml:lang="fr">Nom de Certificat</value>
-        <value xml:lang="hi_IN">प्रमाणपत्र का नाम</value>
-        <value xml:lang="it">Nome Certificato</value>
-        <value xml:lang="nl">Naam certificaat</value>
-        <value xml:lang="pt_BR">Nome do certificado</value>
-        <value xml:lang="th">ชื่อจริง</value>
-        <value xml:lang="zh">证书名</value>
-        <value xml:lang="zh_TW">証書名</value>
-    </property>
-    <property key="PartyCertSaveToKeyStore">
-        <value xml:lang="de">Im KeyStore speichern</value>
-        <value xml:lang="en">Save to KeyStore</value>
-        <value xml:lang="es">Guardar en el fondo de claves</value>
-        <value xml:lang="fr">Sauver dans le magasin de clés</value>
-        <value xml:lang="hi_IN">कुंजीस्टोर में सहेजें</value>
-        <value xml:lang="it">Salva sul KeyStore</value>
-        <value xml:lang="nl">In keystore opslaan</value>
-        <value xml:lang="pt_BR">Salvar na base de chaves</value>
-        <value xml:lang="th">บันทึกรหัสการเก็บข้อมูล</value>
-        <value xml:lang="zh">保存到密钥库</value>
-        <value xml:lang="zh_TW">保存到密鑰庫</value>
-    </property>
-    <property key="PartyCertSerialNumber">
-        <value xml:lang="de">Zertifikat Seriennummer</value>
-        <value xml:lang="en">Cert Serial Number</value>
-        <value xml:lang="es">Nº de serie del certificado</value>
-        <value xml:lang="fr">N° de série de Certificat</value>
-        <value xml:lang="hi_IN">प्रमाणपत्र क्रम संख्या</value>
-        <value xml:lang="it">Numero di Serie Certificato</value>
-        <value xml:lang="nl">Serienummer certificaat</value>
-        <value xml:lang="pt_BR">Número de série do certificado</value>
-        <value xml:lang="th">หมายเลขลำดับ</value>
-        <value xml:lang="zh">证书序列号</value>
-        <value xml:lang="zh_TW">証書序列號</value>
-    </property>
-    <property key="PartyCertType">
-        <value xml:lang="de">Zertifikat Typ</value>
-        <value xml:lang="en">Cert Type</value>
-        <value xml:lang="es">Tipo de certificado</value>
-        <value xml:lang="fr">Type de Certificat</value>
-        <value xml:lang="hi_IN">प्रमाणपत्र का प्रकार</value>
-        <value xml:lang="it">Tipo Certificato</value>
-        <value xml:lang="nl">Type certificaat</value>
-        <value xml:lang="pt_BR">Tipo de certificado</value>
-        <value xml:lang="th">ประเภท</value>
-        <value xml:lang="zh">证书类型</value>
-        <value xml:lang="zh_TW">証書類型</value>
-    </property>
     <property key="PartyChangeParty">
         <value xml:lang="de">Akteur wechseln</value>
         <value xml:lang="en">Change Party</value>
@@ -7200,25 +6924,6 @@
         <value xml:lang="zh">M - 已婚</value>
         <value xml:lang="zh_TW">M - 已婚</value>
     </property>
-    <property key="PartyMaxHit">
-        <value xml:lang="en">Maximum number of visits</value>
-        <value xml:lang="fr">Nombre maximum de visites</value>
-        <value xml:lang="hi_IN">यात्राओं(visits) की अधिकतम संख्या</value>
-        <value xml:lang="it">Massimo numero di visite</value>
-        <value xml:lang="nl">Maximaal aantal bezoeken</value>       
-        <value xml:lang="pt_BR">Número máximo de visitas</value>
-        <value xml:lang="zh">最大访问数量</value>
-        <value xml:lang="zh_TW">最大訪問數量</value>
-    </property>
-    <property key="PartyMaxHitDuration">
-        <value xml:lang="en">Duration during which the visits are considered (in seconds)</value>
-        <value xml:lang="fr">Durée pendant laquelle les visites sont considérées (en secondes)</value>
-        <value xml:lang="hi_IN">अवधि जिसके दौरान यात्राओं पर विचार कर रहे हैं (सेकंड में)</value>
-        <value xml:lang="it">Durata nella quale le visite sono considerate (in secondi)</value>
-        <value xml:lang="pt_BR">Período durante o qual as visitas são consideradas (segundos)</value>
-        <value xml:lang="zh">访问停留时间(秒)</value>
-        <value xml:lang="zh_TW">訪問停留時間(秒)</value>
-    </property>
     <property key="PartyMechPurposeTypeNotFound">
         <value xml:lang="de">Zweck Typ nicht gefunden mit der ID</value>
         <value xml:lang="en">Purpose Type not found with ID</value>
@@ -7683,22 +7388,6 @@
         <value xml:lang="zh">新建角色类型</value>
         <value xml:lang="zh_TW">新建角色類型</value>
     </property>
-    <property key="PartyNewSecurityGroup">
-        <value xml:lang="de">Neue Sicherheitsgruppe</value>
-        <value xml:lang="en">New Security Group</value>
-        <value xml:lang="es">Nuevo grupo de seguridad</value>
-        <value xml:lang="fr">Nouveau groupe de sécurité</value>
-        <value xml:lang="hi_IN">नया सुरक्षा समूह</value>
-        <value xml:lang="it">Nuovo gruppo sicurezza</value>
-        <value xml:lang="nl">Nieuwe beveiligingsgroep</value>
-        <value xml:lang="pt_BR">Novo grupo de segurança</value>
-        <value xml:lang="pt_PT">Novo Grupo de Segurança</value>
-        <value xml:lang="ro">Nou Grup 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="PartyNewTask">
         <value xml:lang="de">Neue Aufgabe</value>
         <value xml:lang="en">New Task</value>
@@ -8910,22 +8599,6 @@
         <value xml:lang="zh">你没有权限对这个会员执行本操作</value>
         <value xml:lang="zh_TW">你沒有權限對這個成員執行本操作</value>
     </property>
-    <property key="PartyPermissionId">
-        <value xml:lang="de">Berechtigung ID</value>
-        <value xml:lang="en">Permission ID</value>
-        <value xml:lang="es">Código de permiso</value>
-        <value xml:lang="fr">Autorisation</value>
-        <value xml:lang="hi_IN">अनुमति क्रमांक</value>
-        <value xml:lang="it">Codice Permesso</value>
-        <value xml:lang="nl">Permissie</value>
-        <value xml:lang="pt_BR">ID de permissão</value>
-        <value xml:lang="pt_PT">ID de Permissão</value>
-        <value xml:lang="ro">Cod Permis</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="PartyPermissionSecurityGroupWithId">
         <value xml:lang="de">Berechtigungen für die Sicherheitsgruppe mit der ID</value>
         <value xml:lang="en">Permissions for SecurityGroup with ID</value>
@@ -8942,22 +8615,6 @@
         <value xml:lang="zh">安全组的权限，标识</value>
         <value xml:lang="zh_TW">安全群組的權限，ID </value>
     </property>
-    <property key="PartyPermissions">
-        <value xml:lang="de">Berechtigungen</value>
-        <value xml:lang="en">Permissions</value>
-        <value xml:lang="es">Permisos</value>
-        <value xml:lang="fr">Autorisations</value>
-        <value xml:lang="hi_IN">अनुमतियाँ</value>
-        <value xml:lang="it">Permessi</value>
-        <value xml:lang="nl">Permissies</value>
-        <value xml:lang="pt_BR">Permissões</value>
-        <value xml:lang="pt_PT">Permissões</value>
-        <value xml:lang="ro">Permis</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="PartyPersonSuccessfullyCreated">
         <value xml:lang="de">Person erfolgreich erstellt.</value>
         <value xml:lang="en">Person successfully created.</value>
@@ -9306,15 +8963,6 @@
         <value xml:lang="zh">简介</value>
         <value xml:lang="zh_TW">簡介</value>
     </property>
-    <property key="PartyProtectedViews">
-        <value xml:lang="en">Protected Views</value>
-        <value xml:lang="fr">Vues protégées</value>
-        <value xml:lang="hi_IN">संरक्षित दृश्य</value>
-        <value xml:lang="it">Viste protette</value>
-        <value xml:lang="pt_BR">Vistas protegidas</value>
-        <value xml:lang="zh">受保护的视图</value>
-        <value xml:lang="zh_TW">受保護的視圖</value>
-    </property>
     <property key="PartyProtectedViewsForSecurityGroup">
         <value xml:lang="en">Protected Views For SecurityGroup</value>
         <value xml:lang="fr">Vues protégées pour le groupe de sécurité</value>
@@ -9940,38 +9588,6 @@
         <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>
-        <value xml:lang="es">Lista de grupos de seguridad</value>
-        <value xml:lang="fr">Liste des groupes de sécurité</value>
-        <value xml:lang="hi_IN">सुरक्षासमूह की सूची</value>
-        <value xml:lang="it">Lista gruppi sicurezza</value>
-        <value xml:lang="nl">Overzicht beveiligingsgroepen</value>
-        <value xml:lang="pt_BR">Lista de grupos de segurança</value>
-        <value xml:lang="pt_PT">Lista de Grupos de Segurança</value>
-        <value xml:lang="ro">Lista 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="PartySecurityViewPermissionError">
-        <value xml:lang="de">Sicherheitsfehler: Sie haben nicht die Berechtigung diese Seite anzusehen. ("SECURITY_VIEW" oder "SECURITY_ADMIN" benötigt) </value>
-        <value xml:lang="en">PartySecurityViewPermissionError You do not have permission to view this page. ("SECURITY_VIEW" or "SECURITY_ADMIN" needed)</value>
-        <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos SECURITY_VIEW o SECURITY_ADMIN</value>
-        <value xml:lang="fr">Error Vous n'avez pas l'autorisation de voir cette page. ("SECURITY_VIEW" ou "SECURITY_ADMIN" est nécessaire)</value>
-        <value xml:lang="hi_IN">PartySecurityViewPermissionError आपको इस पृष्ठ को देखने की अनुमति नहीं है|("SECURITY_VIEW" या "SECURITY_ADMIN" की आवश्यकता)</value>
-        <value xml:lang="it">PartySecurityViewPermissionError Tu non sei autorizzato a vedere questa pagina. (I permessi "SECURITY_VIEW" o "SECURITY_ADMIN" sono necessari)</value>
-        <value xml:lang="nl">Toegangfout: PartySecurityViewPermissionError You do not have permission to view this page. ("SECURITY_VIEW" or "SECURITY_ADMIN" needed)</value>
-        <value xml:lang="pt_BR">Erro de segurança: você não possui permissão para visualizar esta página. (necessário "SECURITY_VIEW" ou "SECURITY_ADMIN")</value>
-        <value xml:lang="pt_PT">Erro de Segurança na visualização de Secções Você não tem permissão para visualizar esta página (necessário "SECURITY_VIEW" ou "SECURITY_ADMIN").</value>
-        <value xml:lang="ro">PartySecurityViewPermissionError Tu nu esti autorizat sa vezi aceasta pagina. (Este necesar sa ai Permisul "SECURITY_VIEW" sau "SECURITY_ADMIN")</value>
-        <value xml:lang="ru">PartySecurityViewPermissionError У вас нет прав на просмотр этой страницы. (необходимы "SECURITY_VIEW" или "SECURITY_ADMIN")</value>
-        <value xml:lang="th">ผิดพลาด ! ความปลอดภัยของกลุ่มผู้ใช้ในการได้รับอนุญาตในการดู  คุณยังไม่ได้รับอุญาตให้ดูหน้านี้ ("SECURITY_VIEW" หรือ "SECURITY_ADMIN" ตามที่คุณต้องการ)</value>
-        <value xml:lang="zh">PartySecurityViewPermissionError 你没有权限浏览本页面。 (需要"SECURITY_VIEW" 或 "SECURITY_ADMIN")</value>
-        <value xml:lang="zh_TW">PartySecurityViewPermissionError 你沒有權限瀏覽本頁面。 (需要"SECURITY_VIEW" 或 "SECURITY_ADMIN")</value>
-    </property>
     <property key="PartySegmentGroupId">
         <value xml:lang="de">Segmentgruppe ID</value>
         <value xml:lang="en">Segment Group Id</value>
@@ -10545,15 +10161,6 @@
         <value xml:lang="zh">供货商</value>
         <value xml:lang="zh_TW">供貨商</value>
     </property>
-    <property key="PartyTarpitDuration">
-        <value xml:lang="en">Duration during which the view will not be accessible (in seconds)</value>
-        <value xml:lang="fr">Durée pendant laquelle la vue ne sera plus accessible (en secondes)</value>
-        <value xml:lang="hi_IN">अवधि जिसके दौरान देखना सुलभ नहीं होगा (सेकंड में)</value>
-        <value xml:lang="it">Durata durante la quale la vista non è accessibile (in secondi)</value>
-        <value xml:lang="pt_BR">Período durante o qual a vista não poderá ser acessada (em segundos)</value>
-        <value xml:lang="zh">视图不能访问的时长(秒)</value>
-        <value xml:lang="zh_TW">視圖不能訪問的時長(秒)</value>
-    </property>
     <property key="PartyTaxAddInfo">
         <value xml:lang="de">Steuerangaben hinzufügen</value>
         <value xml:lang="en">Add Tax Info</value>
@@ -11116,22 +10723,6 @@
         <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>
-        <value xml:lang="es">Código de usuario</value>
-        <value xml:lang="fr">Identifiant de connexion</value>
-        <value xml:lang="hi_IN">प्रयोक्ता लॉगिन क्रमांक</value>
-        <value xml:lang="it">Codice utente login</value>
-        <value xml:lang="nl">User Login Id</value>
-        <value xml:lang="pt_BR">ID de nome de usuário</value>
-        <value xml:lang="pt_PT">Identificação de Início de Secção</value>
-        <value xml:lang="ro">Cod 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="PartyUserLoginMissingError">
         <value xml:lang="cs">Chybí uživatelské jméno</value>
         <value xml:lang="de">Nutzername fehlt</value>
@@ -11150,22 +10741,6 @@
         <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>
-        <value xml:lang="es">Usuarios</value>
-        <value xml:lang="fr">Utilisateurs de connexion</value>
-        <value xml:lang="hi_IN">प्रयोक्ता लॉगिन</value>
-        <value xml:lang="it">Utenti Logins</value>
-        <value xml:lang="nl">User logins</value>
-        <value xml:lang="pt_BR">Nomes de usuário</value>
-        <value xml:lang="pt_PT">Inícios de Secção</value>
-        <value xml:lang="ro">Utilizatori 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="PartyUserLoginsForSecurityGroup">
         <value xml:lang="de">Benutzeranmeldungen für Sicherheitsgruppe mit der ID</value>
         <value xml:lang="en">UserLogins for SecurityGroup with ID</value>
@@ -11279,20 +10854,6 @@
         <value xml:lang="zh">厂家信息</value>
         <value xml:lang="zh_TW">供應商資訊</value>
     </property>
-    <property key="PartyViewCert">
-        <value xml:lang="de">Zertifikat anzeigen</value>
-        <value xml:lang="en">View Cert</value>
-        <value xml:lang="es">Ver certificado</value>
-        <value xml:lang="fr">Afficher le certificat</value>
-        <value xml:lang="hi_IN">प्रमाणपत्र देखें</value>
-        <value xml:lang="it">Mostra certificato</value>
-        <value xml:lang="nl">Certificaat bekijken</value>
-        <value xml:lang="pt_BR">Ver certificado</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="PartyViewCommOrders">
         <value xml:lang="en">View Communication Orders</value>
         <value xml:lang="hi_IN">संचार के आदेश देखें</value>
@@ -11335,15 +10896,6 @@
         <value xml:lang="zh">浏览图像</value>
         <value xml:lang="zh_TW">瀏覽圖像</value>
     </property>
-    <property key="PartyViewName">
-        <value xml:lang="en">View Name</value>
-        <value xml:lang="fr">Nom de la vue</value>
-        <value xml:lang="hi_IN">नाम देखें</value>
-        <value xml:lang="it">Mostra nome</value>
-        <value xml:lang="pt_BR">Ver nome</value>
-        <value xml:lang="zh">浏览名称</value>
-        <value xml:lang="zh_TW">瀏覽名稱</value>
-    </property>
     <property key="PartyViewPostalAddressBoundaryPermissionError">
         <value xml:lang="de">Sicherheitsfehler: um getPostalAddressBoundary auszuführen müssen Sie die Berechtigung PARTYMGR_VIEW oder PARTYMGR_ADMIN besitzen</value>
         <value xml:lang="en">Security Error: to run getPostalAddressBoundary you must have the PARTY_VIEW or PARTY_ADMIN permission</value>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sun Dec 19 19:10:50 2010
@@ -1355,14 +1355,13 @@ under the License.
     <view-map name="FindPartyClassificationGroups" type="screen" page="component://party/widget/partymgr/PartyClassificationScreens.xml#FindPartyClassificationGroups"/>
     <view-map name="EditPartyClassificationGroup" type="screen" page="component://party/widget/partymgr/PartyClassificationScreens.xml#EditPartyClassificationGroup"/>
 
-    <view-map name="FindSecurityGroup" type="screen" page="component://party/widget/partymgr/SecurityScreens.xml#FindSecurityGroup"/>
-    <view-map name="EditSecurityGroup" type="screen" page="component://party/widget/partymgr/SecurityScreens.xml#EditSecurityGroup"/>
-    <view-map name="EditSecurityGroupPermissions" type="screen" page="component://party/widget/partymgr/SecurityScreens.xml#EditSecurityGroupPermissions"/>
-    <view-map name="EditSecurityGroupUserLogins" type="screen" page="component://party/widget/partymgr/SecurityScreens.xml#EditSecurityGroupUserLogins"/>
-    <view-map name="EditSecurityGroupProtectedViews" type="screen" page="component://party/widget/partymgr/SecurityScreens.xml#EditSecurityGroupProtectedViews"/>
-
-    <view-map name="CertIssuerProvisions" type="screen" page="component://party/widget/partymgr/SecurityScreens.xml#EditX509IssuerProvisions"/>
-    <view-map name="ViewCertificate" type="screen" page="component://party/widget/partymgr/SecurityScreens.xml#ViewCertificate"/>
+    <view-map name="FindSecurityGroup" type="screen" page="component://common/widget/SecurityScreens.xml#FindSecurityGroup"/>
+    <view-map name="EditSecurityGroup" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroup"/>
+    <view-map name="EditSecurityGroupPermissions" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroupPermissions"/>
+    <view-map name="EditSecurityGroupUserLogins" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroupUserLogins"/>
+    <view-map name="EditSecurityGroupProtectedViews" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroupProtectedViews"/>
+    <view-map name="CertIssuerProvisions" type="screen" page="component://common/widget/SecurityScreens.xml#EditX509IssuerProvisions"/>
+    <view-map name="ViewCertificate" type="screen" page="component://common/widget/SecurityScreens.xml#ViewCertificate"/>
 
     <view-map name="findVisits" type="screen" page="component://party/widget/partymgr/VisitScreens.xml#FindVisits"/>
     <view-map name="visitdetail" type="screen" page="component://party/widget/partymgr/VisitScreens.xml#visitdetail"/>

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?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl Sun Dec 19 19:10:50 2010
@@ -55,7 +55,7 @@ under the License.
           <td><a href="<@ofbizUrl>showvisits?sort=visitId&amp;showAll=${showAll}<#if partyId?has_content>&amp;partyId=${partyId}</#...@ofbizUrl>">${uiLabelMap.PartyVisitId}</a></td>
           <td><a href="<@ofbizUrl>showvisits?sort=visitorId&amp;showAll=${showAll}<#if visitorId?has_content>&amp;visitorId=${visitorId}</#...@ofbizUrl>">${uiLabelMap.PartyVisitorId}</a></td>
           <td><a href="<@ofbizUrl>showvisits?sort=partyId&amp;showAll=${showAll}<#if partyId?has_content>&amp;partyId=${partyId}</#...@ofbizUrl>">${uiLabelMap.PartyPartyId}</a></td>
-          <td><a href="<@ofbizUrl>showvisits?sort=userLoginId&amp;showAll=${showAll}<#if partyId?has_content>&amp;partyId=${partyId}</#...@ofbizUrl>">${uiLabelMap.PartyUserLoginId}</a></td>
+          <td><a href="<@ofbizUrl>showvisits?sort=userLoginId&amp;showAll=${showAll}<#if partyId?has_content>&amp;partyId=${partyId}</#...@ofbizUrl>">${uiLabelMap.CommonUserLoginId}</a></td>
           <td><a href="<@ofbizUrl>showvisits?sort=-userCreated&amp;showAll=${showAll}<#if partyId?has_content>&amp;partyId=${partyId}</#...@ofbizUrl>">${uiLabelMap.PartyNewUser}</a></td>
           <td><a href="<@ofbizUrl>showvisits?sort=webappName&amp;showAll=${showAll}<#if partyId?has_content>&amp;partyId=${partyId}</#...@ofbizUrl>">${uiLabelMap.PartyWebApp}</a></td>
           <td><a href="<@ofbizUrl>showvisits?sort=clientIpAddress&amp;showAll=${showAll}<#if partyId?has_content>&amp;partyId=${partyId}</#...@ofbizUrl>">${uiLabelMap.PartyClientIP}</a></td>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sun Dec 19 19:10:50 2010
@@ -29,6 +29,7 @@ under the License.
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
@@ -58,7 +59,6 @@ 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"/>
@@ -121,51 +121,6 @@ under the License.
             </widgets>
         </section>
     </screen>
-    <screen name="SecurityGroupDecorator">
-        <section>
-            <actions>
-                <set field="headerItem" value="security"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="pre-body">
-                        <section>
-                            <condition>
-                                <and>
-                                    <if-has-permission permission="SECURITY" action="_VIEW"/>
-                                    <not><if-empty field="groupId"/></not>
-                                </and>
-                            </condition>
-                            <widgets>
-                                <include-menu name="SecurityGroupTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                    <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <if-has-permission permission="SECURITY" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <container>
-                                    <label style="h1" text="${uiLabelMap[labelTitleProperty]} [${groupId}]"/>
-                                </container>
-                                <container style="button-bar">
-                                    <link target="EditSecurityGroup" style="buttontext create" text="${uiLabelMap.PartyNewSecurityGroup}"/>
-                                    <link target="EditCertIssuerProvisions" style="buttontext" text="${uiLabelMap.PartyCertIssuers}"/>
-                                </container>
-
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.PartySecurityViewPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
     <screen name="CommonRequestDecorator">
         <section>
             <actions/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml Sun Dec 19 19:10:50 2010
@@ -200,7 +200,7 @@ under the License.
         paginate-target="LookupPartyAndUserLoginAndPerson" header-row-style="header-row" default-table-style="basic-table">
         <!--<auto-fields-entity entity-name="PartyAndUserLoginAndPerson" default-field-type="find"/>-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
-        <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}"><text-find/></field>
+        <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><text-find/></field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
         <field name="middleName" title="${uiLabelMap.PartyMiddleName}"><text-find/></field>
         <field name="lastName" title="${uiLabelMap.PartyLastName}"><text-find/></field>
@@ -221,7 +221,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display description="${partyId}"/>
         </field>
-        <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}" widget-style="smallSubmit">
+        <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
             <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
         </field>
         <field name="lastName" title="${uiLabelMap.PartyName}"><display description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
@@ -229,7 +229,7 @@ under the License.
 
     <form name="lookupUserLoginAndPartyDetails" type="single" target="LookupUserLoginAndPartyDetails"
         paginate-target="LookupUserLoginAndPartyDetails" header-row-style="header-row" default-table-style="basic-table">
-        <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}"><text-find/></field>
+        <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><text-find/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
         <field name="middleName" title="${uiLabelMap.PartyMiddleName}"><text-find/></field>
@@ -247,7 +247,7 @@ under the License.
             <set field="entityName" value="UserLoginAndPartyDetails"/>
             <script location="component://party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy"/>
         </actions>
-        <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}" widget-style="smallSubmit">
+        <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
             <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
         </field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sun Dec 19 19:10:50 2010
@@ -37,30 +37,6 @@
         <menu-item name="partyinv" title="${uiLabelMap.PartyInvitation}"><link target="partyInvitation"/></menu-item>
     </menu>
 
-    <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.SecurityGroups}">
-            <link target="EditSecurityGroup">
-                <parameter param-name="groupId"/>
-            </link>
-        </menu-item>
-        <menu-item name="EditSecurityGroupPermissions" title="${uiLabelMap.PartyPermissions}">
-            <link target="EditSecurityGroupPermissions">
-                <parameter param-name="groupId"/>
-            </link>
-        </menu-item>
-        <menu-item name="EditSecurityGroupUserLogins" title="${uiLabelMap.PartyUserLogins}">
-            <link target="EditSecurityGroupUserLogins">
-                <parameter param-name="groupId"/>
-            </link>
-        </menu-item>
-        <menu-item name="EditSecurityGroupProtectedViews" title="${uiLabelMap.PartyProtectedViews}">
-            <link target="EditSecurityGroupProtectedViews">
-                <parameter param-name="groupId"/>
-            </link>
-        </menu-item>
-    </menu>
-
     <menu name="ProfileTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
         default-menu-item-name="viewprofile">
         <menu-item name="viewprofile" title="${uiLabelMap.PartyProfile}">

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sun Dec 19 19:10:50 2010
@@ -542,8 +542,6 @@ under the License.
             <actions>
                 <set field="titleProperty" value="PageTitleEditUserLoginSecurityGroups"/>
                 <set field="tabButtonItem" value="viewprofile"/>
-                <set field="labelTitleProperty" value="PageTitleEditUserLoginSecurityGroups"/>
-
                 <set field="userLoginId" from-field="parameters.userLoginId"/>
                 <entity-one entity-name="UserLogin" value-field="editUserLogin"/>
                 <set field="partyId" from-field="parameters.partyId" default-value="${editUserLogin.partyId}"/>
@@ -551,7 +549,7 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet id="AddUserLoginSecurityGroupsPanel" title="${uiLabelMap.PartyAddUserLoginToSecurityGroup}" collapsible="true">
+                        <screenlet id="AddUserLoginSecurityGroupsPanel" title="${uiLabelMap.AddUserLoginToSecurityGroup}" collapsible="true">
                             <include-form name="AddUserLoginSecurityGroup" location="component://party/widget/partymgr/SecurityForms.xml"/>
                         </screenlet>
                         <include-form name="ListUserLoginSecurityGroups" location="component://party/widget/partymgr/SecurityForms.xml"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml Sun Dec 19 19:10:50 2010
@@ -63,7 +63,7 @@ under the License.
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
-        <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}" sort-field="true"><display/></field>
+        <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" sort-field="true"><display/></field>
         <field name="userCreated" title="${uiLabelMap.PartyNewUser}" sort-field="true"><display/></field>
         <field name="webappName" title="${uiLabelMap.PartyWebApp}" sort-field="true"><display/></field>
         <field name="clientIpAddress" title="${uiLabelMap.PartyClientIP}" sort-field="true"><display/></field>
@@ -84,7 +84,7 @@ under the License.
             </entity-condition>
         </actions>
         
-        <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}" sort-field="true"><display/></field>
+        <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" sort-field="true"><display/></field>
         <field name="partyId" widget-style="buttontext" sort-field="true">
             <hyperlink description="${partyId}" target="viewprofile">
                 <parameter param-name="partyId"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml Sun Dec 19 19:10:50 2010
@@ -98,7 +98,7 @@ under the License.
             </entity-condition>
         </actions>
         <field name="groupId"><hidden/></field>
-        <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}"><display/></field>
+        <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><display/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         <field name="partyId" title="${uiLabelMap.PartyParty}">
@@ -122,7 +122,7 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table">
         <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="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><lookup target-form-name="LookupUserLoginAndPartyDetails" size="30"></lookup></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
 

Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml Sun Dec 19 19:10:50 2010
@@ -27,30 +27,13 @@ under the License.
                 <set field="titleProperty" value="PageTitleFindSecurityGroup"/>
                 <set field="headerItem" value="security"/>
                 <set field="tabButtonItem" value="FindSecurityGroup"/>
-
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <if-has-permission permission="SECURITY" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <screenlet title="${uiLabelMap.PartySecurityGroupsList}">
-                                    <container style="button-bar">
-                                        <link target="EditSecurityGroup" style="textbutton create" text="${uiLabelMap.PartyNewSecurityGroup}"/>
-                                        <link target="EditCertIssuerProvisions" style="textbutton" text="${uiLabelMap.PartyCertIssuers}"/>
-                                    </container>
-                                    <include-form name="ListSecurityGroups" location="component://party/widget/partymgr/SecurityForms.xml"/>
-                                </screenlet>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.PartySecurityViewPermissionError}</label>
-                            </fail-widgets>
-                        </section>
+                        <include-screen name="FindSecurityGroup" location="component://common/widget/SecurityScreens.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1050936&r1=1050935&r2=1050936&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sun Dec 19 19:10:50 2010
@@ -8502,6 +8502,22 @@
         <value xml:lang="zh">仅允许登录用户</value>
         <value xml:lang="zh_TW">只允許使用者進入</value>
     </property>
+    <property key="CommonUserLoginId">
+        <value xml:lang="de">Benutzeranmeldung ID</value>
+        <value xml:lang="en">User Login ID</value>
+        <value xml:lang="es">Código de usuario</value>
+        <value xml:lang="fr">Identifiant de connexion</value>
+        <value xml:lang="hi_IN">प्रयोक्ता लॉगिन क्रमांक</value>
+        <value xml:lang="it">Codice utente login</value>
+        <value xml:lang="nl">User Login Id</value>
+        <value xml:lang="pt_BR">ID de nome de usuário</value>
+        <value xml:lang="pt_PT">Identificação de Início de Secção</value>
+        <value xml:lang="ro">Cod 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="CommonUsername">
         <value xml:lang="ar">اسم المستخدم</value>
         <value xml:lang="cs">Uživatelské jméno</value>