From cdf7ee8b351de09bd7bf36b9df8aa440d2cdb68a Mon Sep 17 00:00:00 2001 From: Karl Fogel Date: Thu, 4 Jun 2015 12:25:38 -0500 Subject: [PATCH 1/4] Adjust README.md for OpenWWT->WWT rename. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7d81de1..2eae6819 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OpenWWT-Web - WorldWide Telescope +# WWT-Web - WorldWide Telescope This repository contains the HTML5 SDK which is the rendering engine for the web client and the embeddable web control. It also contains the full web client code. This repository does not contain all the server-side endpoints needed to render tiles, constellation lines, etc. Some samples will be included in the future. ## Prerequisites From ba8e496b2e3c41dc25c109b44c1c526e88cab004 Mon Sep 17 00:00:00 2001 From: Karl Fogel Date: Thu, 4 Jun 2015 15:44:14 -0500 Subject: [PATCH 2/4] Add intro material in README.md. --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2eae6819..84764204 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,12 @@ # WWT-Web - WorldWide Telescope -This repository contains the HTML5 SDK which is the rendering engine for the web client and the embeddable web control. It also contains the full web client code. This repository does not contain all the server-side endpoints needed to render tiles, constellation lines, etc. Some samples will be included in the future. +WorldWide Telescope (WWT) enables you to explore the universe, bringing together imagery from the best ground- and space-based telescopes in the world and combining it with 3D navigation, data visualization, and more. Please see [WorldWideTelescope.org](http://worldwidetelescope.org/) for an overview. + +This repository contains the HTML5 SDK which is the rendering engine for the WWT web client and the embeddable web control. It also contains the full web client code. This repository does _not_ contain all the server-side endpoints needed to render tiles, constellation lines, etc. (Some samples will be included in the future.) + +You may wish to also look at these: + +* https://github.com/WorldWideTelescope/wwt-windows-client +* https://github.com/WorldWideTelescope/wwt-website ## Prerequisites * Visual Studio 2013 ([Free Community Edition](http://www.visualstudio.com/en-us/news/vs2013-community-vs.aspx)) From 9bf421b5c90fd80f657e450e8ffba808bf84128e Mon Sep 17 00:00:00 2001 From: cecilia-donnelly Date: Mon, 8 Jun 2015 16:23:12 -0500 Subject: [PATCH 3/4] Add stub INSTALL.md, update README.md accordingly. --- INSTALL.md | 3 +++ README.md | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 INSTALL.md diff --git a/INSTALL.md b/INSTALL.md new file mode 100644 index 00000000..29c700e9 --- /dev/null +++ b/INSTALL.md @@ -0,0 +1,3 @@ +# WorldWide Telescope Web Client + +Coming soon! \ No newline at end of file diff --git a/README.md b/README.md index 84764204..8bc700a2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # WWT-Web - WorldWide Telescope -WorldWide Telescope (WWT) enables you to explore the universe, bringing together imagery from the best ground- and space-based telescopes in the world and combining it with 3D navigation, data visualization, and more. Please see [WorldWideTelescope.org](http://worldwidetelescope.org/) for an overview. +WorldWide Telescope (WWT) enables you to explore the universe, bringing together imagery from the best ground- and space-based telescopes in the world and combining it with 3D navigation, data visualization, and more. Please see [WorldWideTelescope.org](http://worldwidetelescope.org/) for an overview. The web client is currently available at [worldwidetelescope.org/webclient](worldwidetelescope.org/webclient). This repository contains the HTML5 SDK which is the rendering engine for the WWT web client and the embeddable web control. It also contains the full web client code. This repository does _not_ contain all the server-side endpoints needed to render tiles, constellation lines, etc. (Some samples will be included in the future.) @@ -8,6 +8,9 @@ You may wish to also look at these: * https://github.com/WorldWideTelescope/wwt-windows-client * https://github.com/WorldWideTelescope/wwt-website +## Installing the system +Please see [INSTALL.md](INSTALL.md). + ## Prerequisites * Visual Studio 2013 ([Free Community Edition](http://www.visualstudio.com/en-us/news/vs2013-community-vs.aspx)) * [NodeJs](http://nodejs.org/download/) - Only needed if you want to compile the sdk into javascript or run the minified web client js code. From 979c328394376ddcdd201df1aace45c27428cca2 Mon Sep 17 00:00:00 2001 From: Karl Fogel Date: Tue, 9 Jun 2015 13:41:30 -0500 Subject: [PATCH 4/4] Fix URLs, copyright headers, etc for consistency. * Rename license.md to LICENSE.md. * Say "WWT" instead of "OpenWWT" everywhere. * Update URLs as needed. --- license.md => LICENSE.md | 0 Server/README.md | 2 +- webclient/Default.aspx | 2 +- webclient/Gruntfile.js | 2 +- webclient/README.md | 2 +- webclient/package.json | 9 ++++----- webclient/sdk/wwtsdk.js | 2 +- webclient/sdk/wwtsdk.min.js | 2 +- webclient/wwtwebclient.js | 6 +++--- webclient/wwtwebclient.min.js | 4 ++-- 10 files changed, 15 insertions(+), 16 deletions(-) rename license.md => LICENSE.md (100%) diff --git a/license.md b/LICENSE.md similarity index 100% rename from license.md rename to LICENSE.md diff --git a/Server/README.md b/Server/README.md index 285075bd..319249c0 100644 --- a/Server/README.md +++ b/Server/README.md @@ -1,2 +1,2 @@ -# OpenWWT-Web - Server +# WWT-Web - Server This directory contains the endpoints used in the WWT Web server. More documentation to follow... \ No newline at end of file diff --git a/webclient/Default.aspx b/webclient/Default.aspx index df486df1..c76a4beb 100644 --- a/webclient/Default.aspx +++ b/webclient/Default.aspx @@ -126,7 +126,7 @@ - + <% if (Client == Clients.Html5 || Client == Clients.Mobile) { %> diff --git a/webclient/Gruntfile.js b/webclient/Gruntfile.js index 558701fb..f3fc0393 100644 --- a/webclient/Gruntfile.js +++ b/webclient/Gruntfile.js @@ -25,7 +25,7 @@ module.exports = function(grunt) { pkg: grunt.file.readJSON('package.json'), banner: '/**\n' + '* WorldWide Telescope Web Client\n' + - '* Copyright 2014-2015 OpenWWT\n' + + '* Copyright 2014-2015 WorldWide Telescope\n' + '* Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' + '**/\n', diff --git a/webclient/README.md b/webclient/README.md index 82c14b00..28e792e4 100644 --- a/webclient/README.md +++ b/webclient/README.md @@ -1,4 +1,4 @@ -# OpenWWT-Web - WorldWide Telescope +# WWT-Web - WorldWide Telescope This repository contains the HTML5 SDK which is the rendering engine for the web client and the embeddable web control. It also contains the full web client code. This repository does not contain all the server-side endpoints needed to render tiles, constellation lines, etc. Some samples will be included in the future. ## Prerequisites diff --git a/webclient/package.json b/webclient/package.json index cf7abcae..8510a0f9 100644 --- a/webclient/package.json +++ b/webclient/package.json @@ -5,23 +5,22 @@ "keywords": [ "WorldWide Telescope", "WWT", - "OpenWWT", "client", "web", "HTML5 SDK" ], - "homepage": "http://openwwt.org", + "homepage": "http://WorldWideTelescope.org", "author": "Jonathan Fay (jfay@microsoft.com) and Ron Gilchrist (kid@thewebkid.com)", "repository": { "type": "git", - "url": "https://github.com/MSRConnections/OpenWWT-WebClient.git" + "url": "https://github.com/WorldWideTelescope/wwt-web-client.git" }, "bugs": { - "url": "https://github.com/MSRConnections/OpenWWT-WebClient/Issues" + "url": "https://github.com/WorldWideTelescope/wwt-web-client/Issues" }, "license": { "type": "MIT", - "url": "https://github.com/MSRConnections/OpenWWT-WebClient/blob/master/license.md" + "url": "https://github.com/WorldWideTelescope/wwt-web-client/blob/master/LICENSE.md" }, "devDependencies": { "grunt": "~0.4.5", diff --git a/webclient/sdk/wwtsdk.js b/webclient/sdk/wwtsdk.js index 9eeda4a0..3a30532d 100644 --- a/webclient/sdk/wwtsdk.js +++ b/webclient/sdk/wwtsdk.js @@ -1,7 +1,7 @@ /** * WorldWide Telescope Web Client * Copyright 2014-2015 Microsoft Research -* Licensed under MIT (https://github.com/MSRConnections/OpenWWT-Web/blob/master/LICENSE) +* Licensed under MIT (https://github.com/WorldWideTelescope/wwt-web-client/blob/master/LICENSE.md) **/ /*! Script# Runtime * Designed and licensed for use and distribution with Script#-generated scripts. diff --git a/webclient/sdk/wwtsdk.min.js b/webclient/sdk/wwtsdk.min.js index 43c518b2..2db1cac7 100644 --- a/webclient/sdk/wwtsdk.min.js +++ b/webclient/sdk/wwtsdk.min.js @@ -1,7 +1,7 @@ /** * WorldWide Telescope Web Client * Copyright 2014-2015 Microsoft Research -* Licensed under MIT (https://github.com/MSRConnections/OpenWWT-Web/blob/master/LICENSE) +* Licensed under MIT (https://github.com/WorldWideTelescope/wwt-web-client/blob/master/LICENSE.md) **/ /*! Script# Runtime * Designed and licensed for use and distribution with Script#-generated scripts. diff --git a/webclient/wwtwebclient.js b/webclient/wwtwebclient.js index 239730df..834fec8c 100644 --- a/webclient/wwtwebclient.js +++ b/webclient/wwtwebclient.js @@ -1,7 +1,7 @@ /** * WorldWide Telescope Web Client -* Copyright 2014-2015 OpenWWT -* Licensed under MIT (https://github.com/MSRConnections/OpenWWT-WebClient/blob/master/license.md) +* Copyright 2014-2015 WorldWide Telescope +* Licensed under MIT (https://github.com/WorldWideTelescope/wwt-web-client/blob/master/LICENSE.md) **/ /*! * jQuery JavaScript Library v2.1.4 @@ -53373,4 +53373,4 @@ wwt.exitFullScreen = function(cb) { }, 888); } -}; \ No newline at end of file +}; diff --git a/webclient/wwtwebclient.min.js b/webclient/wwtwebclient.min.js index 014a86a9..9288e03c 100644 --- a/webclient/wwtwebclient.min.js +++ b/webclient/wwtwebclient.min.js @@ -1,7 +1,7 @@ /** * WorldWide Telescope Web Client -* Copyright 2014-2015 OpenWWT -* Licensed under MIT (https://github.com/MSRConnections/OpenWWT-WebClient/blob/master/license.md) +* Copyright 2014-2015 WorldWide Telescope +* Licensed under MIT (https://github.com/WorldWideTelescope/wwt-web-client/blob/master/LICENSE.md) **/ /*! * jQuery JavaScript Library v2.1.4