resolve conflicts

src/rapido/plone/app.py

@@ -6,7 +6,6 @@
 from zope.component import queryUtility
 from zope.interface import implements
 from zope.pagetemplate.pagetemplate import PageTemplate
-from zExceptions import NotFound
 
 from rapido.core import exceptions
 from rapido.core.app import Context
@@ -94,11 +93,16 @@ def get_block(self, block_id, ftype='yaml'):
             else:
                 raise KeyError('%s.%s' % (block_id, ftype))
 
-    def get_resource_directory(self):
+    def get_resource_directory(self, name=None):
         directory = get_theme_directory()
-        try:
+        if not directory.isDirectory('rapido'):
+            raise exceptions.NotFound(self.id)
+        if directory['rapido'].isDirectory(self.id):
             return directory['rapido'][self.id]
-        except NotFound:
+        elif directory['rapido'].isFile(self.id + '.lnk'):
+            directory_name = directory['rapido'].readFile(self.id + '.lnk')
+            return self.get_resource_directory(name=directory_name)
+        else:
             raise exceptions.NotFound(self.id)
 
     def get_resource(self, path):
@@ -155,6 +159,6 @@ def get_app(app_id, request, content=None):
     return IRapidoApplication(app)
 
 
-def get_theme_directory():
-    theme = getCurrentTheme()
-    return queryResourceDirectory(THEME_RESOURCE_NAME, theme)
+def get_theme_directory(name=None):
+    return queryResourceDirectory(
+        THEME_RESOURCE_NAME, name or getCurrentTheme())

src/rapido/plone/handlers.py

@@ -47,7 +47,7 @@ def process_yaml(path, yaml_content):
         path = path.rpartition('.')[0]
         view = get_block_view(path, with_theme)
         provideAdapter(view, (Interface, IBrowserRequest),
-            Interface, name=id)
+                       Interface, name=id)
 
     if HAS_MOSAIC and 'tile' in yaml_settings:
         id = path[-1].rpartition('.')[0]