Changeset 1560

Timestamp:

06/17/08 11:58:13 (2 months ago)

Author:

alo

Message:

Files:

cherokee/trunk/ChangeLog

r1559	r1560
1	1	2008-06-17 Alvaro Lopez Ortega <alvaro@alobbs.com>
	2
	3	* admin/consts.py: Adds Deflate.
	4
	5	* admin/PageEncoders.py: It shows only the encoders that are
	6	available. Besides, fixes a little render issue.
2	7
3	8	* qa/168-Deflate-Encoding.py, qa/Makefile.am (EXTRA_DIST): Added a

r1404	r1560
5	5	from Table import *
6	6	from consts import *
	7	from CherokeeManagement import *
7	8
8	9	DATA_VALIDATION = [
…	…
53	54	FormHelper.__init__ (self, 'encoder', cfg)
54	55
	56	# Check which encoders are available
	57	self.encoders = []
	58	for plugin, name in ENCODERS:
	59	if cherokee_has_plugin(plugin):
	60	self.encoders.append ((plugin, name))
	61
55	62	def _op_render (self):
56	63	content = self._render_encoder_list()
…	…
84	91	encs_txt = []
85	92	for encoder in cfg:
86		t~~xt2 = ''~~
	93	title = "<h3>%s</h3>" % (encoder)
87	94	cfg_key = '%s!%s'%(cfg_key, encoder)
88	95
89	96	mlist = MatchingList (self._cfg, cfg_key, self.errors)
90		txt2 += "<h3>%s</h3>" % (encoder)
91		txt2 += mlist._op_render()
	97	txt2 = mlist._op_render()
92	98	js = "post_del_key('/%s/update', '%s');" % (self._id, cfg_key)
93	99	link_del = self.InstanceImage ("bin.png", "Delete", border="0", onClick=js)
94	100	txt2 += link_del
95		encs_txt.append(txt2)
	101	encoder_render = title + self.Indent(txt2)
	102	encs_txt.append(encoder_render)
96	103
97		txt += ~~self.Indent("<hr />".join(encs_txt)~~)
	104	txt += "<hr />".join(encs_txt)
98	105
99	106	# Add new encoder
100	107	if not cfg:
101		encoders_left = ~~ENCODERS~~
	108	encoders_left = self.encoders
102	109	else:
103	110	encoders_left = []
104		for i in range(len(~~ENCODERS~~)):
105		encoder, desc = ~~ENCODERS~~[i]
	111	for i in range(len(self.encoders)):
	112	encoder, desc = self.encoders[i]
106	113	if not encoder in cfg:
107		encoders_left.append (~~ENCODERS~~[i])
	114	encoders_left.append (self.encoders[i])
108	115
109	116	if encoders_left: