From baec36cece87239e4153011b1922f1058eb2bec8 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 4 Mar 2006 10:49:55 +0000 Subject: [PATCH] replaced submit/abort with ok/cancel --- lam/lib/modules/inetOrgPerson.inc | 4 ++-- lam/lib/modules/posixAccount.inc | 4 ++-- lam/lib/modules/posixGroup.inc | 2 +- lam/lib/modules/sambaAccount.inc | 2 +- lam/lib/modules/sambaSamAccount.inc | 6 +++--- lam/templates/config/confmain.php | 4 ++-- lam/templates/config/confmodules.php | 6 +++--- lam/templates/config/conftypes.php | 4 ++-- lam/templates/config/profmanage.php | 2 +- lam/templates/masscreate.php | 2 +- lam/templates/ou_edit.php | 6 +++--- lam/templates/pdfedit/pdfdelete.php | 6 +++--- lam/templates/pdfedit/pdfmain.php | 4 ++-- lam/templates/pdfedit/pdfpage.php | 4 ++-- lam/templates/profedit/profiledelete.php | 4 ++-- lam/templates/profedit/profilemain.php | 4 ++-- lam/templates/profedit/profilepage.php | 2 +- lam/templates/tree/export_form.php | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc index 5bb93493..ce9288e1 100644 --- a/lam/lib/modules/inetOrgPerson.inc +++ b/lam/lib/modules/inetOrgPerson.inc @@ -710,8 +710,8 @@ class inetOrgPerson extends baseModule { $return[] = array( 0 => array('kind' => 'table', 'value' => array( 0 => array( - 0 => array('kind' => 'input', 'type' => 'submit', 'value' => _('Submit'), 'name' => 'form_subpage_inetOrgPerson_attributes_submit'), - 1 => array('kind' => 'input', 'type' => 'submit', 'value' => _('Back'), 'name' => 'form_subpage_inetOrgPerson_attributes_back'), + 0 => array('kind' => 'input', 'type' => 'submit', 'value' => _('Ok'), 'name' => 'form_subpage_inetOrgPerson_attributes_submit'), + 1 => array('kind' => 'input', 'type' => 'submit', 'value' => _('Cancel'), 'name' => 'form_subpage_inetOrgPerson_attributes_back'), 2 => array('kind' => 'text'))))); return $return; } diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc index a01615e3..232e8979 100644 --- a/lam/lib/modules/posixAccount.inc +++ b/lam/lib/modules/posixAccount.inc @@ -1009,8 +1009,8 @@ class posixAccount extends baseModule { $return[] = array( 0 => array('kind' => 'table', 'value' => array( 0 => array( - 0 => array('kind' => 'input', 'type' => 'submit', 'value' => _('Submit'), 'name' => 'form_subpage_posixAccount_attributes_submit'), - 1 => array('kind' => 'input', 'type' => 'submit', 'value' => _('Back'), 'name' => 'form_subpage_posixAccount_attributes_back'), + 0 => array('kind' => 'input', 'type' => 'submit', 'value' => _('Ok'), 'name' => 'form_subpage_posixAccount_attributes_submit'), + 1 => array('kind' => 'input', 'type' => 'submit', 'value' => _('Cancel'), 'name' => 'form_subpage_posixAccount_attributes_back'), 2 => array('kind' => 'text'))))); return $return; } diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc index 234f964b..7d8364d8 100644 --- a/lam/lib/modules/posixGroup.inc +++ b/lam/lib/modules/posixGroup.inc @@ -280,7 +280,7 @@ class posixGroup extends baseModule { $return[] = array( 0 => array('kind' => 'table', 'value' => array( 0 => array( - 0 => array('kind' => 'input', 'type' => 'submit', 'value' => _('Submit'), 'name' => 'form_subpage_posixGroup_attributes_submit'), + 0 => array('kind' => 'input', 'type' => 'submit', 'value' => _('Ok'), 'name' => 'form_subpage_posixGroup_attributes_submit'), 1 => array('kind' => 'input', 'type' => 'submit', 'value' => _('Back'), 'name' => 'form_subpage_posixGroup_attributes_back'), 2 => array('kind' => 'text'))))); return $return; diff --git a/lam/lib/modules/sambaAccount.inc b/lam/lib/modules/sambaAccount.inc index 7d1daedf..e33d15e9 100644 --- a/lam/lib/modules/sambaAccount.inc +++ b/lam/lib/modules/sambaAccount.inc @@ -803,7 +803,7 @@ class sambaAccount extends baseModule { if ($_SESSION[$this->base]->type=='host') { $return[] = array ( 0 => array ( 'kind' => 'input', 'name' => 'acctFlagsW', 'type' => 'hidden', 'value' => 'true' )); $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Reset password') ), - 1 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'ResetSambaPassword', 'value' => _('Submit')), + 1 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'ResetSambaPassword', 'value' => _('Reset')), 2 => array ( 'kind' => 'help', 'value' => 'resetPassword' )); } return $return; diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc index 4dc7b78c..32dc1312 100644 --- a/lam/lib/modules/sambaSamAccount.inc +++ b/lam/lib/modules/sambaSamAccount.inc @@ -914,7 +914,7 @@ class sambaSamAccount extends baseModule { if ($_SESSION[$this->base]->type=='host') { $return[] = array ( 0 => array ( 'kind' => 'input', 'name' => 'sambaAcctFlagsW', 'type' => 'hidden', 'value' => 'true' )); $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Reset password') ), - 1 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'ResetSambaPassword', 'value' => _('Submit')), + 1 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'ResetSambaPassword', 'value' => _('Reset')), 2 => array ( 'kind' => 'help', 'value' => 'resetPassword' )); } return $return; @@ -1000,8 +1000,8 @@ class sambaSamAccount extends baseModule { } $return[] = array(0 => array('kind' => 'text', 'text' => ' ', 'td' => array('colspan' => 8))); $return[] = array( - 0 => array('kind' => 'input', 'name' => 'form_subpage_sambaSamAccount_attributes_submit', 'type' => 'submit', 'value' => _('Submit'), 'td' => array('align' => 'right')), - 1 => array('kind' => 'input', 'name' => 'form_subpage_sambaSamAccount_attributes_abort', 'type' => 'submit', 'value' => _('Abort'), 'td' => array('align' => 'left')) + 0 => array('kind' => 'input', 'name' => 'form_subpage_sambaSamAccount_attributes_submit', 'type' => 'submit', 'value' => _('Ok'), 'td' => array('align' => 'right')), + 1 => array('kind' => 'input', 'name' => 'form_subpage_sambaSamAccount_attributes_abort', 'type' => 'submit', 'value' => _('Cancel'), 'td' => array('align' => 'left')) ); return $return; } diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php index 6446ac45..b4f6a255 100644 --- a/lam/templates/config/confmain.php +++ b/lam/templates/config/confmain.php @@ -381,11 +381,11 @@ echo ("\n"); echo ""; echo "\n"); diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php index 4f9fffd6..cf7371fb 100644 --- a/lam/templates/config/confmodules.php +++ b/lam/templates/config/confmodules.php @@ -106,13 +106,13 @@ for ($i = 0; $i < sizeof($account_list); $i++) { echo "

\n"; // disable button if there are conflicts/depends if ($allDependenciesOk) { - echo "\n"; + echo "\n"; } else { - echo "\n"; + echo "\n"; } echo " "; - echo "\n"; + echo "\n"; echo "

\n"; echo "



\n"; diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php index 4d49e6cf..85590c9d 100644 --- a/lam/templates/config/conftypes.php +++ b/lam/templates/config/conftypes.php @@ -232,8 +232,8 @@ if (sizeof($activeTypes) > 0) { // submit and abort button echo "

"; -echo "\n"; -echo "\n"; +echo "\n"; +echo "\n"; echo "\n"; echo "

"; diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php index de55f592..81d880f1 100644 --- a/lam/templates/config/profmanage.php +++ b/lam/templates/config/profmanage.php @@ -400,7 +400,7 @@ if (!isset($cfg->default) && !isset($cfg->password)) {     - "> + ">   \n"; echo "

\n"; - echo "\n"; + echo "    \n"; echo "\n"; echo "\n"; diff --git a/lam/templates/ou_edit.php b/lam/templates/ou_edit.php index 3ac62e77..a4cd5857 100644 --- a/lam/templates/ou_edit.php +++ b/lam/templates/ou_edit.php @@ -102,8 +102,8 @@ if ($_POST['submit']) { "\n" . "\n" . "\n" . - "\n" . - "\n" . + "\n" . + "\n" . ""; } else { @@ -189,7 +189,7 @@ function display_main() { echo ("
\n"); } - echo (""); + echo (""); echo ("\n"); echo ("\n"); } diff --git a/lam/templates/pdfedit/pdfdelete.php b/lam/templates/pdfedit/pdfdelete.php index f7f7dea7..fe7dc4b3 100644 --- a/lam/templates/pdfedit/pdfdelete.php +++ b/lam/templates/pdfedit/pdfdelete.php @@ -78,7 +78,7 @@ echo "
\n"; echo "

\n"; echo "
";
-	echo "";
+	echo "";
 	$tabindex++;
 	echo "";
 	$tabindex++;
-	echo "
\n"; echo "\n"; echo "
\n"; - echo "" . _('Account type') . ': ' . $_GET['type']; + echo "" . _('Account type') . ': ' . getTypeAlias($_GET['type']); echo "
\n"; echo "" . _('Name') . ': ' . $_GET['delete'] . "
\n"; @@ -87,8 +87,8 @@ echo "
\n"; echo "
\n"; echo ("
\n"); echo ("

\n"); -echo ("\n"); -echo ("\n"); +echo ("\n"); +echo ("\n"); echo (""); echo (""); echo ("

\n"); diff --git a/lam/templates/pdfedit/pdfmain.php b/lam/templates/pdfedit/pdfmain.php index 2f081b09..2a1ef5de 100644 --- a/lam/templates/pdfedit/pdfmain.php +++ b/lam/templates/pdfedit/pdfmain.php @@ -148,8 +148,8 @@ echo $_SESSION['header'];

- "> - "> + "> + ">

diff --git a/lam/templates/pdfedit/pdfpage.php b/lam/templates/pdfedit/pdfpage.php index eee7acae..48b34529 100644 --- a/lam/templates/pdfedit/pdfpage.php +++ b/lam/templates/pdfedit/pdfpage.php @@ -732,7 +732,7 @@ foreach($_SESSION['availablePDFFields'] as $module => $fields) {
- + $fields) { ">
- "> + ">   diff --git a/lam/templates/profedit/profiledelete.php b/lam/templates/profedit/profiledelete.php index 1f92f318..215be020 100644 --- a/lam/templates/profedit/profiledelete.php +++ b/lam/templates/profedit/profiledelete.php @@ -78,8 +78,8 @@ echo ("

" . _("Do you really want to delete this profile echo ($_GET['del'] . "

\n"); echo ("
\n"); echo ("

\n"); -echo ("\n"); -echo ("\n"); +echo ("\n"); +echo ("\n"); echo (""); echo (""); echo ("

\n"); diff --git a/lam/templates/profedit/profilemain.php b/lam/templates/profedit/profilemain.php index 73d79704..c4632a0c 100644 --- a/lam/templates/profedit/profilemain.php +++ b/lam/templates/profedit/profilemain.php @@ -161,8 +161,8 @@ for ($i = 0; $i < sizeof($profileClasses); $i++) { echo "

\n"; -echo "\n"; -echo "\n"; +echo "\n"; +echo "\n"; echo "

\n"; echo "\n"; diff --git a/lam/templates/profedit/profilepage.php b/lam/templates/profedit/profilepage.php index 9c291dd6..687fcb3a 100644 --- a/lam/templates/profedit/profilepage.php +++ b/lam/templates/profedit/profilepage.php @@ -249,7 +249,7 @@ echo ("\n"); $tabindex++; -echo ("\n"); +echo ("\n"); echo "\n"; echo ("\n"); diff --git a/lam/templates/tree/export_form.php b/lam/templates/tree/export_form.php index dc2119e5..3cc3ab68 100644 --- a/lam/templates/tree/export_form.php +++ b/lam/templates/tree/export_form.php @@ -161,7 +161,7 @@ echo "\n";
- +