From 4ad2204de4b15ecf91bee8db72527126461ee19f Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Fri, 18 Oct 2013 13:40:34 +0000
Subject: [PATCH] adding OK/CANCEL everywhere & replace yes/no by complete
 sentences

---
 bureau/admin/adm_add.php         | 6 +++---
 bureau/admin/adm_defquotas.php   | 2 +-
 bureau/admin/adm_dodefquotas.php | 4 ++--
 bureau/admin/adm_dodel.php       | 4 ++--
 bureau/admin/adm_passpolicy.php  | 4 ++--
 bureau/admin/adm_quotaedit.php   | 4 ++--
 bureau/admin/bro_main.php        | 4 ++--
 bureau/admin/dom_dodel.php       | 3 ++-
 bureau/admin/sql_bck.php         | 4 ++--
 9 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/bureau/admin/adm_add.php b/bureau/admin/adm_add.php
index 9b886f56..fc30001b 100644
--- a/bureau/admin/adm_add.php
+++ b/bureau/admin/adm_add.php
@@ -85,7 +85,7 @@ if (isset($error) && $error) {
 </tr>
 <tr>
         	<th><label for="nom"><?php echo _("Surname")."</label> / <label for=\"prenom\">"._("First Name"); ?></label></th>
-	<td><input class="int" type="text" id="nom" name="nom" value="<?php ehe($nom); ?>" size="20" maxlength="128" />&nbsp;/&nbsp;<input type="text" name="prenom" id="prenom" value="<?php ehe($prenom); ?>" class="int" size="20" maxlength="128" /></td>
+	<td><input class="int" type="text" id="nom" name="nom" value="<?php ehe($nom); ?>" size="16" maxlength="128" />&nbsp;/&nbsp;<input type="text" name="prenom" id="prenom" value="<?php ehe($prenom); ?>" class="int" size="16" maxlength="128" /></td>
 </tr>
 <tr>
 	<th><label for="nmail"><?php __("Email address"); ?></label></th>
@@ -137,8 +137,8 @@ if (isset($error) && $error) {
 </tr>
  <?php } ?>
 <tr class="trbtn"><td colspan="2">
-  <input type="submit" class="inb" name="submit" value="<?php __("Create this AlternC account"); ?>" />
-  <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='adm_list.php'" />
+  <input type="submit" class="inb ok" name="submit" value="<?php __("Create this AlternC account"); ?>" />
+  <input type="button" class="inb cancel" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='adm_list.php'" />
 </td></tr>
 </table>
 </form>
diff --git a/bureau/admin/adm_defquotas.php b/bureau/admin/adm_defquotas.php
index 8b4ffc56..5e79a11b 100644
--- a/bureau/admin/adm_defquotas.php
+++ b/bureau/admin/adm_defquotas.php
@@ -121,7 +121,7 @@ foreach($q as $name => $value) {
 }
 ?>
 <br/>
-<input type="submit" class="inb" value="<?php __("Edit the default quotas"); ?>" />
+<input type="submit" class="inb ok" value="<?php __("Edit the default quotas"); ?>" />
 </div>
 </form>
 <?php include_once("foot.php"); ?>
diff --git a/bureau/admin/adm_dodefquotas.php b/bureau/admin/adm_dodefquotas.php
index ed598bd8..4151c491 100644
--- a/bureau/admin/adm_dodefquotas.php
+++ b/bureau/admin/adm_dodefquotas.php
@@ -72,8 +72,8 @@ if($action == "add") {
       <p class="alert alert-warning"><?php __("WARNING: Confirm the deletion of the quota"); ?></p>
       <p><?php echo $type; ?></p>
       <blockquote>
-        <input type="submit" class="inb" name="confirm" value="<?php __("Yes"); ?>" />&nbsp;&nbsp;
-        <input type="button" class="inb" name="cancel" value="<?php __("No"); ?>" onclick="document.location='adm_defquotas.php';" />
+      <input type="submit" class="inb ok" name="confirm" value="<?php __("Yes, delete this default quota"); ?>" />&nbsp;&nbsp;
+      <input type="button" class="inb cancel" name="cancel" value="<?php __("No, don't delete this default quota"); ?>" onclick="document.location='adm_defquotas.php';" />
       </blockquote>
     </form>
     <?php
diff --git a/bureau/admin/adm_dodel.php b/bureau/admin/adm_dodel.php
index 3864ed78..817b0ea3 100644
--- a/bureau/admin/adm_dodel.php
+++ b/bureau/admin/adm_dodel.php
@@ -84,8 +84,8 @@ if($del_confirm == "y"){
       ?>
       </p>
       <blockquote>
-        <input type="submit" class="inb" name="confirm" value="<?php __("Yes"); ?>" />&nbsp;&nbsp;
-        <input type="button" class="inb" name="cancel" value="<?php __("No"); ?>" onclick="document.location='adm_list.php';" />
+	  <input type="submit" class="inb ok" name="confirm" value="<?php __("Yes, delete those accounts"); ?>" />&nbsp;&nbsp;
+    <input type="button" class="inb cancel" name="cancel" value="<?php __("No, don't delete those accounts"); ?>" onclick="document.location='adm_list.php';" />
       </blockquote>
     </form>
     <?php  
diff --git a/bureau/admin/adm_passpolicy.php b/bureau/admin/adm_passpolicy.php
index 611b16e1..260e05d8 100644
--- a/bureau/admin/adm_passpolicy.php
+++ b/bureau/admin/adm_passpolicy.php
@@ -114,8 +114,8 @@ if (!empty($edit)) {
       <input type="radio" name="allowlogin" id="allowlogin1" value="1" <?php cbox($c[$edit]["allowlogin"]); ?> />&nbsp;<?php __("Yes"); ?>
 </td></tr>
 </table>
-<p><input type="submit" class="inb" name="go" value="<?php __("Apply this password policy"); ?>" /> &nbsp; 
-<input type="button" class="inb" name="cancel" value="<?php __("Cancel and go back to the policy list"); ?>" onclick="document.location='adm_passpolicy.php'" /></p>
+<p><input type="submit" class="inb ok" name="go" value="<?php __("Apply this password policy"); ?>" /> &nbsp; 
+<input type="button" class="inb cancel" name="cancel" value="<?php __("Cancel and go back to the policy list"); ?>" onclick="document.location='adm_passpolicy.php'" /></p>
 </form>
 
       <p><?php __("The classes of characters are : <br />1. Low-case letters (a-z)<br />2. Upper-case letters (A-Z)<br />3. Figures (0-9)<br />4. Ascii symbols (!\"#$%&'()*+,-./:;<=>?@[\\]^_`)<br />5. Non-Ascii symbols (accents...)"); ?></p>
diff --git a/bureau/admin/adm_quotaedit.php b/bureau/admin/adm_quotaedit.php
index 544aeb9f..e274e672 100644
--- a/bureau/admin/adm_quotaedit.php
+++ b/bureau/admin/adm_quotaedit.php
@@ -84,8 +84,8 @@ while (list($key,$val)=each($ql)) {
 }
 ?>
 <tr class="trbtn"><td colspan="3">
-  <input class="inb" type="submit" name="submit" value="<?php __("Edit the quotas"); ?>" />
-  <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='adm_list.php'" />
+  <input class="inb ok" type="submit" name="submit" value="<?php __("Edit the quotas"); ?>" />
+  <input type="button" class="inb cancel" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='adm_list.php'" />
 
 </td></tr>
 </table>
diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php
index d110522e..f705fca8 100644
--- a/bureau/admin/bro_main.php
+++ b/bureau/admin/bro_main.php
@@ -102,8 +102,8 @@ if (!empty($formu) && $formu) {
             <?php } ?>
             </ul>
                 <blockquote>
-                <input type="submit" class="inb" name="del_confirm" value="<?php __("Yes"); ?>" />&nbsp;&nbsp;
-          <input type="submit" class="inb" name="cancel" value="<?php __("No"); ?>" />
+                <input type="submit" class="inb ok" name="del_confirm" value="<?php __("Yes, delte those files/folders"); ?>" />&nbsp;&nbsp;
+          <input type="submit" class="inb cancel" name="cancel" value="<?php __("No, don't delete those files/folders"); ?>" />
             </blockquote>
             </form>
             <?php
diff --git a/bureau/admin/dom_dodel.php b/bureau/admin/dom_dodel.php
index 753d76ba..f401005f 100644
--- a/bureau/admin/dom_dodel.php
+++ b/bureau/admin/dom_dodel.php
@@ -71,7 +71,8 @@ if ($del_confirm!="y") {
 <p>
 <input type="hidden" name="del_confirm" value="y" />
 <input type="hidden" name="domain" value="<?php echo $domain ?>" />
-<input type="submit" class="inb" name="submit" value="<?php __("Yes"); ?>" /> - <input type="button" class="inb" name="non" value="<?php __("No"); ?>" onclick="history.back()" />
+ <input type="submit" class="inb ok" name="submit" value="<?php __("Yes, delete this domain name"); ?>" />
+ <input type="button" class="inb cancel" name="non" value="<?php __("No, don't delete this domain name"); ?>" onclick="history.back()" />
 </form>
 <?php include_once("foot.php");
 	exit();
diff --git a/bureau/admin/sql_bck.php b/bureau/admin/sql_bck.php
index 92f55b04..95cbdbb1 100644
--- a/bureau/admin/sql_bck.php
+++ b/bureau/admin/sql_bck.php
@@ -104,8 +104,8 @@ if (is_array($r)) {
 </tr>
 
 <tr class="trbtn"><td colspan="2">
-  <input class="inb" type="submit" name="submit" value="<?php __("Change the MySQL backup parameters"); ?>" />
-  <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='sql_list.php'"/>
+  <input class="inb ok" type="submit" name="submit" value="<?php __("Change the MySQL backup parameters"); ?>" />
+  <input type="button" class="inb cancel" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='sql_list.php'"/>
 </td></tr>
 </table>
 </form>