From 8dbbf9e69948ae2abc93c27511ef04f90b56c4d3 Mon Sep 17 00:00:00 2001
From: Colin Davis <e1ven@e1ven.com>
Date: Tue, 9 Apr 2019 18:24:01 -0400
Subject: [PATCH] Move the avatars to the bottom
---
robohash/templates/root.html | 48 ++++++++++++------------------------
robohash/webfront.py | 18 ++++++--------
2 files changed, 23 insertions(+), 43 deletions(-)
diff --git a/robohash/templates/root.html b/robohash/templates/root.html
index ae82284..9948be7 100644
--- a/robohash/templates/root.html
+++ b/robohash/templates/root.html
@@ -384,37 +384,6 @@ function submitform()
<div class="hr"></div>
-<!-- *************************************************************************
-****************************** GALLERY5 SECTION *****************************
-************************************************************************** -->
-
-<!-- start of content section -->
-<div class="content_section">
-
- <p>By appending ?set=set5 to our URLs, we can create beautiful avatars. </p>
-
- <ul class="gallery">
- {% set c1 = ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(3)) + ".png?set=set5" %}
- {% set c2 = ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(3)) + ".png?set=set5" %}
- {% set c3 = ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(3)) + ".png?set=set5" %}
- {% set c4 = ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(3)) + ".png?set=set5" %}
- {% set c5 = ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(3)) + ".png?set=set5" %}
-
- <li><a href="//robohash.org/{{c1}}" rel="prettyPhoto[gallery1]"
- title="{{random.choice(avatarquotes)}}" class="fade"><img src="//robohash.org/{{c1}}&size=150x150" width="150" height="150" /></a></li>
- <li><a href="//robohash.org/{{c2}}" rel="prettyPhoto[gallery1]"
- title="{{random.choice(avatarquotes)}}" class="fade"><img src="//robohash.org/{{c2}}&size=150x150" width="150" height="150" /></a></li>
- <li><a href="//robohash.org/{{c3}}" rel="prettyPhoto[gallery1]"
- title="{{random.choice(avatarquotes)}}" class="fade"><img src="//robohash.org/{{c3}}&size=150x150" width="150" height="150" /></a></li>
- <li><a href="//robohash.org/{{c4}}" rel="prettyPhoto[gallery1]"
- title="{{random.choice(avatarquotes)}}" class="fade"><img src="//robohash.org/{{c4}}&size=150x150" width="150" height="150" /></a></li>
- <li><a href="//robohash.org/{{c5}}" rel="prettyPhoto[gallery1]"
- title="{{random.choice(avatarquotes)}}" class="fade"><img src="//robohash.org/{{c5}}&size=150x150" width="150" height="150" /></a></li>
- </ul>
-
-</div><!-- end of content section -->
-
-<div class="hr"></div>
@@ -585,6 +554,21 @@ function submitform()
factory.</p>
</p>
+<!-- *************************************************************************
+****************************** GALLERY5 SECTION *****************************
+************************************************************************** -->
+
+<!-- start of content section -->
+<div class="content_section">
+<hr>
+ <p>By the way - For those afraid of the robocalypse, you can also generate humans technicians to mind the robot army, by appending ?set=set5 to our URLs. </p>
+
+ {% set c1 = ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(3)) + ".png?set=set5" %}
+ <a href="//robohash.org/{{c1}}" rel="prettyPhoto[gallery1]" title="{{random.choice(avatarquotes)}}" class="fade"><img src="//robohash.org/{{c1}}&size=150x150" width="150" height="150" /></a>
+ </ul>
+
+</div><!-- end of content section -->
+
</div><!-- end of content section -->
@@ -611,7 +595,7 @@ function submitform()
<div id="footer_left" style="margin-top:60px;">
<p>
Robohash contains robots created by Zikri Kader (set1), Hrvoje Novakovic (set2), and Julian Peter Arias (set3).<br>
-Cats are created by <a href="https://framagit.org/Deevad/cat-avatar-generator/tree/master">David Revoy</a> and avataaars are created by <a href="https://twitter.com/pablostanley">Pablo Stanley</a>.
+Cats (set4) were created by <a href="https://framagit.org/Deevad/cat-avatar-generator/tree/master">David Revoy</a> and <a href="https://avataaars.com/">avataaars</a> (set5) were created by <a href="https://twitter.com/pablostanley">Pablo Stanley</a>.
<br>
<p>
You are free to embed under the terms of the CC-BY license. <br> Example wording might be "Robots lovingly delivered by
diff --git a/robohash/webfront.py b/robohash/webfront.py
index 5f3033c..2902efb 100755
--- a/robohash/webfront.py
+++ b/robohash/webfront.py
@@ -218,16 +218,12 @@ class MainHandler(tornado.web.RequestHandler):
("It is fun to have fun, but you have to know meow."),
("Who knows the term man-cub but not baby?")]
- avatarquotes = [("Believe me, I'm a doctor"),
- ("Pretty and you know it."),
- ("Nothing works unless I do it"),
- ("I'm a voice not an echo"),
+ avatarquotes = [("I'm just here to fix the robots."),
+ ("Don't blame me, I tried to deactivate them."),
+ ("Don't believe the robot's lies - I do all the work around here."),
("Wanna play hide and seek?"),
- ("Life is short, buy that shoes"),
- ("Follow my dreams - we will be kings"),
- ("My ambition is my power"),
("Look at my face my face is amazing"),
- ("You are awesome")]
+ ("You are awesome, I don't care what anyone says.")]
random.shuffle(drquotes)
self.write(self.render_string('templates/root.html',ip=ip,robo=random.choice(robo),drquote1=drquotes[1],drquote2=drquotes[2],quotes=quotes,catquotes=catquotes,avatarquotes=avatarquotes))
@@ -332,10 +328,10 @@ class ImgHandler(tornado.web.RequestHandler):
roboset = args.get('set',r.sets[0])
elif args.get('set',r.sets[0]) == 'any':
# Add ugly hack.
- # Adding cats, per issue-17, but I don't want to change existing hashes.
- # so we'll ignore that set for the 'any' config.
- roboset = r.sets[r.hasharray[1] % (len(r.sets)-1) ]
+ # Adding cats and people per submitted/requested code, but I don't want to change existing hashes for set=any
+ # so we'll ignore those sets for the 'any' config.
+ roboset = r.sets[r.hasharray[1] % (len(r.sets)-2) ]
else:
roboset = r.sets[0]