Fixed #4055 can't add/delete Addon Template

Till Brehm · Till Brehm · commit cfc847557cbb · 2016-07-28T16:29:04.000+02:00
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
@@ -149,7 +149,7 @@ function onShowEnd() {
 				if (trim($item['client_template_id']) != ''){
 					if ($text != '') $text .= '';
 					$text .= '<li rel="' . $item['assigned_template_id'] . '">' . $tpl[$item['client_template_id']];
-					$text .= '<a href="#" class="button icons16 icoDelete"></a>';
+					$text .= '&nbsp;<a href="#" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></a>';
 					$tmp = new stdClass();
 					$tmp->id = $item['assigned_template_id'];
 					$tmp->data = '';
@@ -173,7 +173,7 @@ function onShowEnd() {
 			foreach($tplAdd as $item){
 				if (trim($item) != ''){
 					if ($text != '') $text .= '';
-					$text .= '<li>' . $tpl[$item]. '<a href="#" class="button icons16 icoDelete"></a></li>';
+					$text .= '<li>' . $tpl[$item]. '&nbsp;<a href="#" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></a></li>';
 				}
 			}
 		}
diff --git a/interface/web/client/reseller_edit.php b/interface/web/client/reseller_edit.php
@@ -143,7 +143,7 @@ function onShowEnd() {
 				if (trim($item['client_template_id']) != ''){
 					if ($text != '') $text .= '';
 					$text .= '<li rel="' . $item['assigned_template_id'] . '">' . $tpl[$item['client_template_id']];
-					$text .= '<a href="#" class="button icons16 icoDelete"></a>';
+					$text .= '&nbsp;<a href="#" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></a>';
 					$tmp = new stdClass();
 					$tmp->id = $item['assigned_template_id'];
 					$tmp->data = '';
@@ -167,7 +167,7 @@ function onShowEnd() {
 			foreach($tplAdd as $item){
 				if (trim($item) != ''){
 					if ($text != '') $text .= '';
-					$text .= '<li>' . $tpl[$item]. '<a href="#" class="button icons16 icoDelete"></a></li>';
+					$text .= '<li>' . $tpl[$item]. '&nbsp;<a href="#" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></a></li>';
 				}
 			}
 		}
diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -502,12 +502,12 @@ var ISPConfig = {
 		if(addTplId > 0) {
 			var newVal = tpl_add.split('/');
 			ISPConfig.new_tpl_add_id += 1;
-			var delbtn = $('<a href="#"></a>').attr('class', 'button icons16 icoDelete').click(function(e) {
+			var delbtn = $('&nbsp;<a href="#"><span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></span></a>').attr('class', 'btn btn-danger btn-xs').click(function(e) {
 				e.preventDefault();
 				ISPConfig.delAdditionalTemplate($(this).parent().attr('rel'));
 			});
 			newVal[newVal.length] = 'n' + ISPConfig.new_tpl_add_id + ':' + addTplId;
-			$('<li>' + addTplText + '</li>').attr('rel', 'n' + new_tpl_add_id).append(delbtn).appendTo('#template_additional_list ul');
+			$('<li>' + addTplText + '</li>').attr('rel', 'n' + ISPConfig.new_tpl_add_id).append(delbtn).appendTo('#template_additional_list ul');
 			$('#template_additional').val(newVal.join('/'));
 			alert('additional template ' + addTplText + ' added to customer');
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ function onShowEnd() {`
`149`	`149`	`if (trim($item['client_template_id']) != ''){`
`150`	`150`	`if ($text != '') $text .= '';`
`151`	`151`	`$text .= '<li rel="' . $item['assigned_template_id'] . '">' . $tpl[$item['client_template_id']];`
`152`		`- $text .= '<a href="#" class="button icons16 icoDelete"></a>';`
	`152`	`+ $text .= ' <a href="#" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></a>';`
`153`	`153`	`$tmp = new stdClass();`
`154`	`154`	`$tmp->id = $item['assigned_template_id'];`
`155`	`155`	`$tmp->data = '';`
`@@ -173,7 +173,7 @@ function onShowEnd() {`
`173`	`173`	`foreach($tplAdd as $item){`
`174`	`174`	`if (trim($item) != ''){`
`175`	`175`	`if ($text != '') $text .= '';`
`176`		`- $text .= '<li>' . $tpl[$item]. '<a href="#" class="button icons16 icoDelete"></a></li>';`
	`176`	`+ $text .= '<li>' . $tpl[$item]. ' <a href="#" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></a></li>';`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ function onShowEnd() {`
`143`	`143`	`if (trim($item['client_template_id']) != ''){`
`144`	`144`	`if ($text != '') $text .= '';`
`145`	`145`	`$text .= '<li rel="' . $item['assigned_template_id'] . '">' . $tpl[$item['client_template_id']];`
`146`		`- $text .= '<a href="#" class="button icons16 icoDelete"></a>';`
	`146`	`+ $text .= ' <a href="#" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></a>';`
`147`	`147`	`$tmp = new stdClass();`
`148`	`148`	`$tmp->id = $item['assigned_template_id'];`
`149`	`149`	`$tmp->data = '';`
`@@ -167,7 +167,7 @@ function onShowEnd() {`
`167`	`167`	`foreach($tplAdd as $item){`
`168`	`168`	`if (trim($item) != ''){`
`169`	`169`	`if ($text != '') $text .= '';`
`170`		`- $text .= '<li>' . $tpl[$item]. '<a href="#" class="button icons16 icoDelete"></a></li>';`
	`170`	`+ $text .= '<li>' . $tpl[$item]. ' <a href="#" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></a></li>';`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`}`