[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] ged templates/base/css/default.css inc/class.ge...
|
From: |
Pascal Vilarem |
|
Subject: |
[Phpgroupware-cvs] ged templates/base/css/default.css inc/class.ge... |
|
Date: |
Thu, 05 Apr 2007 17:01:43 +0000 |
CVSROOT: /sources/phpgroupware
Module name: ged
Changes by: Pascal Vilarem <maat> 07/04/05 17:01:43
Modified files:
templates/base/css: default.css
inc : class.ged_ui.inc.php class.ged_dm.inc.php
templates/base : history.tpl file.tpl browse.tpl
Added files:
templates/base : search.tpl
Log message:
fix : template problem with verdilak
added : search page
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/css/default.css?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_dm.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/history.tpl?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/file.tpl?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/browse.tpl?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/search.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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- templates/base/css/default.css 3 Apr 2007 16:43:21 -0000 1.9
+++ templates/base/css/default.css 5 Apr 2007 17:01:42 -0000 1.10
@@ -13,6 +13,18 @@
border: none;
}
+input {
+margin: 0px;
+padding: 2px;
+border: 1px solid gray;
+}
+
+textarea {
+margin: 0px;
+padding: 2px;
+border: 1px solid gray;
+}
+
.ged_title {
font-size: 14pt;
color: #849AC8;
Index: inc/class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- inc/class.ged_ui.inc.php 5 Apr 2007 09:27:16 -0000 1.26
+++ inc/class.ged_ui.inc.php 5 Apr 2007 17:01:43 -0000 1.27
@@ -22,7 +22,7 @@
var $debug=1;
var $browser;
- var $public_functions=array('browse'=>true, 'add_file'=>true,
'add_folder'=>true, 'update_file'=>true, 'update_folder'=>true,
'delete_folder'=>true, 'download'=>true, 'package_download' => true,
'view'=>true, 'update_file'=>true, 'delete_file'=>true, 'change_acl'=>true,
'approve_file'=>true, 'submit_file'=> true, 'accept_file'=> true,
'refuse_file'=> true, 'deliver_file'=> true, 'reject_file'=> true );
+ var $public_functions=array('browse'=>true, 'add_file'=>true,
'add_folder'=>true, 'update_file'=>true, 'update_folder'=>true,
'delete_folder'=>true, 'download'=>true, 'package_download' => true,
'view'=>true, 'update_file'=>true, 'delete_file'=>true, 'change_acl'=>true,
'approve_file'=>true, 'submit_file'=> true, 'accept_file'=> true,
'refuse_file'=> true, 'deliver_file'=> true, 'reject_file'=> true, 'search' =>
true );
var $icons;
@@ -32,7 +32,7 @@
function ged_ui()
{
//$this->theme = $GLOBALS['phpgw_info']['theme'];
- $this->t = $GLOBALS['phpgw']->template;
+ $this->t = clone ($GLOBALS['phpgw']->template);
$this->t->set_root(PHPGW_APP_TPL);
// Gestion des groupes et des droits
@@ -899,6 +899,13 @@
if ( $this->debug('browse') )
print ( "browse: focused_element
type=".$focused_element['type']."<br>\n");
+
+ $link_data=null;
+ $link_data['menuaction']='ged.ged_ui.search';
+ $search_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
+ $this->t->set_var('search', "<a
href=\"".$search_url."\">".lang('Search')."</a>");
+
+
switch ($focused_element['type'])
{
case 'file' :
@@ -1468,7 +1475,7 @@
{
if ( $version_relation['status']=='obsolete' ||
$version_relation['status']=='rejected' )
{
- print ( 'new version :
'.$version_relation['version_id']."<br/>\n");
+ // print ( 'new version :
'.$version_relation['version_id']."<br/>\n");
// TODO : prepare data for future relation
creation
$the_new_relations=$this->ged_dm->get_current_version($version_relation['element_id']);
@@ -1487,7 +1494,7 @@
}
else
{
- print ( 'report :
'.$version_relation['version_id']."<br/>\n");
+ // print ( 'report :
'.$version_relation['version_id']."<br/>\n");
// TODO : prepare data for future relation
creation
$new_relations[$nri]['linked_version_id']=$version_relation['version_id'];
@@ -2167,6 +2174,75 @@
$GLOBALS['phpgw']->redirect_link('/index.php', $link_data);
}
+ // Search
+ function search()
+ {
+ $search_query=get_var('search_query', array('GET', 'POST'));
+ $search=get_var('search', array('GET', 'POST'));
+
+ $this->set_template_defaults();
+ $this->display_app_header();
+
+ $link_data=null;
+ $link_data['menuaction']='ged.ged_ui.search';
+ $link_data['kp3']=$GLOBALS['phpgw_info']['user']['kp3'];
+ $link_data['sessionid']=$GLOBALS['sessionid'];
+ $link_data['click_history']=$_GET['click_history'];
+ $search_url=$GLOBALS['phpgw_info']['server']['webserver_url'];
+
+ $this->t->set_var('menuaction', $link_data['menuaction']);
+ $this->t->set_var('kp3', $link_data['kp3']);
+ $this->t->set_var('sessionid', $link_data['sessionid']);
+ $this->t->set_var('click_history', $link_data['click_history']);
+ $this->t->set_var('action_search', $search_url);
+
+ // Search
+ $results_query= $this->ged_dm->search($search_query);
+
+ $this->t->set_file(array('search_tpl'=>'search.tpl'));
+
+ $this->t->set_block('search_tpl', 'search_results_block',
'search_results_block_handle');
+
+ // Set block
+ if ( $search == lang("Search") && $search_query != '' &&
is_array($results_query))
+ {
+ foreach($results_query as $result_query )
+ {
+ $this->t->set_var('element_id', $result_query['element_id']);
+ $this->t->set_var('version_id', $result_query['version_id']);
+ $this->t->set_var('name', $result_query['name']);
+ $this->t->set_var('reference', $result_query['reference']);
+ $this->t->set_var('version',
"v".$result_query['major'].".".$result_query['minor']);
+ $this->t->set_var('status', $result_query['status']);
+ $this->t->set_var('description', $result_query['description']);
+ $this->t->set_var('descriptionv',
$result_query['descriptionv']);
+
+
+ $this->t->set_var('status_image',
$GLOBALS['phpgw']->common->image('ged', $result_query['status']."-16"));
+
+ $link_data=null;
+ $link_data['menuaction']='ged.ged_ui.browse';
+
$link_data['focused_id']=$result_query['element_id'];
+ $this->t->set_var('search_link',
$GLOBALS['phpgw']->link('/index.php', $link_data));
+
+ $this->t->fp('search_results_block_handle',
'search_results_block', True);
+
+ }
+
+
+ }
+
+ // Display result
+
+ $this->t->set_var('search_query_field', "search_query");
+ $this->t->set_var('search_query_value', $search_query);
+ $this->t->set_var('do_search_command', "search");
+ $this->t->set_var('do_search_value', lang("Search"));
+
+ $this->t->pfp('out', 'search_tpl');
+
+ }
+
}
?>
Index: inc/class.ged_dm.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_dm.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- inc/class.ged_dm.inc.php 5 Apr 2007 09:27:16 -0000 1.22
+++ inc/class.ged_dm.inc.php 5 Apr 2007 17:01:43 -0000 1.23
@@ -2303,14 +2303,14 @@
// Searching
function search($query)
{
- $sql="SELECT ged_elements.*, ged_current_version.* ";
+ $sql="SELECT ged_elements.*, ged_current_version.*,
ged_elements.description as descriptione, ged_current_version.description as
descriptionv ";
$sql.="FROM ( ged_elements ";
$sql.="INNER JOIN ged_versions as ged_current_version ";
$sql.="ON
ged_elements.element_id=ged_current_version.element_id ";
$sql.="AND ( ged_current_version.status='current' OR
ged_current_version.status='working' OR
ged_current_version.status='pending_for_technical_review' ";
$sql.="OR
ged_current_version.status='pending_for_quality_review' OR
ged_current_version.status='ready_for_delivery' OR
ged_current_version.status='pending_for_approval' )) ";
$sql.="WHERE ged_elements.name like '%".$query."%' OR
ged_elements.description like '%".$query."%' OR ged_elements.reference like
'%".$query."%' ";
- $sql.="OR ged_current_version.description like
'%".$query."%';";
+ $sql.="OR ged_current_version.description like '%".$query."%'
";
$this->db->query($sql);
@@ -2331,7 +2331,8 @@
$docs[$i]['reference']=$this->db->f('reference');
$docs[$i]['reference']=$this->db->f('reference');
-
$docs[$i]['description']=$this->db->f('description');
+
$docs[$i]['description']=$this->db->f('descriptione');
+
$docs[$i]['descriptionv']=$this->db->f('descriptionv');
$i ++;
}
}
Index: templates/base/history.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/history.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/base/history.tpl 2 Apr 2007 17:54:58 -0000 1.2
+++ templates/base/history.tpl 5 Apr 2007 17:01:43 -0000 1.3
@@ -2,7 +2,7 @@
<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="100">{date}</td><td
width="150"><b>{action}</b> ({actor})</td><td align="left">{comment}</td>
+<td width="20"><img src="{icon}"/></td><td
width="30"><b>v{version}</b></td><td width="130">{date}</td><td
width="150"><b>{action}</b> ({actor})</td><td align="left">{comment}</td>
</tr>
<!-- END event_list -->
</table>
\ No newline at end of file
Index: templates/base/file.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/file.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- templates/base/file.tpl 3 Apr 2007 16:43:21 -0000 1.9
+++ templates/base/file.tpl 5 Apr 2007 17:01:43 -0000 1.10
@@ -6,7 +6,7 @@
{lang_current_version_expiration_date} : {current_version_expiration_date}
</div>
-<div style="float: right"><a href="{download_all_link}" ><img
src="{image_download-32}"/></a></div>
+<div style="float: right"><a href="{download_all_link}" ><img style="{border:
none;}" src="{image_download-32}"/></a></div>
<div class="ged_title">Linking to :</div>
<table id="ged_file_relations" cellspacing="0" cellpadding"0">
<!-- BEGIN relations_list -->
Index: templates/base/browse.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/browse.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- templates/base/browse.tpl 2 Apr 2007 17:33:17 -0000 1.4
+++ templates/base/browse.tpl 5 Apr 2007 17:01:43 -0000 1.5
@@ -1,4 +1,4 @@
-<div id="ged_top_menu">{top_link} {up_link} {update_folder} {add_folder}
{delete_folder} {add_file} {edit_file} {update_file} {refuse_file}
{accept_file} {submit_file} {deliver_file} {reject_file} {approve_file}
{delete_file} {change_acl}</div>
+<div id="ged_top_menu">{top_link} {up_link} {update_folder} {add_folder}
{delete_folder} {add_file} {edit_file} {update_file} {refuse_file}
{accept_file} {submit_file} {deliver_file} {reject_file} {approve_file}
{delete_file} {change_acl} {search}</div>
<br/>
<div id="ged_info">
{main_content}
Index: templates/base/search.tpl
===================================================================
RCS file: templates/base/search.tpl
diff -N templates/base/search.tpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/base/search.tpl 5 Apr 2007 17:01:43 -0000 1.1
@@ -0,0 +1,26 @@
+<div align=center>
+<form name="search" action="{action_search}" method="get">
+<input name="menuaction" type="hidden" value="{menuaction}">
+<input name="kp3" type="hidden" value="{kp3}">
+<input name="sessionid" type="hidden" value="{sessionid}">
+<input name="click_history" type="hidden" value="{click_history}">
+<input name="{search_query_field}" type="text" size="50"
value="{search_query_value}"> <input name="{do_search_command}" type="submit"
value="{do_search_value}">
+</form>
+<table cellspacing="0" cellpadding="0" width="70%">
+<!-- BEGIN search_results_block -->
+<tr>
+<td width="20" height="16" valign="bottom">
+<img height="16" src="{status_image}">
+</td>
+<td valign="top"><a href="{search_link}" style="font-size: 10pt;">{name}
[{reference}] {version}</a>
+</td>
+</tr>
+<tr>
+<td></td>
+<td>
+<span style="font-size: 8pt;">{description} - {descriptionv}</span>
+</td>
+</tr>
+<!-- END search_results_block -->
+</table>
+</div>
\ No newline at end of file