launchpad-reviewers team mailing list archive

[Colin Watson <mp+437360@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:zcml-namespaces-favicon into launchpad:master.

Commit message:
Move ZCML favicon directive to lp namespace

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/437360

As with commit 57196c1d6a220f00039e027768cc05368135f556, it makes sense to move our local `favicon` directive to our own namespace rather than poking it into the Zope browser namespace.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:zcml-namespaces-favicon into launchpad:master.

diff --git a/lib/lp/services/webapp/configure.zcml b/lib/lp/services/webapp/configure.zcml
index c47c31b..ad25c53 100644
--- a/lib/lp/services/webapp/configure.zcml
+++ b/lib/lp/services/webapp/configure.zcml
@@ -172,7 +172,7 @@
         />
 
     <!-- Default favicon -->
-    <browser:favicon for="*" file="../../../canonical/launchpad/images/favicon.ico" />
+    <lp:favicon for="*" file="../../../canonical/launchpad/images/favicon.ico" />
 
     <!-- LaunchBag Utility -->
     <utility
diff --git a/lib/lp/services/webapp/meta.zcml b/lib/lp/services/webapp/meta.zcml
index c307612..80bef75 100644
--- a/lib/lp/services/webapp/meta.zcml
+++ b/lib/lp/services/webapp/meta.zcml
@@ -47,7 +47,7 @@
       />
 
   <directive
-      namespace="http://namespaces.zope.org/browser";
+      namespace="http://namespaces.canonical.com/lp";
       name="favicon"
       schema="lp.services.webapp.metazcml.IFaviconDirective"
       handler="lp.services.webapp.metazcml.favicon"