From 1a9461d61991b0aea9f9c40a3a86cff806a833d5 Mon Sep 17 00:00:00 2001
From: Egor Philippov <ephilippov@absolute.com>
Date: Tue, 8 Sep 2015 15:51:44 -0700
Subject: [PATCH] A few formatting and trial changes

---
 app/components/bridge-controls.js             |  6 ++++-
 app/components/bridge-finder.js               |  2 +-
 app/components/huegasm-footer.js              |  3 +++
 app/styles/app.scss                           | 23 ++++++++++---------
 app/templates/components/bridge-controls.hbs  | 11 ++++-----
 app/templates/components/bridge-finder.hbs    |  2 +-
 .../components/controls/light-control.hbs     |  5 ++--
 app/templates/components/huegasm-app.hbs      |  4 +++-
 app/templates/components/huegasm-footer.hbs   |  6 +----
 bower.json                                    |  3 +++
 10 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/app/components/bridge-controls.js b/app/components/bridge-controls.js
index 465ef55..d928842 100644
--- a/app/components/bridge-controls.js
+++ b/app/components/bridge-controls.js
@@ -85,5 +85,9 @@ export default Em.Component.extend({
         });
       }
     });
-  }
+  },
+
+  ready: function() {
+    return this.get('trial') || !Em.isNone(this.get('lightsData'));
+  }.property('lightsData', 'trial')
 });
diff --git a/app/components/bridge-finder.js b/app/components/bridge-finder.js
index abd2b34..fdf0190 100644
--- a/app/components/bridge-finder.js
+++ b/app/components/bridge-finder.js
@@ -1,7 +1,7 @@
 import Em from 'ember';
 
 export default Em.Component.extend({
-  classNames: ['container', 'center-block'],
+  classNames: ['container'],
   elementId: 'finderContainer',
 
   bridgeIp: null,
diff --git a/app/components/huegasm-footer.js b/app/components/huegasm-footer.js
index 6e27545..2bbbc14 100644
--- a/app/components/huegasm-footer.js
+++ b/app/components/huegasm-footer.js
@@ -1,4 +1,7 @@
 import Em from 'ember';
 
 export default Em.Component.extend({
+  tagName: 'footer',
+
+  classNames: ['footer']
 });
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 12160da..5787461 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -10,7 +10,13 @@ $playListBackgroundColor: #1E1E1E;
 $playerDefaultIconColor: #BBBBBB;
 
 // BRIDGE FINDER
-.footer .container {
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+}
+
+.footer .text-muted {
   padding-left: 0;
   margin-top: 30px;
   text-align: center;
@@ -22,7 +28,7 @@ $playerDefaultIconColor: #BBBBBB;
 
 #finderContainer {
   text-align: center;
-  margin-top: 40px;
+  padding-top: 20px;
 }
 
 #finderContainer .title {
@@ -37,18 +43,13 @@ $playerDefaultIconColor: #BBBBBB;
     margin: 0 auto;
   }
 }
-
-#finderContainer p {
-  padding-top: 50px;
-}
-
 md-progress-circular {
-  margin: 0 auto;
+  margin: 0 auto 20px auto !important;
 }
 
 #pressButtonBridgeImg {
   width: 200px;
-  margin: 0 auto 0 auto;
+  margin: 0 auto 30px auto;
   display: inherit;
 }
 
@@ -440,9 +441,9 @@ md-toolbar {
 
 #vertDivider {
   position: absolute;
-  right: 40px;
+  right: 2.857em;
   top: 25%;
-  width: 1px;
+  width: 0.071em;
   height: 50%;
   background-color: white;
 }
diff --git a/app/templates/components/bridge-controls.hbs b/app/templates/components/bridge-controls.hbs
index 78be791..bb92c88 100644
--- a/app/templates/components/bridge-controls.hbs
+++ b/app/templates/components/bridge-controls.hbs
@@ -1,4 +1,4 @@
-{{#liquid-if lightsData}}
+{{#if ready}}
 
   {{#paper-nav-container class="ember-app"}}
 
@@ -19,16 +19,13 @@
         </div>
 
         {{#liquid-if lightsTabSelected class="tabSwitch"}}
-          {{controls/light-control apiURL=apiURL lightsData=lightsData activeLights=activeLights}}
+          {{controls/light-control apiURL=apiURL lightsData=lightsData activeLights=activeLights trial=trial}}
         {{/liquid-if}}
 
         {{#liquid-if musicTabSelected class="tabSwitch"}}
           {{controls/music-control apiURL=apiURL lightsData=lightsData  activeLights=activeLights}}
         {{/liquid-if}}
-
+        {{huegasm-footer}}
     {{/paper-content}}
-
   {{/paper-nav-container}}
-
-  {{huegasm-footer}}
-{{/liquid-if}}
\ No newline at end of file
+{{/if}}
\ No newline at end of file
diff --git a/app/templates/components/bridge-finder.hbs b/app/templates/components/bridge-finder.hbs
index 35dfb2c..788a6cf 100644
--- a/app/templates/components/bridge-finder.hbs
+++ b/app/templates/components/bridge-finder.hbs
@@ -24,7 +24,7 @@
 
         <span id="bridgeInput">
           {{paper-input label="Hue Bridge IP Address" value=manualBridgeIp}}
-          {{#paper-button action="findBridgeByIp" primary=true }}Find{{/paper-button}}
+          {{#paper-button action="findBridgeByIp" primary=true}}Find{{/paper-button}}
         </span>
       {{/if}}
     {{/if}}
diff --git a/app/templates/components/controls/light-control.hbs b/app/templates/components/controls/light-control.hbs
index 4960ec9..c5bcbe2 100644
--- a/app/templates/components/controls/light-control.hbs
+++ b/app/templates/components/controls/light-control.hbs
@@ -7,7 +7,7 @@
   {{#paper-item class="item"}}
     {{paper-icon icon="power-settings-new"}}
     <p>Lights</p>
-    {{#paper-switch checked=lightsOn}} {{lightsOnTxt}} {{/paper-switch}}
+    {{#paper-switch checked=lightsOn disabled=trial}} {{lightsOnTxt}} {{/paper-switch}}
   {{/paper-item}}
 
   {{#paper-item class="item"}}
@@ -19,9 +19,8 @@
   {{#paper-item class="item"}}
     {{paper-icon icon="flare"}}
     <p>Strobe</p>
-    {{#paper-switch checked=strobeOn}} {{strobeOnTxt}} {{/paper-switch}}
+    {{#paper-switch checked=strobeOn disabled=trial}} {{strobeOnTxt}} {{/paper-switch}}
   {{/paper-item}}
 
   {{modals/light-control-modal modalData=modalData apiURL=apiURL action="clickLight" isShowingLightsModal=isShowingLightsModal}}
-
 {{/paper-list}}
\ No newline at end of file
diff --git a/app/templates/components/huegasm-app.hbs b/app/templates/components/huegasm-app.hbs
index 3c8f1d3..9dd2193 100644
--- a/app/templates/components/huegasm-app.hbs
+++ b/app/templates/components/huegasm-app.hbs
@@ -2,6 +2,8 @@
   {{bridge-controls bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}}
 {{else}}
   {{bridge-finder bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}}
-  {{huegasm-footer}}
 {{/liquid-if}}
 
+{{#unless bridgeUsername}}
+  {{huegasm-footer}}
+{{/unless}}
diff --git a/app/templates/components/huegasm-footer.hbs b/app/templates/components/huegasm-footer.hbs
index 87e7c7c..c9a97f9 100644
--- a/app/templates/components/huegasm-footer.hbs
+++ b/app/templates/components/huegasm-footer.hbs
@@ -1,5 +1 @@
-<footer class="footer">
-    <div class="container">
-        <p class="text-muted">Made with ¯\_(ツ)_/¯ by <a href="//egorphilippov.me">egorphilippov.me</a> © 2015 Huegasm</p>
-    </div>
-</footer>
\ No newline at end of file
+<p class="text-muted">Made with ¯\_(ツ)_/¯ by <a href="//egorphilippov.me">egorphilippov.me</a> © 2015 Huegasm</p>
\ No newline at end of file
diff --git a/bower.json b/bower.json
index cb004ff..89694d1 100644
--- a/bower.json
+++ b/bower.json
@@ -16,5 +16,8 @@
     "loader.js": "ember-cli/loader.js#3.2.0",
     "nouislider": "^8.0.1",
     "qunit": "~1.18.0"
+  },
+  "resolutions": {
+    "ember": "~2.0.2"
   }
 }