Revision 9ed51b7e ui/static/synnefo.js
| b/ui/static/synnefo.js | ||
|---|---|---|
| 1207 | 1207 |
var os = machine.metadata.values.OS; |
| 1208 | 1208 |
} catch(err) { var os = 'undefined'; }
|
| 1209 | 1209 |
|
| 1210 |
var params_url = '?ip_address=' + serverIP + '&os=' + os + "&host_os=" + $.client.os; |
|
| 1210 |
var params_url = '?ip_address=' + serverIP + '&os=' + os + "&host_os=" + $.client.os + "&srv=" + serverID;
|
|
| 1211 | 1211 |
|
| 1212 | 1212 |
if ($.client.os == "Windows" && os == "windows") {
|
| 1213 | 1213 |
window.open('machines/connect' + params_url + "&rdp=1");
|
| 1214 | 1214 |
return; |
| 1215 | 1215 |
} |
| 1216 |
|
|
| 1217 |
var title = 'Connect to: ' + '<span class="machine-title"><img src="static/icons/machines/small/'+os+'-on.png" /> '+serverName+'</span>'; |
|
| 1216 | 1218 |
|
| 1217 | 1219 |
try {
|
| 1218 |
msg_box({title:'Connect to ' + serverName,content:'loading...',extra:'',
|
|
| 1220 |
msg_box({title:title, content:'loading...',extra:'',
|
|
| 1219 | 1221 |
'ajax':'machines/connect' + params_url, |
| 1220 | 1222 |
parse_data:function(data){
|
| 1223 |
var box_content = "<a href='"+data.link.url+"'>"+data.link.title+"</a>"; |
|
| 1224 |
if (!data.link.url) {
|
|
| 1225 |
box_content = "<span class='cmd'>"+data.link.title+"</span>"; |
|
| 1226 |
} |
|
| 1221 | 1227 |
data.title = false; |
| 1222 | 1228 |
data.content = data.info; |
| 1223 |
data.extra = "<a href='"+data.link.url+"'>"+data.link.title+"</a>";
|
|
| 1229 |
data.extra = box_content;
|
|
| 1224 | 1230 |
return data; |
| 1225 | 1231 |
} |
| 1226 | 1232 |
}); |
| ... | ... | |
| 2110 | 2116 |
|
| 2111 | 2117 |
var sel = function(s){return $(s, box)};
|
| 2112 | 2118 |
|
| 2113 |
sel("h3 span.header-box").text(config.title);
|
|
| 2119 |
sel("h3 span.header-box").html(config.title);
|
|
| 2114 | 2120 |
sel("div.machine-now-building").html(config.content);
|
| 2115 | 2121 |
sel(".popup-header").removeClass("popup-header-error");
|
| 2116 | 2122 |
box.removeClass("popup-border-error");
|
| ... | ... | |
| 2171 | 2177 |
sel(".password-container .password").html(data.extra);
|
| 2172 | 2178 |
sel(".password-container").show();
|
| 2173 | 2179 |
} |
| 2180 |
if (data.subinfo) {
|
|
| 2181 |
sel(".sub-text").html(data.subinfo);
|
|
| 2182 |
} else {
|
|
| 2183 |
sel(".sub-text").html("");
|
|
| 2184 |
} |
|
| 2174 | 2185 |
} |
| 2175 | 2186 |
|
| 2176 | 2187 |
if (user_success) {
|
Also available in: Unified diff