repo: janusweb
action: commit
revision: 
path_from: 
revision_from: f6007ff9ea9a8eccdee497ef948453d45a0d1407:
path_to: 
revision_to: 

commit f6007ff9ea9a8eccdee497ef948453d45a0d1407
Author: James Baicoianu 
Date:   Sat Apr 7 02:34:19 2018 -0700

    Navigation UI improvements

diff --git a/media/assets/webui/apps/navigation/navigation.css b/media/assets/webui/apps/navigation/navigation.css

--- a/media/assets/webui/apps/navigation/navigation.css
+++ b/media/assets/webui/apps/navigation/navigation.css
@@ -121,3 +121,27 @@ janus-ui-statusindicator>ui-tooltip ul {
   font-size: .8em;
   margin-left: 1em;
 }
+janus-ui-urlbar-suggestions {
+  display: block;
+  background: #333;
+  border: 1px solid black;
+  width: 50em;
+  max-width: 100%;
+}
+janus-ui-urlbar-suggestions h2 {
+  padding: 0 .2em;
+  font-size: 1em;
+}
+janus-ui-urlbar-suggestions ui-list{
+  max-height: 20em;
+  overflow-x: hidden;
+}
+janus-ui-urlbar-suggestions ui-item a {
+  display: flex;
+}
+janus-ui-urlbar-suggestions ui-item img.suggestedroom_thumb {
+  flex: 0;
+  order: -1;
+  width: 60px;
+  height: 60px;
+}
diff --git a/media/assets/webui/apps/navigation/navigation.js b/media/assets/webui/apps/navigation/navigation.js

--- a/media/assets/webui/apps/navigation/navigation.js
+++ b/media/assets/webui/apps/navigation/navigation.js
@@ -339,7 +339,9 @@ elation.elements.define('janus.ui.urlbar', class extends elation.elements.ui.pan
 });
 elation.elements.define('janus.ui.urlbar.suggestions', class extends elation.elements.ui.panel {
   create() {
-    this.popular = elation.elements.create('collection.jsonapi', {
+    this.suggestions = elation.elements.create('collection.jsonapi', {
+      id: 'suggested_popular',
+      append: this,
       host: "https://api.janusvr.com",
       endpoint: "/getPopularRooms",
       itempath: "data",
@@ -349,15 +351,23 @@ elation.elements.define('janus.ui.urlbar.suggestions', class extends elation.ele
         urlContains: ''
       }
     });
-    this.poplist = elation.elements.create('ui.list', {
-      collection: this.popular,
+    this.panel = elation.elements.create('div', {
+      append: this
+    });
+/*
+    this.list = elation.elements.create('ui.list', {
+      collection: this.suggestions,
       append: this,
-      itemtemplate: 'janus.ui.popular.room'
+      itemtemplate: 'janus.ui.navigation.suggestion.room'
     });
+*/
   }
   update(search) {
-    this.popular.apiargs.urlContains = search;
-    this.popular.load();
-console.log(this.popular.items);
+    this.suggestions.apiargs.urlContains = search;
+    this.suggestions.load();
+    var tplvars = {
+      popular: this.suggestions.items
+    };
+    this.panel.innerHTML = elation.template.get('janus.ui.navigation.suggestions', tplvars);
   }
 })
diff --git a/media/assets/webui/apps/navigation/navigation.json b/media/assets/webui/apps/navigation/navigation.json

--- a/media/assets/webui/apps/navigation/navigation.json
+++ b/media/assets/webui/apps/navigation/navigation.json
@@ -1,6 +1,8 @@
 {
   "templates": {
-    "janus.ui.navigation": "./navigation.html"
+    "janus.ui.navigation": "./navigation.html",
+    "janus.ui.navigation.suggestions": "./suggestions.html",
+    "janus.ui.navigation.suggestion.room": "./suggestion-room.html"
   },
   "scripts":  ["./navigation.js"],
   "css":      ["./navigation.css"]
diff --git a/media/assets/webui/apps/popular/popular.css b/media/assets/webui/apps/popular/popular.css

--- a/media/assets/webui/apps/popular/popular.css
+++ b/media/assets/webui/apps/popular/popular.css
@@ -37,4 +37,5 @@
   text-overflow: ellipsis;
   overflow: hidden;
   padding: 0 .2em;
+  margin: 0;
 }

-----END OF PAGE-----