From 8b49c5ce6954a1378a3e5439695d8c7734aa1211 Mon Sep 17 00:00:00 2001
From: alobbs <alvaro@alobbs.com>
Date: Sun, 24 Jan 2010 18:20:25 +0000
Subject: [PATCH] Stops the CTK.Uploader widget from adding duplicating code to
 the final HTML render.

git-svn-id: svn://cherokee-project.com/CTK/trunk@4164 5dc97367-97f1-0310-9951-d761b3857238
---
 CTK/Uploader.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/CTK/Uploader.py b/CTK/Uploader.py
index afc189488..233b7eab8 100644
--- a/CTK/Uploader.py
+++ b/CTK/Uploader.py
@@ -25,13 +25,14 @@
 
 from Server import publish, get_scgi
 from Widget import Widget, RenderResponse
-from HTTP import HTTP_Redir
+from PageCleaner import Uniq_Block
+
 
 HEADERS = [
     '<script type="text/javascript" src="/static/js/jquery.uploadProgress.js"></script>'
 ]
 
-HTML = """
+CSS = """
 <style type="text/css">
 .bar {
   width: 300px;
@@ -49,7 +50,9 @@
   background: #333;
 }
 </style>
+"""
 
+HTML = """
  <form id="%(id)s_form" enctype="multipart/form-data" action="%(upload_url)s" method="post">
    <input name="file" type="file"/>
    <input type="submit" value="Upload"/>
@@ -114,8 +117,11 @@ def Render (self):
         props = {'id':          self.id,
                  'upload_url':  self._url_local}
 
-        html = HTML %(props)
-        js   = JS   %(props)
+        raw_html  = Uniq_Block(CSS)
+        raw_html += HTML
+
+        html = raw_html %(props)
+        js   = JS       %(props)
 
         render = RenderResponse (html, js, HEADERS)
         return render