Merge remote-tracking branch 'upstream/master'

This commit is contained in:
wenshao
2013-01-29 21:09:56 +08:00
@@ -118,7 +118,7 @@
html += '<tr><td valign="top" class="td_lable">PollingConnection Info</td><td><a href="connectionInfo.html?datasourceId=' + datasourceId+
'">View</a></td><td>Info for polling connection. <a href="connectionInfo-' + datasourceId + '.json" target="_blank">[View JSON API]</a></td></tr>'
html += '<tr><td valign="top" class="td_lable">SQL List</td><td><a href="sql.html?datasourceId=' + datasourceId+
html += '<tr><td valign="top" class="td_lable">SQL List</td><td><a href="sql.html?dataSourceId=' + datasourceId+
'">View</a></td><td>Info for SQL. <a href="sql.json?dataSourceId=' + datasourceId + '" target="_blank">[View JSON API]</a></td></tr>'
html += '</table></div>';