Index: site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java =================================================================== --- site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java (revision 121193) +++ site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java (working copy) @@ -2790,6 +2790,7 @@ context.put("check_home", state .getAttribute(STATE_TOOL_HOME_SELECTED)); context.put("importSupportedTools", importTools()); + context.put("hideImportedContent", ServerConfigurationService.getBoolean("content.import.hidden", false)); if(ServerConfigurationService.getBoolean("site-manage.importoption.siteinfo", false)){ try{ Index: site-manage-tool/tool/src/bundle/sitesetupgeneric.properties =================================================================== --- site-manage-tool/tool/src/bundle/sitesetupgeneric.properties (revision 121193) +++ site-manage-tool/tool/src/bundle/sitesetupgeneric.properties (working copy) @@ -598,6 +598,8 @@ sitinfimp.reuse.user = Import User from Other Sites sitinfimp.youcan.user1 = You can choose to import user(s) only from other sitinfimp.youcan.user2 = sites that you own. You can combine users from more than one site. +sitinfimp.material.hidden.warn = Content imported from the Resources tool will be marked as hidden (indicated by grey text), meaning it will not be visible to site participants who do not have permission to access hidden content.
By default, 'guest' and 'student' roles cannot view items marked as hidden, although a site administrator can modify this default setting. +sitinfimp.material.visible.warn = Content imported from the Resources tool will be visible by default, meaning it will be accessible to site participants like 'guest' and 'student' roles, although a site administrator can modify this setting. size.bytes = {0} bytes size.gb = {0} GB Index: site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-importSites.vm =================================================================== --- site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-importSites.vm (revision 121193) +++ site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-importSites.vm (working copy) @@ -1,5 +1,32 @@ ##
+ ## SAK-23305 + #set($materialFound = false) + #foreach($toolId in $selectedTools) + #if ($importSupportedTools.contains($toolId)) + #foreach ($site in $importSites.keys()) + #set($allPages = $site.getPages()) + #foreach ($page in $allPages) + #set($pageTools = $page.getTools()) + #foreach ($pageTool in $pageTools) + #if (($pageTool.getTool().getId() == $toolId) && ("sakai.resources" == $toolId)) + #set($materialFound = true) + #end + #end + #end + #end + #end + #end + #if ($materialFound) +
+ #if ($hideImportedContent) + $tlang.getString("sitinfimp.material.hidden.warn") + #else + $tlang.getString("sitinfimp.material.visible.warn") + #end +
+
+ #end

$tlang.getString("import.reuse")