CSS / ERGONOMICS suite (et pas fin)

bureau/admin/bro_main.php

@@ -142,7 +142,7 @@ if ($c===false) $error=$err->errstr();
 <?php if ($error) echo "<font color=\"red\">$error</font>"; ?>
 
 <table><tr>
-<td valign="top" style="border: 1px solid #aaa; padding: 10px">
+<td class="formcell">
 
      <form action="bro_main.php" enctype="multipart/form-data" method="post">
      <input type="hidden" name="R" value="<?php echo $R; ?>" />
@@ -158,7 +158,7 @@ if ($c===false) $error=$err->errstr();
 
 </td>
 <td style="width: 20px">&nbsp;</td>
-<td valign="top" style="border: 1px solid #aaa; padding: 10px">
+<td class="formcell">
 
 <?php __("New file or folder:"); ?><br />
 <form action="bro_main.php" method="post" name="nn" id="nn">
@@ -281,11 +281,15 @@ document.write("<input type=\"checkbox\" value=\"1\" class=\"inb\" onclick=\"Che
 //  -->
 </script>
 </th>
+<?php if ($p["showicons"]) { ?>
 <th></th>
+      <?php } ?>
 <th><?php __("Filename"); ?></th>
 <th><?php __("Size"); ?></th>
 <th><?php __("Last modification"); ?></th>
+<?php if ($p["showtype"]) { ?>
 <th><?php __("File Type"); ?></th>
+				 <?php } ?>
 <th></th>
 </tr>
 <?php
@@ -527,10 +531,10 @@ else {
 </p><p>
 <span class="ina"><?php
 if ($hta->is_protected($R)) {
-echo "<a href=\"hta_edit.php?dir=$R\">"._("Edit this folder's restrictions")."</a>";
+echo "<a href=\"hta_edit.php?dir=".(($R)?$R:"/")."\">"._("Edit this folder's restrictions")."</a>";
 }
 else {
-echo "<a href=\"hta_add.php?value=$R\">"._("Protect this folder")."</a>";
+  echo "<a href=\"hta_add.php?value=".(($R)?$R:"/")."\">"._("Protect this folder")."</a>";
 }
 ?></span> <?php __("with a login and a password"); ?>
 </p><p>

bureau/admin/dom_edit.php

@@ -69,7 +69,7 @@ function dnsoff() {
 <!-- *****************************************
 		 gestion des sous-domaines
  -->
-<table cellspacing="0" cellpadding="3">
+<table class="tlist">
 <tr><th colspan="2"><?php __("Actions"); ?></th><th><?php __("Subdomain"); ?></th><th><?php __("Place"); ?></th></tr>
 <?php
 $col=1;
@@ -79,6 +79,7 @@ for($i=0;$i<$r["nsub"];$i++) {
 	<tr class="lst<?php echo $col; ?>">
 		<td class="center">
 			<div class="ina"><a href="dom_subedit.php?domain=<?php echo urlencode($r["name"]) ?>&amp;sub=<?php  echo urlencode($r["sub"][$i]["name"]) ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /><?php __("Edit"); ?></a></div>
+
 			</td><td class="center">
 			<div class="ina"><a href="dom_subdel.php?domain=<?php echo urlencode($r["name"]) ?>&amp;sub=<?php  echo urlencode($r["sub"][$i]["name"]) ?>"><img src="images/delete.png" alt="<?php __("Delete"); ?>" /><?php __("Delete"); ?></a></div>
 		</td>
@@ -90,7 +91,7 @@ for($i=0;$i<$r["nsub"];$i++) {
 <br />
 <hr/>
 <br />
-<form action="dom_subdoedit.php?" method="post" name="main" id="main">
+<form action="dom_subdoedit.php" method="post" name="main" id="main">
 	<table border="0">
 		<tr>
 			<td colspan="2">

bureau/admin/ftp_add.php

@@ -47,7 +47,7 @@ if (!$quota->cancreate("ftp")) {
 	}
 ?>
 <form method="post" action="ftp_doadd.php" name="main" id="main">
-<table><thead><?php __("Create a new ftp account"); ?></thead>
+<table>
 <tr><th><input type="hidden" name="id" value="<?php echo $id ?>" />
 <label for="login"><?php __("Username"); ?></label></th><td>
 	<select class="inl" name="prefixe"><?php $ftp->select_prefix_list($prefixe); ?></select>&nbsp;<b>_</b>&nbsp;<input type="text" class="int" name="login" id="login" value="<?php echo $login; ?>" size="20" maxlength="64" />

bureau/admin/hta_add.php

@@ -33,7 +33,7 @@ include_once("head.php");
 ?>
 <h3><?php __("Protect a folder"); ?></h3>
 <p>
-<?php __("The folder must exists."); ?>
+<?php __("Enter the name of the folder you want to protect. It must already exists."); ?>
 </p>
 <?php
 	if ($error) {
@@ -46,15 +46,17 @@ include_once("head.php");
 <table border="1" cellspacing="0" cellpadding="4">
 <tr>
 	<td><label for="dir"><?php __("Folder"); ?></label></td>
-	<td><input type="text" class="int" name="dir" id="dir" value="<?php echo $value ?>" size="20" maxlength="64" />
+	<td><input type="text" class="int" name="dir" id="dir" value="<?php echo $value ?>" maxlength="255" />
 <script type="text/javascript">
 <!--
-  document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.dir');\" value=\" ... \" class=\"inb\">");
+  document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.dir');\" value=\" <?php __("Choose a folder..."); ?> \" class=\"bff\">");
 //  -->
-</script></td>
+</script>
+</td>
 </tr>
-<tr><td colspan="2"><input type="submit" class="inb" value="<?php __("Protect this folder"); ?>" /></td></tr>
 </table>
+<br />
+<input type="submit" class="inb" value="<?php __("Protect this folder"); ?>" />
 </form>
 <script type="text/javascript">
 document.forms['main'].dir.focus();

bureau/admin/hta_adduser.php

@@ -23,7 +23,7 @@
 
  To read the license please visit http://www.gnu.org/copyleft/gpl.html
  ----------------------------------------------------------------------
- Original Author of file: Franck Missoum
+ Original Author of file: Franck Missoum, Benjamin Sonntag
  Purpose of file: Add a username to a protected folder
  ----------------------------------------------------------------------
 */
@@ -61,10 +61,10 @@ getFields($fields);
 		<td><label for="passwordconf"><?php __("Confirm password"); ?></label></td>
 		<td><input type="password" class="int" name="passwordconf" id="passwordconf" value="" size="20" maxlength="64" /></td>
 	</tr>
-	<tr>
-		<td colspan="2"><input type="submit" class="inb" value="<?php __("Add this user"); ?>" /></td>
-	</tr>
 </table>
+<br />
+<input type="submit" class="inb" value="<?php __("Add this user"); ?>" />
+  <input type="button" class="inb" value="<?php __("Cancel"); ?>" onclick="document.location='hta_edit.php?dir=<?php echo urlencode($dir);  ?>';" />
 </form>
 <script type="text/javascript">
 document.forms['main'].user.focus();

bureau/admin/hta_edit.php

@@ -23,7 +23,7 @@
 
  To read the license please visit http://www.gnu.org/copyleft/gpl.html
  ----------------------------------------------------------------------
- Original Author of file: Franck Missoum
+ Original Author of file: Franck Missoum, Benjamin Sonntag
  Purpose of file: Edit a protected folder
  ----------------------------------------------------------------------
 */
@@ -49,18 +49,14 @@ if (!$dir) {
 <?php
 	if (!count($r)) {
 		echo "<p class=\"error\">".sprintf(_("No authorized user in %s"),$dir)."</p>";
-		echo "<a href=\"hta_adduser.php?dir=$dir\">"._("Add a username")."</a><br />";
-		echo "<br /><small><a href=\"bro_main.php?R=$dir\">"._("File browser")."</a><br /></small>";
-		include_once("foot.php");
-		exit();
-	}
-reset($r);
-
+	} else {
+	  reset($r);
+	  
 ?>
 <form method="post" action="hta_dodeluser.php">
 <table cellspacing="0" cellpadding="4">
 	<tr>
-		<th colspan="2" ><input type="hidden" name="dir" value="<?php echo $dir?>">&nbsp;</th>
+   <th colspan="2" ><input type="hidden" name="dir" value="<?php echo $dir?>"><?php __("Actions"); ?></th>
 		<th><?php __("Username"); ?></th>
 	</tr>
 <?php
@@ -71,20 +67,53 @@ for($i=0;$i<count($r);$i++){
 ?>
 	<tr class="lst<?php echo $col; ?>">
 		<td align="center"><input type="checkbox" class="inc" name="d[]"" value="<?php echo $r[$i]?>" /></td>
-		<td><a href="hta_edituser.php?user=<?php echo $r[$i]?>&amp;dir=<?php echo $dir?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /></a></td>
+		<td>
+<div class="ina"><a href="hta_edituser.php?user=<?php echo $r[$i]?>&amp;dir=<?php echo $dir?>"><img src="icon/encrypted.png" alt="<?php __("Change this user's password"); ?>" /><?php __("Change this user's password"); ?></a></div>
+</td>
 		<td><?php echo $r[$i]; ?></td>
 	</tr>
 <?php
 }
 ?>
-<tr><td colspan="3"><input type="submit" class="inb" name="submit" value="<?php __("Delete the checked users"); ?>" /></td></tr>
 </table>
+<br />
+<input type="submit" class="inb" name="submit" value="<?php __("Delete the checked users"); ?>" />
 </form>
 
+<?php } ?>
 <p>
-<a href="hta_adduser.php?dir=<?php echo $dir ?>"><?php __("Add a username"); ?></a>
-</p>
-<p>
-<small><a href="bro_main.php?R=<?php echo $dir ?>"><?php __("File browser"); ?></a></small>
+<span class="inb"><a href="bro_main.php?R=<?php echo $dir ?>"><?php __("Show this folder's content in the File Browser"); ?></a></span>
 </p>
+
+<p>&nbsp;</p>
+
+<hr />
+<p><?php __("Adding an authorized user"); ?></p>
+
+<form method="post" action="hta_doadduser.php" name="main" id="main">
+<table class="tedit">
+	<tr>
+		<td><input type="hidden" name="dir" value="<?php echo $dir ?>" /><?php __("Folder"); ?></td>
+		<td><code><?php echo $dir; ?></code></td>
+	</tr>
+	<tr>
+		<td><label for="user"><?php __("Username"); ?></label></td>
+		<td><input type="text" class="int" name="user" id="user" value="" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><label for="password"><?php __("Password"); ?></label></td>
+		<td><input type="password" class="int" name="password" id="password" value="" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><label for="passwordconf"><?php __("Confirm password"); ?></label></td>
+		<td><input type="password" class="int" name="passwordconf" id="passwordconf" value="" size="20" maxlength="64" /></td>
+	</tr>
+</table>
+<br />
+<input type="submit" class="inb" value="<?php __("Add this user"); ?>" />
+</form>
+<script type="text/javascript">
+document.forms['main'].user.focus();
+</script>
+
 <?php include_once("foot.php"); ?>
\ No newline at end of file

bureau/admin/hta_list.php

@@ -61,8 +61,8 @@ $mem->show_help("hta_list2");
 </p>
 
 <form method="post" action="hta_del.php">
-<table cellspacing="0" cellpadding="4">
-<tr><th colspan="2">&nbsp;</th><th><?php __("Folder"); ?></th></tr>
+<table class="tlist">
+  <tr><th colspan="2"><?php __("Actions"); ?></th><th><?php __("Folder"); ?></th></tr>
 <?php
 $col=1;
 
@@ -72,18 +72,20 @@ for($i=0;$i<count($r);$i++){
 ?>
 	<tr  class="lst<?php echo $col; ?>">
 		<td align="center"><input type="checkbox" class="inc" name="del_<?php echo $r[$i] ?>" value="<?php echo $r[$i] ?>" /></td>
-		<td><a href="hta_edit.php?dir=<?php echo $r[$i]?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /></a></td>
+		<td>
+<div class="ina"><a href="hta_edit.php?dir=<?php echo $r[$i]?>"><img src="icon/encrypted.png" alt="<?php __("Edit login and passwords"); ?>" /><?php __("Edit login and passwords"); ?></a></div>
+</td>
 		<td><code><?php echo "$r[$i]"?></code></td>
 	</tr>
     <?php
 	}
 ?>
-<tr><td colspan="3"><input type="submit" class="inb" name="submit" value="<?php __("Unprotect the checked folders"); ?>" /></td></tr>
 </table>
+<br />
+<input type="submit" class="inb" name="submit" value="<?php __("Unprotect the checked folders"); ?>" />
+			<span class="inb"><a href="hta_add.php"><?php __("Protect a folder"); ?></a></span>
 </form>
-<p>
-<a href="hta_add.php"><?php __("Protect a folder"); ?></a>
-</p>
+
 <p>
 <?php $mem->show_help("hta_list"); ?>
 </p>