SAK-32034 Ensure instruction only displayed if required. (sakaiprojec…

…t#4379)

* SAK-32034 Ensure instruction only displayed if required.
Also change text of second instruction.

* SAK-32034 Small modification to instruction text.

site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties

@@ -340,7 +340,7 @@ list.moreinfotooltip=More information on this site
 
 ## multiple tools vm
 multipleTools.custom = Customize tool instances
-multipleTools.custom1 = Add multiple tool instances or configure tool options. You can also make configuration adjustments later in the site using the configuration capabilities for each tool.
+multipleTools.custom1 = You can make configuration adjustments later using the configuration capabilities for each tool.
 multipleTools.email = Email Archive
 multipleTools.site = Site email address
 multipleTools.emailreq = Email address (required)

site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-modifyENW.vm

@@ -20,13 +20,16 @@
 
 	## customize lti tools
 	#if (!$!ltiTools.isEmpty())
-		<p class="instruction">
-			$tlang.getString("ltiTools.custom.instruction")
-		</p>
 		#foreach($ltiTool in $ltiTools.entrySet())
 			#set($ltiToolId=$ltiTool.getKey())
 			#if (!$!oldLtiTools.containsKey($ltiToolId))
-				## show the input only if the tool is not enabled in the site yet
+				## show the input only if the tool is not enabled in the site yet and display the heading only once
+				#if (!$!instruction)
+					#set($instruction=$tlang.getString("ltiTools.custom.instruction"))
+					<p class="instruction">
+						$instruction
+					</p>
+				#end
 				#set($ltiToolValues=$ltiTool.getValue())
 				#set($ltiToolFormInput=$ltiToolValues.get("formInput"))
 				<h4>