From df1b9ca92cc4ca041584e1170533e840c6e55c13 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Thu, 29 Apr 2010 14:29:27 +0000
Subject: [PATCH] admin panel : starting ergonomics there ...

---
 .gitattributes                  |  1 -
 bureau/admin/adm_panel.php      | 27 ++++++----
 bureau/admin/adm_passpolicy.php |  6 +--
 bureau/admin/dom_edit.php       |  2 +-
 bureau/admin/dom_subedit.php    |  2 +-
 bureau/admin/quota_show_all.php | 93 ---------------------------------
 bureau/admin/quotas_users.php   |  4 ++
 7 files changed, 26 insertions(+), 109 deletions(-)
 delete mode 100644 bureau/admin/quota_show_all.php

diff --git a/.gitattributes b/.gitattributes
index d0ace518..b9463935 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -232,7 +232,6 @@ bureau/admin/mxlist.php -text
 bureau/admin/phpinfo.php -text
 bureau/admin/powered2.jpg -text
 bureau/admin/quota_show.php -text
-bureau/admin/quota_show_all.php -text
 bureau/admin/quotas_users.php -text
 bureau/admin/sql_add.php -text
 bureau/admin/sql_addmain.php -text
diff --git a/bureau/admin/adm_panel.php b/bureau/admin/adm_panel.php
index 885bd319..23db9ba6 100644
--- a/bureau/admin/adm_panel.php
+++ b/bureau/admin/adm_panel.php
@@ -46,16 +46,23 @@ include_once("head.php");
 	}
 ?>
 <ul id="adm_panel">
-<li class="lst1"><a href="adm_tld.php"><?php __("Manage allowed domains (TLD)"); ?></a></li>
-<li class="lst2"><a href="adm_defquotas.php"><?php __("Change the default quotas"); ?></a></li>
-<li class="lst1"><a href="adm_doms.php"><?php __("Manage installed domains"); ?></a></li>
-<li class="lst2"><a href="adm_slaveip.php"><?php __("Manage allowed ip for slave zone transfers"); ?></a></li>
-<li class="lst1"><a href="adm_slaveaccount.php"><?php __("Manage allowed accounts for slave zone transfers"); ?></a></li>
-<li class="lst2"><a href="adm_mxaccount.php"><?php __("Manage allowed accounts for secondary mx"); ?></a></li>
-<li class="lst1"><a href="adm_variables.php"><?php __("Configure AlternC variables"); ?></a></li>
-<li class="lst2"><a href="quota_show_all.php"><?php __("Show all quotas"); ?></a></li>
-<li class="lst1"><a href="stats_members.php"><?php __("Account creation statistics"); ?></a></li>
-<li class="lst2"><a href="adm_passpolicy.php"><?php __("Password Policies"); ?></a></li>
+ <li class="lst1"><a href="adm_tld.php"><?php __("Manage allowed domains (TLD)"); ?></a></li>
+ <li class="lst2"><a href="adm_passpolicy.php"><?php __("Password Policies"); ?></a></li>
+ <li class="lst1"><a href="adm_doms.php"><?php __("Manage installed domains"); ?></a></li>
+ <li class="lst2"><a href="adm_defquotas.php"><?php __("Change the default quotas"); ?></a></li>
+</ul>
+
+
+ <h3><?php __("Advanced features"); ?></h3>
+
+<ul id="adm_panel_root">
+ <li class="lst2"><a href="adm_slaveip.php"><?php __("Manage allowed ip for slave zone transfers"); ?></a></li>
+ <li class="lst1"><a href="adm_slaveaccount.php"><?php __("Manage allowed accounts for slave zone transfers"); ?></a></li>
+ <li class="lst2"><a href="adm_mxaccount.php"><?php __("Manage allowed accounts for secondary mx"); ?></a></li>
+ <li class="lst1"><a href="adm_variables.php"><?php __("Configure AlternC variables"); ?></a></li>
+ <li class="lst2"><a href="stats_members.php"><?php __("Account creation statistics"); ?></a></li>
+</ul>
+
 <?php
 
 // here we include any "adminmenu_*" file content
diff --git a/bureau/admin/adm_passpolicy.php b/bureau/admin/adm_passpolicy.php
index 3242fc01..1ce18471 100644
--- a/bureau/admin/adm_passpolicy.php
+++ b/bureau/admin/adm_passpolicy.php
@@ -82,7 +82,7 @@ if ($edit) {
 
 <form method="post" name="adm_passpolicy.php">
 <input type="hidden" name="doedit" value="<?php echo $edit; ?>"/> 
-<table class="tedit">
+<table class="tlist">
 <tr>
   <th><?php __("Minimum Password Size:"); ?></th>
 						<td><select class="inl" name="minsize" id="minsize"><?php for($i=0;$i<=64;$i++) {
@@ -131,7 +131,7 @@ if (is_array($c)) {
 <?php __("Here is the list of the password policies for each place a password may be needed in AlternC's services. For each of those password kind, you can choose which policy will be applied to passwords. A policy is a minimum and maximum password size, and how many classes of characters must appear in the password. You can also forbid (or not) to use the login or part of it as a password."); ?>
 </p>
 
-<table class="tedit">
+<table class="tlist">
     <tr><th rowspan="2"><?php __("Actions"); ?></th><th rowspan="2"><?php __("Password Kind"); ?></th><th colspan="4"><?php __("Password Policy"); ?></th></tr>
 <tr>
   <th><?php __("Min Size"); ?></th>
@@ -147,7 +147,7 @@ $col=1;
 
 <tr class="lst<?php echo $col; ?>">
 <td class="center">
-   <div class="ina"><a href="adm_passpolicy.php?edit=<?php echo urlencode($v["name"]); ?>"><img src="images/edit.png" alt="<?php __("Change password policy"); ?>" /><?php __("Change password policy"); ?></a></div>
+   <div class="ina"><a href="adm_passpolicy.php?edit=<?php echo urlencode($v["name"]); ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /><?php __("Edit"); ?></a></div>
 </td>
  <td><?php echo $v["description"]; ?></td>
  <td class="center"><?php echo $v["minsize"]; ?></td>
diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index 8927dcdf..21a0745a 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -73,7 +73,7 @@ function dnsoff() {
 		echo "<p class=\"error\">$error</p>";
 	}
 ?>
-<hr />
+<hr id="topbar"/>
 <br />
 <!-- *****************************************
 		 gestion des sous-domaines
diff --git a/bureau/admin/dom_subedit.php b/bureau/admin/dom_subedit.php
index ea3a5d86..46f92318 100644
--- a/bureau/admin/dom_subedit.php
+++ b/bureau/admin/dom_subedit.php
@@ -79,7 +79,7 @@ $dom->unlock();
 		echo "<p class=\"error\">$error</p>";
 	}
 ?>
-<hr />
+<hr id="topbar"/>
 <br />
 <!-- *****************************************
 		 gestion du sous-domaine
diff --git a/bureau/admin/quota_show_all.php b/bureau/admin/quota_show_all.php
deleted file mode 100644
index 2e6a0668..00000000
--- a/bureau/admin/quota_show_all.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/*
- $Id: quota_show_all.php,v 1.4 2005/10/06 16:18:25 anarcat Exp $
- ----------------------------------------------------------------------
- AlternC - Web Hosting System
- Copyright (C) 2002 by the AlternC Development Team.
- http://alternc.org/
- ----------------------------------------------------------------------
- Based on:
- Valentin Lacambre's web hosting softwares: http://altern.org/
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-require_once("../class/config.php");
-include_once("head.php");
-
-?>
-<h3><?php __("Quotas"); ?></h3>
-
-<?php
-
-if ($mem->user['uid'] == "2000")
-  $user_list = $admin->get_list(1);
-else{
-  $user_list = $admin->get_list(0);
-  $user_list[] = $mem->user;
-}
-$class = ($class== 'lst1' ? 'lst2' : 'lst1');
-print "<table><tr class=\"$class\">";
-$ql = $quota->qlist();
-reset($ql);
-print "<td>"._("User")."</td>";
-$sequence = array();
-foreach ($ql as $key => $name) {
-	print "<td>$name</td>";
-	$sequence[] = $key;
-}
-print "</tr>";
-$u = array();
-foreach ($user_list as $user) {
-  $u[$user['uid']] = $user['login'];
-}
-asort($u);
-foreach ($u as $uid => $login) {
-  $class = ($class== 'lst1' ? 'lst2' : 'lst1');
-  print "<tr class=\"$class\"><td>";
-  print $login.'('.$uid.")</td>";
-  $mem->su($uid);
-  if (!($quots = $quota->getquota())) {
-    $error = $err->errstr();
-  }
-  foreach($sequence as $key) {
-    $q = $quots[$key];
-    if ($q['u'] > $q['t']) {
-      $style = ' style="color: red"';
-    } else {
-      $style = '';
-    }
-    $quota_utilise[$key] += $q['u']; 
-    $tot[$key]+= $q['t']; 
-    print "<td $style>".str_replace(" ", "&nbsp;", m_quota::display_val($key, $q['u']).'/'.m_quota::display_val($key, $q['t'])).'</td>';
-  }
-  print "</tr>";
-  $mem->unsu();
-}
-
-echo "<tr>";
-echo "<td $style><b>"._("Total")."</b></td>";
-foreach($sequence as $key) {
-  echo "<td $style><b>";
-  echo $quota_utilise[$key]."/".$tot[$key];
-  echo "</b></td>";
-}
-print "</table>";
-
-?>
-<?php include_once("foot.php"); ?>
diff --git a/bureau/admin/quotas_users.php b/bureau/admin/quotas_users.php
index f7ab2d67..751359d3 100644
--- a/bureau/admin/quotas_users.php
+++ b/bureau/admin/quotas_users.php
@@ -352,7 +352,11 @@ if ($mode==0) {
 } elseif ($mode==1) {
 	echo sprintf("%.1f",(100*$ts/$totaltotal))."&nbsp;%";
 } else {
+  if ($totaltotal) { 
 	$pc=intval(100*$ts/$totaltotal);
+  } else {
+    $pc=0;
+  }
 	echo "<img src=\"hippo_bleue.gif\" style=\"width: ".(1*$pc)."px; height: 16px\" alt=\"".$pc."%\" title=\"".$pc."%\"/>";
 }