Attempt to reference Image/wwtlogo.png relatively everywhere possible

This commit is contained in:
Peter Williams 2020-03-22 10:29:35 -04:00
Родитель 423bde7e3d
Коммит 91b980a921
3 изменённых файлов: 16 добавлений и 5 удалений

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

@ -42,9 +42,20 @@ wwt.controllers.controller('ShareController',
hashManager.removeHashVal('dec', true);
$scope.shareUrlReadOnly = $scope.shareUrl = hashManager.removeHashVal('fov', true);
}
var title, image;
if ($scope.trackingObj) {
title = $scope.trackingObj.get_name() + ' - WorldWide Telescope';
image = $scope.trackingObj.get_thumbnailUrl();
} else {
title = $scope.getFromEn('WorldWide Telescope Web Client');
image = new URL("Images/wwtlogo.png", window.location).toString();
}
$('meta[property="og:url"]').attr('content', $scope.shareUrlReadOnly);
$('meta[property="og:title"]').attr('content', $scope.trackingObj ? $scope.trackingObj.get_name() + ' - WorldWide Telescope' : $scope.getFromEn('WorldWide Telescope Web Client'));
$('meta[property="og:image"]').attr('content', $scope.trackingObj ? $scope.trackingObj.get_thumbnailUrl() : 'https://wwtweb.blob.core.windows.net/webclient/wwtlogo.png');
$('meta[property="og:title"]').attr('content', title);
$('meta[property="og:image"]').attr('content', image);
selectUrl(222);
};

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

@ -9,7 +9,7 @@
<meta property="og:url" content="//worldwidetelescope.org/webclient" />
<meta property="og:title" content="WorldWide Telescope Web Client" />
<meta property="og:description" content="Worldwide Telescope enables your computer to function as a virtual telescope, bringing together imagery from the best earth and space-based telescopes." />
<meta property="og:image" content="https://wwtweb.blob.core.windows.net/webclient/wwtlogo.png" />
<meta property="og:image" content="https://worldwidetelescope.org/webclient/Images/wwtlogo.png" />
<link rel="icon" href="favicon.ico"/>
<link href="css/webclient.min.css?v=<%= shortSHA %>" rel="stylesheet" />
<link href="css/angular-motion.css?v=<%= shortSHA %>" rel="stylesheet" />
@ -877,7 +877,7 @@
<div class="modal-content">
<div class="modal-body">
<img src='https://wwtweb.blob.core.windows.net/webclient/wwtlogo.png?v=<%= shortSHA %>'
<img src='Images/wwtlogo.png'
style="width:19%;height:19%;position:relative;left:-3px;margin-right:12px;"
class="pull-left"
localize="WorldWide Telescope Logo"

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

@ -13,7 +13,7 @@
localize-only="alt" />
</a>
<a href="//worldwidetelescope.org/home" target="_blank" style="display:inline-block;position:relative;left:-3px;margin-right:7px;z-index:5" class="pull-left">
<img ng-src='https://wwtweb.blob.core.windows.net/webclient/wwtlogo.png'
<img ng-src='Images/wwtlogo.png'
style="width:110px;height:110px;"
localize="Microsoft WorldWide Telescope Logo"
localize-only="alt" />