[Spambayes-checkins] spambayes/spambayes ImapUI.py, 1.14, 1.15 ProxyUI.py, 1.14, 1.15 UserInterface.py, 1.14, 1.15

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv20254/spambayes

Modified Files:
	ImapUI.py ProxyUI.py UserInterface.py 
Log Message:
Add version information to the web interface, as requested in
[ spambayes-Bugs-790051 ] Can't review messages if probability header is turned on

Index: ImapUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ImapUI.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ImapUI.py	17 Jun 2003 07:36:49 -0000	1.14
--- ImapUI.py	18 Aug 2003 00:53:11 -0000	1.15
***************
*** 98,101 ****
--- 98,102 ----
          self.imap_pwd = pwd
          self.imap_logged_in = False
+         self.app_for_version = "IMAP Filter"
  
      def onHome(self):

Index: ProxyUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ProxyUI.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ProxyUI.py	12 Aug 2003 04:41:46 -0000	1.14
--- ProxyUI.py	18 Aug 2003 00:53:11 -0000	1.15
***************
*** 118,121 ****
--- 118,122 ----
          state = proxy_state
          self.state_recreator = state_recreator # ugly
+         self.app_for_version = "POP3 Proxy"
  
      def onHome(self):

Index: UserInterface.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/UserInterface.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** UserInterface.py	12 Aug 2003 05:51:55 -0000	1.14
--- UserInterface.py	18 Aug 2003 00:53:11 -0000	1.15
***************
*** 74,77 ****
--- 74,78 ----
  
  import PyMeldLite
+ import Version
  import Dibbler
  import tokenizer
***************
*** 96,99 ****
--- 97,101 ----
          htmlSource, self._images = self.readUIResources()
          self.html = PyMeldLite.Meld(htmlSource, readonly=True)
+         self.app_for_version = None
  
      def onIncomingConnection(self, clientSocket):
***************
*** 103,111 ****
  
      def _getHTMLClone(self):
!         """Gets a clone of the HTML, with the footer timestamped, ready to be
!         modified and sent to the browser."""
          clone = self.html.clone()
          timestamp = time.strftime('%H:%M on %A %B %d %Y', time.localtime())
          clone.footer.timestamp = timestamp
          return clone
  
--- 105,115 ----
  
      def _getHTMLClone(self):
!         """Gets a clone of the HTML, with the footer timestamped, and
!         version information added, ready to be modified and sent to the
!         browser."""
          clone = self.html.clone()
          timestamp = time.strftime('%H:%M on %A %B %d %Y', time.localtime())
          clone.footer.timestamp = timestamp
+         clone.footer.version = Version.get_version_string(self.app_for_version)
          return clone