Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1141

Timestamp:

05/09/08 23:33:32 (7 months ago)

Author:

rats

Message:

Mail management: fordward textarea twice, not working Javascript

Files:

trunk/CHANGELOG (modified) (1 diff)
trunk/gui/themes/omega_original/client/add_mail_acc.tpl (modified) (7 diffs)
trunk/gui/themes/omega_original/client/edit_mail_acc.tpl (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/CHANGELOG

r1140	r1141
4	4	2008-05-09 Benedikt Heintel
5	5	- GUI:
6		* Fixed #1120: Several problem with new mail configuration
	6	* Fixed #1220: Several problem with new mail configuration
	7	* Fixed #1238: Mail management: fordward textarea twice, not working Javascript
7	8	- LANGUAGES:
8	9	* Added Norwegian Norway (Bokmål)

trunk/gui/themes/omega_original/client/add_mail_acc.tpl

r1124	r1141
12	12	<!--
13	13	function sbmt(form, uaction) {
14
15	14	form.uaction.value = uaction;
16	15	form.submit();
17	16
18	17	return false;
19
20	18	}
21	19
22		function checkForm(){
23		var aname = document.forms[0].elements['username'].value;
24		var apass = document.forms[0].elements['pass'].value;
25		var apass2 = document.forms[0].elements['pass_rep'].value;
26		var forw = document.forms[0].elements['forward_list'].value;
27		if (aname == "") {
28		alert(emptyData);
	20	function checkForm() {
	21	var aname = document.forms[0].elements['username'].value;
	22	var apass = document.forms[0].elements['pass'].value;
	23	var apass2 = document.forms[0].elements['pass_rep'].value;
	24	var forw = document.forms[0].elements['forward_list'].value;
	25	if (aname == "") {
	26	alert(emptyData);
	27	}
	28
	29	if (mailtype == "normal") {
	30	if (apass == "" \|\| apass2 == "") {
	31	alert(emptyData)
	32	} else if (apass != apass2) {
	33	alert(passerr);
	34	} else {
	35	document.forms[0].submit();
29	36	}
30
31		if (mailtype == "normal") {
32		if (apass == "" \|\| apass2 == "") {
33		alert(emptyData)
34		}
35		else if (apass != apass2) {
36		alert(passerr);
37		}
38		else {
39		document.forms[0].submit();
40		}
	37	} else {
	38	if (forw == "") {
	39	alert(emptyData)
	40	} else {
	41	document.forms[0].submit();
41	42	}
42		else {
43		if (forw == "") {
44		alert(emptyData)
45		}
46		else {
47		document.forms[0].submit();
48		}
49		}
	43	}
50	44	}
51	45
52	46	<!-- BDP: js_to_all_domain -->
53		function begin_js(){
54		document.forms[0].als_id.disabled = true;
55		document.forms[0].sub_id.disabled = true;
56		document.forms[0].pass.disabled = false;
57		document.forms[0].pass_rep.disabled = false;
58		document.forms[0].forward_list.disabled = true;
59		document.forms[0].username.focus();
60		}
61
62
	47	function begin_js() {
	48	document.forms[0].als_id.disabled = true;
	49	document.forms[0].sub_id.disabled = true;
	50	document.forms[0].pass.disabled = false;
	51	document.forms[0].pass_rep.disabled = false;
	52	document.forms[0].forward_list.disabled = true;
	53	document.forms[0].username.focus();
	54	}
63	55
64	56	function changeDom(what) {
…	…
66	58	document.forms[0].als_id.disabled = false;
67	59	document.forms[0].sub_id.disabled = true;
68		}
69		else if (what == "real"){
70		document.forms[0].als_id.disabled = true;
71		document.forms[0].sub_id.disabled = true;
72		}
73		else {
	60	} else if (what == "real"){
	61	document.forms[0].als_id.disabled = true;
	62	document.forms[0].sub_id.disabled = true;
	63	} else {
74	64	document.forms[0].als_id.disabled = true;
75	65	document.forms[0].sub_id.disabled = false;
…	…
79	69
80	70	<!-- BDP: js_not_domain -->
81		function begin_js(){
82		document.forms[0].pass.disabled = false;
83		document.forms[0].pass_rep.disabled = false;
84		document.forms[0].forward_list.disabled = true;
85		document.forms[0].username.focus();
	71	function begin_js() {
	72	document.forms[0].pass.disabled = false;
	73	document.forms[0].pass_rep.disabled = false;
	74	document.forms[0].forward_list.disabled = true;
	75	document.forms[0].username.focus();
86	76	}
87	77	<!-- EDP: js_not_domain -->
88	78
89
90	79	<!-- BDP: js_to_subdomain -->
91		function begin_js(){
92		document.forms[0].sub_id.disabled = true;
93		document.forms[0].pass.disabled = false;
94		document.forms[0].pass_rep.disabled = false;
95		document.forms[0].forward_list.disabled = true;
96		document.forms[0].username.focus();
97		}
98
99
	80	function begin_js() {
	81	document.forms[0].sub_id.disabled = true;
	82	document.forms[0].pass.disabled = false;
	83	document.forms[0].pass_rep.disabled = false;
	84	document.forms[0].forward_list.disabled = true;
	85	document.forms[0].username.focus();
	86	}
100	87
101	88	function changeDom(what) {
102	89	if (what == "alias") {
103	90	document.forms[0].sub_id.disabled = true;
104		}
105		else if (what == "real"){
106		document.forms[0].sub_id.disabled = true;
107		}
108		else {
	91	} else if (what == "real"){
	92	document.forms[0].sub_id.disabled = true;
	93	} else {
109	94	document.forms[0].sub_id.disabled = false;
110	95	}
…	…
112	97	<!-- EDP: js_to_subdomain -->
113	98
114
115	99	<!-- BDP: js_to_alias_domain -->
116		function begin_js(){
117		document.forms[0].als_id.disabled = true;
118		document.forms[0].pass.disabled = false;
119		document.forms[0].pass_rep.disabled = false;
120		document.forms[0].forward_list.disabled = true;
121		document.forms[0].username.focus();
122		}
123
124
	100	function begin_js() {
	101	document.forms[0].als_id.disabled = true;
	102	document.forms[0].pass.disabled = false;
	103	document.forms[0].pass_rep.disabled = false;
	104	document.forms[0].forward_list.disabled = true;
	105	document.forms[0].username.focus();
	106	}
125	107
126	108	function changeDom(what) {
…	…
135	117	<!-- EDP: js_to_alias_domain -->
136	118
137
138
139		function changeType(what){
140		if (what == "normal") {
141		document.forms[0].forward_list.disabled = true;
142		}
143		else {
144		if (document.forms[0].forward_list.disabled == false) {
145		document.forms[0].forward_list.disabled = true;
146		} else {
147		document.forms[0].forward_list.disabled = false;
148		}
149		}
150		}
	119	function changeType() {
	120	if (document.forms[0].elements['mail_type_normal'].checked == true) {
	121	document.forms[0].pass.disabled = false;
	122	document.forms[0].pass_rep.disabled = false;
	123	} else {
	124	document.forms[0].pass.disabled = true;
	125	document.forms[0].pass_rep.disabled = true;
	126	}
	127	if (document.forms[0].elements['mail_type_forward'].checked == true) {
	128	document.forms[0].forward_list.disabled = false;
	129	} else {
	130	document.forms[0].forward_list.disabled = true;
	131	}
	132	}
151	133	//-->
152	134	</script>
…	…
247	229	<tr>
248	230	<td nowrap class="content2" colspan="2">
249		<input type="checkbox" name="mail_type_normal" value="1" onClick="changeType(~~'normal'~~);" {NORMAL_MAIL_CHECKED}>{TR_NORMAL_MAIL}</td>
	231	<input type="checkbox" name="mail_type_normal" value="1" onClick="changeType();" {NORMAL_MAIL_CHECKED}>{TR_NORMAL_MAIL}</td>
250	232	</tr>
251	233	<tr>
…	…
263	245	<tr>
264	246	<td nowrap class="content2" colspan="2">
265		<input type="checkbox" name="mail_type_forward" value="1" {FORWARD_MAIL_CHECKED} onClick="changeType(~~'forward'~~);">{TR_FORWARD_MAIL}</td>
	247	<input type="checkbox" name="mail_type_forward" value="1" {FORWARD_MAIL_CHECKED} onClick="changeType();">{TR_FORWARD_MAIL}</td>
266	248	</tr>
267	249	<tr>

trunk/gui/themes/omega_original/client/edit_mail_acc.tpl

r1140	r1141
10	10	<script language="JavaScript" type="text/JavaScript">
11	11	<!--
12		function sbmt(form, uaction) {
	12	function sbmt(form, uaction) {
	13	form.uaction.value = uaction;
	14	form.submit();
13	15
14		~~form.uaction.value = uaction~~;
15		form.submit();
	16	return false;
	17	}
16	18
17		return false;
18
19		}
20
21		function changeType(what) {
22		if (what == "forward") {
23		if (document.forms[0].elements['forward_list'].disabled == true) {
24		document.forms[0].elements['forward_list'].disabled = false;
25		} else {
	19	function begin_js() {
	20	if (document.forms[0].elements['mail_forward']) {
26	21	document.forms[0].elements['forward_list'].disabled = true;
27	22	}
28	23	}
29		}
	24
	25	function changeType(what) {
	26	if (what == "forward") {
	27	if (document.forms[0].elements['forward_list'].disabled == true) {
	28	document.forms[0].elements['forward_list'].disabled = false;
	29	} else {
	30	document.forms[0].elements['forward_list'].disabled = true;
	31	}
	32	}
	33	}
30	34	//-->
31	35	</script>
…	…
122	126	</td>
123	127	</tr>
124		~~<td nowrap class="content2" colspan="2">~~
125		~~  <input type="checkbox" name="mail_forward" value="1" {FORWARD_MAIL_CHECKED} onClick="changeType('forward');">{TR_FORWARD_MAIL}~~
126		~~</td>~~
127		~~</tr>~~
128		~~<tr>~~
129		~~<td class="content2" style="width:200px;vertical-align:top;">~~
130		~~{TR_FORWARD_TO} <img src="{THEME_COLOR_PATH}/images/icons/help.png" width="16" height="16" onMouseOver="showTip('fwd_help', event)" onMouseOut="hideTip('fwd_help')" />~~
131		~~</td>~~
132		~~<td nowrap class="content">~~
133		~~<textarea name="forward_list" cols="35" rows="5" wrap="virtual" style="width:210px">{FORWARD_LIST}</textarea>~~
134		~~</td>~~
135		~~</tr>~~
136	128	</table>
137	129	<!-- EDP: normal_mail -->

Development

Navigation

Changeset 1141

Legend:

trunk/CHANGELOG

trunk/gui/themes/omega_original/client/add_mail_acc.tpl

trunk/gui/themes/omega_original/client/edit_mail_acc.tpl

Download in other formats: