From ed445e9033ac007df0357fc4c53e8904a18330d7 Mon Sep 17 00:00:00 2001
From: liwencTaiwan <Liwen@Liwens-MBP.wv.cc.cmu.edu>
Date: Tue, 18 Oct 2016 11:09:58 -0400
Subject: change web layout & start fish at depth 0

---
 fish_show.py                    | 14 +++++++-------
 webapp/app/templates/index.html | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/fish_show.py b/fish_show.py
index 4dde51e..dd97f90 100644
--- a/fish_show.py
+++ b/fish_show.py
@@ -151,22 +151,22 @@ class FishShow(Show):
             for col in self.lights:
                 for light in col:
                     light.blit()
-
+            
+            if self.depth == 0:
+                    self.send_event('enable image', {'name': 'boat'})
+                    self.send_event('enable image', {'name': 'dolphin'})
+                    self.send_event('enable image', {'name': 'jellyfish'})
 
             self.tick_count += 1
             if self.tick_count % self.TICKS_PER_DEPTH == 0:
                 self.depth += 1
                 print("DEPTH: ", self.depth)
-                if self.depth == 0:
-                    self.send_event('enable image', {'name': 'boat'})
-                    self.send_event('enable image', {'name': 'dolphin'})
-                elif self.depth == 1:
+                if self.depth == 1:
+                    self.send_event('enable image', {'name': 'dory'})
                     self.send_event('disable image', {'name': 'boat'})
-                    self.send_event('enable image', {'name': 'jellyfish'})
                 elif self.depth == 2:
                     self.send_event('disable image', {'name': 'dolphin'})
                     self.send_event('enable image', {'name': 'nemo'})
-                    self.send_event('enable image', {'name': 'dory'})
                     self.send_event('enable image', {'name': 'whale'})
                 elif self.depth == 3:
                     self.send_event('disable image', {'name': 'jellyfish'})
diff --git a/webapp/app/templates/index.html b/webapp/app/templates/index.html
index bba0579..c0ac612 100644
--- a/webapp/app/templates/index.html
+++ b/webapp/app/templates/index.html
@@ -43,13 +43,13 @@
       <!-- Three columns of text below the carousel -->
       <div class="row">
         <div class="col-lg-4">
-          <img id="jellyfish" onClick="clickImg(this)" class="img-disable img-circle" src="http://i.imgur.com/wZl8BhW.jpg" alt="Generic placeholder image" width="140" height="140">
+          <img id="boat" onClick="clickImg(this)" class="img-disable img-circle" src="http://i.imgur.com/ZU8sA8Z.jpg" alt="Generic placeholder image" width="140" height="140">
         </div><!-- /.col-lg-4 -->
         <div class="col-lg-4">
           <img id="dolphin" onClick="clickImg(this)" class="img-disable img-circle" src="http://i.imgur.com/MLP3x37.jpg" alt="Generic placeholder image" width="140" height="140">
         </div><!-- /.col-lg-4 -->
         <div class="col-lg-4">
-          <img id="boat" onClick="clickImg(this)" class="img-disable img-circle" src="http://i.imgur.com/ZU8sA8Z.jpg" alt="Generic placeholder image" width="140" height="140">
+          <img id="jellyfish" onClick="clickImg(this)" class="img-disable img-circle" src="http://i.imgur.com/wZl8BhW.jpg" alt="Generic placeholder image" width="140" height="140">
         </div><!-- /.col-lg-4 -->
       </div><!-- /.row -->
 <br>
@@ -66,15 +66,15 @@
       </div><!-- /.row -->
 <br>
 	  <div class="row">
+	    <div class="col-lg-4">
+          <img id="shark" onClick="clickImg(this)" class="img-disable img-circle" src="http://i.imgur.com/6AuJ36F.jpg" alt="Generic placeholder image" width="140" height="140">
+        </div><!-- /.col-lg-4 -->
         <div class="col-lg-4">
           <img id="stingray" onClick="clickImg(this)" class="img-disable img-circle" src="http://i.imgur.com/RuOqhqh.jpg" alt="Generic placeholder image" width="140" height="140">
         </div><!-- /.col-lg-4 -->
         <div class="col-lg-4">
           <img id="eel" onClick="clickImg(this)" class="img-disable img-circle" src="http://i.imgur.com/RmK7wJv.jpg" alt="Generic placeholder image" width="140" height="140">
         </div><!-- /.col-lg-4 -->
-        <div class="col-lg-4">
-          <img id="shark" onClick="clickImg(this)" class="img-disable img-circle" src="http://i.imgur.com/6AuJ36F.jpg" alt="Generic placeholder image" width="140" height="140">
-        </div><!-- /.col-lg-4 -->
       </div><!-- /.row -->
 
     </div><!-- /.container -->
-- 
cgit v1.3.1