Merge lp:~dholbach/ubuntu-review-overview/js into lp:ubuntu-review-overview

[Daniel Holbach]

=== modified file '.bzrignore'
--- .bzrignore	2010-06-09 09:04:53 +0000
+++ .bzrignore	2010-06-10 11:43:25 +0000
@@ -4,3 +4,4 @@
 review/meter.horiz.png
 review/meter.png
 review/total.txt
+review/gadget.js

=== modified file 'clean-sweep.py' (properties changed: -x to +x)
=== modified file 'countdown.py'
--- countdown.py	2010-06-09 09:04:53 +0000
+++ countdown.py	2010-06-10 11:43:25 +0000
@@ -6,42 +6,21 @@
 
 import data
 
-def write_css(reviewed, total):
-    css_text = """
-            .progress-bar {
-                 background:url("bg.png") repeat-x;
-                 border: 1px solid #cbcbcb; 
-                 width: 293px;
-                 margin: 5px; 
-                 padding: 1px; 
-                 padding-left: 2px;
-                 padding-right: 1px;
-                 float: left;
-                 -moz-border-radius: 10px;
-                 -khtml-border-radius: 10px;
-                 -webkit-border-radius: 10px;
-                 border-radius: 10px;
-             }
-
-             .bar {
-                 height: 14px;
-                 text-indent:-9000px;
-                 background: #eee url(bar.png);
-                 -moz-border-radius: 10px;
-                 -khtml-border-radius: 10px;
-                 -webkit-border-radius: 10px;
-                 border-radius: 10px;
-                 width: """
-    css_text += str(int(293*float(reviewed)/float(total)))+"px;"
-    css_text += """
-             }
-"""
-    css_file = os.path.join(data.data_dir(), "meter.css")
-    if os.path.exists(css_file):
-        os.remove(css_file)
-    f = open(css_file, "w")
-    f.write(css_text)
-    f.close()
+def write_js(reviewed, total):
+    percent = str(reviewed*100/total)+"%"
+    js_text ="""/* Ubuntu Reviews Gadget */
+var gadget =\'<link rel="stylesheet" href="default.css" type="text/css" media="screen">\'+
+\'<div id="badge">\'+
+\'<div id="ubuntu-reviewers-logo"></div>\'+
+\'<div id="ubuntu-logo"></div>\'+
+\'<div id="progress-bar"><div id="bar" style="width:%s">%s</div></div>\'+
+\'<div id="percentage">%s</div>\'+
+\'<div id="ubuntu-review-team"><img src="images/3.png"><a href="http://launchpad.net/ubuntu-review" target="_blank">Powered by Ubuntu Review Gadget</a></div>\'+
+\'</div>\';
+document.write(gadget);
+""" % (percent, percent, percent)
+    js_file = os.path.join(data.data_dir(), "gadget.js")
+    data.write_file(js_file, js_text)
 
 def draw(reviewed, total, horizontal=False):
     if horizontal:
@@ -60,14 +39,6 @@
             im.putpixel((x,y), (255,0,0))
     im.save(os.path.join(data.data_dir(), meterfile))
 
-def write_out(file_name, number):
-    if os.path.exists(file_name):
-        os.remove(file_name)
-    f = open(file_name, "w")
-    f.write("%s\n" % str(number))
-    f.close()
-
-
 def main():
     launchpad = data.lp_login()
     datadir = data.data_dir()
@@ -82,13 +53,14 @@
     print "In the queue: %s" % (total_patches-already_reviewed_patches)
     draw(already_reviewed_patches, total_patches, False) 
     draw(already_reviewed_patches, total_patches, True)
-    write_out(os.path.join(datadir, "in-the-queue.txt"), 
-              total_patches-already_reviewed_patches)
-    write_out(os.path.join(datadir, "total.txt"), 
-              total_patches)
-    write_css(already_reviewed_patches, total_patches)
+    data.write_file(os.path.join(datadir, "in-the-queue.txt"), 
+                    str(total_patches-already_reviewed_patches))
+    data.write_file(os.path.join(datadir, "total.txt"), 
+                    str(total_patches))
+    write_js(already_reviewed_patches, total_patches)
 
 if __name__ == "__main__":
+    sys.exit(main())
     try:
         sys.exit(main())
     except Exception, e:

=== modified file 'data.py'
--- data.py	2010-06-09 09:04:53 +0000
+++ data.py	2010-06-10 11:43:25 +0000
@@ -26,6 +26,13 @@
 def data_dir():
     return os.path.join(os.path.dirname(__file__), "review")
 
+def write_file(file_name, content):
+    if os.path.exists(file_name):
+        os.remove(file_name)
+    f = open(file_name, "w")
+    f.write(content)
+    f.close()
+
 def lp_login(anonymous=True):
     cachedir = os.path.expanduser("~/.launchpadlib/cache/")
     creddir = os.path.expanduser('~/.launchpadlib')
@@ -84,9 +91,5 @@
     return []
 
 def write_bug_list(list_of_bugs):
-    if os.path.exists(bug_list):
-        os.remove(bug_list)
-    f = open(bug_list, "w")
-    for bug in list_of_bugs:
-        f.write("%s\n" % str(bug))
-    f.close()
+    content = "\n".join(map(lambda a: str(a), list_of_bugs))
+    write_file(bug_list, content)

=== modified file 'patch-overview.py' (properties changed: -x to +x)
--- patch-overview.py	2010-06-02 11:16:18 +0000
+++ patch-overview.py	2010-06-10 11:43:25 +0000
@@ -100,11 +100,7 @@
     </body></html>""" % date.communicate()[0].strip()
 
 
-    if os.path.exists("index.html"):
-        os.remove("index.html")
-    f = open("index.html", "w")
-    f.write(html.encode("utf-8"))
-    f.close()
+    data.write_file("index.html", html.encode("utf-8"))
 
     # to get the length of a searchTasks collection
     # int(return_value._wadl_resource.representation['total_size'])

=== added file 'review/default.css'
--- review/default.css	1970-01-01 00:00:00 +0000
+++ review/default.css	2010-06-10 11:43:25 +0000
@@ -0,0 +1,85 @@
+#badge{
+        width: 300px; 
+	border: 2px solid #cbcbcb;
+	background-color:#F7F7F7;
+        -moz-border-radius: 10px;
+        -khtml-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+	height:85px
+}
+
+#ubuntu-reviewers-logo{
+	width:106px;
+	height:32px;
+	float:left;
+	color:  #cbcbcb;
+	margin-right: 8px;
+	margin-bottom:4px;
+}
+
+#ubuntu-logo{
+	width:106px;
+	height:25px;
+	background:url("images/ubuntu-logo.png") no-repeat top right;
+	float:right;
+	color:  #cbcbcb;
+	margin-right: 8px;
+	margin-top:5px;
+	margin-bottom:4px;
+}
+
+#progress-bar {
+	background:url("images/default/bg.png") repeat-x;
+	border: 1px solid #cbcbcb; 
+	width: 240px; 
+	margin: 8px; 
+	margin-right: 0;
+	float: left;
+	-moz-border-radius: 5px;
+  	-khtml-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+}
+
+#bar {
+	height: 15px;
+	text-indent:-9000px;
+	background: #eee url(images/default/bar.png);
+	-moz-border-radius: 5px;
+	-khtml-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+}
+
+#percentage{
+	font-family:dejavu sans, sans, verdana, arial;
+	float: left;
+	color:  #999;
+	margin-left: 2px;
+	margin-top:8px;
+}
+
+#ubuntu-review-team{
+        width: 300px; 
+	font-family:dejavu sans, sans, verdana, arial;
+	float: left;
+	font-size:10px;
+	color:  #999;
+	margin-left: 8px;
+}
+
+#ubuntu-review-team img{
+	vertical-align:text-bottom;
+	border:0;
+}
+
+#ubuntu-review-team a:link, a:visited{
+	text-decoration:none;
+	color:  #999;
+}
+
+#ubuntu-review-team a:hover{
+	text-decoration:underline;
+	
+}

=== modified file 'review/example.html'
--- review/example.html	2010-06-09 09:04:53 +0000
+++ review/example.html	2010-06-10 11:43:25 +0000
@@ -1,4 +1,5 @@
 <html>
-  <head><style type="text/css" media="all">@import "meter.css";</style></head>
-  <body><div class="progress-bar"><div id="sample" class="bar">.</div></body>
+  <body>
+    <script type="text/javascript" src="gadget.js"></script>
+  </body>
 </html>

=== added directory 'review/images'
=== added file 'review/images/3.png'
Binary files review/images/3.png	1970-01-01 00:00:00 +0000 and review/images/3.png	2010-06-10 11:43:25 +0000 differ
=== added directory 'review/images/default'
=== added file 'review/images/default/bar copie2.png'
Binary files review/images/default/bar copie2.png	1970-01-01 00:00:00 +0000 and review/images/default/bar copie2.png	2010-06-10 11:43:25 +0000 differ
=== added file 'review/images/default/bar.png'
Binary files review/images/default/bar.png	1970-01-01 00:00:00 +0000 and review/images/default/bar.png	2010-06-10 11:43:25 +0000 differ
=== added file 'review/images/default/bar1.png'
Binary files review/images/default/bar1.png	1970-01-01 00:00:00 +0000 and review/images/default/bar1.png	2010-06-10 11:43:25 +0000 differ
=== added file 'review/images/default/bg.png'
Binary files review/images/default/bg.png	1970-01-01 00:00:00 +0000 and review/images/default/bg.png	2010-06-10 11:43:25 +0000 differ
=== added file 'review/images/review-team.png'
Binary files review/images/review-team.png	1970-01-01 00:00:00 +0000 and review/images/review-team.png	2010-06-10 11:43:25 +0000 differ
=== added file 'review/images/ubuntu-logo.png'
Binary files review/images/ubuntu-logo.png	1970-01-01 00:00:00 +0000 and review/images/ubuntu-logo.png	2010-06-10 11:43:25 +0000 differ
=== modified file 'stats.py' (properties changed: -x to +x)