commit 2e81680dda34019176c026ad06dfb771312df002 Author: Kostas Papadimitriou Date: Fri Jul 22 14:21:37 2011 +0300 Handle long machines names on single and list view, Refs #857 diff --git a/ui/templates/machines_list.html b/ui/templates/machines_list.html index 061ab97..0f6e273 100644 --- a/ui/templates/machines_list.html +++ b/ui/templates/machines_list.html @@ -300,7 +300,7 @@ function update_machines_view(data){ imgSrc = "static/icons/indicators/small/wave.gif"; imgStr = ""; tableData[current][1] = "" + osTag + "" + imgStr; - tableData[current][2] = "" + server.name.substring(0,60) + ""; + tableData[current][2] = "" + fix_server_name(server.name) + ""; //tableData[current][4] = "group"; //TODO tableData[current][5] = "" + STATUSES[server.status] + ""; vmTable.fnUpdate(tableData[current],current); @@ -312,7 +312,7 @@ function update_machines_view(data){ imgSrc = "static/icons/indicators/small/wave.gif"; imgStr = ""; tableData[current][1] = "" + osTag + "" + imgStr; - tableData[current][2] = "" + server.name.substring(0,60) + ""; + tableData[current][2] = "" + fix_server_name(server.name) + ""; //tableData[current][4] = "group"; //TODO tableData[current][4] = "" + STATUSES[server.status] + ""; vmTable.fnUpdate(tableData[current],current); @@ -325,7 +325,7 @@ function update_machines_view(data){ imgSrc = "static/icons/indicators/small/wave.gif"; imgStr = ""; tableData[current][1] = "" + osTag + "" + imgStr; - tableData[current][2] = "" + server.name.substring(0,60) + ""; + tableData[current][2] = "" + fix_server_name(server.name) + ""; //tableData[current][4] = "group"; //TODO tableData[current][4] = "" + STATUSES[server.status] + ""; vmTable.fnUpdate(tableData[current],current); @@ -376,7 +376,7 @@ function update_machines_view(data){ "", "" + osTag + "", - "" + server.name.substring(0,60) + "", + "" + fix_server_name(server.name) + "", ""+ flavorLabel + "", //"group", "" + status_string + ""