From eeb5494e13c85637c9505acc289814dfe09f6533 Mon Sep 17 00:00:00 2001
From: Robohash <401330+e1ven@users.noreply.github.com>
Date: Wed, 6 Jul 2011 02:31:34 -0400
Subject: [PATCH] changes

---
 templates/root.html | 12 +++++++++---
 webfront.py         | 18 ++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/templates/root.html b/templates/root.html
index 581fb6f..3835890 100644
--- a/templates/root.html
+++ b/templates/root.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Slate - Landing Page</title>
+<title>RoboHash</title>
 <link href="/static/css/main.css" rel="stylesheet" type="text/css" />
 <link href="/static/css/prettyPhoto.css" rel="stylesheet" type="text/css" />
 
@@ -481,9 +481,15 @@ $(document).ready(function(){
 
 <!-- start of footer container -->
 <div id="footer_container">
-
 <!-- start of footer left -->
-<div id="footer_left"> <a href="#top" class="scroll"><img src="bottom_logo.png" width="140" height="55" alt="logo" /></a>
+<div id="footer_left"> 
+<p>
+Set 1 artwork created by Zikri Kader<br>
+Set 2 artwork created by Hrvoje Novakovic. <br>
+Set 3 artwork created by Julian Peter Arias.<br>
+<br><br>
+All artwork used under license.
+</p>
 </div><!-- end of footer left -->
 
 <!-- start of footer right -->
diff --git a/webfront.py b/webfront.py
index 458d715..9be4d82 100755
--- a/webfront.py
+++ b/webfront.py
@@ -95,22 +95,24 @@ class ImgHandler(tornado.web.RequestHandler):
         r.createHashes(10)
         
         
+                
         #Now, customize the request if possible.
         client_color = ""
-        if "color" in self.request.arguments:
-                if self.get_argument("color") in colors:
-                    client_set = tornado.escape.xhtml_escape(self.get_argument("color"))
-                    
-        #If they don't specify a color, use hashvalue        
-        if client_color == "":
-            client_set = colors[r.hasharray[0] % len(colors) ]
-          
+        client_set = ""
         if "set" in self.request.arguments:
                 if self.get_argument("set") in sets:
                     client_set =  tornado.escape.xhtml_escape(self.get_argument("set"))   
                     #Set one is distributed     
                     if client_set == 'set1':
                         client_set = colors[r.hasharray[0] % len(colors) ]
+
+        if "color" in self.request.arguments:
+                if self.get_argument("color") in colors:
+                    client_set = tornado.escape.xhtml_escape(self.get_argument("color"))
+
+        #If they don't specify a color, use hashvalue        
+        if ((client_color == "") and (client_set == "")):
+            client_set = colors[r.hasharray[0] % len(colors) ]
         
         
         #Change to a usuable format
