From 2bcf01168c9e11cca5feb117bdf3227e93c665df Mon Sep 17 00:00:00 2001
From: alban <>
Date: Fri, 18 Oct 2013 13:01:30 +0000
Subject: [PATCH] Un peu de presentation en haut de la liste des comptes
 alternC [Manuc].

---
 .gitattributes                                |   3 +-
 bureau/admin/adm_list.php                     |  84 +++++++++++-------
 bureau/admin/cron.php                         |   8 +-
 bureau/admin/icon/filter.png                  | Bin 0 -> 300 bytes
 bureau/admin/images/copyrights.txt            |   2 +-
 .../admin/images/{alert.png => warning.png}   | Bin
 bureau/admin/styles/style.css                 |  18 ++--
 7 files changed, 66 insertions(+), 49 deletions(-)
 create mode 100644 bureau/admin/icon/filter.png
 rename bureau/admin/images/{alert.png => warning.png} (100%)

diff --git a/.gitattributes b/.gitattributes
index d8a3a941..90d6c12b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -143,6 +143,7 @@ bureau/admin/icon/edit.png -text
 bureau/admin/icon/encrypted.png -text
 bureau/admin/icon/exe.png -text
 bureau/admin/icon/file.png -text
+bureau/admin/icon/filter.png -text
 bureau/admin/icon/folder.png -text
 bureau/admin/icon/htm.png -text
 bureau/admin/icon/jpg.png -text
@@ -176,7 +177,6 @@ bureau/admin/icon/winresize.gif -text
 bureau/admin/icon/xls.png -text
 bureau/admin/icon/zip.png -text
 bureau/admin/images/admin.png -text
-bureau/admin/images/alert.png -text
 bureau/admin/images/bgborder.gif -text
 bureau/admin/images/blank.gif -text
 bureau/admin/images/check_no.png -text
@@ -247,6 +247,7 @@ bureau/admin/images/ssh.png -text
 bureau/admin/images/stat.png -text
 bureau/admin/images/success.png -text
 bureau/admin/images/undelete.png -text
+bureau/admin/images/warning.png -text
 bureau/admin/index.php -text
 bureau/admin/ip_main.php -text
 bureau/admin/js/alternc.js -text
diff --git a/bureau/admin/adm_list.php b/bureau/admin/adm_list.php
index ca484bae..b6bbb8be 100644
--- a/bureau/admin/adm_list.php
+++ b/bureau/admin/adm_list.php
@@ -69,18 +69,55 @@ if ($pattern && $pattern_type) {
 
 <h3><?php __("AlternC account list"); ?></h3>
 <hr id="topbar"/>
-<br />
 
-<p><span class="ina"><a href="adm_add.php"><?php __("Create a new AlternC account"); ?></a></span></p>
+<?php
+// Depending on the admin's choice, let's show a short list or a long list.
+if ($mem->user["admlist"]==0) { // Normal (large) mode
+?>
+  <p><span class="ina" style="float: right;"><a href="adm_list.php?short=1"><?php __("Minimal view"); ?></a></span></p>
+<?php
+} else {
+?>
+  <p><span class="ina" style="float:right;"><a href="adm_list.php?short=0"><?php __("Complete view"); ?></a></span></p>
+<?php
+}
+?>
 
-<form method="post" action="adm_list.php" >
-<p>
-  <label for="pattern_type_login"><?php __("Search for a Login"); ?></label><input type="radio" name="pattern_type" value="login" id="pattern_type_login" <?php if (!$pattern_type || $pattern_type === 'login') echo ' checked="checked" '; ?>/>&nbsp;
-<label for="pattern_type_domain"><?php __("Search for a Domain"); ?></label><input type="radio" name="pattern_type" value="domaine" id="pattern_type_domain" <?php if ($pattern_type === 'domaine') echo ' checked="checked" '; ?>/>
-  <input type="text" id="pattern" name="pattern" value="<?php echo $pattern ?>"/> <input type="submit" class="inb" value="<?php __("submit"); ?>" />
-</p>
-</form>
+<fieldset style="clear:both;">
+  <legend><?php __("Filters"); ?></legend>
+  <form method="post" action="adm_list.php" >
+  <p>
+    <label for="pattern_type_login"><?php __("Search for a Login"); ?></label><input type="radio" name="pattern_type" value="login" id="pattern_type_login" <?php if (!$pattern_type || $pattern_type === 'login') echo ' checked="checked" '; ?>/>&nbsp;
+    <label for="pattern_type_domain"><?php __("Search for a Domain"); ?></label><input type="radio" name="pattern_type" value="domaine" id="pattern_type_domain" <?php if ($pattern_type === 'domaine') echo ' checked="checked" '; ?>/>
+    <input type="text" id="pattern" name="pattern" value="<?php echo $pattern ?>"/> <input type="submit" class="inb filter" value="<?php __("submit"); ?>" />
+  </p>
+  </form>
+  <?php
+  $list_creators = $admin->get_creator_list();
 
+  if ($subadmin==1 || $cuid==2000) {
+    if($show != 'all') {
+      echo '<p><span class="inb filter"><a href="adm_list.php?show=all">' . _('List all AlternC accounts') . '</a></span>';
+      
+      if ($subadmin==1 || $cuid==2000) {
+        $infos_creators = array();
+
+        foreach ($list_creators as $key => $val) {
+          $infos_creators[] = '<a href="adm_list.php?creator=' . $val['uid'] . '">' . $val['login'] . '</a>';
+        }
+
+        if (count($infos_creators)) {
+          echo ' ('._("Or only the accounts of:")." ". implode(', ', $infos_creators) . ')';
+        }
+      }
+      echo "</p>";
+    } else { // if show != all
+      echo '<p><span class="ina filter"><a href="adm_list.php">' . _('List only my accounts') . '</a></span></p>';
+    } 
+  }// END ($subadmin==1 || $cuid==2000)
+  ?>
+</fieldset>
+  
 <?php
 if ( !empty($error) ) {
   echo '<p class="alert alert-danger">' , $error, '</p>';
@@ -91,29 +128,10 @@ if ( !empty($error) ) {
 <p>
 <?php __("Here is the list of hosted AlternC accounts"); ?> (<?php printf(_("%s accounts"),count($r)); ?>)
 </p>
+
+<p><span class="ina add"><a href="adm_add.php"><?php __("Create a new AlternC account"); ?></a></span></p>
+
 <?php
-$list_creators = $admin->get_creator_list();
-
-if ($subadmin==1 || $cuid==2000) {
-if($show != 'all') {
-  echo '<p><span class="ina"><a href="adm_list.php?show=all">' . _('List all AlternC accounts') . '</a></span>';
-  if ($subadmin==1 || $cuid==2000) {
-    $infos_creators = array();
-
-    foreach ($list_creators as $key => $val) {
-      $infos_creators[] = '<a href="adm_list.php?creator=' . $val['uid'] . '">' . $val['login'] . '</a>';
-    }
-
-    if (count($infos_creators)) {
-      echo ' ('._("Or only the accounts of:")." ". implode(', ', $infos_creators) . ')';
-    }
-  }
-  echo "</p>";
-} else { // if show != all
-  echo '<p><span class="ina"><a href="adm_list.php">' . _('List only my accounts') . '</a></span></p>';
-} 
-}// END ($subadmin==1 || $cuid==2000)
-
 if (!is_array($r) || empty($r) ) {
   echo '<p class="alert alert-danger">'._("No account defined for now").'</p>';
   include('foot.php');
@@ -127,9 +145,8 @@ if (!is_array($r) || empty($r) ) {
 if ($mem->user["admlist"]==0) { // Normal (large) mode
 ?>
 <p>
-<span class="ina" style="float: right;"><a href="adm_list.php?short=1"><?php __("Minimal view"); ?></a></span> &nbsp;
 <?php  if (count($r)>5) { ?>
-<input type="submit" class="inb" name="submit" value="<?php __("Delete checked accounts"); ?>" />
+<input type="submit" class="inb delete" name="submit" value="<?php __("Delete checked accounts"); ?>" />
 <?php } ?>
 </p>
 <table class="tlist" style="clear:both;">
@@ -206,7 +223,6 @@ if ($mem->user["admlist"]==1) { // SHORT MODE
   [&nbsp;<?php __("Q"); ?>&nbsp;] <?php __("Quotas"); ?> &nbsp; &nbsp; 
 
 <p>
-<span class="ina" style="float:right;"><a href="adm_list.php?short=0"><?php __("Complete view"); ?></a></span> &nbsp;
 <?php  if (count($r)>50) { ?>
   <input type="submit" class="inb" name="submit" value="<?php __("Delete checked accounts"); ?>" />
 <?php } // finc count > 50 ?>
diff --git a/bureau/admin/cron.php b/bureau/admin/cron.php
index 3de77768..1ae06b56 100644
--- a/bureau/admin/cron.php
+++ b/bureau/admin/cron.php
@@ -54,7 +54,7 @@ for ($i=0; $i < $max_cron ; $i++) {
       <a href="javascript:cleancron('<?php echo $i ?>');"><img src="images/delete.png" alt="<?php __("Delete");?>" title="<?php __("Delete");?>"/></a>
     </td>
     <td colspan='2'>
-      <label for="crup_url_<?php echo $i?>"><?php __("Called URL"); ?> :</label><br/><input type="text" placeholder="<?php __("Called URL"); ?>" id="crup_url_<?php echo $i?>" name="<?php echo "cronupdate[$i][url]";?>" size="40" maxlength="255" value="<?php if (isset($lst_cron[$i]['url'])) { echo htmlentities($lst_cron[$i]['url']);} ?>"/>
+      <label for="crup_url_<?php echo $i?>"><?php __("Called URL"); ?> :</label><br/><input type="text" id="crup_url_<?php echo $i?>" name="<?php echo "cronupdate[$i][url]";?>" size="40" maxlength="255" value="<?php if (isset($lst_cron[$i]['url'])) { echo htmlentities($lst_cron[$i]['url']);} ?>"/>
     </td>
     <td>
       <?php __("Period:");?> <select name='cronupdate[<?php echo $i; ?>][schedule]'>
@@ -72,9 +72,9 @@ foreach ($cron->schedule() as $cs) {
       <br/><?php if (isset($lst_cron[$i])) {__("Next execution: "); echo $lst_cron[$i]['next_execution'];}?>
     </td>
   </tr><tr class="<?php echo ($i%2)?"lst1":"lst2"; ?>">
-    <td><label for="crup_user_<?php echo $i?>"><?php __("HTTP user (optional)"); ?> :</label><br/><input type="text" placeholder="<?php __("HTTP user (optional)"); ?>" id="crup_user_<?php echo $i?>" name="<?php echo "cronupdate[$i][user]";?>" size="20" maxlength="64" value="<?php if (isset($lst_cron[$i]['user'])) { echo htmlentities($lst_cron[$i]['user']);} ?>"/></td>
-    <td><label for="crup_pass_<?php echo $i?>"><?php __("HTTP password (optional)"); ?> :</label><br/><input type="text" placeholder="<?php __("HTTP password (optional)"); ?>" id="crup_pass_<?php echo $i?>" name="<?php echo "cronupdate[$i][password]";?>" size="20" maxlength="64" value="<?php if (isset($lst_cron[$i]['password'])) { echo htmlentities($lst_cron[$i]['password']);} ?>"/></td>
-    <td><label for="crup_mail_<?php echo $i?>"><?php __("Mail address (optional)"); ?> :</label><br/><input type="text" placeholder="<?php __("Mail address (optional)"); ?>" id="crup_mail_<?php echo $i?>" name="<?php echo "cronupdate[$i][email]";?>" size="25" maxlength="64" value="<?php if (isset($lst_cron[$i]['email'])) { echo htmlentities($lst_cron[$i]['email']);} ?>"/></td>
+    <td><label for="crup_user_<?php echo $i?>"><?php __("HTTP user (optional)"); ?> :</label><br/><input type="text" id="crup_user_<?php echo $i?>" name="<?php echo "cronupdate[$i][user]";?>" size="20" maxlength="64" value="<?php if (isset($lst_cron[$i]['user'])) { echo htmlentities($lst_cron[$i]['user']);} ?>"/></td>
+    <td><label for="crup_pass_<?php echo $i?>"><?php __("HTTP password (optional)"); ?> :</label><br/><input type="text" id="crup_pass_<?php echo $i?>" name="<?php echo "cronupdate[$i][password]";?>" size="20" maxlength="64" value="<?php if (isset($lst_cron[$i]['password'])) { echo htmlentities($lst_cron[$i]['password']);} ?>"/></td>
+    <td><label for="crup_mail_<?php echo $i?>"><?php __("Mail address (optional)"); ?> :</label><br/><input type="text" id="crup_mail_<?php echo $i?>" name="<?php echo "cronupdate[$i][email]";?>" size="25" maxlength="64" value="<?php if (isset($lst_cron[$i]['email'])) { echo htmlentities($lst_cron[$i]['email']);} ?>"/></td>
   </tr>
 <?php } //foreach ?>
 </table>
diff --git a/bureau/admin/icon/filter.png b/bureau/admin/icon/filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dae56d303bed9cd613f663f87473ede002006b3
GIT binary patch
literal 300
zcmV+{0n`48P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002<Nkl<ZcwXI*
zJ!`^H6o%hKe?_62gJ3)Lx9D%^FKAcS4lXV_I5;_E544jY2&GU$DWRds&=Nl|@uOO#
z=Hq&LZ-WFX;ewk!aN*o@&iin=IDQl)(4kos33#?#jHgSi)*CRkg*RW})fu5@IMDkh
z+WHgfS`XKE8d6fh#Z~bf)2}tcD8^3^f^7+5%pi!lFyi&w#{|vW%HRHffhn4og)_{S
zLc);GC8L1X;#i*^8aL%#*hB^;0A#y9`HOFQv4`~VXi>FwPokg9Q=}69WU6(#Sz)<^
yf2=gDX7o*PHbIo$<$`^T_W@)m$c7|)r@}9Gb9IY<$3wmV0000<MNUMnLSTYyD~199

literal 0
HcmV?d00001

diff --git a/bureau/admin/images/copyrights.txt b/bureau/admin/images/copyrights.txt
index bbfa1264..265709a2 100644
--- a/bureau/admin/images/copyrights.txt
+++ b/bureau/admin/images/copyrights.txt
@@ -2,7 +2,7 @@
 20131018 [alban] 
 	icons:
 	*    abort.png
-	*    alert.png
+	*    warning.png
 	*    danger.png
 	*    success.png
 	24x24 Free Application Icons
diff --git a/bureau/admin/images/alert.png b/bureau/admin/images/warning.png
similarity index 100%
rename from bureau/admin/images/alert.png
rename to bureau/admin/images/warning.png
diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css
index 00154eb9..7da36aa5 100644
--- a/bureau/admin/styles/style.css
+++ b/bureau/admin/styles/style.css
@@ -95,14 +95,6 @@ pre {
   -moz-border-radius: 4px;
 }
 
-
-.filter a, a.edit, input.filter {
-  background-image: url(../icon/filter.png);
-  background-repeat: no-repeat;
-  background-position: 8px 3px;
-  padding-left: 30px;
-}
-
 .inp {
   /* Should not be use anymore !!! */
   border-color: blue;
@@ -355,7 +347,8 @@ img {
 
 /* Alert icons */
 #content .alert {
-    background-position: 16px 16px;
+    background-position: 12px 10px;
+    background-repeat: no-repeat;
     padding-left: 48px;
 }
 #content .alert-danger {
@@ -999,6 +992,13 @@ div.progress-bar div.txt {
   padding-left: 30px;
 }
 
+.filter a, a.edit, input.filter {
+  background-image: url(../icon/filter.png);
+  background-repeat: no-repeat;
+  background-position: 8px 3px;
+  padding-left: 30px;
+}
+
 /* Jquery-ui */
 
 body .ui-widget-content {