[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar/templates/default edit.tpl, 1.17 header.inc.
|
From: |
skwashd |
|
Subject: |
[Phpgroupware-cvs] calendar/templates/default edit.tpl, 1.17 header.inc.php, 1.28 contacts_popup.tpl, 1.1 |
|
Date: |
Sun, 23 Oct 2005 14:57:00 +0200 |
Update of calendar/templates/default
Modified Files:
Branch: MAIN
edit.tpl lines: +3 -3
header.inc.php lines: +36 -31
Added Files:
Branch: MAIN
contacts_popup.tpl
Log Message:
now selection is based on contacts not account
====================================================
Index: calendar/templates/default/edit.tpl
diff -u calendar/templates/default/edit.tpl:1.16
calendar/templates/default/edit.tpl:1.17
--- calendar/templates/default/edit.tpl:1.16 Sun May 15 06:57:38 2005
+++ calendar/templates/default/edit.tpl Sun Oct 23 12:57:16 2005
@@ -1,10 +1,10 @@
<!-- $Id$ -->
<!-- BEGIN edit_entry -->
<script language="JavaScript">
- self.name="first_Window";
+ self.name="phpgw_calendar_edit";
function accounts_popup()
{
-
Window1=window.open('{accounts_link}',"Search","width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes");
+
Window1=window.open('{popup_url}',"Search","width=600,height=450,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
<center>
====================================================
Index: calendar/templates/default/header.inc.php
diff -u calendar/templates/default/header.inc.php:1.27
calendar/templates/default/header.inc.php:1.28
--- calendar/templates/default/header.inc.php:1.27 Sun May 15 06:57:38 2005
+++ calendar/templates/default/header.inc.php Sun Oct 23 12:57:16 2005
@@ -22,15 +22,15 @@
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']);
+ $refer = explode('.',$_GET['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_file(array
+ (
+ 'head_tpl' => 'head.tpl',
+ 'form_button_dropdown' => 'form_button_dropdown.tpl',
+ 'form_button_script' => 'form_button_script.tpl'
+ ));
$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');
@@ -79,21 +79,21 @@
$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);
+ $date = (isset($_GET['date'])?$_GET['date']:$date);
+ $date = ($date=='' &&
isset($_POST['date'])?$_POST['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="from"
value="'.$_GET['menuaction'].'">'."\n";
+ if(isset($_GET['cal_id']) && $_GET['cal_id'] != 0)
{
- $base_hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$GLOBALS['HTTP_GET_VARS']['cal_id'].'">'."\n";
+ $base_hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$_GET['cal_id'].'">'."\n";
}
- if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) &&
$GLOBALS['HTTP_POST_VARS']['keywords'])
+ if(isset($_POST['keywords']) && $_POST['keywords'])
{
- $base_hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'">'."\n";
+ $base_hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$_POST['keywords'].'">'."\n";
}
- if(isset($GLOBALS['HTTP_POST_VARS']['matrixtype']) &&
$GLOBALS['HTTP_POST_VARS']['matrixtype'])
+ if(isset($_POST['matrixtype']) && $_POST['matrixtype'])
{
- $base_hidden_vars .= ' <input type="hidden"
name="matrixtype" value="'.$GLOBALS['HTTP_POST_VARS']['matrixtype'].'">'."\n";
+ $base_hidden_vars .= ' <input type="hidden"
name="matrixtype" value="'.$_POST['matrixtype'].'">'."\n";
}
if($date)
{
@@ -103,15 +103,15 @@
$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'])
+ if(isset($_POST['participants']) && $_POST['participants'])
{
- for
($i=0;$i<count($GLOBALS['HTTP_POST_VARS']['participants']);$i++)
+ for ($i=0;$i<count($_POST['participants']);$i++)
{
- $base_hidden_vars .= ' <input type="hidden"
name="participants[]"
value="'.$GLOBALS['HTTP_POST_VARS']['participants'][$i].'">'."\n";
+ $base_hidden_vars .= ' <input type="hidden"
name="participants[]" value="'.$_POST['participants'][$i].'">'."\n";
}
}
- $var = Array(
+ $var = array(
'form_width' => '28',
'form_link' => $this->page($referrer),
'form_name' => 'cat_id',
@@ -124,7 +124,7 @@
$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')
+ if($_GET['menuaction'] == 'calendar.uicalendar.planner')
{
$remainder -= 28;
print_debug('Sort By',$this->bo->sortby);
@@ -132,7 +132,7 @@
$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(
+ $var = array(
'form_width' => '28',
'form_link' => $this->page($referrer),
'form_name' => 'sortby',
@@ -152,7 +152,7 @@
$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(
+ $var = array(
'form_width' => '28',
'form_link' => $this->page($referrer),
'form_name' => 'filter',
@@ -172,10 +172,15 @@
$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";
+ if ( $grant['value'] && $grant['name'] )//stop
empties showing up
+ {
+ $form_options .= "<option
value=\"{$grant['value']}\" "
+ .
($grant['value'] == $this->bo->owner ? 'selected="selected"' : '') . '>'
+ .
"{$grant['name']}</option>\n";
+ }
}
- $var = Array(
+ $var = array(
'form_width' => $remainder,
'form_link' => $this->page($referrer),
'form_name' => 'owner',
@@ -190,10 +195,10 @@
}
}
- $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="from"
value="'.$_GET['menuaction'].'">'."\n";
+ if(isset($_GET['date']) && $_GET['date'])
{
- $hidden_vars .= ' <input type="hidden" name="date"
value="'.$GLOBALS['HTTP_GET_VARS']['date'].'">'."\n";
+ $hidden_vars .= ' <input type="hidden" name="date"
value="'.$_GET['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";
@@ -210,9 +215,9 @@
{
$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'].'"':'').'>';
+ $hidden_vars .= ' <input name="keywords"'.($_POST['keywords']?'
value="'.$_POST['keywords'].'"':'').'>';
- $var = Array(
+ $var = array(
'action_url_button' => $this->page('search'),
'action_text_button' => lang('Search'),
'action_confirm_button' => '',
====================================================
Index: contacts_popup.tpl
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
<title>{lang_title}</title>
<script type="text/javascript"
src="./communik8r/js/base/base.js"><script>
<script type="text/javascript"
src="./communik8r/js/base/events.js"></script>
<script type="text/javascript"
src="./communik8r/js/sarissa/sarissa.js"></script>
<script type="text/javascript">
var iCat = 0;
var strBaseURL = '{base_url}';
function updateCat()
{
var oSelect =
document.getElementById('search_cat');
iCat =
oSelect.options[oSelect.selectedIndex].value;
}
function doSearch()
{
var oSearch =
document.getElementById('search_search');
if ( oSearch.value.length < 3 )
{
return true;
}
document.getElementById('search_list').innerHTML = '';
var oArgs =
{
menuaction :
'calendar.uicalendar.participants_popup',
lookup : oSearch.value
};
if ( iCat )
{
oArgs.cat_id = iCat;
}
var strURL = phpGWLink('index.php', oArgs);
var oHTTP = new XMLHttpRequest();
oHTTP.open('GET', strURL, true);
oHTTP.onreadystatechange = function()
{
if ( oHTTP.readyState == 4 )
{
document.getElementById('search_results').innerHTML =
"<select
id=\"search_list\" name=\"search_list\" multiple=\"multiple\" size=\"10\">"
+
oHTTP.responseText
+ "</select>";
}
}
oHTTP.send('');
}
function addContact()
{
var oSource =
document.getElementById('search_list');
var oTarget =
document.getElementById('selected_list');
for ( i = 0; i < oSource.options.length; ++i )
{
if ( oSource.options.item(i).selected )
{
oSource.options.item(i).selected = false;
oTarget.appendChild(oSource.options.item(i).cloneNode(true));
}
}
var oOpenerSelect =
window.opener.document.getElementById('event_participants');
removeAllChildren(oOpenerSelect);
adopt(oTarget, oOpenerSelect);
for ( i = 0; i < oOpenerSelect.options.length;
++i)
{
oOpenerSelect.options.item(i).selected
= true;
}
return false;
}
function removeContact()
{
var oSource =
document.getElementById('selected_list');
for ( var i = 0; i < oSource.options.length;
++i )
{
if ( oSource.options[i].selected )
{
oSource.options[i] = null;
}
}
return false;
}
function removeAllChildren(oTarget)
{
if ( oTarget.childNodes )
{
while ( oTarget.childNodes.length )
{
oTarget.removeChild(oTarget.firstChild);
}
}
}
function adopt(oSource, oTarget)
{
if ( oSource.childNodes.length )
{
for ( var i = 0; i <
oSource.childNodes.length; ++i )
{
oTarget.appendChild(oSource.childNodes.item(i).cloneNode(true));
}
}
}
window.onload = function()
{
if ( window.opener )
{
var oSelect =
document.getElementById('selected_list');
adopt(window.opener.document.getElementById('event_participants'), oSelect);
}
else
{
alert('Not called as a popup window.
Closing now!');
window.close();
}
}
</script>
<style>
body, button
{
background-color: #d9d9d9;
}
body, button, div, fieldset, p, td
{
font-size: 12px;
}
legend
{
font-size: 13px;
font-weight: bold;
}
button img
{
vertical-align: middle;
}
label, input, #cal_contacts_search select
{
display: block;
float: left;
margin-bottom: 10px;
width: 350px;
}
label
{
width: 100px;
}
#cal_contacts_search br
{
clear: left;
}
#cal_contacts_selection
{
height: 220px;
margin-top: 20px;
}
#cal_contacts_selection select, #cal_contacts_selection
div
{
height: 200px;
width: 200px;
}
#cal_contacts_selection div
{
float: left;
}
#cal_contacts_selection #search_select_btns
{
margin: 70px 10px;
text-align: center;
width: 120px;
}
#cal_contacts_selection div button
{
margin: 5px 10px;
width: 100px;
}
#cal_contacts_selection button img
{
vertical-align: middle;
}
#btn_grp
{
bottom: 5px;
display: block;
position: absolute;
right: 5px;
text-align: right;
}
</style>
</head>
<body>
<form action="#" onSubmit="return false;">
<fieldset id="cal_contacts_search">
<legend>{lang_show_contacts}</legend>
<label for="search_cat">{lang_category}:</label>
<select id="search_cat" name="cat"
onChange="updateCat();">
<option value="0"
selected="selected">{lang_all}</option>
<!-- BEGIN cat_option -->
<option
value="{cat_id}">{cat_name}</option>
<!-- END cat_option -->
</select><br />
<label
for="search_search">{lang_search}:</label>
<input type="text" name="search"
id="search_search" onkeypress="doSearch();" autocomplete="off" /><br />
</fieldset>
<fieldset id="cal_contacts_selection">
<legend>{lang_contacts}</legend>
<div id="search_results">
<select id="search_list"
name="search_list" multiple="multiple" size="10"></select>
</div>
<div id="search_select_btns">
<button
onClick="addContact();">{lang_add}<img src="{img_add}" alt="{lang_add}"
/></button><br />
<button onClick="removeContact();"><img
src="{img_remove}" alt="{lang_remove}" />{lang_remove}</button>
</div>
<div>
<select id="selected_list"
name="selected_list" multiple="multiple" size="10"></select>
</div>
</fieldset>
<div id="btn_grp">
<button onClick="window.close();"><img
src="{img_close}" alt="{lang_close}" />{lang_close}</button>
</div>
</form>
</body>
</html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] calendar/templates/default edit.tpl, 1.17 header.inc.php, 1.28 contacts_popup.tpl, 1.1,
skwashd <=
- Prev by Date:
[Phpgroupware-cvs] calendar/templates/default/images close-24x24.png, 1.1 right-24x24.png, 1.1 left-24x24.png, 1.1
- Next by Date:
[Phpgroupware-cvs] calendar/setup tables_update.inc.php, 1.25 setup.inc.php, 1.31 phpgw_en.lang, 1.32
- Previous by thread:
[Phpgroupware-cvs] calendar/templates/default/images close-24x24.png, 1.1 right-24x24.png, 1.1 left-24x24.png, 1.1
- Next by thread:
[Phpgroupware-cvs] calendar/setup tables_update.inc.php, 1.25 setup.inc.php, 1.31 phpgw_en.lang, 1.32
- Index(es):