phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] ged templates/base/css/default.css setup/setup....


From: Pascal Vilarem
Subject: [Phpgroupware-cvs] ged templates/base/css/default.css setup/setup....
Date: Mon, 02 Apr 2007 17:33:17 +0000

CVSROOT:        /sources/phpgroupware
Module name:    ged
Changes by:     Pascal Vilarem <maat>   07/04/02 17:33:17

Modified files:
        templates/base/css: default.css 
        setup          : setup.inc.php tables_current.inc.php 
                         tables_update.inc.php 
        inc            : class.ged_ui.inc.php class.ged_dm.inc.php 
        templates/base : file.tpl browse.tpl 
Added files:
        templates/base : history.tpl 

Log message:
        Added history storing and display
        Kiked ged version to 0.9.18.001
        Updated setup files accordingly

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/css/default.css?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ged/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ged/setup/tables_current.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ged/setup/tables_update.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_dm.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/file.tpl?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/browse.tpl?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/history.tpl?cvsroot=phpgroupware&rev=1.1

Patches:
Index: templates/base/css/default.css
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/css/default.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- templates/base/css/default.css      28 Mar 2007 16:54:13 -0000      1.6
+++ templates/base/css/default.css      2 Apr 2007 17:33:17 -0000       1.7
@@ -13,6 +13,16 @@
 border: none;
 }
 
+.ged_title {
+       font-size: 14pt;
+       color: #849AC8;
+}
+
+.ged_label {
+font-weight: bold;
+color: #849AC8;
+}
+
 #ged_top_menu {
 text-align: left;
 background-color: #849ac8;
@@ -57,11 +67,12 @@
 clear: both;
 }
 
-#ged_info .ged_file_name {
-       font-size: 14pt;
-       color: #849AC8;
+#ged_history {
+clear: both;
+padding-top: 1em;
 }
 
+
 #ged_info .ged_file_description {
        border: 1px solid black;
        padding: 5px;
@@ -92,10 +103,9 @@
        width: 100%;
 }
 
-
-.ged_label {
-font-weight: bold;
-color: #849AC8;
+#ged_history .ged_events_list {
+       border: 1px solid black;
+       width: 100%;
 }
 
 /* text colors */
@@ -198,3 +208,13 @@
 {
 background: #ff7b88;
 }
+
+.event_odd
+{
+background: #efefef;
+}
+
+.event_even
+{
+background: lightgrey;
+}

Index: setup/setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/setup/setup.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- setup/setup.inc.php 17 Jun 2006 18:25:07 -0000      1.4
+++ setup/setup.inc.php 2 Apr 2007 17:33:17 -0000       1.5
@@ -13,7 +13,7 @@
 
        $setup_info['ged']['name']='ged';
        $setup_info['ged']['title']='Document Management';
-       $setup_info['ged']['version']='0.9.16.001';
+       $setup_info['ged']['version']='0.9.18.001';
        $setup_info['ged']['app_order']=17;
        $setup_info['ged']['enable']=1;
 
@@ -26,12 +26,13 @@
        $setup_info['ged']['hooks'][]='home';
 //     $setup_info['ged']['hooks'][]='sidebox_menu';
 
-// Tables dans la base de données
+// Tables in database
 
        $setup_info['ged']['tables']=array (
                'ged_comments',
                'ged_elements',
                'ged_history',
+               'ged_relations',
                'ged_mimes',
                'ged_versions',
                'ged_acl',

Index: setup/tables_current.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/setup/tables_current.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- setup/tables_current.inc.php        8 Nov 2006 10:32:03 -0000       1.4
+++ setup/tables_current.inc.php        2 Apr 2007 17:33:17 -0000       1.5
@@ -48,23 +48,35 @@
                        'ix'=>array(),
                        'uc'=>array()
                ),
-               'ged_history'=>array(
-                       'fd'=>array(
-                               
'history_id'=>array('type'=>'auto','nullable'=>False),
-                               'account_id'=>array('type'=>'int', 
'precision'=>4,'nullable'=>True),
-                               'filename'=>array('type'=>'varchar', 
'precision'=>255,'nullable'=>True),
-                               'parent_id'=>array('type'=>'int', 
'precision'=>4,'nullable'=>True),
-                               'action'=>array('type'=>'varchar', 
'precision'=>40,'nullable'=>True),
-                               
'details'=>array('type'=>'text','nullable'=>True),
-                               'ip'=>array('type'=>'varchar', 
'precision'=>16,'nullable'=>True),
-                               'agent'=>array('type'=>'varchar', 
'precision'=>100,'nullable'=>True),
-                               
'logdate'=>array('type'=>'timestamp','nullable'=>False,'default'=>'current_timestamp'),
-                               'type'=>array('type'=>'varchar', 
'precision'=>20,'nullable'=>True)
-                       ),
-                       'pk'=>array('history_id'),
-                       'fk'=>array(),
-                       'ix'=>array(),
-                       'uc'=>array()
+               'ged_history' => array(
+                       'fd' => array(
+                               'history_id' => array('type' => 
'auto','nullable' => False),
+                               'account_id' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'element_id' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'version_id' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'status' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'action' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'ip' => array('type' => 'varchar', 'precision' 
=> 16,'nullable' => True),
+                               'agent' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'logdate' => array('type' => 'int', 'precision' 
=> 4,'nullable' => False,'default' => '0'),
+                               'comment' => array('type' => 'text','nullable' 
=> True)
+                       ),
+                       'pk' => array('history_id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ),
+               'ged_relations' => array(
+                       'fd' => array(
+                               'relation_id' => array('type' => 
'auto','nullable' => False),
+                               'linked_version_id' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
+                               'linking_version_id' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
+                               'relation_type' => array('type' => 'varchar', 
'precision' => 255,'nullable' => False)
+                       ),
+                       'pk' => array('relation_id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
                ),
                'ged_mimes'=>array(
                        'fd'=>array(

Index: setup/tables_update.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/setup/tables_update.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- setup/tables_update.inc.php 17 Jun 2006 18:25:07 -0000      1.3
+++ setup/tables_update.inc.php 2 Apr 2007 17:33:17 -0000       1.4
@@ -12,6 +12,50 @@
        
***************************************************************************/
 
        $test[]='0.9.16.000';
+       $test[]='0.9.16.001';
+       
+       function ged_upgrade0_9_16_001()
+       {
+               
+               $GLOBALS['phpgw_setup']->oProc->CreateTable( 'ged_relations' 
,array(
+                       'fd' => array(
+                               'relation_id' => array('type' => 
'auto','nullable' => False),
+                               'linked_version_id' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
+                               'linking_version_id' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
+                               'relation_type' => array('type' => 'varchar', 
'precision' => 255,'nullable' => False)
+                       ),
+                       'pk' => array('relation_id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ) );
+               
+               $GLOBALS['phpgw_setup']->oProc->DropTable('ged_history');
+               
+               $GLOBALS['phpgw_setup']->oProc->CreateTable('ged_history' , 
array(
+                       'fd' => array(
+                               'history_id' => array('type' => 
'auto','nullable' => False),
+                               'account_id' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'element_id' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'version_id' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'status' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'action' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'ip' => array('type' => 'varchar', 'precision' 
=> 16,'nullable' => True),
+                               'agent' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'logdate' => array('type' => 'int', 'precision' 
=> 4,'nullable' => False,'default' => '0'),
+                               'comment' => array('type' => 'text','nullable' 
=> True)
+                       ),
+                       'pk' => array('history_id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               )       );
+               
+               $GLOBALS['setup_info']['ged']['currentver']='0.9.18.001';
+               return $GLOBALS['setup_info']['ged']['currentver'];
+               
+       }
+               
        function ged_upgrade0_9_16_000()
        {
                
$GLOBALS['phpgw_setup']->oProc->AddColumn('ged_elements','validity_period',array('type'=>'int',
 'precision'=>4, 'nullable'=>True, 'default'=>NULL));            
@@ -76,8 +120,8 @@
                $GLOBALS['phpgw_setup']->oProc->query ("INSERT INTO ged_periods 
( period, description) VALUES ( 155520000, '5 years')" );
 
                
-               
-               $GLOBALS['setup_info']['notes']['currentver']='0.9.16.000';
-               return $GLOBALS['setup_info']['notes']['currentver'];
+               $GLOBALS['setup_info']['ged']['currentver']='0.9.16.001';
+               return $GLOBALS['setup_info']['ged']['currentver'];
        }
+
 ?>
\ No newline at end of file

Index: inc/class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- inc/class.ged_ui.inc.php    30 Mar 2007 12:37:47 -0000      1.22
+++ inc/class.ged_ui.inc.php    2 Apr 2007 17:33:17 -0000       1.23
@@ -730,6 +730,46 @@
                return $out;
        }
 
+       function draw_history_panel ( $element_id)
+       {
+               $this->t->set_file(array('history_tpl'=>'history.tpl'));
+
+               $history=$this->ged_dm->get_history($element_id);
+               
+               $this->t->set_block('history_tpl', 'event_list', 
'event_list_handle');
+               $event_odd_even='odd';
+               
+               if ( $history )
+               {
+                       $history=array_reverse($history);
+                       
+                       foreach ( $history as $event)
+                       {
+                               if ( $event_odd_even=='odd' )
+                                       $event_odd_even='even';
+                               else
+                                       $event_odd_even='odd';
+                               
+                               $this->t->set_var('event_status_oe', 
'event_'.$event_odd_even);
+                               
+                               $this->t->set_var('icon', 
$GLOBALS['phpgw']->common->image('ged', $event['status']."-16"));
+                               $this->t->set_var('version', 
$event['major'].".".$event['minor']);
+                               $this->t->set_var('action', $event['action']);
+                               $this->t->set_var('actor', 
$GLOBALS['phpgw']->common->grab_owner_name($event['account_id']));
+                               $this->t->set_var('comment', $event['comment']);
+                               $this->t->set_var('date', 
$GLOBALS['phpgw']->common->show_date($event['logdate']));
+                               
+                               $this->t->fp('event_list_handle', 'event_list', 
True);
+                       }
+                       
+                       
+               }
+
+               $out=$this->t->parse('history_tpl', 'history_tpl');
+
+               return $out;
+       }
+       
        function draw_url_panel($element_id)
        {
                return "url".$element_id;
@@ -783,6 +823,7 @@
                                
$last_version=$this->ged_dm->get_last_version($focused_id);
 
                                $this->t->set_var('main_content', 
$this->draw_file_panel($focused_id));
+                               $this->t->set_var('history_content', 
$this->draw_history_panel($focused_id));
                                $this->t->set_var('add_folder', '');
                                $this->t->set_var('lang_add_folder', '');
                                $this->t->set_var('add_file', '');
@@ -879,7 +920,7 @@
                                break;
                        case 'folder' :
                                $this->t->set_var('main_content', 
$this->draw_folder_panel($focused_id));
-
+                               $this->t->set_var('history_content', '');
                                $this->t->set_var('lang_update_file', '');
                                $this->t->set_var('update_file', '');
 

Index: inc/class.ged_dm.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_dm.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- inc/class.ged_dm.inc.php    30 Mar 2007 12:37:47 -0000      1.17
+++ inc/class.ged_dm.inc.php    2 Apr 2007 17:33:17 -0000       1.18
@@ -256,6 +256,11 @@
                // Effacement des ACLS
                $this->rm_all_acl ( $element_id );
 
+               // Effacement des historiques
+               $sqlh="DELETE FROM ".$this->tables['history']." WHERE 
element_id=".$element_id;
+               $this->db->query($sqlh, __LINE__, __FILE__);
+               
+
                // Effacement de l'element
                $sqle="DELETE FROM ".$this->tables['elements']." WHERE 
element_id=".$element_id;
                $this->db->query($sqle, __LINE__, __FILE__);
@@ -332,6 +337,8 @@
                                
                                $this->db->unlock();
        
+                               $this->store_history ('updated', 'New version', 
$my_new_version_id);
+       
                        }
                        
                        // AJOUT des relations
@@ -345,16 +352,6 @@
                                }
                        }
            
-           if ($new_version['status']=="current" && 
$current_or_alert_or_rejected_version['status']=="current")
-           {
-             $sql_model2="UPDATE %s set status='obsolete' WHERE version_id=%d";
-             $sql2=sprintf($sql_model2, $this->tables['versions'], 
$current_or_alert_or_rejected_version['version_id']);
-       
-             $this->db->query($sql2, __LINE__, __FILE__);
-             $this->db->unlock();
-       
-           }
-           
                        if ( $this->debug('add_version') )
                                print ( "add_version: end.<br>\n");
        
@@ -445,6 +442,8 @@
                        $this->db->query($sql1, __LINE__, __FILE__);
                        $this->db->unlock();
                        
+                       $this->store_history ('updated', 'comment', 
$amended_version['version_id']);
+                       
                        // Gestion des relations
                        if ( is_array($amended_version['relations']))
                        {
@@ -886,7 +885,6 @@
                return $version;
        }
 
-
        function get_pending_for_approval ($element_id)
        {
                if ( $this->debug('get_pending_for_approval') )
@@ -1024,7 +1022,6 @@
                return false;
        }
        
-       
        function can_read($element_id)
        {
                if ( $this->admin )
@@ -1666,6 +1663,7 @@
                                                        $sql="UPDATE 
ged_versions set status='obsolete' WHERE 
version_id=".$current_or_alert_or_rejected_version['version_id']." ";
                                                        $sql.="AND status != 
'rejected'";               
                                                        $this->db->query($sql, 
__LINE__, __FILE__);
+                                               $this->db->unlock();
                                                        
                                                        // TODO : Set status of 
depending documents to alert
                                                        
$versions_referring_to=$this->list_versions_referring_to($current_or_alert_or_rejected_version['version_id']);
@@ -1681,10 +1679,11 @@
                                        }
                                        $sql="UPDATE ged_versions set 
status='current', validation_date=".time()." WHERE 
version_id=".$working_or_pending_version['version_id'];                        
                                        $this->db->query($sql, __LINE__, 
__FILE__);
+                               $this->db->unlock();
+                               
+                               $this->store_history ('approved', 'approved', 
$working_or_pending_version['version_id']);
                                }
                        }
-                                               
-                       $this->db->unlock();
        }
 
        function alert_version ( $version_id )
@@ -1695,6 +1694,8 @@
                // TODO : recursivite
                                                
                $this->db->unlock();
+               
+               $this->store_history ('alerted', 'alerted', 
$version_id['version_id']);
        }
 
        // Say file is not valid
@@ -1712,10 +1713,11 @@
                                        
                                        $sql="UPDATE ged_versions set 
status='".$next_status."' WHERE version_id=".$pending_version['version_id'];    
                  
                                        $this->db->query($sql, __LINE__, 
__FILE__);
+                               $this->db->unlock();
+                               
+                               $this->store_history ('refused', 'refused', 
$pending_version['version_id']);
                                }
                        }
-                                               
-                       $this->db->unlock();
        }
        
        // Say file is not valid
@@ -1735,10 +1737,11 @@
                                        // TODO : Add submission date
                                        $sql="UPDATE ged_versions set 
status='rejected' WHERE version_id=".$pending_version['version_id'];            
          
                                        $this->db->query($sql, __LINE__, 
__FILE__);
+                               $this->db->unlock();
+                               
+                               $this->store_history ('rejected', 'rejected', 
$pending_version['version_id']);
                                }
                        }
-                                               
-                       $this->db->unlock();
        }
 
        // Submit file to customer for approval
@@ -1758,10 +1761,11 @@
                                        // TODO : Add submission date
                                        $sql="UPDATE ged_versions set 
status='pending_for_approval' WHERE 
version_id=".$pending_version['version_id'];                  
                                        $this->db->query($sql, __LINE__, 
__FILE__);
+                               $this->db->unlock();
+                               
+                               $this->store_history ('delivered', 'delivered', 
$pending_version['version_id']);
                                }
                        }
-                                               
-                       $this->db->unlock();
        }
 
        // submit file for internal approval then delivery
@@ -1780,10 +1784,11 @@
                                        // TODO : Add submission date
                                        $sql="UPDATE ged_versions set 
status='pending_for_technical_review' WHERE 
version_id=".$working_version['version_id'];                  
                                        $this->db->query($sql, __LINE__, 
__FILE__);
+                               $this->db->unlock();
+                               
+                               $this->store_history ('submitted', 'submitted', 
$working_version['version_id']);
                                }
                        }
-                                               
-                       $this->db->unlock();
        }
 
        function accept_file ( $element_id )
@@ -1806,10 +1811,11 @@
                                        
                                        $sql="UPDATE ged_versions set 
status='".$next_status."' WHERE version_id=".$pending_version['version_id'];    
                  
                                        $this->db->query($sql, __LINE__, 
__FILE__);
+                               $this->db->unlock();
+                               
+                               $this->store_history ('accepted', 'accepted', 
$pending_version['version_id']);
                                }
                        }
-                                               
-                       $this->db->unlock();
        }
 
        // relations management
@@ -2189,8 +2195,54 @@
        
        }
 
-  // Recherches
+       // History
+       function get_history ( $element_id)
+       {
+               $sql="SELECT ".$this->tables['history'].".*, 
".$this->tables['versions'].".major, ".$this->tables['versions'].".minor FROM 
".$this->tables['history']." INNER JOIN ".$this->tables['versions']." ";
+               $sql.="ON ".$this->tables['history'].".version_id = 
".$this->tables['versions'].".version_id ";
+               $sql.="WHERE 
".$this->tables['history'].".element_id=".$element_id;
+                               
+               $this->db->query($sql);
+
+               $i=0;
+               while ($this->db->next_record())
+               {
+                       $history[$i]['element_id']=$element_id;
+                       $history[$i]['version_id']=$this->db->f('version_id');
+                       $history[$i]['status']=$this->db->f('status');
+                       $history[$i]['logdate']=$this->db->f('logdate');
+                       $history[$i]['action']=$this->db->f('action');
+                       $history[$i]['account_id']=$this->db->f('account_id');
+                       $history[$i]['comment']=$this->db->f('comment');
+                       $history[$i]['ip']=$this->db->f('ip');
+                       $history[$i]['agent']=$this->db->f('agent');
+                       $history[$i]['major']=$this->db->f('major');
+                       $history[$i]['minor']=$this->db->f('minor');
+                       
+                       $i++;
+
+               }
+                       
+               $this->db->unlock();
+               
+               if ( isset($history))
+                       return ($history);
+               else
+                       return null;    
+       }
+       
+       function store_history ($action, $comment, $version_id)
+       {
+               $version_info=$this->get_version_info($version_id);
+               
+               $sql="INSERT INTO ".$this->tables['history']. "(element_id, 
version_id, status, logdate, action, account_id, comment, ip, agent) ";
+               $sql.="VALUES (".$version_info['element_id'].", 
".$version_info['version_id'].", '".$version_info['status']."', '".time()."', 
'".$action."', ".intval($GLOBALS['phpgw_info']['user']['account_id']).", 
'".$comment."', 'ip', 'agent')";
+               
+               $this->db->query($sql);
+               $this->db->unlock();
+       }
   
+  // Searching  
   function search($query)
   {
                $sql="SELECT ged_elements.*, ged_current_version.* ";

Index: templates/base/file.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/file.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- templates/base/file.tpl     28 Mar 2007 14:52:35 -0000      1.7
+++ templates/base/file.tpl     2 Apr 2007 17:33:17 -0000       1.8
@@ -1,13 +1,12 @@
-<div id="ged_info">
 <div style="float: right"><img src="{current_version_status_image}"/></div>
-<div class="ged_file_name">{name} [{reference}] v{current_version}</div>
+<div class="ged_title">{name} [{reference}] v{current_version}</div>
 <div class="ged_file_description">{description}<br/>
 {current_version_description}</div>
 <div class="ged_file_metadata">Owned by : {owner} - Creation : {creation_date} 
- Version : {current_version_date} by {current_version_creator} -
 {lang_current_version_expiration_date} : {current_version_expiration_date}
 </div>
 
-<div class="ged_file_name">Linking to :</div>
+<div class="ged_title">Linking to :</div>
 <table id="ged_file_relations" cellspacing="0" cellpadding"0">
 <!-- BEGIN relations_list -->
 <tr class="{relation_status_oe}">
@@ -18,7 +17,7 @@
 <!-- END relations_list -->
 </table>
 
-<div class="ged_file_name">Linked by :</div>
+<div class="ged_title">Linked by :</div>
 <table id="ged_file_relations2" cellspacing="0" cellpadding"0">
 <!-- BEGIN relations_list2 -->
 <tr class="{relation_status_oe}">
@@ -29,7 +28,7 @@
 <!-- END relations_list2 -->
 </table>
 
-<div class="ged_file_name">Versions :</div>
+<div class="ged_title">Versions :</div>
 <table id="ged_file_versions" cellspacing="0" cellpadding"0">
 <!-- BEGIN versions_list -->
 <tr class="{file_version_status_oe}">
@@ -46,4 +45,3 @@
 </tr>
 <!-- END versions_list -->
 </table>
-</div>
\ No newline at end of file

Index: templates/base/browse.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/browse.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/base/browse.tpl   28 Mar 2007 13:31:57 -0000      1.3
+++ templates/base/browse.tpl   2 Apr 2007 17:33:17 -0000       1.4
@@ -6,6 +6,7 @@
 <div id="ged_tree">
 {tree}
 </div>
+<div id="ged_history">{history_content}</div>
 <div id="ged_bottom"></div>
 <!-- pour plus tard : fonction de recherche
 <form name="search" enctype="multipart/form-data" action="{action_search}" 
method="post">

Index: templates/base/history.tpl
===================================================================
RCS file: templates/base/history.tpl
diff -N templates/base/history.tpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ templates/base/history.tpl  2 Apr 2007 17:33:17 -0000       1.1
@@ -0,0 +1,8 @@
+<div class="ged_title">History :</div>
+<table class="ged_events_list" width="70%" cellspacing="0" cellpadding"0">
+<!-- BEGIN event_list -->
+<tr class="{event_status_oe}">
+<td width="20"><img src="{icon}"/></td><td 
width="30"><b>v{version}</b></td><td width="300">{date} <b>{action}</b> 
({actor})</td><td align="left">{comment}</td>
+</tr>
+<!-- END event_list -->
+</table>
\ No newline at end of file




reply via email to

[Prev in Thread] Current Thread [Next in Thread]