cherokee at cherokee-project
Nov 20, 2009, 4:35 AM
Post #1 of 1
(93 views)
Permalink
|
|
[3849] cherokee/trunk/admin/PageEntry.py: The "Expiration" tab has become the "Time" tab.
|
|
Revision: 3849
http://svn.cherokee-project.com/changeset/3849
Author: alo
Date: 2009-11-20 13:35:08 +0100 (Fri, 20 Nov 2009)
Log Message:
-----------
The "Expiration" tab has become the "Time" tab. Now it holds the
previous expiration entries, plus the Connections timeout related
fields (a single entry box by now).
Modified Paths:
--------------
cherokee/trunk/admin/PageEntry.py
Modified: cherokee/trunk/admin/PageEntry.py
===================================================================
--- cherokee/trunk/admin/PageEntry.py 2009-11-20 10:14:07 UTC (rev 3848)
+++ cherokee/trunk/admin/PageEntry.py 2009-11-20 12:35:08 UTC (rev 3849)
@@ -162,8 +162,6 @@
if not props or props.show_document_root:
self.AddPropEntry (table, _('Document Root'), '%s!document_root'%(pre), _(NOTE_DOCUMENT_ROOT), optional=True)
- self.AddPropEntry (table, _('Timeout'), '%s!timeout'%(pre), _(NOTE_TIMEOUT), optional=True)
-
if e:
tabs += [(_('Handler'), str(table) + e)]
else:
@@ -175,7 +173,7 @@
tabs += [(_('Encoding'), self._render_encoding())]
# Expiration
- tabs += [(_('Expiration'), self._render_expiration())]
+ tabs += [(_('Time'), self._render_time())]
# Security
tabs += [(_('Security'), self._render_security())]
@@ -219,8 +217,17 @@
return txt
- def _render_expiration (self):
+ def _render_time (self):
txt = ''
+
+ # Timeout
+ table = TableProps()
+ self.AddPropEntry (table, _('Timeout'), '%s!timeout'%(self._conf_prefix), _(NOTE_TIMEOUT), optional=True)
+
+ txt += "<h2>%s</h2>" % (_('Connections timeout'))
+ txt += self.Indent(table)
+
+ # Expiration
pre = "%s!expiration"%(self._conf_prefix)
table = TableProps()
|
