Changeset 1792

Timestamp:

08/13/08 13:52:59 (3 months ago)

Author:

alo

Message:

Files:

cherokee/trunk/ChangeLog

r1791	r1792
1	1	2008-08-13 Alvaro Lopez Ortega <alvaro@alobbs.com>
	2
	3	* admin/ModuleBalancer.py (ModuleBalancerGeneric._op_render): Adds
	4	the missing "removing" option to the host entries. Fixes the first
	5	part of: http://code.google.com/p/cherokee/issues/detail?id=87.
	6	It also improves the page layout a little bit.
2	7
3	8	* admin/ModuleMirror.py: The "Generic balancer" handler should not

r1427	r1792
56	56	# Host list
57	57	if hosts:
	58	txt += "<h3>Hosts list</h3>"
58	59	t1 = Table(2,1)
59	60	t1 += ('Host', '')
…	…
64	65	link_del = self.InstanceImage ("bin.png", "Delete", border="0", onClick=js)
65	66	t1 += (e_host, link_del)
66		txt += str(t1)
	67	txt += self.Indent(t1)
67	68
68	69	# New host
	70	txt += "<h3>Add new host</h3>"
	71
69	72	t1 = Table(2,1)
70	73	t1 += ('New host', '')
71	74	en1 = self.InstanceEntry('new_host', 'text')
72	75	t1 += (en1, SUBMIT_ADD)
73		txt += str(t1)
	76	txt += self.Indent(t1)
74	77
75	78	elif self._type == 'interpreter':
76	79	# Interpreter list
77	80	if hosts:
	81	txt += "<h3>Hosts list</h3>"
78	82	for host in hosts:
79	83	pre = '%s!%s' % (self._prefix, host)
…	…
82	86	e_envs = self._render_envs('%s!env'%(pre))
83	87
84		t2 = Table(2, title_left=1)
85		t2 += ('Host', e_host)
	88	js = "post_del_key('/ajax/update', '%s');" % (pre)
	89	link_del = self.InstanceImage ("bin.png", "Delete", border="0", onClick=js)
	90
	91	t2 = Table(3, title_left=1)
	92	t2 += ('Host', e_host, link_del)
86	93	t2 += ('Interpreter', e_inte)
87	94	t2 += ('Environment', e_envs)
88		txt += str(t2)
	95	txt += self.Indent(t2)
89	96	txt += "<hr />"
90	97
91	98	if txt.endswith("<hr />"):
92	99	txt = txt[:-6]
	100
	101	txt += "<h3>Add new host</h3>"
93	102
94	103	# New Interpreter
…	…
98	107	e_inte = self.InstanceEntry('new_interpreter', 'text', size=25)
99	108	t2 += (e_host, e_inte, SUBMIT_ADD)
100		txt += str(t2)
	109
	110	txt += self.Indent(t2)
101	111
102	112	else: