webish: more verifierid-to-uri transition

diff --git a/src/allmydata/web/directory.xhtml b/src/allmydata/web/directory.xhtml
index 38a09c9c74f2405c150df90101de52befa8af249..a290d1fe8a0493fc92abd16fe7c87a669e500136 100644 (file)
--- a/src/allmydata/web/directory.xhtml
+++ b/src/allmydata/web/directory.xhtml
@@ -17,13 +17,13 @@
   <tr n:pattern="header">
     <td>Filename</td>
     <td>Type</td>
-    <td>fileid</td>
+    <td>URI</td>
     <td></td>
   </tr>
   <tr n:pattern="item" n:render="row">
     <td><n:slot name="filename"/></td>
     <td><n:slot name="type"/></td>
-    <td><n:slot name="fileid"/></td>
+    <td><n:slot name="uri"/></td>
     <td><n:slot name="delete"/></td>
   </tr>
 

diff --git a/src/allmydata/webish.py b/src/allmydata/webish.py
index 70c1c737264aa7986027a627ee47f1b5bbc007f4..d0569c9cef51224b1fdb0100cdef62ae9f37d51e 100644 (file)
--- a/src/allmydata/webish.py
+++ b/src/allmydata/webish.py
@@ -121,7 +121,7 @@ class Directory(rend.Page):
             dl_uri_url = url.root.child("download_uri").child(uri)
             # add a filename= query argument to give it a Content-Type
             dl_uri_url = dl_uri_url.add("filename", name)
-            ctx.fillSlots("fileid", T.a(href=dl_uri_url)[html.escape(uri)])
+            ctx.fillSlots("uri", T.a(href=dl_uri_url)[html.escape(uri)])
 
             # this creates a button which will cause our child__delete method
             # to be invoked, which deletes the file and then redirects the
@@ -139,7 +139,7 @@ class Directory(rend.Page):
             ctx.fillSlots("filename",
                           T.a(href=subdir_url)[html.escape(name)])
             ctx.fillSlots("type", "DIR")
-            ctx.fillSlots("fileid", "-")
+            ctx.fillSlots("uri", "-")
             ctx.fillSlots("delete", "-")
         return ctx.tag