- improved echo output of DataTable (now showing user friendly output of datatable_Array)

- refs #208 hopefully fixed by limiting the number of levels in the Actions table hierarchy
- refs #124 started cleaning html code (patch by milianw)

2 files changed, 6 insertions, 6 deletions

diff --git a/plugins/SitesManager/templates/SitesManager.js b/plugins/SitesManager/templates/SitesManager.js
index f418818982..7a8cab75a1 100644
--- a/plugins/SitesManager/templates/SitesManager.js
+++ b/plugins/SitesManager/templates/SitesManager.js
@@ -136,7 +136,7 @@ function getUpdateSiteAJAX( row )
 								}

 								if(idName == 'urls')

 								{

-									var contentAfter = '<textarea cols=30 rows=3 id="urls">'+contentBefore.replace(/<br>/gi,"\n")+'</textarea>';

+									var contentAfter = '<textarea cols=30 rows=3 id="urls">'+contentBefore.replace(/<br *\/? *>/gi,"\n")+'</textarea>';

 									$(n).html(contentAfter);

 								}

 							}

diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl
index e26a8b3b2a..1527586c08 100644
--- a/plugins/SitesManager/templates/SitesManager.tpl
+++ b/plugins/SitesManager/templates/SitesManager.tpl
@@ -16,7 +16,7 @@
 {/literal}

 <h2>{'SitesManager_Sites'|translate}</h2>

 <div id="ajaxError" style="display:none"></div>

-<div id="ajaxLoading" style="display:none">{'General_LoadingData'|translate} <img src="themes/default/loading.gif"></div>

+<div id="ajaxLoading" style="display:none">{'General_LoadingData'|translate} <img src="themes/default/loading.gif" alt="" /></div>

 

 {if $sites|@count == 0}

 	{'SitesManager_NoWebsites'|translate}

@@ -37,15 +37,15 @@
 			<tr id="row{$i}">

 				<td id="idSite">{$site.idsite}</td>

 				<td id="siteName" class="editableSite">{$site.name}</td>

-				<td id="urls" class="editableSite">{foreach from=$site.alias_urls item=url}{$url}<br>{/foreach}</td>       

-				<td><img src='plugins/UsersManager/images/edit.png' class="editSite" id="row{$i}" href='#'></td>

-				<td><img src='plugins/UsersManager/images/remove.png' class="deleteSite" id="row{$i}" value="{'General_Delete'|translate}"></td>

+				<td id="urls" class="editableSite">{foreach from=$site.alias_urls item=url}{$url}<br />{/foreach}</td>       

+				<td><img src='plugins/UsersManager/images/edit.png' class="editSite" id="row{$i}" href='#' alt="" /></td>

+				<td><img src='plugins/UsersManager/images/remove.png' class="deleteSite" id="row{$i}" value="{'General_Delete'|translate}" alt="" /></td>

 				<td><a href='{url actionToLoad=displayJavascriptCode idsite=$site.idsite}'>{'SitesManager_ShowJsCode'|translate}</a></td>

 			</tr>

 			{/foreach}

 			

 		</tbody>

 	</table>

-	<div class="addRowSite"><img src='plugins/UsersManager/images/add.png'>{'SitesManager_AddSite'|translate}</div>

+	<div class="addRowSite"><img src='plugins/UsersManager/images/add.png' alt="" />{'SitesManager_AddSite'|translate}</div>

 {/if}