From: Olivier Lamy <olamy@apache.org>
Date: Fri, 30 Dec 2011 17:08:19 +0000 (+0000)
Subject: use existing i18n from redback
X-Git-Tag: archiva-1.4-M3~1671
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4edc7d2a367c3937047bbdddc0b74a613e3437b5;p=archiva.git

use existing i18n from redback

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1225864 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/TODO.TXT b/archiva-modules/archiva-web/archiva-webapp-js/TODO.TXT
index 18cc32fc6..5720a38f8 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/TODO.TXT
+++ b/archiva-modules/archiva-web/archiva-webapp-js/TODO.TXT
@@ -5,4 +5,4 @@ ui pages to do in js:
   ** roles list
   ** single roles read (parent, childs, permissions, users with a parent role, users with this role)
 
-* too much for archiva :-)
\ No newline at end of file
+* too much todo for archiva :-)
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
index 7017e6744..bea2ef35d 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
@@ -2,8 +2,8 @@
   <table class="bordered-table zebra-striped" id="rolesTable">
     <thead>
       <tr>
-        <th>${$.i18n.prop('roles.name')}</th>
-        <th>${$.i18n.prop('roles.description')}</th>
+        <th>${$.i18n.prop('name')}</th>
+        <th>${$.i18n.prop('description')}</th>
         <th>${$.i18n.prop('edit')}</th>
       </tr>
     </thead>
@@ -31,7 +31,7 @@
       <a href="#roles-view">${$.i18n.prop('roles.grid.tab.title')}</a>
     </li>
     <li id="roles-view-tabs-li-roles-edit">
-      <a href="#role-edit">${$.i18n.prop('role.edit')}</a>
+      <a href="#role-edit">${$.i18n.prop('edit')}</a>
     </li>
   </ul>
   <div id="roles-view-tabs-content" class="tab-content">
@@ -44,23 +44,23 @@
 
 <script id="editRoleTab" type="text/x-jquery-tmpl">
   <div class="page-header">
-    <h3>${$.i18n.prop('role.edit')}</h3>
+    <h3>${$.i18n.prop('role')}</h3>
   </div>
   <table class="bordered-table" id="editRoleTable">
     <tbody>
       <tr>
-        <td>${$.i18n.prop('role.edit.name')}:</td>
+        <td>${$.i18n.prop('name')}:</td>
         <td>${name}</td>
       </tr>
       <tr>
-        <td>${$.i18n.prop('role.edit.description')}:</td>
+        <td>${$.i18n.prop('description')}:</td>
         <td>${description}</td>
       </tr>
     </tbody>
   </table>
 
   <div class="page-header">
-    <h3>${$.i18n.prop('role.parents')}</h3>
+    <h3>${$.i18n.prop('role.model.parent.roles')}</h3>
   </div>
   {{if parentRoleNames}}
     <ul>
@@ -75,7 +75,7 @@
   {{/if}}
 
   <div class="page-header">
-    <h3>${$.i18n.prop('role.childs')}</h3>
+    <h3>${$.i18n.prop('role.model.child.roles')}</h3>
   </div>
   {{if childRoleNames}}
     <ul>
@@ -89,16 +89,16 @@
     </ul>
   {{/if}}
 
+  <div class="page-header">
+    <h3>${$.i18n.prop('permissions')}</h3>
+  </div>
   {{if permissions}}
-    <div class="page-header">
-      <h3>${$.i18n.prop('role.permissions')}</h3>
-    </div>
     <table class="bordered-table zebra-striped" id="rolePermissionsTable">
       <thead>
         <tr>
-          <th>${$.i18n.prop('role.permission.name')}</th>
-          <th>${$.i18n.prop('role.permission.operation.name')}</th>
-          <th>${$.i18n.prop('role.permission.resource.')}</th>
+          <th>${$.i18n.prop('name')}</th>
+          <th>${$.i18n.prop('role.operation')}</th>
+          <th>${$.i18n.prop('role.resource')}</th>
         </tr>
       </thead>
       <tbody>
@@ -121,4 +121,9 @@
     </table>
   {{/if}}
 
+  <div class="page-header">
+    <h3>${$.i18n.prop('role.edit.users.defined.in.current.role')}</h3>
+  </div>
+
+
 </script>