[Phpcompta-dev] r4182 - in phpcompta/trunk: . html html/js include

[phpcompta-dev]

Author: danydb
Date: 2011-07-10 18:55:01 +0200 (Sun, 10 Jul 2011)
New Revision: 4182

Modified:
   phpcompta/trunk/
   phpcompta/trunk/html/ajax_card.php
   phpcompta/trunk/html/js/card.js
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/class_user.php
Log:
Merged revisions 4176-4181 via svnmerge from 
svn+ssh://address@hidden/svn/phpcompta/branches/rel560

........
  r4176 | danydb | 2011-07-05 23:26:47 +0200 (Tue, 05 Jul 2011) | 1 line
  
  add function HtmlInput::button_close
........
  r4177 | danydb | 2011-07-05 23:27:16 +0200 (Tue, 05 Jul 2011) | 1 line
  
  Background transparency 
........
  r4178 | danydb | 2011-07-05 23:27:47 +0200 (Tue, 05 Jul 2011) | 1 line
  
  Fix bug : in parameter > extension all the users are seen
........
  r4179 | danydb | 2011-07-05 23:35:31 +0200 (Tue, 05 Jul 2011) | 2 lines
  
  Bug for 9.0.4: comparison with always true
........
  r4180 | danydb | 2011-07-05 23:39:26 +0200 (Tue, 05 Jul 2011) | 2 lines
  
  fix small bug
........
  r4181 | danydb | 2011-07-10 18:43:22 +0200 (Sun, 10 Jul 2011) | 2 lines
  
  #320 bouton fermer dans popup de fiche
........



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/branches/rel560:1-4170
   + /phpcompta/branches/rel560:1-4181

Modified: phpcompta/trunk/html/ajax_card.php
===================================================================
--- phpcompta/trunk/html/ajax_card.php  2011-07-10 16:43:22 UTC (rev 4181)
+++ phpcompta/trunk/html/ajax_card.php  2011-07-10 16:55:01 UTC (rev 4182)
@@ -122,7 +122,8 @@
 case 'dc':
     $f=new Fiche($cn);
     /* add title + close */
-    $html=HtmlInput::button_close($ctl);
+    $html="";
+    $html=HtmlInput::anchor_close($ctl);
     $html.=h2info('Détail fiche');
     if ( $qcode != '')
     {
@@ -176,7 +177,7 @@
     if ( $user->check_action(FICADD)==1 )
     {
         $r='';
-       $r=HtmlInput::button_close($ctl);
+       $r=HtmlInput::anchor_close($ctl);
        /* get cat. name */
        $cat_name=$cn->get_value('select fd_label from fiche_def where 
fd_id=$1',
                                 array($fd_id));
@@ -244,7 +245,7 @@
             }
     }
     $array=$cn->make_array($sql);
-    $html=HtmlInput::button_close('select_card_div');
+    $html=HtmlInput::anchor_close('select_card_div');
     $html.=h2info('Choix de la catégorie');
     if ( empty($array))
     {

Modified: phpcompta/trunk/html/js/card.js
===================================================================
--- phpcompta/trunk/html/js/card.js     2011-07-10 16:43:22 UTC (rev 4181)
+++ phpcompta/trunk/html/js/card.js     2011-07-10 16:55:01 UTC (rev 4182)
@@ -408,7 +408,7 @@
         sx=document.body.scrollTop+60;
     }
 
-    var str_style="top:"+sx+";left:10%;width:80%;height:auto";
+    var str_style="top:"+sx+";left:25%;width:50%;height:auto";
 
     var popup={'id':  
content,'cssclass':'op_detail','style':str_style,'html':loading(),'drag':true};
 

Modified: phpcompta/trunk/html/style-color.css
===================================================================
--- phpcompta/trunk/html/style-color.css        2011-07-10 16:43:22 UTC (rev 
4181)
+++ phpcompta/trunk/html/style-color.css        2011-07-10 16:55:01 UTC (rev 
4182)
@@ -585,7 +585,7 @@
        height:100%;
        z-index:1;
        /*background-color:lightgrey;*/
-       
+background-color: rgba(203, 203,203, 0.2);     
        display:none;   
 }
 

Modified: phpcompta/trunk/html/style-light.css
===================================================================
--- phpcompta/trunk/html/style-light.css        2011-07-10 16:43:22 UTC (rev 
4181)
+++ phpcompta/trunk/html/style-light.css        2011-07-10 16:55:01 UTC (rev 
4182)
@@ -602,7 +602,7 @@
 
        z-index:1;
        /*background-color:lightgrey;*/
-background-color: rgba(165, 213,195, 0.5);
+background-color: rgba(203, 203,203, 0.2);
        display:none;   
 }
 

Modified: phpcompta/trunk/include/class_html_input.php
===================================================================
--- phpcompta/trunk/include/class_html_input.php        2011-07-10 16:43:22 UTC 
(rev 4181)
+++ phpcompta/trunk/include/class_html_input.php        2011-07-10 16:55:01 UTC 
(rev 4182)
@@ -397,11 +397,12 @@
      */
     static function button_close($div_name)
     {
-    $html=' <div 
style="float:right;height:10px;display:block;margin-top:2px;margin-right:2px">';
+      $a=new IButton('Fermer','Fermer');
+      $a->label="Fermer";
+      $a->javascript="removeDiv('".$div_name."')";
+      $html=$a->input();
 
-    $html.= '<A style="background-color:blue;color:white;text-decoration:none" 
HREF="javascript:void(0)" onclick="removeDiv(\''.$div_name.'\');">Fermer</A>';
-    $html.='</div>';
-    return $html;
+      return $html;
 
     }
     /**
@@ -411,7 +412,7 @@
     static function anchor_close($div)
     {
        $r='';
-       $r.='<div style="float:right">';
+       $r.='<div style="float:right;margin:2;">';
        $r.= '<A style="background-color:blue;color:white;text-decoration:none" 
HREF="javascript:void(0)" onclick="removeDiv(\''.$div.'\');">Fermer</A>';
        $r.='</div>';
        return $r;

Modified: phpcompta/trunk/include/class_user.php
===================================================================
--- phpcompta/trunk/include/class_user.php      2011-07-10 16:43:22 UTC (rev 
4181)
+++ phpcompta/trunk/include/class_user.php      2011-07-10 16:55:01 UTC (rev 
4182)
@@ -692,8 +692,11 @@
     {
         $sql="select distinct use_id,use_login,use_first_name,use_name from 
ac_users
              left outer join  jnt_use_dos using (use_id)
-             where
-             (dos_id=$1 or  use_admin=1) and use_active=1 order by 
use_login,use_name";
+            left join priv_user on (priv_jnt=jnt_id)
+              where
+              (dos_id=$1 or  use_admin=1) and use_active=1 and (use_admin=1  
or priv_priv <> 'X') order by use_login,use_name";
+
+
         $repo=new Database();
         $array=$repo->get_array($sql,array($p_dossier));
         if ( $repo->size() == 0 ) throw new Exception ('Error inaccessible 
folder');