Merge branch 'master' into goocharts

templates/base.html

@@ -70,7 +70,13 @@ function changeTime(obj, label) {
    </td>
 
    <td align="center">
-    <img width="107" height="37" src="/gracedb-static/images/anim2.gif">
+    {% if ligouser and ligouser.name == "Chad Hanna" %}
+        <img width="194" height="37" src="/gracedb-static/images/PI_Logo-anim.gif">
+    {% else %}{% if ligouser and ligouser.name == "Kipp Cannon" %}
+        <img width="194" height="37" src="/gracedb-static/images/CITA_logo-anim.gif">
+    {% else %}
+        <img width="107" height="37" src="/gracedb-static/images/anim2.gif">
+    {% endif %}{% endif %}
     <!-- 287px 101px -->
    </td>
 

utils/__init__.py

@@ -30,6 +30,7 @@ leapSeconds = map(calendar.timegm, [
     (1999, 1, 0, 0, 0, 0, 0, 0, 0),
     (2006, 1, 0, 0, 0, 0, 0, 0, 0),
     (2009, 1, 0, 0, 0, 0, 0, 0, 0),
+    (2012, 7, 0, 0, 0, 0, 0, 0, 0),
 ])
 
 def gpsToPosixTime(gpsTime):