diff -r 3433df0d6ae3 -r 367d791aeb57 gmyth-stream/server/0.2/lib/server.py --- a/gmyth-stream/server/0.2/lib/server.py Tue May 15 18:25:19 2007 +0100 +++ b/gmyth-stream/server/0.2/lib/server.py Thu May 17 14:07:27 2007 +0100 @@ -138,10 +138,6 @@ return ret # _nav_items() - def _create_html_item(self, opt): - return "
  • %s
  • \n" % opt - # _create_html_item - def serve_main(self, body): self.send_response(200) self.send_header("Content-Type", "text/html") @@ -234,13 +230,13 @@ self.send_header("Content-Type", "text/html") self.send_header('Connection', 'close') self.end_headers() + stopone = "" if body: tl = self.server.get_transcoders() if not tl: running = "

    No running transcoder.

    \n" stopall = "" - stopone = "" elif self.query.get("ip") and self.query.get("file"): for transcoder, request in tl: @@ -254,14 +250,15 @@ else: running = "

    Running transcoders:

    \n" - stopall = self._create_html_item("" + stopall = utils._create_html_item("" "[STOP ALL]" % self.menu["Stop"]) for transcoder, request in tl: - stopone = self._create_html_item("%s: %s:%s" - "[STOP] - Status: %s%%"\ + stopone += utils._create_html_item("%s: %s:%s" + "[STOP] - " + "Status: %s%%"\ % ( transcoder, request.client_address[0], request.client_address[1], @@ -269,11 +266,11 @@ request.client_address[1], transcoder.status) ) - self.wfile.write(utils.getHTML("status", - {"menu": self._nav_items(), - "running": running, - "stopall": stopall, - "stopone": stopone})) + self.wfile.write(utils.getHTML("status", + {"menu": self._nav_items(), + "running": running, + "stopall": stopall, + "stopone": stopone})) # serve_status()