Index: site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-modifyENW.vm =================================================================== --- site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-modifyENW.vm (revision 82351) +++ site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-modifyENW.vm (working copy) @@ -107,7 +107,7 @@ - $tlang.getString("multipleTools.title.suggest") + $tlang.getString("multipleTools.title.suggest")
#set($attributeHashtable=false) #set($attributeHashtable=$!multipleToolConfiguration.get($toolId)) @@ -117,7 +117,7 @@ - + #end #end Index: site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-editFeatures.vm =================================================================== --- site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-editFeatures.vm (revision 82351) +++ site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-editFeatures.vm (working copy) @@ -99,7 +99,7 @@ #if ($!multipleToolIdTitleMap.containsKey($toolId)) #set($properties = $!multipleToolConfiguration.get($toolId)) (#foreach ($property in $!properties.keySet()) - $property = $validator.escapeHtml($properties.get($property)) + $property = $validator.escapeHtmlFormattedText($properties.get($property)) #end) #end Index: site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-addRemoveFeatureConfirm.vm =================================================================== --- site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-addRemoveFeatureConfirm.vm (revision 82351) +++ site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-addRemoveFeatureConfirm.vm (working copy) @@ -86,13 +86,13 @@ $!newToolTitle: $!emailId@$serverName #elseif ($!multipleToolIdTitleMap.containsKey($newTool)) ## show tool title - $validator.escapeHtml($!multipleToolIdTitleMap.get($newTool)) + $validator.escapeHtmlFormattedText($!multipleToolIdTitleMap.get($newTool)) ## show tool configuration #if ($!multipleToolIdTitleMap.containsKey($toolId)) #set($properties = $!multipleToolConfiguration.get($toolId)) ( #foreach ($property in $!properties.keySet()) - $property : $validator.escapeHtml($properties.get($property)) + $property : $validator.escapeHtmlFormattedText($properties.get($property)) #end ) #end 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 82351) +++ site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java (working copy) @@ -658,7 +658,7 @@ // First: get the tool ids from configuration files // initially by "wsetup.home.toolids" + site type, and if missing, use "wsetup.home.toolids" if (ServerConfigurationService.getStrings("wsetup.home.toolids." + siteType) != null) { - rv = new ArrayList(Arrays.asList(ServerConfigurationService.getStrings("wsetup.home.toolids.") + siteType)); + rv = new ArrayList(Arrays.asList(ServerConfigurationService.getStrings("wsetup.home.toolids." + siteType))); } else if (ServerConfigurationService.getStrings("wsetup.home.toolids") != null) { rv = new ArrayList(Arrays.asList(ServerConfigurationService.getStrings("wsetup.home.toolids"))); } @@ -1442,6 +1442,7 @@ String siteType = (String) state.getAttribute(STATE_SITE_TYPE); context.put("type", siteType); context.put("siteTitleEditable", Boolean.valueOf(siteTitleEditable(state, siteType))); + context.put("titleMaxLength", state.getAttribute(STATE_SITE_TITLE_MAX)); if (siteType.equalsIgnoreCase((String) state.getAttribute(STATE_COURSE_SITE_TYPE))) { context.put("isCourseSite", Boolean.TRUE); @@ -8235,6 +8236,11 @@ for (String homeToolId: homeToolIds) { + if(nonSynopticToolIndex == 2){ + synopticToolIndex++; + nonSynopticToolIndex = 0; + } + if (!SYNOPTIC_TOOL_ID_MAP.containsKey(homeToolId)) { if (!pageHasToolId(toolList, homeToolId)) @@ -8246,7 +8252,7 @@ ToolConfiguration tool = page.addTool(); tool.setTool(homeToolId, reg); tool.setTitle(reg.getTitle() != null?reg.getTitle():""); - tool.setLayoutHints("0," + nonSynopticToolIndex++); + tool.setLayoutHints(synopticToolIndex + "," + nonSynopticToolIndex++); } } } @@ -8279,7 +8285,7 @@ { // use value from map to find an internationalized tool title String toolTitleText = rb.getString(SYNOPTIC_TOOL_TITLE_MAP.get(homeToolId)); - addSynopticTool(page, homeToolId, toolTitleText, synopticToolIndex++ + ",1"); + addSynopticTool(page, homeToolId, toolTitleText, synopticToolIndex + "," + nonSynopticToolIndex++); } catch (Exception e) { M_log.warn(this + ".saveFeatures addSynotpicTool: " + e.getMessage() + " site id = " + site.getId() + " tool = " + homeToolId, e); } @@ -9687,7 +9693,7 @@ else if (isMultipleInstancesAllowed(findOriginalToolId(state, id)) && (idSelected != null && !idSelected.contains(id) || idSelected == null)) { // newly added mutliple instances - String title = StringUtil.trimToNull(Validator.escapeHtml(params.getString("title_" + id))); + String title = StringUtil.trimToNull(Validator.escapeHtmlFormattedText(params.getString("title_" + id))); if (title != null) { // save the titles entered