[Noalyss-commit] [noalyss] 01/02: Follow-up display ================== Fix bug : auto complet misplaced Cosmetic move button to the detail

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 67b22425cedb72e645b8f10a3192cc6af9be1326
Author: Dany De Bontridder <address@hidden>
Date:   Thu Mar 3 23:05:29 2016 +0100

    Follow-up display
    ==================
    Fix bug : auto complet misplaced
    Cosmetic move button to the detail
---
 include/template/detail-action.php |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/template/detail-action.php 
b/include/template/detail-action.php
index 9002dc1..215011c 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -280,7 +280,6 @@ echo '</span>';
 </div>
 <?php if ( $p_view !='READ'  ) :?>
 <input type='button' class="button" class="noprint" value="<?php echo 
_('Montrer articles');?>" id="toggleButton" onclick='toggleShowDetail()'>
-<input type='button' class="button" class="noprint" value="<?php echo 
_('Générer')?>" id="toggleButtonGenerate" 
onclick="$('div_generate_document').show()">
 <?php endif; ?>
 <?php
 /**
@@ -310,7 +309,7 @@ for ($i=0;$i<count($aArticle);$i++) :
        if ( ($aCard[$i] != 0 && $p_view == 'READ') || $p_view != 'READ'){ 
$show_row=1;}
 endfor;
 ?>
-    <div style="position:relative;top:5px">
+    <div>
 <table style="width:100%" id="art" >
 <tr>
   <th><?php echo _('Fiche')?></th>
@@ -374,7 +373,15 @@ function toggleShowDetail() {
      <input type="button" class="smallbutton" onclick="gestion_add_row()" 
value="<?php echo _("Ajouter une ligne")?>">
      </div>
      
-<?php endif; ?>         
+<?php endif; ?> 
+    <?php if ($p_view != 'READ' && $str_select_doc != '') : ?>
+         <?php echo _('Document à générer')?>
+  </legend>
+  <?php echo $str_select_doc;
+ echo $str_submit_generate;
+
+endif; ?>
+    <legend>
 </div>
 <?php if ( $this->ag_id != 0 && ! $readonly) : ?>
      <div >
@@ -391,16 +398,7 @@ function toggleShowDetail() {
 <?php endif; ?>
 
 <div style="clear:both"></div>    
-<?php if ($p_view != 'READ' && $str_select_doc != '') : ?>
-<div id="div_generate_document" class="noprint" style="display:none" >
-  <legend>
-     <?php echo _('Document à générer')?>
-  </legend>
-  <?php echo $str_select_doc;
- echo $str_submit_generate;
-  ?>
-</div>
-<?php endif; ?>
+
 
 
 <div class="myfieldset" id="div_action_attached_doc">