[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar inc/class.uicalendar.inc.php templates...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] calendar inc/class.uicalendar.inc.php templates... |
|
Date: |
Fri, 08 Dec 2006 21:05:21 +0000 |
CVSROOT: /sources/phpgroupware
Module name: calendar
Changes by: Sigurd Nes <sigurdne> 06/12/08 21:05:21
Modified files:
inc : class.uicalendar.inc.php
templates/base : matrix_query.tpl
Added files:
templates/base : header.inc.php
Log message:
search and filter
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/calendar/templates/base/matrix_query.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/calendar/templates/base/header.inc.php?cvsroot=phpgroupware&rev=1.1
Patches:
Index: inc/class.uicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- inc/class.uicalendar.inc.php 8 Dec 2006 11:37:54 -0000 1.135
+++ inc/class.uicalendar.inc.php 8 Dec 2006 21:05:21 -0000 1.136
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uicalendar.inc.php,v 1.135 2006/12/08 11:37:54 sigurdne
Exp $ */
+ /* $Id: class.uicalendar.inc.php,v 1.136 2006/12/08 21:05:21 sigurdne
Exp $ */
class uicalendar
{
@@ -1802,12 +1802,14 @@
// Date
$var[] = array
(
+ 'tr_color' => 'row_on',
'field' => lang('Date'),
'data' => $jscal->input('date_select',
$datetime)
);
// View type
$var[] = array(
+ 'tr_color' => 'row_off',
'field' => lang('View'),
'data' => '<select
name="matrixtype">'."\n"
. '<option value="free/busy"
selected>'.lang('free/busy').'</option>'."\n"
@@ -1883,6 +1885,7 @@
}
$var[] = array
(
+ 'tr_color' => 'row_on',
'field' => lang('Participants'),
'data' => "\n<select
name=\"participants[]\" multiple size=\"$size\">\n{$groups}{$usrs}\n</select>\n"
);
@@ -2248,14 +2251,11 @@
$tpl->set_root(PHPGW_APP_TPL);
$tpl->set_unknowns('remove');
- /*
if (!file_exists($file =
$this->template_dir.'/header.inc.php'))
{
$file = PHPGW_SERVER_ROOT .
'/calendar/templates/base/header.inc.php';
}
include($file);
- $tpl->pfp('out','head_tpl');
- */
}
function footer()
Index: templates/base/matrix_query.tpl
===================================================================
RCS file: /sources/phpgroupware/calendar/templates/base/matrix_query.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/matrix_query.tpl 28 Jul 2006 03:30:43 -0000 1.1
+++ templates/base/matrix_query.tpl 8 Dec 2006 21:05:21 -0000 1.2
@@ -1,9 +1,9 @@
-<!-- $Id: matrix_query.tpl,v 1.1 2006/07/28 03:30:43 skwashd Exp $ -->
+<!-- $Id: matrix_query.tpl,v 1.2 2006/12/08 21:05:21 sigurdne Exp $ -->
<!-- BEGIN matrix_query -->
<center>
<form action="{action_url}" method="post" name="matrixform">
<table border="0" width="90%">
- <tr bgcolor="{th_bg}">
+ <tr class="th">
<td colspan="2" align="center"><b>{title}</b></td>
</tr>
{rows}
@@ -19,7 +19,7 @@
</center>
<!-- END matrix_query -->
<!-- BEGIN list -->
- <tr bgcolor="{tr_color}">
+ <tr class="{tr_color}">
<td valign="top" width="35%"><b> {field}:</b></td>
<td valign="top" width="65%">{data}</td>
</tr>
Index: templates/base/header.inc.php
===================================================================
RCS file: templates/base/header.inc.php
diff -N templates/base/header.inc.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/base/header.inc.php 8 Dec 2006 21:05:21 -0000 1.1
@@ -0,0 +1,226 @@
+<?php
+ /**************************************************************************\
+ * phpGroupWare *
+ * http://www.phpgroupware.org *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
+ \**************************************************************************/
+
+ /* $Id: header.inc.php,v 1.1 2006/12/08 21:05:21 sigurdne Exp $ */
+
+ function add_col(&$tpl,$str)
+ {
+ $tpl->set_var('str',$str);
+ $tpl->parse('header_column','head_col',True);
+ }
+
+ function add_image_ahref($link,$image,$alt)
+ {
+ return '<a href="'.$link.'"><img
src="'.$GLOBALS['phpgw']->common->image('calendar',$image).'" alt="'.$alt.'"
title="'.$alt.'" border="0"></a>';
+ }
+
+ $refer = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
+ $referrer = $refer[2];
+
+ $templates = Array(
+ 'head_tpl' => 'head.tpl',
+ 'form_button_dropdown' => 'form_button_dropdown.tpl',
+ 'form_button_script' => 'form_button_script.tpl'
+ );
+ $tpl->set_file($templates);
+ $tpl->set_block('head_tpl','head','head');
+ $tpl->set_block('head_tpl','head_table','head_table');
+ $tpl->set_block('head_tpl','head_col','head_col');
+ $tpl->set_block('form_button_script','form_button');
+
+ if(floor(phpversion()) >= 4)
+ {
+ $tpl->set_var('cols',8);
+ }
+ else
+ {
+ $tpl->set_var('cols',7);
+ }
+
+ $today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
+
+ $col_width = 12;
+
+ add_col($tpl,' <td width="2%"> </td>');
+
+ add_col($tpl,' <td
width="2%">'.add_image_ahref($this->page('day','&date='.$today),'today',lang('Today')).'</td>');
+
+ add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('week','&date='.$today),'week',lang('This
week')).'</td>');
+
+ add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('month','&date='.$today),'month',lang('This
month')).'</td>');
+
+ add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('year','&date='.$today),'year',lang('This
Year')).'</td>');
+
+ if(floor(phpversion()) >= 4)
+ {
+ add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('planner','&date='.$today),'planner',lang('Planner')).'</td>');
+ $col_width += 2;
+ }
+
+ add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('matrixselect'),'view',lang('Daily
Matrix View')).'</td>');
+
+ add_col($tpl,' <td width="'.(100 - $col_width).'%"
align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'> </td>');
+
+ $tpl->parse('row','head_table',True);
+
+ $tpl->set_var('header_column','');
+ $tpl->set_var('cols',$cols);
+
+ if($referrer!='view')
+ {
+ $remainder = 72;
+
+ $date = (isset($GLOBALS['date'])?$GLOBALS['date']:'');
+ $date =
(isset($GLOBALS['HTTP_GET_VARS']['date'])?$GLOBALS['HTTP_GET_VARS']['date']:$date);
+ $date = ($date=='' &&
isset($GLOBALS['HTTP_POST_VARS']['date'])?$GLOBALS['HTTP_POST_VARS']['date']:$date);
+
+ $base_hidden_vars = '<input type="hidden" name="from"
value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
+ if(isset($GLOBALS['HTTP_GET_VARS']['cal_id']) &&
$GLOBALS['HTTP_GET_VARS']['cal_id'] != 0)
+ {
+ $base_hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$GLOBALS['HTTP_GET_VARS']['cal_id'].'">'."\n";
+ }
+ if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) &&
$GLOBALS['HTTP_POST_VARS']['keywords'])
+ {
+ $base_hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'">'."\n";
+ }
+ if(isset($GLOBALS['HTTP_POST_VARS']['matrixtype']) &&
$GLOBALS['HTTP_POST_VARS']['matrixtype'])
+ {
+ $base_hidden_vars .= ' <input type="hidden"
name="matrixtype" value="'.$GLOBALS['HTTP_POST_VARS']['matrixtype'].'">'."\n";
+ }
+ if($date)
+ {
+ $base_hidden_vars .= ' <input type="hidden"
name="date" value="'.$date.'">'."\n";
+ }
+ $base_hidden_vars .= ' <input type="hidden" name="month"
value="'.$this->bo->month.'">'."\n";
+ $base_hidden_vars .= ' <input type="hidden" name="day"
value="'.$this->bo->day.'">'."\n";
+ $base_hidden_vars .= ' <input type="hidden" name="year"
value="'.$this->bo->year.'">'."\n";
+
+ if(isset($GLOBALS['HTTP_POST_VARS']['participants']) &&
$GLOBALS['HTTP_POST_VARS']['participants'])
+ {
+ for
($i=0;$i<count($GLOBALS['HTTP_POST_VARS']['participants']);$i++)
+ {
+ $base_hidden_vars .= ' <input type="hidden"
name="participants[]"
value="'.$GLOBALS['HTTP_POST_VARS']['participants'][$i].'">'."\n";
+ }
+ }
+
+ $var = Array(
+ 'form_width' => '28',
+ 'form_link' => $this->page($referrer),
+ 'form_name' => 'cat_id',
+ 'title' => lang('Category'),
+ 'hidden_vars' => $base_hidden_vars,
+ 'form_options' => '<option
value="0">All</option>'.$this->cat->formated_list('select','all',$this->bo->cat_id,'True'),
+ 'button_value' => lang('Go!')
+ );
+ $tpl->set_var($var);
+ $tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+ $tpl->parse('header_column','head_col',True);
+
+ if($GLOBALS['HTTP_GET_VARS']['menuaction'] ==
'calendar.uicalendar.planner')
+ {
+ $remainder -= 28;
+ print_debug('Sort By',$this->bo->sortby);
+
+ $form_options = '<option
value="user"'.($this->bo->sortby=='user'?'
selected':'').'>'.lang('User').'</option>'."\n";
+ $form_options .= ' <option
value="category"'.((!isset($this->bo->sortby) || !$this->bo->sortby) ||
$this->bo->sortby=='category'?'
selected':'').'>'.lang('Category').'</option>'."\n";
+
+ $var = Array(
+ 'form_width' => '28',
+ 'form_link' => $this->page($referrer),
+ 'form_name' => 'sortby',
+ 'title' => lang('Sort By'),
+ 'hidden_vars' => $base_hidden_vars,
+ 'form_options' => $form_options,
+ 'button_value' => lang('Go!')
+ );
+ $tpl->set_var($var);
+
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+ $tpl->parse('header_column','head_col',True);
+ }
+
+ if($this->bo->check_perms(PHPGW_ACL_PRIVATE))
+ {
+ $remainder -= 28;
+ $form_options = '<option value=" all
"'.($this->bo->filter==' all '?' selected':'').'>'.lang('All').'</option>'."\n";
+ $form_options .= ' <option value=" private
"'.((!isset($this->bo->filter) || !$this->bo->filter) || $this->bo->filter=='
private '?' selected':'').'>'.lang('Private Only').'</option>'."\n";
+
+ $var = Array(
+ 'form_width' => '28',
+ 'form_link' => $this->page($referrer),
+ 'form_name' => 'filter',
+ 'title' => lang('Filter'),
+ 'hidden_vars' => $base_hidden_vars,
+ 'form_options' => $form_options,
+ 'button_value' => lang('Go!')
+ );
+ $tpl->set_var($var);
+
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+ $tpl->parse('header_column','head_col',True);
+ }
+
+
if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) ||
!$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) &&
count($this->bo->grants) > 0)
+ {
+ $form_options = '';
+ $drop_down = $this->bo->list_cals();
+ foreach($drop_down as $key => $grant)
+ {
+ $form_options .= ' <option
value="'.$grant['value'].'"'.($grant['grantor']==$this->bo->owner?'
selected':'').'>'.$grant['name'].'</option>'."\n";
+ }
+
+ $var = Array(
+ 'form_width' => $remainder,
+ 'form_link' => $this->page($referrer),
+ 'form_name' => 'owner',
+ 'title' => lang('User'),
+ 'hidden_vars' => $base_hidden_vars,
+ 'form_options' => $form_options,
+ 'button_value' => lang('Go!')
+ );
+ $tpl->set_var($var);
+
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+ $tpl->parse('header_column','head_col',True);
+ }
+ }
+
+ $hidden_vars = ' <input type="hidden" name="from"
value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
+ if(isset($GLOBALS['HTTP_GET_VARS']['date']) &&
$GLOBALS['HTTP_GET_VARS']['date'])
+ {
+ $hidden_vars .= ' <input type="hidden" name="date"
value="'.$GLOBALS['HTTP_GET_VARS']['date'].'">'."\n";
+ }
+ $hidden_vars .= ' <input type="hidden" name="month"
value="'.$this->bo->month.'">'."\n";
+ $hidden_vars .= ' <input type="hidden" name="day"
value="'.$this->bo->day.'">'."\n";
+ $hidden_vars .= ' <input type="hidden" name="year"
value="'.$this->bo->year.'">'."\n";
+ if(isset($this->bo->filter) && $this->bo->filter)
+ {
+ $hidden_vars .= ' <input type="hidden" name="filter"
value="'.$this->bo->filter.'">'."\n";
+ }
+ if(isset($this->bo->sortby) && $this->bo->sortby)
+ {
+ $hidden_vars .= ' <input type="hidden" name="sortby"
value="'.$this->bo->sortby.'">'."\n";
+ }
+ if(isset($this->bo->num_months) && $this->bo->num_months)
+ {
+ $hidden_vars .= ' <input type="hidden" name="num_months"
value="'.$this->bo->num_months.'">'."\n";
+ }
+ $hidden_vars .= ' <input
name="keywords"'.($GLOBALS['HTTP_POST_VARS']['keywords']?'
value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'"':'').'>';
+
+ $var = Array(
+ 'action_url_button' => $this->page('search'),
+ 'action_text_button' => lang('Search'),
+ 'action_confirm_button' => '',
+ 'action_extra_field' => $hidden_vars
+ );
+ $tpl->set_var($var);
+ $button = $tpl->fp('out','form_button');
+ $tpl->set_var('str','<td align="right"
valign="bottom">'.$button.'</td>');
+ $tpl->parse('header_column','head_col',True);
+ echo $tpl->parse('row','head_table',True);
+?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] calendar inc/class.uicalendar.inc.php templates...,
Sigurd Nes <=