[Phpcompta-dev] r5071 - in phpcompta/tags/rel650: html include include/template

[phpcompta-dev]

Author: danydb
Date: 2012-07-19 02:22:15 +0200 (Thu, 19 Jul 2012)
New Revision: 5071

Modified:
   phpcompta/tags/rel650/html/style-light.css
   phpcompta/tags/rel650/html/style-print.css
   phpcompta/tags/rel650/html/style.css
   phpcompta/tags/rel650/include/class_follow_up.php
   phpcompta/tags/rel650/include/template/detail-action.php
Log:
Improve printing of action - gestion

Modified: phpcompta/tags/rel650/html/style-light.css
===================================================================
--- phpcompta/tags/rel650/html/style-light.css  2012-07-15 23:10:32 UTC (rev 
5070)
+++ phpcompta/tags/rel650/html/style-light.css  2012-07-19 00:22:15 UTC (rev 
5071)
@@ -9,6 +9,7 @@
        color:blue;
 }
 .notice {
+       background: white;
        color:red;
        font-style: italic;
 }

Modified: phpcompta/tags/rel650/html/style-print.css
===================================================================
--- phpcompta/tags/rel650/html/style-print.css  2012-07-15 23:10:32 UTC (rev 
5070)
+++ phpcompta/tags/rel650/html/style-print.css  2012-07-19 00:22:15 UTC (rev 
5071)
@@ -1,13 +1,15 @@
 body {
-       font-size:7px;
+       font-size:8px;
        }
 select ,.input_text{
+       font-size:8px;
 border:1px solid #FFFFFF;
  }
 form {
   display:none;
  }
 .print {
+       font-size:8px;
        display: block;
        }
 .noprint  {
@@ -30,6 +32,11 @@
        font-size:7px;
        font-family:sans-serif;
 }
+h3,h4 {
+       font-size:10px;
+       text-decoration: underline;
+       font-family:sans-serif;
+}
 
 h2 {
        font-size:12px;
@@ -42,7 +49,7 @@
 .content  {
        font-size:7px;
 }
-h1.content,h1,h2.info {
+h1.content,h1,h2.info,legend {
        font-size:14px;
        font-weight:bold;
        font-family:sans-serif;
@@ -244,6 +251,7 @@
 }
 .num {
        text-align:right;
+       font-size:8px;
 }
 
 /* </style> */

Modified: phpcompta/tags/rel650/html/style.css
===================================================================
--- phpcompta/tags/rel650/html/style.css        2012-07-15 23:10:32 UTC (rev 
5070)
+++ phpcompta/tags/rel650/html/style.css        2012-07-19 00:22:15 UTC (rev 
5071)
@@ -11,6 +11,7 @@
 .notice {
                color:red;
         font-style: italic;
+               background-color: white;
         }
 
 table.table_large, table.result  ,table.resultfooter {

Modified: phpcompta/tags/rel650/include/class_follow_up.php
===================================================================
--- phpcompta/tags/rel650/include/class_follow_up.php   2012-07-15 23:10:32 UTC 
(rev 5070)
+++ phpcompta/tags/rel650/include/class_follow_up.php   2012-07-19 00:22:15 UTC 
(rev 5071)
@@ -177,7 +177,7 @@
                        $desc->width = 120;
                        $desc->heigh = 40;
                }
-               $acomment = $this->db->get_array("SELECT agc_id, ag_id, 
to_char(agc_date,'DD.MM.YYYY') as str_agc_date, agc_comment, tech_user
+               $acomment = $this->db->get_array("SELECT agc_id, ag_id, 
to_char(agc_date,'DD.MM.YYYY HH24:MI') as str_agc_date, agc_comment, tech_user
                                 FROM action_gestion_comment where ag_id=$1 
order by agc_id;", array($this->ag_id)
                );
 

Modified: phpcompta/tags/rel650/include/template/detail-action.php
===================================================================
--- phpcompta/tags/rel650/include/template/detail-action.php    2012-07-15 
23:10:32 UTC (rev 5070)
+++ phpcompta/tags/rel650/include/template/detail-action.php    2012-07-19 
00:22:15 UTC (rev 5071)
@@ -132,7 +132,7 @@
 </div>
 <div style="float:right;clear:both"></div>
        <div style="float:left;width:45%">
-               <h4 style="display:inline">Opérations</h4>
+               <h4 style="display:inline">Opérations concernées</h4>
                <ol>
 
                <?
@@ -156,7 +156,7 @@
 
                ?>
                </ol>
-               <? if ($p_view != 'READ') echo $iconcerned->input()?>
+               <? if ($p_view != 'READ')   echo '<span 
class="noprint">'.$iconcerned->input().'</span>';?>
        </div>
 
        <div style="float:left;width:45%">
@@ -187,13 +187,13 @@
 
                ?>
                </ol>
-               <? if ( $p_view != 'READ') echo $iaction->input()?>
+               <? if ( $p_view != 'READ') echo '<span 
class="noprint">'.$iaction->input().'</span>';?>
        </div>
 </fieldset>
-<fieldset>
-  <legend>
+<div style="margin-left:15px;margin-right: 15px">
+  <h1>
            <?=_('Description')?>
-  </legend>
+  </h1>
   <p>
 <script language="javascript">
    function enlarge(p_id_textarea){
@@ -228,7 +228,7 @@
                                                dossier::id(),
                                                $acomment[$c]['agc_id']);
                                $js= '<a class="mtitle" style="color:orange" 
id="accom'.$acomment[$c]['agc_id'].'" href="'.$rmComment.'">Effacer</a>';
-               echo 
'n°'.$acomment[$c]['agc_id'].'('.h($acomment[$c]['tech_user'])." 
".smaller_date($acomment[$c]['str_agc_date']).')'.$js.
+               echo 
'n°'.$acomment[$c]['agc_id'].'('.h($acomment[$c]['tech_user'])." 
".$acomment[$c]['str_agc_date'].')'.$js.
                                '<pre style="white-space: 
-moz-pre-wrap;white-space: pre-wrap;border:1px solid blue;width:70%;" 
id="com'.$acomment[$c]['agc_id'].'"> '.
                                " ".h($acomment[$c]['agc_comment']).'</pre>'
                                ;
@@ -242,15 +242,19 @@
 
        }
 }
+echo '<span class="noprint">';
 echo $desc->input();
+echo '</span>';
 ?>
 <? if ($p_view != "READ" ): ?>
+<p class="noprint">
 <input type="button" id="bt_enlarge" <?=$style_enl?> value="+" 
onclick="enlarge('ag_comment');return false;">
 <input type="button" id="bt_small"  <?=$style_small?> value="-" 
style="display:none" onclick="small('ag_comment');return false;">
+</p>
 <? endif; ?>
   </div>
-</fieldset>
-<input type='button' class="button" value='Montrer articles' id="toggleButton" 
onclick='toggleShowDetail()'>
+</div>
+<input type='button' class="button" class="noprint" value='Montrer articles' 
id="toggleButton" onclick='toggleShowDetail()'>
 <fieldset id="fldDetail" style='display:block'>
    <LEGEND> <?=_('Détail des articles')?>
 </LEGEND>
@@ -316,7 +320,7 @@
 </fieldset>
 
 <? if ($p_view != 'READ' && $str_select_doc != '') : ?>
-<fieldset >
+<fieldset class="noprint" >
   <legend>
      <?=_('Document à générer')?>
   </legend>
@@ -331,11 +335,13 @@
   <legend>
      <?=_('Pièces attachées')?>
   </legend>
+  <div class="print">
+  <ol>
   <?php
 for ($i=0;$i<sizeof($aAttachedFile);$i++) :
   ?>
-  <p>
-    <A class="mtitle" id="<?php echo "doc".$aAttachedFile[$i]['d_id'];?>" 
href="<?php echo $aAttachedFile[$i]['link']?>"><?php echo 
$aAttachedFile[$i]['d_filename'];?>
+
+         <li> <A class="print" style="display:inline" id="<?php echo 
"doc".$aAttachedFile[$i]['d_id'];?>" href="<?php echo 
$aAttachedFile[$i]['link']?>"><?php echo $aAttachedFile[$i]['d_filename'];?>
     </A>
 <?php $rmDoc=sprintf("javascript:if ( confirm('"._('Voulez-vous effacer le 
document')." %s')==true ) {remove_document('%s','%s');}",
        $aAttachedFile[$i]['d_filename'],
@@ -343,10 +349,12 @@
        $aAttachedFile[$i]['d_id']);
     ?>
   <? if ($p_view != 'READ') : ?>  <a class="mtitle" style="color:orange" 
id="<?php echo "ac".$aAttachedFile[$i]['d_id'];?>" href="<?php echo 
$rmDoc;?>">Effacer</a><? endif;?>
-  </p>
+  </li>
   <?php
 endfor;
   ?>
+  </ol>
+  </div>
   <script language="javascript">
 function addFiles() {
 try {
@@ -358,17 +366,17 @@
 catch(exception) { alert('<?=j(_('Je ne peux pas ajouter de fichier'))?>'); 
alert(exception.message);}
 }
 </script>
-  <p >
-     <h3>Fichiers à ajouter: </h3>
-    <ol id='add_file' >
+  <div class="noprint">
+     <h3 >Fichiers à ajouter: </h3>
+    <ol id='add_file'  >
       <li>
         <?php echo $upload->input();
         ?>
       </li>
     </ol>
-  <span >
+  <span   >
 <? if ($p_view != 'READ') : ?> <input type="button" class="button" 
onclick="addFiles();" value="Ajouter un fichier"> <? endif;?>
   </span>
-  </p>
+  </div>
 </fieldset>
 <script>compute_all_ledger()</script>
\ No newline at end of file



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu