First round of fixes for the list of installed apps #138

PaulKinlan · Dec 30, 2011 · fb59acc · fb59acc
1 parent 123ea00
commit fb59acc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 RELEASE := $(shell cat ./src/release.js)
 DEBUG := $(shell cat ./src/debug.js)
 
-all: server/webintents/cache.manifest.src production
+all: server/webintents/static/cache.manifest production
 
 release: ./src/webintents.js ./src/json2.js ./src/base64.js
 	cat ./src/webintents.js ./src/json2.js ./src/base64.js | sed 's|// __WEBINTENTS_ROOT|$(RELEASE)|' > webintents.js
@@ -20,7 +20,7 @@ production: server/webintents/static/cache.manifest release
 server/webintents/static/webintents.js:
 
 # Manifest depends on changes to other files, so include them in the dependency chain
-server/webintents/static/cache.manifest: server/webintents/cache.manifest.src server/webintents/static/picker.html server/webintents/static/picker.js server/webintents/static/webintents.js server/webintents/static/intents.html server/webintents/static/json2.js server/webintents/static/webintents-server.js server/webintents/static/controller.js server/webintents/static/base64.js
+server/webintents/static/cache.manifest: server/webintents/cache.manifest.src server/webintents/static/list.html server/webintents/static/picker.html server/webintents/static/picker.js server/webintents/static/webintents.js server/webintents/static/intents.html server/webintents/static/json2.js server/webintents/static/webintents-server.js server/webintents/static/controller.js server/webintents/static/base64.js
 	cat server/webintents/cache.manifest.src > server/webintents/static/cache.manifest
 	echo '#' `date` >> server/webintents/static/cache.manifest
 

diff --git a/server/webintents/static/controller.js b/server/webintents/static/controller.js
@@ -44,7 +44,7 @@ var IntentController = new (function() {
   this.renderActions = function(actions, intent, root) {
     root = root || document.getElementById("actions");
     var action;
-    for(var i = 0; action = actions.actions[i]; i++) {
+    for(var i = 0; action = actions[i]; i++) {
       var actionElement = renderAction(action, intent);
       root.appendChild(actionElement); 
     } 

diff --git a/server/webintents/static/list.html b/server/webintents/static/list.html
@@ -1,8 +1,24 @@
 <!doctype html>
-<html>
+<html manifest="cache.manifest">
   <head>
-    <title>Installed Intents</title>
+    <title>Installed Applications</title>
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;" />
+    <style>
+     li {
+       clear:both;
+     }
+
+     li img {
+       width: 32px;
+       height: 32px;
+     }
+
+     li span {
+       display: block;
+       color: #888;
+       font-style: italic;
+     }
+    </style>
     <script src="/webintents-server.js"></script>
     <script src="/controller.js"></script>
     <script>