[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services/registration - __init__.py:1.13.6.1 changeregistrations.pt:1.3.22.1 namecomponentregistry.pt:1.7.22.1

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/app/browser/services/registration
In directory cvs.zope.org:/tmp/cvs-serv1563/src/zope/app/browser/services/registration

Modified Files:
      Tag: zope3-fdrake-globalized-modules-branch
	__init__.py changeregistrations.pt namecomponentregistry.pt 
Log Message:
Checkpointing the current state of the module globalization work on a branch
so it does not get lost.  See http://dev.zope.org/Zope3/ModulesAreGlobal.


=== Zope3/src/zope/app/browser/services/registration/__init__.py 1.13 => 1.13.6.1 ===
--- Zope3/src/zope/app/browser/services/registration/__init__.py:1.13	Thu Dec 18 01:09:43 2003
+++ Zope3/src/zope/app/browser/services/registration/__init__.py	Thu Jan 15 15:50:20 2004
@@ -200,6 +200,11 @@
             reg = info['registration']
             if reg is not None:
                 info['summary'] = reg.implementationSummary()
+                id = info["id"]
+                if id[:1] == '/':
+                    info['path'] = id
+                else:
+                    info['path'] = '%s/%s' % (self.configBase, id)
             else:
                 info['summary'] = ""
                 info['id'] = 'disable'


=== Zope3/src/zope/app/browser/services/registration/changeregistrations.pt 1.3 => 1.3.22.1 ===
--- Zope3/src/zope/app/browser/services/registration/changeregistrations.pt:1.3	Thu Aug  7 16:27:33 2003
+++ Zope3/src/zope/app/browser/services/registration/changeregistrations.pt	Thu Jan 15 15:50:20 2004
@@ -13,7 +13,7 @@
              />
      </td>
      <td tal:condition="python: registration['id'] != 'disable'"><a href="."
-            tal:attributes="href string:${view/configBase}/${registration/id}"
+            tal:attributes="href string:${registration/path}/registration.html"
             tal:content="registration/id"
          >foo/bar</a></td>
      <td tal:condition="python: registration['id'] == 'disable'"


=== Zope3/src/zope/app/browser/services/registration/namecomponentregistry.pt 1.7 => 1.7.22.1 ===
--- Zope3/src/zope/app/browser/services/registration/namecomponentregistry.pt:1.7	Thu Aug  7 15:50:30 2003
+++ Zope3/src/zope/app/browser/services/registration/namecomponentregistry.pt	Thu Jan 15 15:50:20 2004
@@ -13,21 +13,21 @@
       </div>
 
       <div tal:condition="registries">
-  
+
         <div metal:define-slot="extra_top" tal:condition="nothing">
-  
+
           <p>For each fruit, the fruit name is given and all of the components
              registered to provide the fruit are shown.  You may select the
              component to provide the fruit or disable the fruit.
           </p>
-  
+
           <p>Select a fruit name or a component name to visit the fruit or
             component.</p>
-  
+
         </div>
-  
+
           <form action="." method="post" tal:attributes="action request/URL">
-  
+
             <div tal:repeat="registry registries">
               <a href="#"
                  tal:content="registry/name"
@@ -38,14 +38,14 @@
               <br />
               <span tal:content="structure registry/view" />
             </div>
-  
-            <input type="submit" name="submit_update" value="Update" 
+
+            <input type="submit" name="submit_update" value="Update"
                    i18n:attributes="value update-button"/><br />
-  
+
         </form>
-  
+
         <div metal:define-slot="extra_bottom" tal:condition="nothing" />
-  
+
       </div>
     </div>
   </div>