From 2386dcb694470cf39e2d69ca69b7bc7654ec7816 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 10 Aug 2007 07:42:44 +0000
Subject: [PATCH] Qual: Uniformisation code

---
 build/tgz/tar.exclude                          |  1 +
 htdocs/domain/index.php                        |  2 +-
 htdocs/energie/compteur.php                    |  8 ++++----
 htdocs/energie/groupe.php                      |  4 ++--
 htdocs/energie/index.php                       | 10 +++++-----
 htdocs/includes/modules/modBarcode.class.php   |  2 +-
 htdocs/includes/modules/modDroitPret.class.php |  2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/build/tgz/tar.exclude b/build/tgz/tar.exclude
index 6ea63fc99fb..81492ffabfe 100644
--- a/build/tgz/tar.exclude
+++ b/build/tgz/tar.exclude
@@ -30,6 +30,7 @@ htdocs/includes/treemenu/imagesAlt
 htdocs/includes/treemenu/imagesAlt2
 htdocs/includes/modules/modEditeur.class.php 
 htdocs/includes/modules/modDocument.class.php 
+htdocs/includes/modules/modDomain.class.php 
 htdocs/includes/modules/modDroitPret.class.php 
 htdocs/includes/modules/modPostnuke.class.php 
 htdocs/includes/modules/modClickToDial.class.php 
diff --git a/htdocs/domain/index.php b/htdocs/domain/index.php
index 0773336deba..fa3d0f2d935 100644
--- a/htdocs/domain/index.php
+++ b/htdocs/domain/index.php
@@ -80,5 +80,5 @@ if ($result) {
 
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/energie/compteur.php b/htdocs/energie/compteur.php
index 89c3195ba93..c69d2d1b2e0 100644
--- a/htdocs/energie/compteur.php
+++ b/htdocs/energie/compteur.php
@@ -107,9 +107,9 @@ if ($_GET["action"] == 'create')
   print $html->select_array("energie", $compteur->energies);
   print '</td></tr>';
 
-  print '<tr><td colspan="2" align="center"><input type="submit" value="'.$langs->trans("Add").'"></td></tr>';
+  print '<tr><td colspan="2" align="center"><input type="submit" value="'.$langs->trans("Add").'" class="button"></td></tr>';
   
-  print "</table></form><br>";	  
+  print "</table></form>";	  
   print '</div>';
   
 } 
@@ -167,14 +167,14 @@ else
 	  print '</td><td>Valeur relevée</td>';
 
 	  print '<td align="center"><input type="text" size="11" maxlength="10" name="releve"></td>';
-	  print '<td align="center"><input type="submit" value="'.$langs->trans("Add").'"></td></tr>';
+	  print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
 	  print "</table></form><br>";
 	
 	  print '<table class="noborder" width="100%">';
 	  print '<tr><td><a href="compteur_graph.php?id='.$compteur->id.'">';
 	  $file = "all.".$compteur->id.".png";
 	  print '<img border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=energie&file='.$file.'" alt="" title="">';
-	  print '</a></td></tr></table><br>';
+	  print '</a></td></tr></table>';
 
 	  print '</div>';
 
diff --git a/htdocs/energie/groupe.php b/htdocs/energie/groupe.php
index 92ba9e6350e..3d1bf861baa 100644
--- a/htdocs/energie/groupe.php
+++ b/htdocs/energie/groupe.php
@@ -79,9 +79,9 @@ if ($_GET["action"] == 'create')
   
   print '<td><input type="text" size="40" maxlength="255" name="libelle"></td></tr>';
   
-  print '<tr><td colspan="2" align="center"><input type="submit" value="'.$langs->trans("Add").'"></td></tr>';
+  print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
   
-  print "</table></form><br>";
+  print "</table></form>";
 	  
   print '</div>';
   
diff --git a/htdocs/energie/index.php b/htdocs/energie/index.php
index 19925a026c1..41fc6c1e909 100644
--- a/htdocs/energie/index.php
+++ b/htdocs/energie/index.php
@@ -31,11 +31,11 @@ require("./pre.inc.php");
 
 llxHeader($langs,"",$langs->trans("Energy"),$langs->trans("Energy"));
 
-print_titre($langs->trans("Energy"));
+print_fiche_titre($langs->trans("Energy"));
 
-print '<table class="noborder" width="100%">';
+print '<table class="notopnoleftnoright" width="100%">';
 
-print '<tr><td valign="top" width="30%">';
+print '<tr><td valign="top" width="30%" class="notopnoleft">';
 
 /*
  * Groupe
@@ -95,7 +95,7 @@ if ( $resql)
     }
 }
 
-print '</td><td valign="top" width="70%">';
+print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
 
 print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=energie&file=month.png" alt="" title=""><br /><br />'."\n";
 
@@ -103,5 +103,5 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/includes/modules/modBarcode.class.php b/htdocs/includes/modules/modBarcode.class.php
index dba40d80624..f7e106fad83 100644
--- a/htdocs/includes/modules/modBarcode.class.php
+++ b/htdocs/includes/modules/modBarcode.class.php
@@ -58,7 +58,7 @@ class modBarcode extends DolibarrModules
 
     //$this->revision = explode(' ','$Revision$');
     //$this->version = $this->revision[1];
-    $this->version = 'experimental';    // 'experimental' or 'dolibarr' or version
+    $this->version = 'development';		// 'development' or 'experimental' or 'dolibarr' or version
 
     $this->const_name = 'MAIN_MODULE_BARCODE';
     $this->special = 0;
diff --git a/htdocs/includes/modules/modDroitPret.class.php b/htdocs/includes/modules/modDroitPret.class.php
index fa8081c4737..a2b7112f540 100644
--- a/htdocs/includes/modules/modDroitPret.class.php
+++ b/htdocs/includes/modules/modDroitPret.class.php
@@ -53,7 +53,7 @@ class modDroitPret  extends DolibarrModules
     $this->family = "other";
     $this->name = "Droit Prêt";
     $this->description = "Gestion du droit de prêts";
-    $this->version = '1.1-beta';    // 'experimental' or 'dolibarr' or version
+    $this->version = 'experimental';    // 'development' or 'experimental' or 'dolibarr' or version
     $this->const_name = 'MAIN_MODULE_DROITPRET';
     $this->special = 2;