tour authoring rough initial ui scaffolding...

remove external lib peripheral files

remove binaries from git
This commit is contained in:
Ron Gilchrist 2016-05-16 14:51:58 -07:00
Родитель 338c0d9bb9
Коммит e39959217f
11 изменённых файлов: 249 добавлений и 51 удалений

Просмотреть файл

@ -1,5 +1,6 @@
<%@ Page Language="C#" %>
<%@ Import Namespace="System.Globalization" %>
<%@ Import Namespace="System.Security.Cryptography.X509Certificates" %>
<%@ Import Namespace="WURFL" %>
<script runat="server">
public bool Debug = false;
@ -129,13 +130,15 @@
<meta property="og:image" content="http://worldwidetelescope.org/webclient/Images/wwtlogo.png" />
<link rel="icon" href="favicon.ico"/>
<% if (Client == Clients.Html5 || Client == Clients.Mobile)
{ %>
<%-- Console complains about unquoted css, but need this to get resourcesversion in the path -
otherwise webforms will error with quotes --%>
<link href=css/webclient.min.css?v=<%= ResourcesVersion%> rel="stylesheet" />
<link href=css/angular-motion.css?v=<%= ResourcesVersion%> rel="stylesheet" />
{
string css = "<link href=\"css/webclient.min.css?v="+ResourcesVersion+"\" rel=\"stylesheet\" />";
css+="<link href=\"css/angular-motion.css?v="+ResourcesVersion+"\" rel=\"stylesheet\" />";
css+="<link href=\"ext/introjs.css?v="+ResourcesVersion+"\" rel=\"stylesheet\" />";
%>
<%=css%>
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet"/>
<link href=ext/introjs.css?v=<%= ResourcesVersion%> rel="stylesheet" />
<style>
html, body.fs-player, iframe {
height: 100%;
@ -152,14 +155,14 @@
<script src="//js.live.net/v5.0/wl.js"></script>
<script src="sdk/wwtsdk.js"></script>
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.1/angular.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.1/angular-touch.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.1/angular-route.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.1/angular-cookies.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.1/angular-animate.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-strap/2.2.4/angular-strap.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-strap/2.2.4/angular-strap.tpl.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.5/angular.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.5/angular-touch.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.5/angular-route.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.5/angular-cookies.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.5/angular-animate.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.8/angular-strap.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.8/angular-strap.tpl.min.js"></script>
<% if (Debug || DebugChrome)
{ %>
@ -198,6 +201,7 @@
<script src="<%= ResourcesLocation %>/controllers/tabs/ToursController.js?v=<%= ResourcesVersion%>"></script>
<script src="<%= ResourcesLocation %>/controllers/tabs/ViewController.js?v=<%= ResourcesVersion%>"></script>
<script src="<%= ResourcesLocation %>/controllers/tabs/CommunityController.js?v=<%= ResourcesVersion%>"></script>
<script src="<%= ResourcesLocation %>/controllers/tabs/CurrentTourController.js?v=<%= ResourcesVersion%>"></script>
<script src="<%= ResourcesLocation %>/controllers/LoginController.js?v=<%= ResourcesVersion%>"></script>
<script src="<%= ResourcesLocation %>/controls/move.js?v=<%= ResourcesVersion%>"></script>
<script src="<%= ResourcesLocation %>/controls/util.js?v=<%= ResourcesVersion%>"></script>
@ -448,6 +452,16 @@
</a>
</div>
</li>
<li data-ng-class="activePanel == 'currentTour' ? 'active' : 'hide'">
<div class="outer">
<a href="javascript:void(0)">
<span class="label" data-ng-click="tabClick(tab)" id="btnCurTour" localize="{{currentTour._title}}"></span>
<%--<div class="menu" data-ng-click="menuClick(tab.menu)" id="tabMenu{{ribbon.tabs.length}}" data-target="#menu{{ribbon.tabs.length}}">
<i class="fa fa-caret-down"></i>
</div>--%>
</a>
</div>
</li>
</ul>
</div>
@ -840,7 +854,54 @@
</div>
<% } %>
<% } %>
<div
ng-show="!loadingUrlPlace"
ng-switch-when="currentTour"
id="currentTourPanel"
class="explore-panel rel"
ng-controller="CurrentTourController"
>
<table>
<colgroup>
<col style="width:80px"/>
<col style="width:99%"/>
<col style="width:16px"/>
</colgroup>
<tr>
<td class="play-tour">
<a class="btn-play-tour" ng-click="pauseTour()">
<i class="fa fa-{{tourPaused ? 'play' : 'pause'}}"></i>
</a><br/>
{{currentTour.minuteDuration}}:{{currentTour.secDuration}}
</td>
<td class="tour-stops">
<div class="scroller">
<div class="stops-container">
<div class="stop-arrow" ng-repeat="stop in tourStops">
<div class="stop-thumb thumbnail" ng-click="gotoStop($index)">
<img ng-src="{{stop.thumb}}" alt="{{stop.description}}"/>
<label>{{stop.description}}</label>
<label class="duration">{{stop.secDuration}}</label>
</div>
<div class="right-arrow" ng-if="!$last">
<i class="fa fa-stop"></i><i class="fa fa-caret-right"></i>
</div>
</div>
</div>
</div>
</td>
<td>&nbsp;</td>
</tr>
</table>
</div>
</div>
<div class="layer-manager desktop" ng-controller="LayerManagerController" ng-style="{display: layerManagerHidden ? 'none' : 'block'}" ng-init="initLayerManager()">
<button aria-hidden="true" class="close pull-right" type="button" ng-click="toggleLayerManager()">×</button>

Просмотреть файл

@ -69,6 +69,7 @@ module.exports = function(grunt) {
'controllers/tabs/ViewController.js',
'controllers/tabs/ToursController.js',
'controllers/tabs/CommunityController.js',
'controllers/tabs/CurrentTourController.js',
'controllers/modals/ShareController.js',
'controllers/modals/OpenItemController.js',
'controllers/modals/ObservingTimeController.js',

2
app.js
Просмотреть файл

@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
**/
var wwt = {
var wwt = {
app: angular.module('wwtApp', [
'mgcrea.ngStrap',
'ngTouch',

Просмотреть файл

@ -630,19 +630,52 @@ wwt.controllers.controller('MainController',
$('#openModal').modal('show');
};
$scope.playTour = function(url) {
$('.finder-scope').hide();
wwtlib.WWTControl.singleton.playTour(url);
wwt.tourPlaying = $rootScope.tourPlaying = true;
wwt.wc.add_tourEnded(tourChangeHandler);
//wwt.wc.add_tourPaused(tourChangeHandler);
setTimeout(function() {
$('#ribbon,.top-panel,.context-panel,.layer-manager').fadeOut(800);
}, 200);
}
$scope.playTour = function(url) {
$('.finder-scope').hide();
wwtlib.WWTControl.singleton.playTour(url);
wwt.tourPlaying = $rootScope.tourPlaying = true;
$rootScope.tourPaused = false;
wwt.wc.add_tourEnded(tourChangeHandler);
wwt.wc.add_tourReady(function() {
function tourChangeHandler() {
$scope.$applyAsync(function() {
$scope.currentTour = wwtlib.WWTControl.singleton.tour;
$scope.currentTour.duration = 0;
$scope.tourStops = $scope.currentTour.get_tourStops().map(function(s) {
s.description = s.get_description();
s.thumb = s.get_thumbnail();
s.duration = s.get_duration();
s.secDuration = Math.round(s.duration / 1000);
if (s.secDuration < 10) {
s.secDuration = '0' + s.secDuration;
}
s.secDuration = '0:' + s.secDuration;
$scope.currentTour.duration += s.duration;
return s;
});
$scope.currentTour.minuteDuration = Math.floor($scope.currentTour.duration / 60000);
$scope.currentTour.secDuration = Math.floor(($scope.currentTour.duration % 60000) / 1000);
$scope.activeItem = { label: 'currentTour' };
$scope.activePanel = 'currentTour';
});
//$('#ribbon,.top-panel,.context-panel,.layer-manager').fadeOut(800);
});
//wwt.wc.add_tourPaused(tourChangeHandler);
};
$scope.gotoStop = function(index) {
$scope.currentTour.set_currentTourstopIndex(index);
};
$scope.pauseTour = function () {
wwtlib.WWTControl.singleton.uiController.pauseTour();
$rootScope.tourPaused = !$rootScope.tourPaused;
}
function tourChangeHandler() {
var settings = appState.get('settings') || {};
wwt.tourPlaying = $rootScope.tourPlaying = false;
@ -651,6 +684,7 @@ wwt.controllers.controller('MainController',
$('.context-panel').fadeIn(800);
}
if (!settings.autoHideTabs) {
$('#ribbon,.top-panel,.layer-manager').fadeIn(800);
}
ctl.clearAnnotations();
@ -678,7 +712,7 @@ wwt.controllers.controller('MainController',
$scope.setLanguageCode = function(code) {
appState.set('language', code);
$timeout(function() {
if ($scope.selectedLanguage != code) {
if ($scope.selectedLanguage !== code) {
$scope.selectedLanguage = code;
$scope.languageCode = code;
}
@ -705,7 +739,7 @@ wwt.controllers.controller('MainController',
//util.log('loc calls: ' + locCalls);
}
var key = englishString + $scope.selectedLanguage;
if ($scope.selectedLanguage == 'EN') {
if ($scope.selectedLanguage === 'EN') {
localized[key] = englishString;
}
if (localized[key]) {

Просмотреть файл

@ -0,0 +1,5 @@
wwt.controllers.controller('CurrentTourController', ['$scope', function($scope) {
}]);

Просмотреть файл

@ -43,7 +43,7 @@
background-image: -moz-linear-gradient(top, @start-color, @second-color @color-stop2, @third-color @color-stop3, @end-color);
background-image: linear-gradient(@start-color, @second-color @color-stop2, @third-color @color-stop3, @end-color);
background-repeat: no-repeat;
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@second-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
}
}

Просмотреть файл

@ -466,6 +466,7 @@ body.wwt-webclient-wrapper.mobile{
//height: 267px;
width: 278px;
margin: -3px -8px -8px -8px;
}
div.explore-panel {
@ -473,8 +474,111 @@ body.wwt-webclient-wrapper.mobile{
max-height: 97px;
height: 97px;
//overflow: hidden;
table{
table-layout:fixed;
width:100%;
margin:5px 8px;
td.play-tour{
width:80px;
vertical-align:middle;
text-align:center;
height:112px;
}
td.tour-stops{
width:100%;
border: solid 1px #728f9a;
.scroller{
padding-left:5px;
max-width: 100%;
overflow-x: auto;
overflow-y:hidden;
div.stops-container{
position:relative;
top:-26px;
height:84px;
white-space:nowrap;
vertical-align:text-top;
.stop-arrow{
white-space:nowrap;
vertical-align:text-top;
width:155px;
display:inline-block;
}
div.stop-thumb{
position:relative;
img{
display:inline-block;
border:none;
}
.duration{
position:absolute;
bottom:-16px;
left:0;
}
}
.right-arrow{
padding-top:33px;
width:50px;
vertical-align:middle;
display:inline-block;
position: relative;
//top: 11px;
left: -3px;
i.fa{
font-size:20px;vertical-align:middle;
}
i.fa.fa-caret-right{
font-size:47px;
position:relative;
top:1px;
}
}
}
}
}
}
tour-slides{
overflow-x:scroll;
}
}
a.btn-play-tour{
height:48px;width:48px;
border-radius:50%;
display:inline-block;
font-size: 20px;
//padding: 10px 17px;
//margin:16px 0 0 8px;
box-shadow:inset 0 -2px 6px #324272,
inset 0 0 2px rgba(0,0,0,.5),
0 0 3px rgba(0,0,0,.5),
0 0 6px rgba(44,185,201,.7);
background-color:rgba(0,0,0,.3);
#gradient > .vertical-four-colors(rgba(255,255,255,.3), rgba(155,155,155,.01), 50%, rgba(155,155,155,.01), 75%, rgba(44,185,201,.7));
border:solid 1px #000;
i.fa{
margin:14px 17px;
}
i.fa.fa-pause{
margin:14px 14px;
}
}
a.btn-play-tour:hover {
box-shadow:inset 0 -2px 6px lighten(rgba(44,185,201,1),10%),
inset 0 0 2px rgba(0,0,0,.3),
0 0 2px rgba(0,0,0,.5),
0 0 9px lighten(rgba(44,185,201,1),10%);
border:solid 1px #000;
background-color:rgba(23,56,156,.5);
#gradient > .vertical-four-colors(rgba(255,255,255,.6), rgba(155,155,155,.01), 50%, rgba(155,155,155,.01), 75%, rgba(44,185,201,.7));
}
div.explore-panel.expanded {
height: 377px;
max-height: 377px;

Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="bootstrap.less" version="3.3.6" targetFramework="net451" />
<package id="jQuery" version="2.2.0" targetFramework="net451" />
<package id="jQuery" version="2.2.3" targetFramework="net451" />
<package id="Twitter.Bootstrap.Less" version="3.3.6" targetFramework="net451" />
<package id="WURFL_Official_API" version="1.7.1.0" targetFramework="net451" />
</packages>

Просмотреть файл

@ -12,7 +12,7 @@
localize="Microsoft WorldWide Telescope Logo"
localize-only="alt" />
<h1 style="position:relative;top:-2px">
<small style="color:white">Microsoft<sup>&reg;</sup> Research</small><br />
<small style="color:white">American Astronomical Society</small><br />
World<span style="color:#6ba9e6">Wide Telescope</span>
</h1>
<h3 localize="Welcome to the WorldWide Telescope Web Client"></h3>

Просмотреть файл

@ -7,9 +7,10 @@
<label localize="Name">Name:</label> <label>{{locationName}}</label>
</div>
<div>
<div class="pull-right">
<label localize="Alt">Alt:</label> <label>{{UITools.formatDistance(ctl.settings.get_locationAltitude())}}</label>
</div>
<div class="pull-right">
<label localize="Alt">Alt:</label> <label>{{UITools.formatDistance(ctl.settings.get_locationAltitude())}}</label>
</div>
<label localize="Lat">Lat:</label> <label>{{formatHms(ctl.settings.get_locationLat())}}</label>
</div>
<div class="clearfix">

Просмотреть файл

@ -74,7 +74,7 @@
<Content Include="controllers\LoginController.js" />
<Content Include="controllers\tabs\AdsController.js" />
<Content Include="controllers\tabs\CommunityController.js" />
<Content Include="COPYING.txt" />
<Content Include="controllers\tabs\CurrentTourController.js" />
<Content Include="dataproxy\Community.js" />
<Content Include="dataproxy\Places.js" />
<Content Include="Gruntfile.js" />
@ -190,7 +190,6 @@
<Content Include="Images\wwtlogo.png" />
<Content Include="login.aspx" />
<Content Include="package.json" />
<Content Include="App_Data\wurfl-latest.zip" />
<Content Include="Content\fonts\glyphicons-halflings-regular.woff2" />
<Content Include="Content\fonts\glyphicons-halflings-regular.woff" />
<Content Include="Content\fonts\glyphicons-halflings-regular.ttf" />
@ -266,26 +265,20 @@
<Content Include="Content\bootstrap\bootstrap.less" />
<Content Include="Content\bootstrap\badges.less" />
<Content Include="Content\bootstrap\alerts.less" />
<Content Include="Introspector\Introspector.pdf" />
<Content Include="Introspector\Introspector.ashx" />
<Content Include="App_Readme\WURFL.chm" />
<Content Include="App_Readme\wurfl-latest.zip" />
<Content Include="App_Readme\WURFL Quick Guide_v1_5.pdf" />
<Content Include="App_Data\wurfl-latest.zip" />
<Content Include="Chandra.wtml" />
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
<None Include="Scripts\jquery-2.2.0.intellisense.js" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Scripts\jquery-2.2.0.js" />
<Content Include="Scripts\jquery-2.2.0.min.js" />
<Content Include="sdk\mscorlib.dll" />
<None Include="Scripts\jquery-2.2.3.intellisense.js" />
<Content Include="Scripts\jquery-2.2.3.js" />
<Content Include="Scripts\jquery-2.2.3.min.js" />
<Content Include="sdk\mscorlib.xml" />
<Content Include="sdk\old\wwtsdk_old.debug.js" />
<Content Include="sdk\Script.Web.dll" />
<Content Include="sdk\Script.Web.xml" />
<Content Include="sdk\ss.js" />
<Content Include="sdk\ss.min.js" />
<Content Include="sdk\wwtsdk.aspx" />
<Content Include="sdk\wwtlib.dll" />
<Content Include="sdk\wwtlib.xml" />
<Content Include="searchdata.min.js" />
<Content Include="searchdataraw.js" />
@ -313,7 +306,6 @@
<Content Include="css\variables.less" />
<Content Include="css\webclient.css.map" />
<Content Include="css\webclient.less" />
<Content Include="WURFL AGPL License.txt" />
<Content Include="WWTSL.xap" />
<Content Include="wwtwebclient.js" />
<Content Include="wwtwebclient.min.js" />
@ -328,7 +320,7 @@
</None>
<Content Include="README.md" />
<Content Include="sdk\wwtlib.scripts" />
<Content Include="Scripts\jquery-2.2.0.min.map" />
<Content Include="Scripts\jquery-2.2.3.min.map" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>