bugfix

Cumulocity-IoT · Feb 3, 2016 · 7ea0861 · 7ea0861
1 parent b994b3f
commit 7ea0861
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 10 deletions.
diff --git a/app/script/main.js b/app/script/main.js
@@ -260,14 +260,15 @@
  $('.staticInfo .medium .val').text(info.medium);
  }
 
+ var MO;
  function setupMain() {
  if (!setupMain.done) {
  drawCircle($('#gauge').width());
  setupMain.done = true;
  }
 
  getMainData().success(function (data) {
- var MO, mo;
+ var mo;
  if (MO) {
  mo = data.managedObjects.find(function (x) {
  return x.id === MO.id;
@@ -278,6 +279,7 @@
  drawMainData(mo || {});
  deviceSelector.off('change');
  deviceSelector.data('selectBox-selectBoxIt').refresh();
+ deviceSelector.data('selectBox-selectBoxIt').remove();
  data.managedObjects.forEach(function (mo, idx) {
  deviceSelector.data('selectBox-selectBoxIt')
  .add({value: idx, text: mo.name});

diff --git a/build/index.html b/build/index.html
@@ -16,8 +16,9 @@
 
  <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,400,700">
  <link rel="stylesheet" href="style/main.css">
+ <link rel="stylesheet" href="//cdn.jsdelivr.net/selectboxit/3.6.0/stylesheets/jquery.selectBoxIt.css">
  </head>
- <body>
+ <body class="proteus">
 
  <div class="container">
 
@@ -39,7 +40,7 @@ <h1 class="logo_title"><img alt="Proteus" src="img/logo.svg" class="logo_img"></
  <input type="checkbox" name="remember" style="width:auto;display:inline-block;"> Login merken
  </label>
  <button class="submit btn">Einloggen</button>
-  </form>
+ </form>
  </div>
 
  <div class="changePassword screen">
@@ -133,7 +134,8 @@ <h2 class="beige bold title">Letztes update</h2>
  <div class="row staticInfo">
  <div class="info serialNr">
  <h3 class="title beige bold">Gerätenr.</h3>
- <span class="thin val"></span>
+ <select id="device-selector">
+ </select>
  </div>
  <div class="info vol">
  <h3 class="title beige bold">Max volumen</h3>
@@ -186,6 +188,7 @@ <h2 class="title beige center">Füllstand</h2>
 
  </div>
 
+ <script src="//cdn.jsdelivr.net/g/jquery@2.1.4,jquery.ui@1.9.2,selectboxit@3.6.0"></script>
  <script src="script/main.js"></script>
 <script>
  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -198,4 +201,4 @@ <h2 class="title beige center">Füllstand</h2>
 
 </script>
  </body>
-</html>
+</html>
diff --git a/build/script/main.js b/build/script/main.js
diff --git a/build/style/main.css b/build/style/main.css
@@ -348,4 +348,41 @@ body, html {
  -webkit-transform: scale(1.0);
  }
 }
-/*spinner end*/
+/*spinner end*/
+
+.proteus .selectboxit-container {
+ width: 80%;
+}
+
+.proteus .selectboxit-container .selectboxit, .proteus .selectboxit-container .selectboxit-options {
+ width: 100%;
+}
+
+.proteus .selectboxit-text {
+ width: 100%;
+}
+
+.proteus .selectboxit-container > .selectboxit {
+ background-color: transparent;
+ background-image: none;
+ border: 1px solid #A5A19B;
+ border-radius: 0;
+}
+
+.proteus .selectboxit-container span {
+ font: 14px Lato;
+ height: 22px;
+ line-height: 22px;
+}
+
+.proteus .selectboxit-container > .selectboxit-options a {
+ font: 14px Lato;
+ height: 22px;
+ line-height: 22px;
+}
+
+.proteus .selectboxit-container > .selectboxit-options {
+ background-color: #F0E8DE;
+ border: 1px solid #A5A19B;
+ border-radius: 0;
+}