JavaScriptSolidServer
diff --git a/‎lib/icons/noun_145978.svg‎
Lines changed: 0 additions & 1 deletion b/‎lib/icons/noun_145978.svg‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎lib/icons/noun_289243.svg‎
Lines changed: 0 additions & 1 deletion b/‎lib/icons/noun_289243.svg‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎lib/icons/noun_534313.svg‎
Lines changed: 0 additions & 1 deletion b/‎lib/icons/noun_534313.svg‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/acl-control.js‎
Lines changed: 1 addition & 1 deletion b/‎src/acl-control.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/signin.js‎
Lines changed: 21 additions & 6 deletions b/‎src/signin.js‎
Lines changed: 21 additions & 6 deletions
diff --git a/‎src/tabs.js‎
Lines changed: 1 addition & 1 deletion b/‎src/tabs.js‎
Lines changed: 1 addition & 1 deletion
@@ -239,7 +239,7 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {
           }
         }
         var tr = middleTable.appendChild(
-          UI.widgets.personTR(dom, $rdf.sym(pred), $rdf.sym(obj), opt))
+          UI.widgets.personTR(dom, ACL(pred), $rdf.sym(obj), opt))
         tr.predObj = [pred.uri, obj.uri]
 
       }
 
@@ -233,15 +233,22 @@ UI.widgets.ensureTypeIndexes = function(context) {
 // Returns promise of context with arrays of symbols
 //   context.instances
 //   context.containers
+// 2016-12-11 change to inclde forClass arc a la
+//  https://github.com/solid/solid/blob/master/proposals/data-discovery.md
 //
 UI.widgets.findAppInstances = function(context, klass) {
     return new Promise(function(resolve, reject){
         var kb = UI.store, ns = UI.ns, me = context.me, fetcher = UI.store.fetcher;
         UI.widgets.loadTypeIndexes(context)
         .then(function(indexes){
             var ix = context.index.private.concat(context.index.public);
-            var instances = kb.each(klass, ns.solid('instance'));
-            var containers = kb.each(klass, ns.solid('instanceContainer'));
+            var registrations = kb.each(undefined, ns.solid('forClass'), klass)
+            var instances = []
+            var containers = []
+            for (var r=0; r < registrations.length; r++) {
+              instances = instances.concat(kb.each(klass, ns.solid('instance')))
+              containers = containers.concat(kb.each(klass, ns.solid('instanceContainer')))
+            }
             if (containers.length) {
                 fetcher.load(containers).then(function(xhrs){
                     for (var i=0; i<containers.length; i++) {
@@ -276,18 +283,26 @@ UI.widgets.registrationControl = function(context, instance, klass) {
                 var tbody = box.children[0].children[0];
                 var form = kb.bnode();// @@ say for now
 
+                var registrationStatements = function(index){
+                  var registrations = kb.each(undefined, ns.solid('instance'), instance)
+                    .filter(function(r){return kb.holds(r, ns.solid('forClass'), klass)})
+                  var reg = registrations.length ? registrations[0] : UI.widgets.newThing(index)
+                  return [ $rdf.st(reg, ns.solid('instance'), instance, index),
+                          $rdf.st(reg, ns.solid('forClass'), klass, index),];
+                }
+
                 if (context.index.public && context.index.public.length >0) {
                     var index = context.index.public[0];
-                    var statement = $rdf.st(klass, ns.solid('instance'), instance, index);
+                    var statements = registrationStatements(index)
                     tbody.children[0].appendChild(UI.widgets.buildCheckboxForm(
-                        context.dom, UI.store, "Public link to this " + context.noun, null, statement, form, index));
+                        context.dom, UI.store, "Public link to this " + context.noun, null, statements, form, index));
                 }
 
                 if (context.index.private && context.index.private.length >0) {
                     var index = context.index.private[0];
-                    var statement = $rdf.st(klass, ns.solid('instance'), instance, index);
+                    var statements = registrationStatements(index)
                     tbody.children[1].appendChild(UI.widgets.buildCheckboxForm(
-                        context.dom, UI.store, "Personal note of this " + context.noun, null, statement, form, index));
+                        context.dom, UI.store, "Personal note of this " + context.noun, null, statements, form, index));
                 }
 
                 // UI.widgets.buildCheckboxForm(dom, kb, lab, del, ins, form, store)
 
@@ -141,7 +141,7 @@ UI.tabs.tabWidget = function(options){
       } else {
         if (bodyDiv.asSetttings !== false){
           bodyDiv.innerHTML = 'loading item ...' + item
-          options.showMain(bodyDiv, ele.subject)
+          options.renderMain(bodyDiv, ele.subject)
           bodyDiv.asSetttings = false
         }
       }
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {`
`239`	`239`	`}`
`240`	`240`	`}`
`241`	`241`	`var tr = middleTable.appendChild(`
`242`		`- UI.widgets.personTR(dom, $rdf.sym(pred), $rdf.sym(obj), opt))`
	`242`	`+ UI.widgets.personTR(dom, ACL(pred), $rdf.sym(obj), opt))`
`243`	`243`	`tr.predObj = [pred.uri, obj.uri]`
`244`	`244`
`245`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ UI.tabs.tabWidget = function(options){`
`141`	`141`	`} else {`
`142`	`142`	`if (bodyDiv.asSetttings !== false){`
`143`	`143`	`bodyDiv.innerHTML = 'loading item ...' + item`
`144`		`- options.showMain(bodyDiv, ele.subject)`
	`144`	`+ options.renderMain(bodyDiv, ele.subject)`
`145`	`145`	`bodyDiv.asSetttings = false`
`146`	`146`	`}`
`147`	`147`	`}`