Moved all location related queries into CMS_API, instead of CMS_SETUP.

Note that CMS_SETUP provides locations set by default or from configuration file.
Now theme related resources can be found under site/modules/$mod_name/... or site/themes/$theme/modules/...
  so only theme related resources can be overriden for now.
This commit is contained in:
2015-06-24 17:15:05 +02:00
parent fa5efede2c
commit 2886c90782
14 changed files with 231 additions and 225 deletions

View File

@@ -152,39 +152,6 @@ feature -- API
Result := api.formats
end
feature -- Module
module_resource_path (a_module: CMS_MODULE; a_resource: PATH): detachable PATH
-- Resource path of `a_resource' for module `a_module', if resource exists.
local
rp: PATH
ut: FILE_UTILITIES
do
-- Check first in selected theme folder.
rp := module_assets_theme_location (a_module)
Result := rp.extended_path (a_resource)
if not ut.file_path_exists (Result) then
-- And if not found, look into site/modules/$a_module.name/.... folders.
rp := module_assets_location (a_module)
Result := rp.extended_path (a_resource)
if not ut.file_path_exists (Result) then
Result := Void
end
end
end
module_assets_location (a_module: CMS_MODULE): PATH
-- Location for the assets associated with `a_module'.
do
Result := setup.environment.path.extended ("modules").extended (a_module.name)
end
module_assets_theme_location (a_module: CMS_MODULE): PATH
-- Location for the assets associated with `a_module'.
do
Result := setup.theme_location.extended ("modules").extended (a_module.name)
end
feature -- URL utilities
is_front: BOOLEAN