From: Scott Torborg <scott@crookedmedia.com>
Date: Fri, 13 Nov 2009 01:17:57 +0000 (-0800)
Subject: Merge branch 'master' into mobile_interface
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0b9f273d12cbbe8790c4a9dec14d282a461e54be;hp=28c9c65bb98e6981a516a64850744335bf36f81b;p=bluechips.git

Merge branch 'master' into mobile_interface
---

diff --git a/bluechips/public/icons/dashboard.png b/bluechips/public/icons/status.png
similarity index 100%
rename from bluechips/public/icons/dashboard.png
rename to bluechips/public/icons/status.png
diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index b45b8ef..8ad40aa 100644
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -22,7 +22,7 @@
           </td>
           <td>
             <a href="${h.url_for(controller='status', action='index', id=None)}">
-              <img src="/icons/dashboard.png" alt="">
+              <img src="/icons/status.png" alt="">
               <span>Dashboard</span>
             </a>
           </td>