summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorCurtis Windatt2013-12-03 14:44:27 (EST)
committer Gerrit Code Review @ Eclipse.org2013-12-05 14:55:34 (EST)
commitd19f6c5dab7c94d6ec97e3c864d8c8d669ac2918 (patch)
treea86a55e45a996e789ef4e2fab672f0a24545d347
parentcaa47054e857717b4a2cf6e6ef537ed377a523a8 (diff)
downloadorg.eclipse.orion.client-d19f6c5dab7c94d6ec97e3c864d8c8d669ac2918.zip
org.eclipse.orion.client-d19f6c5dab7c94d6ec97e3c864d8c8d669ac2918.tar.gz
org.eclipse.orion.client-d19f6c5dab7c94d6ec97e3c864d8c8d669ac2918.tar.bz2
Bug 423074 - Remove brackets from site status textrefs/changes/65/19265/2
Change-Id: Iff845a8f079a96f736a9600e20f5f19c461fe53a Signed-off-by: Curtis Windatt <cwindatt@ca.ibm.com>
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/sites/nls/root/messages.js4
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/sites/sitesExplorer.js12
2 files changed, 8 insertions, 8 deletions
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/sites/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/sites/nls/root/messages.js
index 1d0a586..aa74b78 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/sites/nls/root/messages.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/sites/nls/root/messages.js
@@ -52,7 +52,8 @@ define({
"Add the file to this site": "Add the file to this site",
"View": "View",
"View the file on the site": "View the file on the site",
- "Started": "Started at",
+ // The url of the site will be inserted as a link
+ "Started" : "Started at ${0}",
"Unknown": "Unknown",
"Name": "Name",
"Actions": "Actions",
@@ -71,7 +72,6 @@ define({
"Optional; used to determine the URL where a started site can be accessed." : "Optional; used to determine the URL where a started site can be accessed.",
"Changes you make here won't affect the running site." : "Changes you make here won't affect the running site.",
"Stopped" : "Stopped",
- "Started at " : "Started at ",
"Sites": "Sites",
"Mappings": "Mappings",
// The create button will be inserted into the following text
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/sites/sitesExplorer.js b/bundles/org.eclipse.orion.client.ui/web/orion/sites/sitesExplorer.js
index 6584b37..d4d6580 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/sites/sitesExplorer.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/sites/sitesExplorer.js
@@ -224,7 +224,6 @@ define(['i18n!orion/sites/nls/messages', 'orion/i18nUtil', 'orion/explorers/expl
noSites.appendChild(textNode);
parentElement.appendChild(noSites);
- // document.getElementById(that.parentId)
};
return SiteServicesExplorer;
@@ -294,16 +293,17 @@ define(['i18n!orion/sites/nls/messages', 'orion/i18nUtil', 'orion/explorers/expl
var status = item.HostingStatus;
if (typeof status === "object") { //$NON-NLS-0$
if (status.Status === "started") { //$NON-NLS-0$
- statusField.appendChild(document.createTextNode("(" + messages["Started"] + " ")); //TODO NLS fragment (
-
var link = document.createElement("a"); //$NON-NLS-0$
link.textContent = status.URL;
link.href = status.URL;
statusField.appendChild(link);
- statusField.appendChild(document.createTextNode(")")); //TODO NLS fragment )
-
+
+ var startedNode = document.createElement("span"); //$NON-NLS-0$
+ startedNode.textContent = messages["Started"];
+ lib.processDOMNodes(startedNode, [link]);
+ statusField.appendChild(startedNode);
} else {
- var statusString = "(" + status.Status.substring(0,1).toUpperCase() + status.Status.substring(1) + ")";
+ var statusString = status.Status.substring(0,1).toUpperCase() + status.Status.substring(1);
statusField.appendChild(document.createTextNode(statusString));
}
} else {