Updated the text field labels to match AWS IoT and the IoT Ethernet Kit DM990004

martinrbowman · martinrbowman · commit 769ef00ccf2f · 2016-06-17T09:26:07.000-07:00
diff --git a/documents/images/insight_no_credentials.png b/documents/images/insight_no_credentials.png
diff --git a/documents/images/insight_normal_operation.png b/documents/images/insight_normal_operation.png
diff --git a/documents/images/insight_update_credentials.png b/documents/images/insight_update_credentials.png
diff --git a/software/source/config.json b/software/source/config.json
@@ -11,15 +11,15 @@
   },
   "win" : {
       "title" : "Insight",
-      "version" : "1.0.0",
+      "version" : "1.1.0",
       "publisher": "Microchip Technology",
       "icon" : "content/win/IoT_App_256x256.ico",
       "verbosity": 1
   },
   "linux" : {
       "arch" : 64,
       "target" : "deb",
-      "version" : "1.0.0",
+      "version" : "1.1.0",
       "title" : "Insight",
       "comment" : "Initial Alpha Release",
       "executable" : "insight",
diff --git a/software/source/content/about.html b/software/source/content/about.html
@@ -55,7 +55,7 @@ <h3>Insight on Things</h3>
         the reported state of the Microchip IoT Ethernet board</p>
         <p>For more information and to download the latest version of this application
           please view available links in the Help menu</p>
-        <p>Application Version 1.0.0(1.0.1)<p>
+        <p>Application Version 1.1.0(1.0.1)<p>
       </div>
     </div>
 
@@ -85,7 +85,7 @@ <h3>License Information</h3>
     <!-- This is the footer section -->
     <footer class="mdl-mini-footer">
       <div class="mdl-mini-footer__left-section">
-          Copyright &copy Microchip Technology, Inc. Microchip Insight Application v1.0.0
+          Copyright &copy Microchip Technology, Inc. Microchip Insight Application v1.1.0
       </div>
     </footer>
   </body>
diff --git a/software/source/content/active.html b/software/source/content/active.html
@@ -37,7 +37,7 @@
     <div class"mdl-layout mdl-js-layout mdl-layout--fixed-header">
       <header class="mdl-layout__header mdl-layout__header--scroll">
         <div class="mdl-layout__header-row">
-          <span class="mdl-layout__title" id="thing_address">IoT Device: xx:xx:xx:xx:xx:xx</span>
+          <span class="mdl-layout__title" id="thing_address">AWS Thing Name: </span>
           <div class="mdl-layout-spacer"></div>
           <i class="material-icons" id="web_present">cloud_off</i>
         </div>
@@ -185,7 +185,7 @@ <h3>mikroBUS Data</h3>
     <!-- This is the footer section -->
     <footer class="mdl-mini-footer">
       <div class="mdl-mini-footer__left-section">
-          Copyright &copy Microchip Technology, Inc. Microchip Insight Application v1.0.0
+          Copyright &copy Microchip Technology, Inc. Microchip Insight Application v1.1.0
       </div>
     </footer>
   </body>
diff --git a/software/source/content/css/insight.css b/software/source/content/css/insight.css
@@ -73,6 +73,16 @@ h3, h4 {
   z-index: 900;
 }
 
+#reset-shadow {
+  position: fixed;
+  display: block;
+  left: 0;
+  bottom: 0;
+  margin-left: 20px;
+  margin-bottom: 100px;
+  z-index: 900;
+}
+
 #fixed-footer {
   position: fixed;
   display: block;
diff --git a/software/source/content/js/insight.js b/software/source/content/js/insight.js
@@ -22,22 +22,21 @@ window.onload = function(){
   //check if the config file is present
   checkAndLoad();
   setTimeout(function(){
-    jsonDataDesired = JSON.stringify({"state":{"reported":{"insight_desktop_version" : app_version}}});
+    jsonDataDesired = JSON.stringify({"state":{"reported":{"insight_on_things":{"insight_on_things_desktop_version" : app_version}}}});
     updateThingStatus();
     updateAMIStatus();
   }, 1000);
 }
 
 //This is the AWS IOT main code
-
 //Include the required node modules
 var AWS = require('aws-sdk');
 var $ = require('jquery');
 var fs = require('fs');
 var os = require('os');
 
 //App version sent to reported state as insight_desktop_version
-var app_version = "1.0.0";
+var app_version = "1.1.0";
 
 
 //Access keys are not global variables, passed as function
@@ -91,13 +90,14 @@ function initThing(credaccess_key, credsecret_key){
 
   iotdata = new AWS.IotData(options);
   //set the thingName is the title bar.
-  document.getElementById("thing_address").innerHTML = "IoT Device: " + credthingname;
+  document.getElementById("thing_address").innerHTML = "AWS Thing Name: " + credthingname;
 
   setInterval(updateAMIStatus, UPDATE_RATE);
   setInterval(updateLANStatus, 3000);
 }
 
 
+
 function updateLANStatus(){
   //For now test navigator.online - not 100% as may have lan but no connection
   if(navigator.onLine === true){
diff --git a/software/source/content/newthing.html b/software/source/content/newthing.html
@@ -38,7 +38,7 @@
     <div class"mdl-layout mdl-js-layout mdl-layout--fixed-header">
       <header class="mdl-layout__header mdl-layout__header--scroll">
         <div class="mdl-layout__header-row">
-          <span class="mdl-layout__title" >Insight Thing setup</span>
+          <span class="mdl-layout__title" >Insight on Things Setup</span>
           <div class="mdl-layout-spacer"></div>
           <!-- <i class="material-icons" id="web_present">cloud_off</i> -->
         </div>
@@ -49,9 +49,9 @@
       <div class="mdl-cell mdl-cell--12-col">
         <!-- Textfield with Floating Label -->
         <form action="#">
-          <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+          <div class="mdl-textfield mdl-textfield--full-width mdl-js-textfield mdl-textfield--floating-label">
             <input class="mdl-textfield__input" type="text" id="thingname">
-            <label class="mdl-textfield__label" for="thingname">IoT Thingname</label>
+            <label class="mdl-textfield__label" for="thingname">AWS Thing Name (MAC Address)</label>
           </div>
         </form>
       </div>
@@ -60,9 +60,9 @@
       <div class="mdl-cell mdl-cell--12-col">
 
         <form action="#">
-          <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+          <div class="mdl-textfield mdl-textfield--full-width mdl-js-textfield mdl-textfield--floating-label">
             <input class="mdl-textfield__input" type="text" id="endpoint">
-            <label class="mdl-textfield__label" for="endpoint">AWS-IOT Endpoint</label>
+            <label class="mdl-textfield__label" for="endpoint">AWS IoT Endpoint Address</label>
           </div>
         </form>
       </div>
@@ -71,9 +71,9 @@
       <div class="mdl-cell mdl-cell--12-col">
 
         <form action="#">
-          <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+          <div class="mdl-textfield mdl-textfield--full-width mdl-js-textfield mdl-textfield--floating-label">
             <input class="mdl-textfield__input" type="text" id="accesskey">
-            <label class="mdl-textfield__label" for="accesskey">Access Key</label>
+            <label class="mdl-textfield__label" for="accesskey">AWS Access Key ID</label>
           </div>
         </form>
       </div>
@@ -82,9 +82,9 @@
       <div class="mdl-cell mdl-cell--12-col">
 
         <form action="#">
-          <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+          <div class="mdl-textfield mdl-textfield--full-width mdl-js-textfield mdl-textfield--floating-label">
             <input class="mdl-textfield__input" type="password" id="secretkey">
-            <label class="mdl-textfield__label" for="secretkey">Secret key</label>
+            <label class="mdl-textfield__label" for="secretkey">AWS Secret Access Key</label>
           </div>
         </form>
       </div>
@@ -106,7 +106,7 @@
     <!-- This is the footer section -->
     <footer id="fixed-footer" class="mdl-mini-footer">
       <div class="mdl-mini-footer__left-section">
-          Copyright &copy Microchip Technology, Inc. Microchip Insight Application v1.0.0
+          Copyright &copy Microchip Technology, Inc. Microchip Insight Application v1.1.0
       </div>
     </footer>
   </body>
diff --git a/software/source/content/settings.html b/software/source/content/settings.html
@@ -39,7 +39,7 @@
     <div class"mdl-layout mdl-js-layout mdl-layout--fixed-header">
       <header class="mdl-layout__header mdl-layout__header--scroll">
         <div class="mdl-layout__header-row">
-          <span class="mdl-layout__title" >Insight Thing setup</span>
+          <span class="mdl-layout__title" >Insight on Things Setup</span>
           <div class="mdl-layout-spacer"></div>
           <!-- <i class="material-icons" id="web_present">cloud_off</i> -->
         </div>
@@ -52,7 +52,7 @@
         <form>
           <div class="mdl-textfield mdl-textfield--full-width mdl-js-textfield mdl-textfield--floating-label">
             <input class="mdl-textfield__input" type="text" id="thingname">
-            <label class="mdl-textfield__label" for="thingname">IoT Thingname</label>
+            <label class="mdl-textfield__label" for="thingname">AWS Thing Name (MAC Address)</label>
           </div>
         </form>
       </div>
@@ -63,7 +63,7 @@
         <form>
           <div class="mdl-textfield mdl-textfield--full-width mdl-js-textfield mdl-textfield--floating-label">
             <input class="mdl-textfield__input" type="text" id="endpoint">
-            <label class="mdl-textfield__label" for="endpoint">AWS-IOT Endpoint</label>
+            <label class="mdl-textfield__label" for="endpoint">AWS IoT Endpoint Address</label>
           </div>
         </form>
       </div>
@@ -74,7 +74,7 @@
         <form>
           <div class="mdl-textfield mdl-textfield--full-width mdl-js-textfield mdl-textfield--floating-label">
             <input class="mdl-textfield__input" type="text" id="accesskey">
-            <label class="mdl-textfield__label" for="accesskey">Access Key</label>
+            <label class="mdl-textfield__label" for="accesskey">AWS Access Key ID</label>
           </div>
         </form>
       </div>
@@ -84,7 +84,7 @@
         <form>
           <div class="mdl-textfield mdl-textfield--full-width mdl-js-textfield mdl-textfield--floating-label">
             <input class="mdl-textfield__input" type="password" id="secretkey">
-            <label class="mdl-textfield__label" for="secretkey">Secret key</label>
+            <label class="mdl-textfield__label" for="secretkey">AWS Secret Access Key</label>
           </div>
         </form>
       </div>
@@ -106,7 +106,7 @@
     <!-- This is the footer section -->
     <footer id="fixed-footer" class="mdl-mini-footer">
       <div class="mdl-mini-footer__left-section">
-          Copyright &copy Microchip Technology, Inc. Microchip Insight Application v1.0.0
+          Copyright &copy Microchip Technology, Inc. Microchip Insight Application v1.1.0
       </div>
     </footer>
   </body>
diff --git a/software/source/main.js b/software/source/main.js
@@ -115,7 +115,7 @@ var template = [
         label: 'Settings',
         accelerator: 'Shift+Command+S',
         click: function() { mainWindow.loadURL('file://' + __dirname + '/content/settings.html'); }
-      },
+      }
     ]
   },
   {
@@ -251,6 +251,7 @@ app.on('window-all-closed', function() {
   app.quit();
 });
 
+
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 app.on('ready', function() {
diff --git a/software/source/package.json b/software/source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Insight",
-  "version": "0.1.0",
+  "version": "1.1.0",
   "main": "main.js",
   "scripts": {
     "start": "/Applications/Electron1.0.1.app/Contents/MacOS/Electron ."
