Merge branch 'master' of github.com:open-cloud/xos
diff --git a/planetstack/core/static/observer_status.js b/planetstack/core/static/observer_status.js
index 4ec7710..3dafae4 100644
--- a/planetstack/core/static/observer_status.js
+++ b/planetstack/core/static/observer_status.js
@@ -7,10 +7,16 @@
              success: function(newData) {
                   console.log(newData);
                   if (newData.health==":-)") {
-                      html = '<span style="margin-left: 16px;" title="last observer run time = ' + Math.floor(newData.last_duration) + ' seconds"><img src="/static/img/green-cloud.gif" width=16 height=16></span>';
+                      tooltip = 'last observer run time = ' + Math.floor(newData.last_duration) + ' seconds';
+                      icon = "/static/img/green-cloud.gif";
                   } else {
-                      html = '<span style="margin-left: 16px;" title="observer is offline"><img src="/static/img/red-cloud.gif" width=16 height=16></span>';
+                      tooltip = "observer is offline";
+                      icon = "/static/img/red-cloud.gif";
                   }
+
+                  html = '<span style="margin-left: 16px; cursor: pointer;" title="' + tooltip + '"><img src="' + icon +
+                         '" width=16 height=16 onClick="showObserverCalendar();"></span>';
+
                   $("#observer-status").html(html);
                   setTimeout(function() { updateObserverStatus(); }, 60000);
              },
@@ -20,6 +26,21 @@
 });
 }
 
+function showObserverCalendar() {
+    $("#dialog-placeholder").html('<iframe src="https://www.google.com/calendar/embed?src=qlnr1b3rsquq702nbns42l88s4%40group.calendar.google.com&ctz=America/New_York" style="border: 0" width="800" height="600" frameborder="0" scrolling="no"></iframe>');
+    $("#dialog-placeholder").dialog({
+           autoOpen: false,
+           modal: true,
+           width: 850,
+           buttons : {
+                "Ok" : function() {
+                  $(this).dialog("close");
+                }
+              }
+            });
+        $("#dialog-placeholder").dialog("open");
+}
+
 $( document ).ready(function() {
     updateObserverStatus();
 });
diff --git a/planetstack/templates/admin/base.html b/planetstack/templates/admin/base.html
index 29823a5..5b355d9 100644
--- a/planetstack/templates/admin/base.html
+++ b/planetstack/templates/admin/base.html
@@ -29,6 +29,10 @@
 
 <body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}">
 
+<div id="dialog-placeholder">
+<!-- This is a placeholder for dialog boxes, like the observer calendar -->
+</div>
+
 <!-- Sticky footer wrap -->
 <div id="wrap">