diff --git a/VERSIONS_HOTLINE/37169 b/VERSIONS_HOTLINE/37169
new file mode 100644
index 0000000000000000000000000000000000000000..f77c24a083bfd2a0a389e89ba73dadc67bb068a0
--- /dev/null
+++ b/VERSIONS_HOTLINE/37169
@@ -0,0 +1 @@
+ - ticket #37169 : Grésivaudan Crolles : changement de numéro de code barres abonnés ne permet plus la connexion du lecteur
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Admin/SearchUsers.php b/library/ZendAfi/View/Helper/Admin/SearchUsers.php
index 0a8323578df527faa1ec10ebef55aa314b4bfc45..233492d6ff19588ee152b36eb967f69418cb6f4b 100644
--- a/library/ZendAfi/View/Helper/Admin/SearchUsers.php
+++ b/library/ZendAfi/View/Helper/Admin/SearchUsers.php
@@ -51,7 +51,7 @@ class ZendAfi_View_Helper_Admin_SearchUsers extends ZendAfi_View_Helper_BaseHelp
? ($this->view->tag('center',
$this->view->tag('div',
$this->view->bouton('id=19',
- 'picto=add.gif',
+ 'picto=add',
'texte='.$this->view->_('Ajouter un utilisateur'),
'url='. $this->view->url(['action'=> 'add']),
'largeur=210px'))))
diff --git a/library/ZendAfi/View/Helper/Bouton.php b/library/ZendAfi/View/Helper/Bouton.php
index e76f55e66cde39fcb0abcdefedd59c3979681903..308847b8c14efc64162ae08dcf5efe6dc80e88be 100644
--- a/library/ZendAfi/View/Helper/Bouton.php
+++ b/library/ZendAfi/View/Helper/Bouton.php
@@ -36,7 +36,6 @@ class ZendAfi_View_Helper_Bouton extends ZendAfi_View_Helper_BaseHelper {
//------------------------------------------------------------------------------------------------------
function bouton( )
{
- xdebug_break();
for( $i=0; $i < func_num_args(); $i++) $args[] = func_get_arg($i);
$id = '';
@@ -90,7 +89,7 @@ class ZendAfi_View_Helper_Bouton extends ZendAfi_View_Helper_BaseHelper {
$onclick=$javascript.str_replace("@ID_FORM@",$idForm,$onclick);
if($id_toolbar > 0 ) {
$html[]='<td class="toolbar" style="width:'.$largeur.';">';}
- $html[]='<div id="' . $rootName . '" style="margin: 0 auto; width:'.$largeur.';" class="bouton"';
+ $html[]='<div id="' . $rootName . '" style="width:'.$largeur.';" class="bouton"';
$html[]= ' onmouseover="javascript:PicToolbarOver( this, \'' . $rootName . '\')"';
$html[]= ' onmouseout="javascript:PicToolbarNormal(this, \'' . $rootName . '\')"';
$html[]= ' onmousedown="javascript:PicToolbarDown(this, \'' . $rootName . '\')"';
diff --git a/library/ZendAfi/View/Helper/RenderForm.php b/library/ZendAfi/View/Helper/RenderForm.php
index 999e83afa077bb557c741f6c163fe74624c3f638..886b241143cbe3c1af96f3b4641ce0b640600234 100644
--- a/library/ZendAfi/View/Helper/RenderForm.php
+++ b/library/ZendAfi/View/Helper/RenderForm.php
@@ -130,13 +130,10 @@ class ZendAfi_View_Helper_RenderForm extends ZendAfi_View_Helper_BaseHelper {
protected function _buttonsFor($form, $buttons) {
$id = $form->getAttrib('id');
if (empty($buttons))
- return "
- <table>
- <tr>
- <td>".$this->view->bouton('type=V', "form=$id", "javascript=;setFlagMaj(false);")."</td>
- <td>".$this->view->boutonRetour($this->_getBackUrl($form))."</td>
- </tr>
- </table>";
+ return $this->_tag('div',
+ $this->view->bouton('type=V', "form=$id", "javascript=;setFlagMaj(false);")
+ .$this->view->boutonRetour($this->_getBackUrl($form)),
+ ['class' => 'boutons']);
$ratio = 100 / count($buttons);
return "<table><tr><td style='width:" . $ratio . "%'>" . implode('</td><td style="width:' . $ratio . '%">', $buttons) . "</td></tr></table>";
diff --git a/public/admin/css/global.css b/public/admin/css/global.css
index f022ca1329ef16f3e6bca91bca3dd4272a7ee67b..6f20c1d8232bfc11cf5b85fe79c24dac39c20c0d 100644
--- a/public/admin/css/global.css
+++ b/public/admin/css/global.css
@@ -127,7 +127,7 @@ option {font-weight:normal; color:#666;}
.form div.tag_liste:hover{background-color:#FFFF99;cursor:pointer}
.form span.element-description {color: #999999;}
-div.bouton {max-width: 300px}
+div.bouton {max-width: 300px; display: inline-block}
div.bouton td {color:#575757;font-size:10pt;font-weight:bold; background-repeat: repeat-x; padding: 0px; border:0; cursor: pointer}
div.bouton td:first-child {
background: url(../images/bouton/bouton_milieu.gif);
diff --git a/public/admin/skins/bokeh74/colors/blue.css b/public/admin/skins/bokeh74/colors/blue.css
index da8105fd122d2906c3daabb7b78e2e5d0880073d..5e7da273eea55a8ec2bfa9ae5499df07fe71b13f 100644
--- a/public/admin/skins/bokeh74/colors/blue.css
+++ b/public/admin/skins/bokeh74/colors/blue.css
@@ -4,7 +4,8 @@ body {
}
body #banniere,
-.barre_nav {
+.barre_nav,
+div.bouton:hover {
background-color: rgba(0, 80, 175, 0.8);
}
diff --git a/public/admin/skins/bokeh74/colors/green.css b/public/admin/skins/bokeh74/colors/green.css
index 66f625ac0f91cb2836be3dfcc5c3f9164087635c..0625944fa40f16fc622435d16c88bc29004c881e 100644
--- a/public/admin/skins/bokeh74/colors/green.css
+++ b/public/admin/skins/bokeh74/colors/green.css
@@ -4,7 +4,8 @@ body {
}
body #banniere,
-.barre_nav {
+.barre_nav,
+div.bouton:hover {
background-color: rgba(7, 111, 21, 0.8);
}
diff --git a/public/admin/skins/bokeh74/colors/orange.css b/public/admin/skins/bokeh74/colors/orange.css
index fa8a7750723f8a65eedcbd3c3deeccedc31ed35a..b771bcafa8ba50d3334d7d42e7b9c12d1b2c7a40 100644
--- a/public/admin/skins/bokeh74/colors/orange.css
+++ b/public/admin/skins/bokeh74/colors/orange.css
@@ -4,7 +4,8 @@ body {
}
body #banniere,
-.barre_nav {
+.barre_nav,
+div.bouton:hover {
background-color: rgba(159, 104, 9, 0.8);
}
diff --git a/public/admin/skins/bokeh74/colors/purple.css b/public/admin/skins/bokeh74/colors/purple.css
index fc6503dd706f9d1b6a58cfa7816d7a5f5c42afb0..ef5b18c686f1badb96f632d4e53033b64ff0c66c 100644
--- a/public/admin/skins/bokeh74/colors/purple.css
+++ b/public/admin/skins/bokeh74/colors/purple.css
@@ -4,7 +4,8 @@ body {
}
body #banniere,
-.barre_nav {
+.barre_nav,
+div.bouton:hover {
background-color: rgba(127, 7, 113, 0.8);
}
diff --git a/public/admin/skins/bokeh74/colors/red.css b/public/admin/skins/bokeh74/colors/red.css
index 9e0363e248f00cbf834f35f59670df7d9dd2e353..a03915fce3fa0ba1043b934699b40be48e5431f7 100644
--- a/public/admin/skins/bokeh74/colors/red.css
+++ b/public/admin/skins/bokeh74/colors/red.css
@@ -4,7 +4,8 @@ body {
}
body #banniere,
-.barre_nav {
+.barre_nav,
+div.bouton:hover {
background-color: rgba(143, 17 , 17 , 0.8);
}
diff --git a/public/admin/skins/bokeh74/colors/solarized_dark.css b/public/admin/skins/bokeh74/colors/solarized_dark.css
index f8a91a9b15b29bb48414ff404d7365ae8a575671..6bebba8ef8c8ba4ebe1944e0bfb50b844204c5f7 100644
--- a/public/admin/skins/bokeh74/colors/solarized_dark.css
+++ b/public/admin/skins/bokeh74/colors/solarized_dark.css
@@ -4,6 +4,16 @@ body {
color: rgb(181, 137, 0);
}
+
+div.bouton:hover {
+ background-color: #93a1a1;
+}
+
+div.bouton:hover td {
+ color: #073642;
+}
+
+
body #banniere,
.barre_nav {
background-color: rgba(7, 54, 66, 0.8);
diff --git a/public/admin/skins/bokeh74/global.css b/public/admin/skins/bokeh74/global.css
index db0bd029791cb249ea7c2b4382d53c2df910c865..334e272a04b972bd902e3b57c372563c8d1df7c2 100755
--- a/public/admin/skins/bokeh74/global.css
+++ b/public/admin/skins/bokeh74/global.css
@@ -4,7 +4,8 @@ body {
}
body #banniere,
-.barre_nav {
+.barre_nav,
+div.bouton:hover {
background-color: rgba(0, 0 , 0 , 0.8);
}
@@ -115,10 +116,8 @@ body {
font-size: 1em;
}
-div.bouton td:hover,
.left .selected a,
.modules a.selected,
-[onclick*=";"]:hover,
a:hover {
text-decoration: underline;
}
@@ -447,14 +446,15 @@ table {
}
div.bouton {
- margin: 0.5em auto !important;
+ margin: 0.5em 10px;
max-width: 300px;
}
-.boutons div.bouton {
- margin: 0.5em 10px !important;
+div.bouton a:hover {
+ text-decoration: none;
}
+
div.bouton > * {
visibility: hidden;
}
diff --git a/public/admin/skins/retro/global.css b/public/admin/skins/retro/global.css
index 556af748296eccbd8763874dd019f489d324377f..30dde8e43fe0559115184a6d089ac125eb8959b9 100755
--- a/public/admin/skins/retro/global.css
+++ b/public/admin/skins/retro/global.css
@@ -454,7 +454,7 @@ table {
}
div.bouton {
- margin: 0.5em auto !important;
+ margin: 0.5em 10px;
max-width: 300px;
}