Merge branch 'dev' of https://github.com/Caltech-IPAC/Firefly into dev

ejoliet · ejoliet · commit 55592c9903ff · 2016-08-15T10:36:15.000-07:00
diff --git a/src/firefly/html/firefly-dev.html b/src/firefly/html/firefly-dev.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<html>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="icon" type="image/x-icon" href="images/fftools-logo-16x16.png">
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <link rel="apple-touch-icon" href="images/fftools-logo-57x57_ipad.png"/>
+    <link rel=”apple-touch-startup-image” href=”images/fftools-ipad_splash_768x1004.png”>
+    <title>IRSA Viewer</title>
+
+    <script>
+        window.firefly = {
+            app: {},
+            MenuItemKeys: {maskOverlay:true}
+        };
+    </script>
+    <script  type="text/javascript" src="firefly_loader.js"></script>
+</head>
+
+<body style="margin: 0px;">
+<!-- attached loaction for firefly app -->
+<div id='app'/>
+
+
+
+
+</body>
+
+</html>
+
+
diff --git a/src/firefly/html/firefly.html b/src/firefly/html/firefly.html
@@ -11,7 +11,15 @@
 
     <script>
         window.firefly = {
-            app: {},
+            app: {
+                menu: [
+                    {label:'Images', action:'ImageSelectDropDownCmd'},
+                    {label:'Catalogs', action:'IrsaCatalogDropDown'},
+                    {label:'Charts', action:'ChartSelectDropDownCmd'},
+                    {label:'Demo Searches', action:'TestSearches'},
+                    //{label:'Help', action:'app_data.helpLoad', type:'COMMAND'},
+                    ]
+            },
             MenuItemKeys: {maskOverlay:true}
         };
     </script>
