fix up templates for latest ss and display logic versions

templates/CheckboxSetField.ss

@@ -0,0 +1,12 @@
+<ul id="$ID" $AttributesHTML class="$extraClass" <% if $DisplayLogic || $DisplayLogicMasters %>name="$Name" data-display-logic-masters="$DisplayLogicMasters" data-display-logic-eval="$DisplayLogic"<% end_if %>>
+	<% if $Options.Count %>
+		<% loop $Options %>
+			<li class="$Class">
+				<input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value"<% if $isChecked %> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
+				<label for="$ID">$Title</label>
+			</li>
+		<% end_loop %>
+	<% else %>
+		<li>No options available</li>
+	<% end_if %>
+</ul>

templates/OptionsetField_holder.ss

@@ -1,4 +1,4 @@
-<div id="$Name" class="field<% if $extraClass %> $extraClass<% end_if %>" $AttributesHTML>
+<div id="$HolderID" class="field<% if $extraClass %> $extraClass<% end_if %>" $AttributesHTML>
 	<% if $Title %><label class="left">$Title</label><% end_if %>
 	<div class="middleColumn">
 		$Field