extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 01:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix cancel button in edit dialog

Browse Source
This commit is contained in:
Nathan Gray 2013-07-30 14:24:32 +00:00
parent 84b891f979
commit c3b3fb5019
2 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addressbook/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

127
addressbook/templates/default/edit.xet
View File

@ -27,23 +27,23 @@
</columns> </columns>
<rows> <rows>
<row> <row>
<description value="prefix" for="n_prefix"/> <description for="n_prefix" value="prefix"/>
<textbox id="n_prefix" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/> <textbox id="n_prefix" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/>
</row> </row>
<row> <row>
<description value="first name" for="n_given"/> <description for="n_given" value="first name"/>
<textbox id="n_given" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/> <textbox id="n_given" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/>
</row> </row>
<row> <row>
<description value="middle name" for="n_middle"/> <description for="n_middle" value="middle name"/>
<textbox id="n_middle" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/> <textbox id="n_middle" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/>
</row> </row>
<row> <row>
<description value="last name" for="n_family"/> <description for="n_family" value="last name"/>
<textbox id="n_family" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/> <textbox id="n_family" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/>
</row> </row>
<row> <row>
<description value="suffix" for="n_suffix"/> <description for="n_suffix" value="suffix"/>
<textbox id="n_suffix" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/> <textbox id="n_suffix" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/>
</row> </row>
<row> <row>
@ -72,7 +72,6 @@
<column/> <column/>
<column/> <column/>
<column/> <column/>
<column/>
</columns> </columns>
<rows> <rows>
<row> <row>
@ -86,12 +85,12 @@
<description/> <description/>
</row> </row>
<row> <row>
<description value="Title" for="title"/> <description for="title" value="Title"/>
<textbox id="title" size="36" maxlength="64" span="2"/> <textbox id="title" size="36" maxlength="64" span="2"/>
<description/> <description/>
</row> </row>
<row> <row>
<description value="Role" for="role"/> <description for="role" value="Role"/>
<textbox id="role" size="20" maxlength="64"/> <textbox id="role" size="20" maxlength="64"/>
<textbox label="Room" id="room" size="5"/> <textbox label="Room" id="room" size="5"/>
<description/> <description/>
@ -106,12 +105,12 @@
</row> </row>
<row> <row>
<description/> <description/>
<description value="department" for="org_unit"/> <description for="org_unit" value="department"/>
<textbox id="org_unit" onchange="check_value(this,'$cont[id]');" size="45" maxlength="64"/> <textbox id="org_unit" onchange="check_value(this,'$cont[id]');" size="45" maxlength="64"/>
</row> </row>
<row> <row>
<image src="gohome"/> <image src="gohome"/>
<description value="street" for="adr_one_street"/> <description for="adr_one_street" value="street"/>
<textbox id="adr_one_street" size="45" maxlength="64"/> <textbox id="adr_one_street" size="45" maxlength="64"/>
</row> </row>
<row> <row>
@ -121,7 +120,7 @@
</row> </row>
<row disabled="@addr_format=city_state_postcode"> <row disabled="@addr_format=city_state_postcode">
<description/> <description/>
<description value="city" for="adr_one_locality"/> <description for="adr_one_locality" value="city"/>
<hbox options="0,0"> <hbox options="0,0">
<textbox statustext="ZIP Code" id="adr_one_postalcode" size="5" maxlength="64"/> <textbox statustext="ZIP Code" id="adr_one_postalcode" size="5" maxlength="64"/>
<textbox statustext="City" id="adr_one_locality" size="35" maxlength="64" class="leftPad5"/> <textbox statustext="City" id="adr_one_locality" size="35" maxlength="64" class="leftPad5"/>
@ -129,10 +128,10 @@
</row> </row>
<row disabled="@addr_format=city_state_postcode"> <row disabled="@addr_format=city_state_postcode">
<description/> <description/>
<description value="country" for="adr_one_countryname"/> <description for="adr_one_countryname" value="country"/>
<hbox options="0,0"> <hbox options="0,0">
<menulist class="countrySelect"> <menulist>
<menupopup type="select-country" id="adr_one_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/> <menupopup type="select-country" class="countrySelect" id="adr_one_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
</menulist> </menulist>
<textbox id="adr_one_countryname" class="custom_country"/> <textbox id="adr_one_countryname" class="custom_country"/>
<textbox statustext="State" id="adr_one_region" size="19" maxlength="64" class="leftPad5"/> <textbox statustext="State" id="adr_one_region" size="19" maxlength="64" class="leftPad5"/>
@ -149,10 +148,10 @@
</row> </row>
<row disabled="!@addr_format=city_state_postcode"> <row disabled="!@addr_format=city_state_postcode">
<description/> <description/>
<description value="country" for="adr_one_countryname"/> <description for="adr_one_countryname" value="country"/>
<hbox options="0,0"> <hbox options="0,0">
<menulist class="countrySelect"> <menulist>
<menupopup type="select-country" id="adr_one_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/> <menupopup type="select-country" class="countrySelect" id="adr_one_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
</menulist> </menulist>
<textbox id="adr_one_countryname" class="custom_country"/> <textbox id="adr_one_countryname" class="custom_country"/>
</hbox> </hbox>
@ -160,8 +159,8 @@
<row valign="bottom" height="25"> <row valign="bottom" height="25">
<image src="private.png"/> <image src="private.png"/>
<description value="Addressbook"/> <description value="Addressbook"/>
<menulist class="owner"> <menulist>
<menupopup statustext="Addressbook the contact should be saved to" id="owner" no_lang="1"/> <menupopup class="owner" statustext="Addressbook the contact should be saved to" id="owner" no_lang="1"/>
</menulist> </menulist>
</row> </row>
</rows> </rows>
@ -195,7 +194,7 @@
<rows> <rows>
<row> <row>
<image src="accounts"/> <image src="accounts"/>
<description value="street" for="adr_two_street"/> <description for="adr_two_street" value="street"/>
<textbox id="adr_two_street" size="45" maxlength="64"/> <textbox id="adr_two_street" size="45" maxlength="64"/>
</row> </row>
<row> <row>
@ -205,7 +204,7 @@
</row> </row>
<row disabled="@addr_format2=city_state_postcode"> <row disabled="@addr_format2=city_state_postcode">
<description/> <description/>
<description value="city" for="adr_two_locality"/> <description for="adr_two_locality" value="city"/>
<hbox options="0,0"> <hbox options="0,0">
<textbox statustext="ZIP Code" id="adr_two_postalcode" size="5" maxlength="64"/> <textbox statustext="ZIP Code" id="adr_two_postalcode" size="5" maxlength="64"/>
<textbox statustext="City" id="adr_two_locality" size="35" maxlength="64" class="leftPad5"/> <textbox statustext="City" id="adr_two_locality" size="35" maxlength="64" class="leftPad5"/>
@ -213,10 +212,10 @@
</row> </row>
<row disabled="@addr_format2=city_state_postcode"> <row disabled="@addr_format2=city_state_postcode">
<description/> <description/>
<description value="country" for="adr_two_countryname"/> <description for="adr_two_countryname" value="country"/>
<hbox options="0,0"> <hbox options="0,0">
<menulist class="countrySelect"> <menulist>
<menupopup type="select-country" id="adr_two_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/> <menupopup type="select-country" class="countrySelect" id="adr_two_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
</menulist> </menulist>
<textbox id="adr_two_countryname" class="custom_country"/> <textbox id="adr_two_countryname" class="custom_country"/>
<textbox statustext="State" id="adr_two_region" size="19" maxlength="64" class="leftPad5"/> <textbox statustext="State" id="adr_two_region" size="19" maxlength="64" class="leftPad5"/>
@ -224,7 +223,7 @@
</row> </row>
<row disabled="!@addr_format2=city_state_postcode"> <row disabled="!@addr_format2=city_state_postcode">
<description/> <description/>
<description value="city" for="adr_two_locality"/> <description for="adr_two_locality" value="city"/>
<hbox options="0,0"> <hbox options="0,0">
<textbox statustext="City" id="adr_two_locality" size="30" maxlength="64"/> <textbox statustext="City" id="adr_two_locality" size="30" maxlength="64"/>
<textbox statustext="State" id="adr_two_region" size="3" maxlength="64" class="leftPad5"/> <textbox statustext="State" id="adr_two_region" size="3" maxlength="64" class="leftPad5"/>
@ -235,15 +234,15 @@
<description/> <description/>
<description value="Country"/> <description value="Country"/>
<hbox options="0,0"> <hbox options="0,0">
<menulist class="countrySelect"> <menulist>
<menupopup type="select-country" id="adr_two_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/> <menupopup type="select-country" class="countrySelect" id="adr_two_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
</menulist> </menulist>
<textbox id="adr_two_countryname" class="custom_country"/> <textbox id="adr_two_countryname" class="custom_country"/>
</hbox> </hbox>
</row> </row>
<row height="30"> <row height="30">
<image src="gear"/> <image src="gear"/>
<description value="Birthday" for="bday"/> <description for="bday" value="Birthday"/>
<hbox options="0,0"> <hbox options="0,0">
<date id="bday" options="Y-m-d"/> <date id="bday" options="Y-m-d"/>
<menulist> <menulist>
@ -253,7 +252,7 @@
</row> </row>
<row valign="top"> <row valign="top">
<image src="private.png"/> <image src="private.png"/>
<description value="Public key" for="pubkey"/> <description for="pubkey" value="Public key"/>
<textbox multiline="true" id="pubkey" rows="4" cols="40"/> <textbox multiline="true" id="pubkey" rows="4" cols="40"/>
</row> </row>
</rows> </rows>
@ -405,12 +404,16 @@
<column/> <column/>
<column/> <column/>
<column/> <column/>
<column/>
<column/>
</columns> </columns>
<rows> <rows>
<row> <row>
<description align="center" value="Edit Phonenumbers - " id="fn" no_lang="1" span="all" class="windowheader"/> <description align="center" value="Edit Phonenumbers - " id="fn" no_lang="1" span="all" class="windowheader"/>
<description/> <description/>
<description/> <description/>
<description/>
<description/>
</row> </row>
<row class="th"> <row class="th">
<description value="Description"/> <description value="Description"/>
@ -418,27 +421,27 @@
<description value="pref"/> <description value="pref"/>
</row> </row>
<row> <row>
<description value="business" for="tel_work2" class="bold"/> <description for="tel_work2" value="business" class="bold"/>
<url-phone id="tel_work2" options="30"/> <url-phone id="tel_work2" options="30"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_work,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_work,&amp;hearts;"/>
</row> </row>
<row> <row>
<description value="mobile phone" for="tel_cell2"/> <description for="tel_cell2" value="mobile phone"/>
<url-phone id="tel_cell2" options="30"/> <url-phone id="tel_cell2" options="30"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_cell,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_cell,&amp;hearts;"/>
</row> </row>
<row> <row>
<description value="fax" for="tel_fax"/> <description for="tel_fax" value="fax"/>
<url-phone id="tel_fax2" options="30"/> <url-phone id="tel_fax2" options="30"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_fax,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_fax,&amp;hearts;"/>
</row> </row>
<row> <row>
<description value="car phone" for="tel_car"/> <description for="tel_car" value="car phone"/>
<url-phone id="tel_car" options="30"/> <url-phone id="tel_car" options="30"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_car,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_car,&amp;hearts;"/>
</row> </row>
<row> <row>
<description value="pager" for="tel_pager"/> <description for="tel_pager" value="pager"/>
<url-phone id="tel_pager" options="30"/> <url-phone id="tel_pager" options="30"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_pager,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_pager,&amp;hearts;"/>
</row> </row>
@ -446,11 +449,11 @@
<hrule span="all"/> <hrule span="all"/>
</row> </row>
<row> <row>
<description value="Assistent" for="assistent" class="bold"/> <description for="assistent" value="Assistent" class="bold"/>
<textbox id="assistent" size="35" span="2"/> <textbox id="assistent" size="35" span="2"/>
</row> </row>
<row> <row>
<description value="number" for="tel_assistent"/> <description for="tel_assistent" value="number"/>
<url-phone id="tel_assistent" options="30"/> <url-phone id="tel_assistent" options="30"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_assistent,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_assistent,&amp;hearts;"/>
</row> </row>
@ -458,17 +461,17 @@
<hrule span="all"/> <hrule span="all"/>
</row> </row>
<row> <row>
<description value="Private" for="tel_home2" class="bold"/> <description for="tel_home2" value="Private" class="bold"/>
<url-phone id="tel_home2" options="30"/> <url-phone id="tel_home2" options="30"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_home,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_home,&amp;hearts;"/>
</row> </row>
<row> <row>
<description value="mobile phone" for="tel_cell_private"/> <description for="tel_cell_private" value="mobile phone"/>
<url-phone id="tel_cell_private" options="30"/> <url-phone id="tel_cell_private" options="30"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_cell_private,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_cell_private,&amp;hearts;"/>
</row> </row>
<row> <row>
<description value="fax" for="tel_fax_home"/> <description for="tel_fax_home" value="fax"/>
<url-phone id="tel_fax_home" options="30"/> <url-phone id="tel_fax_home" options="30"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_fax_home,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_fax_home,&amp;hearts;"/>
</row> </row>
@ -476,7 +479,7 @@
<hrule span="all"/> <hrule span="all"/>
</row> </row>
<row> <row>
<description value=" Other Phone" for="tel_other"/> <description for="tel_other" value=" Other Phone"/>
<url-phone id="tel_other" options="30"/> <url-phone id="tel_other" options="30"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_other,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_other,&amp;hearts;"/>
</row> </row>
@ -498,8 +501,8 @@
<description/> <description/>
</row> </row>
<row> <row>
<menulist class="fileas"> <menulist>
<menupopup blur="Name" statustext="own sorting" id="fileas_type" no_lang="1"/> <menupopup blur="Name" class="fileas" statustext="own sorting" id="fileas_type" no_lang="1"/>
</menulist> </menulist>
<grid> <grid>
<columns> <columns>
@ -508,8 +511,8 @@
</columns> </columns>
<rows> <rows>
<row disabled="@no_tid"> <row disabled="@no_tid">
<menulist class="leftPad5"> <menulist>
<menupopup label="Type" id="tid" no_lang="1" onchange="1"/> <menupopup class="leftPad5" label="Type" id="tid" no_lang="1" onchange="1"/>
</menulist> </menulist>
<html label=" " id="typegfx" needed="1" no_lang="1" readonly="true" class="space"/> <html label=" " id="typegfx" needed="1" no_lang="1" readonly="true" class="space"/>
</row> </row>
@ -517,17 +520,17 @@
</grid> </grid>
</row> </row>
<row valign="top"> <row valign="top">
<tabbox id="tabs"> <tabbox id="addressbook.edit.general|addressbook.edit.cats|addressbook.edit.home|addressbook.edit.details|addressbook.edit.links|addressbook.edit.distribution_list|addressbook.edit.custom|addressbook.edit.custom_private|addressbook.edit.history">
<tabs> <tabs>
<tab id="general" label="General" statustext="Name, Address"/> <tab id="addressbook.edit.general" label="General" statustext="Name, Address"/>
<tab id="cats" label="Categories" statustext="Categories"/> <tab id="addressbook.edit.cats" label="Categories" statustext="Categories"/>
<tab id="home" label="Private" statustext="Home address, Birthday, ..."/> <tab id="addressbook.edit.home" label="Private" statustext="Home address, Birthday, ..."/>
<tab id="details" label="Details" statustext="Categories, Notes, ..."/> <tab id="addressbook.edit.details" label="Details" statustext="Categories, Notes, ..."/>
<tab id="links" label="Links" statustext="Links"/> <tab id="addressbook.edit.links" label="Links" statustext="Links"/>
<tab id="distribution_list" label="Distribution lists" statustext="Distribution lists, ..."/> <tab id="addressbook.edit.distribution_list" label="Distribution lists" statustext="Distribution lists, ..."/>
<tab id="custom" label="Extra" statustext="Custom fields"/> <tab id="addressbook.edit.custom" label="Extra" statustext="Custom fields"/>
<tab id="custom_private" label="Extra private" statustext="Private custom fields"/> <tab id="addressbook.edit.custom_private" label="Extra private" statustext="Private custom fields"/>
<tab id="history" label="History"/> <tab id="addressbook.edit.history" label="History"/>
</tabs> </tabs>
<tabpanels> <tabpanels>
<template id="addressbook.edit.general"/> <template id="addressbook.edit.general"/>
@ -555,19 +558,19 @@
<rows> <rows>
<row> <row>
<image src="phone"/> <image src="phone"/>
<description value="business" for="tel_work"/> <description for="tel_work" value="business"/>
<url-phone id="tel_work" options="24,40" class="telNumbers"/> <url-phone id="tel_work" options="24,40" class="telNumbers"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_work,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_work,&amp;hearts;"/>
</row> </row>
<row> <row>
<description/> <description/>
<description value="mobile phone" for="tel_cell"/> <description for="tel_cell" value="mobile phone"/>
<url-phone id="tel_cell" options="24,40" class="telNumbers"/> <url-phone id="tel_cell" options="24,40" class="telNumbers"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_cell,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_cell,&amp;hearts;"/>
</row> </row>
<row> <row>
<description/> <description/>
<description value="Private" for="tel_home"/> <description for="tel_home" value="Private"/>
<url-phone id="tel_home" options="24,40" class="telNumbers"/> <url-phone id="tel_home" options="24,40" class="telNumbers"/>
<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_home,&amp;hearts;"/> <radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_home,&amp;hearts;"/>
</row> </row>
@ -597,22 +600,22 @@
<rows> <rows>
<row> <row>
<image src="internet"/> <image src="internet"/>
<description value="url" for="url"/> <description for="url" value="url"/>
<url id="url" options="28,128"/> <url id="url" options="28,128"/>
</row> </row>
<row> <row>
<description/> <description/>
<description value="Private" for="url_home"/> <description for="url_home" value="Private"/>
<url id="url_home" options="28,128"/> <url id="url_home" options="28,128"/>
</row> </row>
<row> <row>
<image src="email.png"/> <image src="email.png"/>
<description value="email" for="email"/> <description for="email" value="email"/>
<url-email id="email" onchange="check_value(this,'$cont[id]');" options="28,128"/> <url-email id="email" onchange="check_value(this,'$cont[id]');" options="28,128"/>
</row> </row>
<row> <row>
<description/> <description/>
<description value="Private" for="email_home"/> <description for="email_home" value="Private"/>
<url-email id="email_home" onchange="check_value(this,'$cont[id]');" options="28,128"/> <url-email id="email_home" onchange="check_value(this,'$cont[id]');" options="28,128"/>
</row> </row>
</rows> </rows>
@ -627,7 +630,7 @@
<button statustext="download this contact as vCard file" label="vCard" id="button[vcard]"/> <button statustext="download this contact as vCard file" label="vCard" id="button[vcard]"/>
<button accesskey="s" label="Save" id="button[save]"/> <button accesskey="s" label="Save" id="button[save]"/>
<button label="Apply" id="button[apply]"/> <button label="Apply" id="button[apply]"/>
<button label="Cancel" id="button[cancel]" onclick="if($cont[view]0) return true; self.close(); return false;"/> <button label="Cancel" id="button[cancel]" onclick="if($cont[view] || false) return true; self.close(); return false;"/>
<checkbox statustext="Apply changes to all members, whose fields have the same previous content" label="change all organisation members" id="change_org" span="all"/> <checkbox statustext="Apply changes to all members, whose fields have the same previous content" label="change all organisation members" id="change_org" span="all"/>
</hbox> </hbox>
<button align="right" label="Delete" id="button[delete]" onclick="return confirm('Are you shure you want to delete this contact?');" tabindex="25"/> <button align="right" label="Delete" id="button[delete]" onclick="return confirm('Are you shure you want to delete this contact?');" tabindex="25"/>