[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] addressbook inc/class.uiaddressbook.inc.php tem... [V
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] addressbook inc/class.uiaddressbook.inc.php tem... [Version-0_9_16-branch] |
|
Date: |
Fri, 16 Dec 2005 13:42:48 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: addressbook
Branch: Version-0_9_16-branch
Changes by: Dave Hall <address@hidden> 05/12/16 13:42:48
Modified files:
inc : class.uiaddressbook.inc.php
templates/default: person_data1.tpl
Added files:
js/base : base.js
Log message:
patches #4698 & #4339 (modified)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php.diff?only_with_tag=Version-0_9_16-branch&tr1=1.36.2.15.2.61&tr2=1.36.2.15.2.62&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/addressbook/js/base/base.js?only_with_tag=Version-0_9_16-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/addressbook/templates/default/person_data1.tpl.diff?only_with_tag=Version-0_9_16-branch&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
Patches:
Index: addressbook/inc/class.uiaddressbook.inc.php
diff -u addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.61
addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.62
--- addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.61 Thu Sep 15
17:41:41 2005
+++ addressbook/inc/class.uiaddressbook.inc.php Fri Dec 16 13:42:48 2005
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uiaddressbook.inc.php,v 1.36.2.15.2.61 2005/09/15 17:41:41
jarg Exp $ */
+ /* $Id: class.uiaddressbook.inc.php,v 1.36.2.15.2.62 2005/12/16 13:42:48
skwashd Exp $ */
class uiaddressbook
@@ -1206,16 +1206,19 @@
$this->form_start();
$this->template->set_var('lang_general_data',
lang('General Data'));
- $this->set_form_fields(array(1 => array('Prefix',
'entry[per_prefix]', $fields['per_prefix']),
- 2 => array('Email',
'entry[email]', $fields['email']),
- 3 => array('First Name',
'entry[per_first_name]', $fields['per_first_name']),
- 4 => array('Phone',
'entry[wphone]', $fields['wphone']),
- 5 => array('Last Name',
'entry[per_last_name]', $fields['per_last_name']),
- 6 => array('Title',
'entry[per_title]', $fields['per_title']),
- 7 => array('Middle Name',
'entry[per_middle_name]', $fields['per_middle_name']),
- 8 => array('Department',
'entry[per_department]', $fields['per_department']),
- 9 => array('Private',
$access_check, 'special'),
- 10 => array('Birthday',
$bday, 'special')));
+ $this->set_form_fields(array
+ (
+ 1 =>
array('Prefix', 'entry[per_prefix]', $fields['per_prefix']),
+ 2 => array('First
Name', 'entry[per_first_name]', $fields['per_first_name']),
+ 3 =>
array('Middle Name', 'entry[per_middle_name]', $fields['per_middle_name']),
+ 4 => array('Last
Name', 'entry[per_last_name]', $fields['per_last_name']),
+ 5 =>
array('Title', 'entry[per_title]', $fields['per_title']),
+ 6 =>
array('Department', 'entry[per_department]', $fields['per_department']),
+ 7 =>
array('Email', 'entry[email]', $fields['email']),
+ 8 =>
array('Phone', 'entry[wphone]', $fields['wphone']),
+ 9 =>
array('Birthday', $bday, 'special'),
+ 10 =>
array('Private', $access_check, 'special')
+ ));
$this->form_end();
return $this->template->fp('out',
'tab_body_general_data');
@@ -1315,14 +1318,14 @@
$this->set_form_fields(array(1 => array('Address 1',
'entry[tmp_data][addr][addr_add1]',
$fields['tmp_data']['addr']['addr_add1']),
- 2 => array('State',
'entry[tmp_data][addr][addr_state]',
-
$fields[tmp_data]['addr']['addr_state']),
- 3 => array('Address 2',
'entry[tmp_data][addr][addr_add2]',
+ 2 => array('Address 2',
'entry[tmp_data][addr][addr_add2]',
$fields[tmp_data]['addr']['addr_add2']),
- 4 => array('Postal Code',
'entry[tmp_data][addr][addr_postal_code]',
-
$fields[tmp_data]['addr']['addr_postal_code']),
- 5 => array('City',
'entry[tmp_data][addr][addr_city]',
+ 3 => array('City',
'entry[tmp_data][addr][addr_city]',
$fields[tmp_data]['addr']['addr_city']),
+ 4 => array('State',
'entry[tmp_data][addr][addr_state]',
+
$fields[tmp_data]['addr']['addr_state']),
+ 5 => array('Postal Code',
'entry[tmp_data][addr][addr_postal_code]',
+
$fields[tmp_data]['addr']['addr_postal_code']),
6 => array('Country',
'entry[tmp_data][addr][addr_country]',
$fields[tmp_data]['addr']['addr_country']),
7 => array(lang('Type'),
$addresstype, 'special'),
@@ -3143,107 +3146,7 @@
function java_script()
{
- $tmp= '
- <SCRIPT LANGUAGE="JavaScript">
- function move(fboxname, tboxname, sboxname, cboxname) {
- var arrFbox = new Array();
- var arrTbox = new Array();
- var arrLookup = new Array();
- var i;
-
- fbox = document.body_form.elements[fboxname];
- tbox = document.body_form.elements[tboxname];
-
- for (i = 0; i < tbox.options.length; i++)
- {
- arrLookup[tbox.options[i].text] =
tbox.options[i].value;
- arrTbox[i] = tbox.options[i].text;
- }
- var fLength = 0;
- var tLength = arrTbox.length;
- for(i = 0; i < fbox.options.length; i++)
- {
- arrLookup[fbox.options[i].text] =
fbox.options[i].value;
- if (fbox.options[i].selected &&
fbox.options[i].value != "")
- {
- arrTbox[tLength] =
fbox.options[i].text;
- tLength++;
- }
- else
- {
- arrFbox[fLength] =
fbox.options[i].text;
- fLength++;
- }
- }
- arrFbox.sort();
- arrTbox.sort();
- fbox.length = 0;
- tbox.length = 0;
-
- var c;
- for(c = 0; c < arrFbox.length; c++)
- {
- var no = new Option();
- no.value = arrLookup[arrFbox[c]];
- no.text = arrFbox[c];
- fbox[c] = no;
- }
- for(c = 0; c < arrTbox.length; c++)
- {
- var no = new Option();
- no.value = arrLookup[arrTbox[c]];
- no.text = arrTbox[c];
- tbox[c] = no;
- }
-
- move_cbo(sboxname, cboxname);
- }
-
- function move_cbo(sboxname, cboxname) {
- sbox = document.body_form.elements[sboxname];
- cbox = document.body_form.elements[cboxname];
- if(sbox.length > 0)
- {
- sel_opt =
sbox.options[sbox.selectedIndex].text;
- }
- else
- {
- sel_opt="";
- }
- sbox.length = 0;
- for(c = 0; c < cbox.length; c++)
- {
- var no = new Option();
- no.value = cbox[c].value;
- no.text = cbox[c].text;
- if(no.text == sel_opt)
- {
- i = c;
- }
- sbox[c] = no;
- }
- if(i>0)
- {
- sbox.options[i].selected = true;
- }
- }
-
- function process_list(allboxname, myboxname) {
- mybox = document.body_form.elements[myboxname];
- for(c = 0; c < mybox.options.length; c++)
- {
- mybox.options[c].selected = true;
- }
- }
-
- function showHide(sDiv)
- {
- var oDiv = document.getElementById(sDiv);
- if (oDiv)
- oDiv.style.display = oDiv.style.display
== "none" ? "" : "none";
- }
- </script>';
- return $tmp;
+ return '<script type="text/javascript" src="' .
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/addressbook/js/base/base.js"></script>';
}
function css()
Index: addressbook/js/base/base.js
diff -u /dev/null addressbook/js/base/base.js:1.1.2.1
--- /dev/null Fri Dec 16 13:42:48 2005
+++ addressbook/js/base/base.js Fri Dec 16 13:42:48 2005
@@ -0,0 +1,110 @@
+/* $Id: base.js,v 1.1.2.1 2005/12/16 13:42:48 skwashd Exp $ */
+/* Base Javascript function for phpGroupWare addressbook */
+
+function move(fboxname, tboxname, sboxname, cboxname)
+{
+ var arrFbox = new Array();
+ var arrTbox = new Array();
+ var arrLookup = new Array();
+ var i;
+
+ fbox = document.body_form.elements[fboxname];
+ tbox = document.body_form.elements[tboxname];
+
+ for (i = 0; i < tbox.options.length; i++)
+ {
+ arrLookup[tbox.options[i].text] = tbox.options[i].value;
+ arrTbox[i] = tbox.options[i].text;
+ }
+ var fLength = 0;
+ var tLength = arrTbox.length;
+ for(i = 0; i < fbox.options.length; i++)
+ {
+ arrLookup[fbox.options[i].text] = fbox.options[i].value;
+ if (fbox.options[i].selected && fbox.options[i].value != "")
+ {
+ arrTbox[tLength] = fbox.options[i].text;
+ tLength++;
+ }
+ else
+ {
+ arrFbox[fLength] = fbox.options[i].text;
+ fLength++;
+ }
+ }
+ arrFbox.sort();
+ arrTbox.sort();
+ fbox.length = 0;
+ tbox.length = 0;
+
+ var c;
+ for(c = 0; c < arrFbox.length; c++)
+ {
+ var no = new Option();
+ no.value = arrLookup[arrFbox[c]];
+ no.text = arrFbox[c];
+ fbox[c] = no;
+ }
+ for(c = 0; c < arrTbox.length; c++)
+ {
+ var no = new Option();
+ no.value = arrLookup[arrTbox[c]];
+ no.text = arrTbox[c];
+ tbox[c] = no;
+ }
+
+ move_cbo(sboxname, cboxname);
+}
+
+function move_cbo(sboxname, cboxname)
+{
+ var i;
+ var sbox = document.body_form.elements[sboxname];
+ var cbox = document.body_form.elements[cboxname];
+
+ if ( !sbox || !cbox ) // there is no point continuing
+ {
+ return false;
+ }
+
+ if( sbox.length > 0)
+ {
+ sel_opt = sbox.options[sbox.selectedIndex].text;
+ }
+ else
+ {
+ sel_opt="";
+ }
+ sbox.length = 0;
+ for(c = 0; c < cbox.length; c++)
+ {
+ var no = new Option();
+ no.value = cbox[c].value;
+ no.text = cbox[c].text;
+ if(no.text == sel_opt)
+ {
+ i = c;
+ }
+ sbox[c] = no;
+ }
+ if ( i > 0 && typeof(sbox.options[i]) != 'undefined' )
+ {
+ sbox.options[i].selected = true;
+ }
+}
+
+function process_list(allboxname, myboxname)
+{
+ mybox = document.body_form.elements[myboxname];
+ for(c = 0; c < mybox.options.length; c++)
+ {
+ mybox.options[c].selected = true;
+ }
+}
+
+function showHide(sDiv)
+{
+ var oDiv = document.getElementById(sDiv);
+ if (oDiv)
+ oDiv.style.display = oDiv.style.display == "none" ? "" : "none";
+}
Index: addressbook/templates/default/person_data1.tpl
diff -u addressbook/templates/default/person_data1.tpl:1.1.2.1
addressbook/templates/default/person_data1.tpl:1.1.2.2
--- addressbook/templates/default/person_data1.tpl:1.1.2.1 Mon Sep 8
13:26:37 2003
+++ addressbook/templates/default/person_data1.tpl Fri Dec 16 13:42:48 2005
@@ -11,46 +11,50 @@
<table width="100%" border="0" align="center"
cellspacing="2" cellpadding="2">
<tbody>
<tr bgcolor="{row_on}">
- <td
width="15%">{lang_prefix}</td>
- <td width="35%"><input
type="text" name="entry[prefix]" value="{prefix}"></td>
- <td
width="15%">{lang_address}</td>
- <td width="35%"><input
type="text" name="entry[address]" value="{address}"></td>
+ <td
width="15%">{lang_prefix}</td>
+ <td width="35%"><input
type="text" name="entry[prefix]" value="{prefix}"></td>
+ <td
width="15%">{lang_address}</td>
+ <td width="35%"><input
type="text" name="entry[address]" value="{address}"></td>
</tr>
<tr bgcolor="{row_off}">
- <td>{lang_firstname}</td>
- <td><input type="text"
name="entry[firstname]" value="{firstname}"></td>
- <td>{lang_email}</td>
- <td><input type="text"
name="entry[email]" value="{email}"></td>
+
<td>{lang_firstname}</td>
+ <td><input type="text"
name="entry[firstname]" value="{firstname}"></td>
+ <td>{lang_email}</td>
+ <td><input type="text"
name="entry[email]" value="{email}"></td>
</tr>
<tr bgcolor="{row_on}">
- <td>{lang_lastname}</td>
- <td><input type="text"
name="entry[lastname]" value="{lastname}"></td>
- <td>{lang_phone}</td>
- <td><input type="text"
name="entry[phone]" value="{phone}"></td>
+ <td>{lang_lastname}</td>
+ <td><input type="text"
name="entry[lastname]" value="{lastname}"></td>
+ <td>{lang_phone}</td>
+ <td><input type="text"
name="entry[phone]" value="{phone}"></td>
</tr>
+
<tr bgcolor="{row_off}">
- <td>{lang_middlename}</td>
- <td><input type="text"
name="entry[middlename]" value="{middlename}"></td>
- <td>{lang_department}</td>
- <td><input type="text"
name="entry[department]" value="{department}"></td>
+
<td>{lang_middlename}</td>
+ <td><input type="text"
name="entry[middlename]" value="{middlename}"></td>
+
<td>{lang_department}</td>
+ <td><input type="text"
name="entry[department]" value="{department}"></td>
</tr>
+
<tr bgcolor="{row_on}">
- <td>{lang_suffix}</td>
- <td><input type="text"
name="entry[suffix]" value="{suffix}"></td>
- <td>{lang_birthday}</td>
- <td>{birthday}</td>
+ <td>{lang_suffix}</td>
+ <td><input type="text"
name="entry[suffix]" value="{suffix}"></td>
+ <td>{lang_birthday}</td>
+ <td>{birthday}</td>
</tr>
+
<tr bgcolor="{row_off}">
- <td width="15%">{lang_cats}</td>
- <td width="35%">{cats_link}</td>
- <td width="15%">{lang_orgs}</td>
- <td width="35%">{orgs_link}</td>
+ <td
width="15%">{lang_cats}</td>
+ <td
width="35%">{cats_link}</td>
+ <td
width="15%">{lang_orgs}</td>
+ <td
width="35%">{orgs_link}</td>
</tr>
+
<tr bgcolor="{row_on}">
- <td
width="15%">{lang_private}</td>
- <td width="35%"><input
type="checkbox" name="access"></td>
+ <td
width="15%">{lang_private}</td>
+ <td width="35%"><input
type="checkbox" name="access"></td>
</tr>
</tbody>
</table>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] addressbook inc/class.uiaddressbook.inc.php tem... [Version-0_9_16-branch],
Dave Hall <=