[silva.core.contentlayout][Sylvain Viollon] API update fixes.

author:    Sylvain Viollon
date:      Tue Aug 27 18:23:50 2013 +0200
revision:  352:16027da52ae9 in silva.core.contentlayout
branch:    2.4
details:   https://hg.infrae.com/silva.core.contentlayout?cmd=changeset;node=16027da52ae9
modified:  src/silva/core/contentlayout/blocks/manager.py src/silva/core/contentlayout/blocks/source.py
added:     
removed:   
log:       API update fixes.


diffstat:

 src/silva/core/contentlayout/blocks/manager.py |  5 ++---
 src/silva/core/contentlayout/blocks/source.py  |  4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 9e50d62d4b96 -r 16027da52ae9 src/silva/core/contentlayout/blocks/manager.py
--- a/src/silva/core/contentlayout/blocks/manager.py	Mon Aug 26 18:12:02 2013 +0200
+++ b/src/silva/core/contentlayout/blocks/manager.py	Tue Aug 27 18:23:50 2013 +0200
@@ -35,13 +35,12 @@
         self.block = block
 
     def get_icon(self, view):
-        icon = None
         try:
-            icon = icon_registry.get_icon_by_identifier(
+            icon = icon_registry.get(
                 ('silva.core.contentlayout.blocks', self.identifier))
         except ValueError:
             return None
-        return '/'.join((view.root_url, icon))
+        return icon.get_url(view, self.block)
 
     def is_available(self, view):
         comply, require = verify_context(self.block, view.context)
diff -r 9e50d62d4b96 -r 16027da52ae9 src/silva/core/contentlayout/blocks/source.py
--- a/src/silva/core/contentlayout/blocks/source.py	Mon Aug 26 18:12:02 2013 +0200
+++ b/src/silva/core/contentlayout/blocks/source.py	Tue Aug 27 18:23:50 2013 +0200
@@ -57,11 +57,11 @@
             url = getMultiAdapter((icon, view.request), IContentURL)
             return str(url)
         try:
-            icon = icon_registry.get_icon_by_identifier(
+            icon = icon_registry.get(
                 ('silva.core.contentlayout.blocks', self.prefix))
         except ValueError:
             return None
-        return '/'.join((view.root_url, icon))
+        return icon.get_url(view, self.source)
 
     def is_available(self, view):
         found_source = getattr(view.context, self.source.getId(), None)