Template update .

-Ok/Cancel/Save via msgPool

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9488 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/plugins/admin/acl/acl_role.tpl b/gosa-core/plugins/admin/acl/acl_role.tpl
index 17a2704b7ff9279af82251a47ea7736fd7f955c7..bed56c352ab747655b3810f9ff1d5f96f66c76b2 100644 (file)
--- a/gosa-core/plugins/admin/acl/acl_role.tpl
+++ b/gosa-core/plugins/admin/acl/acl_role.tpl
@@ -46,7 +46,7 @@
 {/if}
 
 {if $dialogState eq 'create'}
-<h1>{t}ACL type{/t} <select size="1" name="aclType" title="{t}Select an acl type{/t}" onChange="document.mainform.submit()">{html_options options=$aclTypes selected=$aclType}<option disabled>&nbsp;</option></select>&nbsp;{if $javascript eq 'false'}<input type="submit" value="{t}Apply{/t}" name="refresh">{/if}</h1>
+<h1>{t}ACL type{/t} <select size="1" name="aclType" title="{t}Select an acl type{/t}" onChange="document.mainform.submit()">{html_options options=$aclTypes selected=$aclType}<option disabled>&nbsp;</option></select>&nbsp;{if $javascript eq 'false'}<input type="submit" value="{msgPool type=applyButton}" name="refresh">{/if}</h1>
 
 <p class="seperator">&nbsp;</p>
 
@@ -56,9 +56,9 @@
 
 <p class="seperator">&nbsp;</p>
 <div style='text-align:right;margin-top:5px'>
-       <input type="submit" name="submit_new_acl" value="{t}Apply{/t}">
+       <input type="submit" name="submit_new_acl" value="{msgPool type=applyButton}">
        &nbsp;
-       <input type="submit" name="cancel_new_acl" value="{t}Cancel{/t}">
+       <input type="submit" name="cancel_new_acl" value="{msgPool type=cancelButton}">
 </div>
 {/if}
 
@@ -70,9 +70,9 @@
 
 <p class="seperator">&nbsp;</p>
 <div style='text-align:right;margin-top:5px'>
-       <input type="submit" name="submit_edit_acl" value="{t}Apply{/t}">
+       <input type="submit" name="submit_edit_acl" value="{msgPool type=applyButton}">
        &nbsp;
-       <input type="submit" name="cancel_edit_acl" value="{t}Cancel{/t}">
+       <input type="submit" name="cancel_edit_acl" value="{msgPool type=cancelButton}">
 </div>
 {/if}
 <input type='hidden' name='acl_role_posted' value='1'>

diff --git a/gosa-core/plugins/admin/acl/remove.tpl b/gosa-core/plugins/admin/acl/remove.tpl
index 0b5323df4c7e08647afac83497f0a29f4e3c354c..c9d8311556aeac62e50a7c556931e3e51fc9c1d8 100644 (file)
--- a/gosa-core/plugins/admin/acl/remove.tpl
+++ b/gosa-core/plugins/admin/acl/remove.tpl
@@ -14,10 +14,10 @@
 {if $is_role}
   <input type=submit name="delete_acl_role_confirmed" value="{t}Delete{/t}">
   &nbsp;
-  <input type=submit name="delete_acl_role_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="delete_acl_role_cancel" value="{msgPool type=cancelButton}">
 {else}
   <input type=submit name="delete_acl_confirm" value="{t}Delete{/t}">
   &nbsp;
-  <input type=submit name="delete_acl_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="delete_acl_cancel" value="{msgPool type=cancelButton}">
 {/if}
 </p>

diff --git a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
index 9338b7611c6efd1bce69a18aedb4fcff0b4a6bcf..a18e7932c13046eca79079e73e439653fa4df097 100644 (file)
--- a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
+++ b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
@@ -12,8 +12,8 @@
 </p>
 
 <p class="plugbottom">
-       <input type='submit' name='dep_move_confirm' value='{t}Save{/t}'>
+       <input type='submit' name='dep_move_confirm' value='{msgPool type=saveButton}'>
        &nbsp;
-       <input type='submit' name='cancel_save' value='{t}Cancel{/t}'>
+       <input type='submit' name='cancel_save' value='{msgPool type=cancelButton}'>
 </p>
 

diff --git a/gosa-core/plugins/admin/departments/remove.tpl b/gosa-core/plugins/admin/departments/remove.tpl
index e4e075aa3027df1de96f6c242222967f00f9360d..f065d6838fcd3ca72ca139c7d9661372ba59e524 100644 (file)
--- a/gosa-core/plugins/admin/departments/remove.tpl
+++ b/gosa-core/plugins/admin/departments/remove.tpl
@@ -14,11 +14,11 @@
        {if $multiple}
                <input type=submit name="delete_multiple_department_confirm" value="{t}Delete{/t}">
                &nbsp;
-               <input type=submit name="delete_multiple_department_cancel" value="{t}Cancel{/t}">
+               <input type=submit name="delete_multiple_department_cancel" value="{msgPool type=cancelButton}">
                {else}
                <input type=submit name="delete_department_confirm" value="{t}Delete{/t}">
                &nbsp;
-               <input type=submit name="delete_cancel" value="{t}Cancel{/t}">
+               <input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
        {/if}
 </p>
 

diff --git a/gosa-core/plugins/admin/groups/group_objects.tpl b/gosa-core/plugins/admin/groups/group_objects.tpl
index 5fcdc73a2b58628b0ff917312bf2e2709a0d78e9..bdf7f9ce3f25e162897b8c7bf6da9e7362bf3742 100644 (file)
--- a/gosa-core/plugins/admin/groups/group_objects.tpl
+++ b/gosa-core/plugins/admin/groups/group_objects.tpl
@@ -54,6 +54,6 @@
 <p class="plugbottom">
   <input type=submit name="add_users_finish" value="{t}Add{/t}">
   &nbsp;
-  <input type=submit name="add_users_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="add_users_cancel" value="{msgPool type=cancelButton}">
 </p>
 

diff --git a/gosa-core/plugins/admin/groups/remove.tpl b/gosa-core/plugins/admin/groups/remove.tpl
index 1c938342c53514b1d7f74755e072c0ec84d6d232..53648089d245133871a88db779371f7b649371d8 100644 (file)
--- a/gosa-core/plugins/admin/groups/remove.tpl
+++ b/gosa-core/plugins/admin/groups/remove.tpl
@@ -15,11 +15,11 @@
   {if $multiple}
   <input type=submit name="delete_multiple_groups_confirm" value="{t}Delete{/t}">
   &nbsp;
-  <input type=submit name="delete_multiple_group_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="delete_multiple_group_cancel" value="{msgPool type=cancelButton}">
   {else}
   <input type=submit name="delete_group_confirm" value="{t}Delete{/t}">
   &nbsp;
-  <input type=submit name="delete_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
   {/if}
 
 

diff --git a/gosa-core/plugins/admin/ogroups/ogroup_objects.tpl b/gosa-core/plugins/admin/ogroups/ogroup_objects.tpl
index 663b602746760ed01c8286f12cfcf05de5296b6d..b0d5dcb3ea7516de2e9261298ad2a97f08c1de0a 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/ogroup_objects.tpl
+++ b/gosa-core/plugins/admin/ogroups/ogroup_objects.tpl
@@ -53,6 +53,6 @@
 <p class="plugbottom">
   <input type=submit name="add_object_finish" value="{t}Add{/t}">
   &nbsp;
-  <input type=submit name="add_object_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="add_object_cancel" value="{msgPool type=cancelButton}">
 </p>
 

diff --git a/gosa-core/plugins/admin/ogroups/remove.tpl b/gosa-core/plugins/admin/ogroups/remove.tpl
index 720156b97792b42e358f8b48a4bf416f7978150c..6160b6b6064908be1cb7678b7fe86ddcebe5ddb1 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/remove.tpl
+++ b/gosa-core/plugins/admin/ogroups/remove.tpl
@@ -14,11 +14,11 @@
        {if $multiple}
                <input type=submit name="delete_multiple_ogroup_confirm" value="{t}Delete{/t}">
                &nbsp;
-               <input type=submit name="delete_multiple_ogroup_cancel" value="{t}Cancel{/t}">
+               <input type=submit name="delete_multiple_ogroup_cancel" value="{msgPool type=cancelButton}">
        {else}
                <input type=submit name="delete_group_confirm" value="{t}Delete{/t}">
                &nbsp;
-               <input type=submit name="delete_cancel" value="{t}Cancel{/t}">
+               <input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
        {/if}
 </p>
 

diff --git a/gosa-core/plugins/admin/users/password.tpl b/gosa-core/plugins/admin/users/password.tpl
index 9eb761f3a42315c7e2c9429096141dcee0f64c97..18b8b0744479d7426dda5d8a67fd4bb4d5a7618f 100644 (file)
--- a/gosa-core/plugins/admin/users/password.tpl
+++ b/gosa-core/plugins/admin/users/password.tpl
@@ -29,7 +29,7 @@
 <p class="plugbottom">
   <input type=submit name="password_finish" value="{t}Set password{/t}">
   &nbsp;
-  <input type=submit name="password_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="password_cancel" value="{msgPool type=cancelButton}">
   <input type='hidden' id='formSubmit'>
 </p>
 

diff --git a/gosa-core/plugins/admin/users/remove.tpl b/gosa-core/plugins/admin/users/remove.tpl
index eb414716654e77f8ed0224cf391ed06ed1d6bc93..805cc7a45e8116c41ee95d5944dfe54d500883fe 100644 (file)
--- a/gosa-core/plugins/admin/users/remove.tpl
+++ b/gosa-core/plugins/admin/users/remove.tpl
@@ -13,10 +13,10 @@
 <p class="plugbottom">
   {if $multiple}
   <input type=submit name="delete_multiple_user_confirm" value="{t}Delete{/t}">
-  <input type=submit name="delete_multiple_user_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="delete_multiple_user_cancel" value="{msgPool type=cancelButton}">
   {else}
   <input type=submit name="delete_user_confirm" value="{t}Delete{/t}">
-  <input type=submit name="delete_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
   {/if}
   &nbsp;
 </p>

diff --git a/gosa-core/plugins/admin/users/template.tpl b/gosa-core/plugins/admin/users/template.tpl
index 37237f9fc0bc0e8a07068723fd5874f887536e85..0ce36ce9666a939cbbe68e0ffe7a591dca349968 100644 (file)
--- a/gosa-core/plugins/admin/users/template.tpl
+++ b/gosa-core/plugins/admin/users/template.tpl
@@ -47,7 +47,7 @@
 <p class="plugbottom">
   <input type=submit name="template_continue" value="{t}Continue{/t}">
   &nbsp;
-  <input type=submit name="edit_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="edit_cancel" value="{msgPool type=cancelButton}">
 </p>
 
 

diff --git a/gosa-core/plugins/personal/generic/generic_certs.tpl b/gosa-core/plugins/personal/generic/generic_certs.tpl
index 0b5e7597c5dab950cca156093f988c6a14cd3f9b..f5953898063c6df0539deac0fd7efdc685a4bf65 100644 (file)
--- a/gosa-core/plugins/personal/generic/generic_certs.tpl
+++ b/gosa-core/plugins/personal/generic/generic_certs.tpl
@@ -88,9 +88,9 @@
 
 <p class="plugbottom">
        {render acl=$CertificateACL}
-  <input type=submit name="cert_edit_finish" value="{t}Save{/t}">
+  <input type=submit name="cert_edit_finish" value="{msgPool type=saveButton}">
        {/render}
   &nbsp;
-  <input type=submit name="cert_edit_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="cert_edit_cancel" value="{msgPool type=cancelButton}">
 </p>
 

diff --git a/gosa-core/plugins/personal/generic/generic_picture.tpl b/gosa-core/plugins/personal/generic/generic_picture.tpl
index 0e2b06cffe8f8f699d71c01969c0c98672dce3bd..3ca58773423705a4f99e44b5a4cfb0ba848144b9 100644 (file)
--- a/gosa-core/plugins/personal/generic/generic_picture.tpl
+++ b/gosa-core/plugins/personal/generic/generic_picture.tpl
@@ -30,8 +30,8 @@
 </table>
 <br>
 <p class="plugbottom">
-  <input type=submit name="picture_edit_finish" value="{t}Save{/t}">
+  <input type=submit name="picture_edit_finish" value="{msgPool type=saveButton}">
   &nbsp;
-  <input type=submit name="picture_edit_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="picture_edit_cancel" value="{msgPool type=cancelButton}">
 </p>
 

diff --git a/gosa-core/plugins/personal/generic/password.tpl b/gosa-core/plugins/personal/generic/password.tpl
index 3d26511fc927afd2e302e263209bc91c57f88a33..0430e544e76dc13a3a84037ab08fd9c124b3625c 100644 (file)
--- a/gosa-core/plugins/personal/generic/password.tpl
+++ b/gosa-core/plugins/personal/generic/password.tpl
@@ -16,7 +16,7 @@
 <p class="plugbottom">
   <input type=submit name="password_finish" value="{t}Set password{/t}">
   &nbsp;
-  <input type=submit name="password_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="password_cancel" value="{msgPool type=cancelButton}">
 </p>
 
 <!-- Place cursor -->

diff --git a/gosa-core/plugins/personal/posix/posix_groups.tpl b/gosa-core/plugins/personal/posix/posix_groups.tpl
index 841d8a87a93f223b73cee0169cd18334a53aafc8..42671e36b3176bea69c11d12d74ea5bf3a26476d 100644 (file)
--- a/gosa-core/plugins/personal/posix/posix_groups.tpl
+++ b/gosa-core/plugins/personal/posix/posix_groups.tpl
@@ -78,6 +78,6 @@
 <p class="plugbottom">
   <input type=submit name="add_groups_finish" value="{t}Add{/t}">
   &nbsp;
-  <input type=submit name="add_groups_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="add_groups_cancel" value="{msgPool type=cancelButton}">
 </p>
 

diff --git a/gosa-core/plugins/personal/posix/trust_machines.tpl b/gosa-core/plugins/personal/posix/trust_machines.tpl
index 3550fcf29c389b982d36b6467bf8e7b9ba760cf0..1c28d1eda3875ff49fdcd1c99e0d2eef136e04f1 100644 (file)
--- a/gosa-core/plugins/personal/posix/trust_machines.tpl
+++ b/gosa-core/plugins/personal/posix/trust_machines.tpl
@@ -38,5 +38,5 @@ t}Filters{/t}</b></p>
 <p class="plugbottom">
   <input type=submit name="add_ws_finish" value="{t}Add{/t}">
   &nbsp;
-  <input type=submit name="add_ws_cancel" value="{t}Cancel{/t}">
+  <input type=submit name="add_ws_cancel" value="{msgPool type=cancelButton}">
 </p>