microsoft
/
TouchDevelop
зеркало из https://github.com/microsoft/TouchDevelop.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

renamed "web sites" to "web apps"

This commit is contained in:
Peli de Halleux 2015-03-25 17:44:37 -07:00
Родитель 1daf569fe6
Коммит ca45ab4d2c
5 изменённых файлов: 18 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
editor/apps.ts
Просмотреть файл

@ -445,7 +445,7 @@ module TDev.AppExport
var m = new ModalDialog();
m.add(div('wall-dialog-header', lf("azure publish profile import")));
m.addHTML(
lf("Paste your .PublishSettings file here. You can get it by first creating an Azure Website and then clicking on 'Download the publish profile' in 'quick glance' section on the right of the DASHBOARD tab.")
lf("Paste your .PublishSettings file here. You can get it by first creating an Azure Web App and then clicking on 'Download the publish profile' in 'quick glance' section on the right of the DASHBOARD tab.")
)
var err = div(null)
m.add(err)
@ -784,7 +784,7 @@ module TDev.AppExport
r.success(chooseWebsiteAsync(true))
}))
boxes.push(mkNavBtn("Add,#aaa", "white", lf("create new azure website"),
boxes.push(mkNavBtn("Add,#aaa", "white", lf("create new azure web app"),
lf("using your imported management certificate"))
.withClick(() => {
m.dismiss()
@ -845,7 +845,7 @@ module TDev.AppExport
if (cancel) return
loading.dismiss()
// remove old azure web sites
// remove old azure web apps
var auths = Azure.getWebsiteAuths()
Object.keys(auths).forEach(ws => {
if (auths[ws].webspace !== 'custom') delete auths[ws];
@ -867,7 +867,7 @@ module TDev.AppExport
var createStorageCb = HTML.mkCheckBox(lf("create azure storage")); HTML.setCheckboxValue(createStorageCb, true);
var createServiceBusCb = HTML.mkCheckBox(lf("create azure service bus")); HTML.setCheckboxValue(createServiceBusCb, true);
m.add(div("wall-dialog-header", lf("create azure website")))
m.add(div("wall-dialog-header", lf("create azure web app")))
var err = div(null)
m.add(err)
@ -1035,8 +1035,8 @@ module TDev.AppExport
var sub = getManagementCerificate()
var m = new ModalDialog()
m.add(div('wall-dialog-header', "export to node.js+azure web site"));
m.addHTML(lf("<a href='http://azure.microsoft.com/en-us/services/websites/' target='_blank'>Azure web sites</a> let you deploy and scale modern websites and web apps in seconds."));
m.add(div('wall-dialog-header', "export to node.js+azure web app"));
m.addHTML(lf("<a href='http://azure.microsoft.com/en-us/services/websites/' target='_blank'>Azure web apps</a> let you deploy and scale modern websites and web apps in seconds."));
var err = div(null)
m.add(err)

8
editor/scriptProperties.ts
Просмотреть файл

@ -37,7 +37,7 @@ module TDev
"HTML5": PlatformCapability.AnyWeb,
"App Studio": PlatformCapability.AppStudio,
"Cordova App": PlatformCapability.CordovaApp,
"Node.js+Azure Web Site": PlatformCapability.AzureWebSite,
"Node.js Azure Web App": PlatformCapability.AzureWebSite,
}
static shortPlatforms = {
@ -97,7 +97,7 @@ module TDev
platforms = PlatformCapability.CordovaApp;
m.dismiss()
}),
HTML.mkButton(lf("Node.js+Azure web site"), () => {
HTML.mkButton(lf("Node.js Azure Web App"), () => {
platforms = PlatformCapability.AzureWebSite;
m.dismiss()
}),
@ -208,8 +208,8 @@ module TDev
this.exportSection = divId("exportApp", "formLine",
div("varLabel", lf("export")),
btn("cordova", lf("Cordova app")),
btn("azure", lf("Node.js+Azure web site")),
btn("html5", "HTML5 web app")
btn("azure", lf("Node.js Azure web app")),
btn("html5", "HTML5 client")
),
this.dataSection = divId("dataManagement", "formLine",
div("varLabel", lf("manage data")),

4
lib/App.ts
Просмотреть файл

@ -155,7 +155,7 @@ module TDev.RT {
}
var res = [];
msgs.forEach((lvl, index) => {
msgs.filter(msg => !!msg).forEach((lvl, index) => {
var msg = lvl.msg;
var txt = Util.htmlEscape(msg)
.replace(/https?:\/\/[^\s\r\n"'`]+/ig, (m) => "<a href=\"" + m + "\" target='_blank' rel='nofollow'>" + m + "</a>");
@ -525,7 +525,7 @@ module TDev.RT {
//? When exported server-side, retreives the value of a setting stored on the server. If not optional, fails if missing. Returns invalid if missing.
export function server_setting(key : string, optional : boolean, s : IStackFrame) : string {
if (!optional)
Util.userError(lf("only supported on exported web sites"), s.pc);
Util.userError(lf("only supported on exported node.js apps"), s.pc);
return undefined;
}

2
shell/shell.ts
Просмотреть файл

@ -380,7 +380,7 @@ function lazyRequire(pkg: string, finish: (md: any) => void) {
function executeNpm(args:string[], finish:()=>void)
{
// NPM_JS_PATH defined in Azure Web Sites
// NPM_JS_PATH defined in Azure Web Apps
var p = process.env["NPM_JS_PATH"] || path.join(path.dirname(process.execPath), "node_modules/npm/bin/npm-cli.js")
if (!fs.existsSync(p))
p = path.join(path.dirname(process.execPath).replace("/bin", "/lib"), "node_modules/npm/bin/npm-cli.js")

10
tools/client.ts
Просмотреть файл

@ -3647,7 +3647,7 @@ var lf = (x:string) => x;
var sectTemplates = 'templates';
var sectBeginners = lf("beginners");
var sectCordova = lf("apps");
var sectAzure = lf("web sites");
var sectAzure = lf("web apps");
var sectMakers = lf("makers");
var sectTouchDevelop = lf("touchdevelop");
var sectOthers = lf("others");
@ -3756,20 +3756,20 @@ var templates: ScriptTemplate[] = [{
scriptid: 'ripnb',
editorMode: 3,
}, {
title: lf("blank web api"),
title: lf("blank web app"),
id: 'blankwebapi',
icon: 'Stacks',
name: 'ADJ api',
description: lf("A web API using node.js and restify."),
description: lf("A web app using Node.js and Restify."),
section: sectAzure,
scriptid: 'qexxc',
editorMode: 3,
}, {
title: lf("blank azure web api"),
title: lf("blank azure web app"),
id: 'blankazurewebapi',
icon: 'Stacks',
name: 'azure ADJ api',
description: lf("A web API using azure services, node.js and restify."),
description: lf("A web app using Azure Services, Node.js and Restify."),
section: sectAzure,
scriptid: 'gexxa',
editorMode: 3,