Skip to content

Commit 650ed3d

Browse files
authored
Merge pull request #3 from OrdnanceSurvey/docs-and-license-landingpage-updates
Docs and license landing page updates
2 parents 690aa98 + 30b6e09 commit 650ed3d

13 files changed

Lines changed: 36 additions & 36 deletions

capabilities.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@
493493
"https://gdisquadstorage.file.core.windows.net", "https://os-powerbi-api.azurewebsites.net",
494494
"https://fonts.googleapis.com", "https://fonts.gstatic.com", "https://*.ordsvy.gov.uk:6443",
495495
"https://epsg.io",
496-
"https://*.arcgis.com", "http://localhost:20000", "https://*.in.applicationinsights.azure.com/v2/track","https://js.monitor.azure.com", "https://www.ordnancesurvey.co.uk/*", "https://forms.office.com/e/*", "https://forms.cloud.microsoft/e/*", "https://localhost:8080", "https://api.github.com/repos/OrdnanceSurvey/os-powerbi-map/releases/latest"
496+
"https://*.arcgis.com", "http://localhost:20000", "https://*.in.applicationinsights.azure.com/v2/track","https://js.monitor.azure.com", "https://www.ordnancesurvey.co.uk/*", "https://forms.office.com/e/*", "https://forms.cloud.microsoft/e/*", "https://localhost:8080", "https://api.github.com/repos/OrdnanceSurvey/os-powerbi-map/releases/latest", "https://github.com/OrdnanceSurvey/os-powerbi-map"
497497
]
498498
},
499499
{

src/maps/mapmanager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ export class OSPowerBIMapManager {
295295
const button = event.target as HTMLElement;
296296
if (button.classList.contains("terms")) {
297297
this.hostVisual.host.launchUrl(
298-
// TODO remove hardcoding and get this from a config file pointing to the github license
298+
// map viewing terms can stay as this url
299299
"https://labs.os.uk/licensing/public-viewing-terms.pdf"
300300
);
301301
}

src/ui/landing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default function createLandingPageContent(
4444
} else if (button.classList.contains('ireland-mapping')) {
4545
launchButtonCallback("https://www.ordnancesurvey.co.uk/blog/whats-the-difference-between-uk-britain-and-british-isles")
4646
} else if (button.classList.contains('licence-agreement')) {
47-
launchButtonCallback("https://www.ordnancesurvey.co.uk/documents/licences/OS-PowerBI-Visual.pdf")
47+
launchButtonCallback("https://github.com/OrdnanceSurvey/os-powerbi-map?tab=MIT-1-ov-file#readme")
4848
} else if (button.classList.contains('landing-page__copy-button')) {copyCallback(button);
4949
}
5050
});

src/ui/templates.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const Templates = {
8282
// to the landing-page.less and edit the styling for
8383
// landing-page__expiry-message which is currently set to display: none
8484
Banner: `<span class="material-symbols-rounded">bolt</span>
85-
<p> The OS Power BI Visual is now an open source project on GitHub, maintained by a small team on a best-efforts basis. By using this visual, you agree to the <em class="licence-agreement">licence terms</em>. To raise a bug or suggest enhancements, please <em class="report-bug">log a GitHub Issue</em>. You are using v<span id="version"></span> of the visual<span id="versionUpdateNotice"></span>. <span class="landing-page__expiry-message"><span id="expiryDate"></span></span></p>`,
85+
<p> The OS Power BI Visual is now an open source project on GitHub, maintained by a small team on a best-efforts basis. It is published under the terms of the <em class="licence-agreement">MIT License</em>. To raise a bug or suggest enhancements, please <em class="report-bug">log a GitHub Issue</em>. You are using v<span id="version"></span> of the visual<span id="versionUpdateNotice"></span>. <span class="landing-page__expiry-message"><span id="expiryDate"></span></span></p>`,
8686

8787
NotificationPopup: `
8888
<div class="notification-popup__container">

style/faqs-accordian.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
background: #ffffffe3;
66
border-radius: 5px;
77
margin: 0;
8-
.box-shadow;
8+
.box-shadow();
99

1010
&__dropdown {
1111
position: relative;

style/landing-page.less

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,18 @@
7272
flex-direction: row;
7373
align-items: center;
7474
padding: 1rem 1.5rem 1rem 0;
75-
.gap;
75+
.gap();
7676
}
7777
}
7878

7979
&__docs-logo-container {
8080
display: flex;
8181
justify-content: center;
82-
.gap;
82+
.gap();
8383
}
8484

8585
&__button {
86-
.button;
86+
.button();
8787

8888
& span {
8989
font-size: 18px;
@@ -123,7 +123,7 @@
123123
overflow-wrap: anywhere;
124124
user-select: text;
125125
-webkit-user-select: text;
126-
.box-shadow;
126+
.box-shadow();
127127
}
128128

129129
&__copy-button {
@@ -226,7 +226,7 @@
226226
.landing-page {
227227

228228
&__docs-logo-container {
229-
.gap-small;
229+
.gap-small();
230230
}
231231

232232
&__find-info p {

style/legend.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// legend.less
22

33
.legend {
4-
.box-shadow;
4+
.box-shadow();
55
background: white;
66
border-radius: 5px;
77
color: black;

style/map-icons.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
margin-top: 14px !important;
1818
border: none !important;
1919
border-radius: 50% !important;
20-
.box-shadow !important;
20+
.box-shadow() !important;
2121
}
2222

2323
.leaflet-control-zoom {
2424
border-radius: 20px !important;
25-
.box-shadow !important;
25+
.box-shadow() !important;
2626

2727
}
2828

@@ -58,7 +58,7 @@
5858
height: 2.1rem !important;
5959
width: 2.1rem !important;
6060
border-radius: 50% !important;
61-
.box-shadow !important;
61+
.box-shadow() !important;
6262
background-size: auto;
6363
background: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMjRweCIgdmlld0JveD0iMCAtOTYwIDk2MCA5NjAiIHdpZHRoPSIyNHB4IiBmaWxsPSIjMDAwMDAwIj48cGF0aCBkPSJNNDc2Ljc0LTYyLjIycS0zNi43IDAtNzIuNjEtNS41dC02OS42MS0xOS4wNnEtMTUuOTYtNS4xMy0yNi0xOC44MS0xMC4wNC0xMy42Ny0xMC4wNC0zMS42MyAwLTIyLjA4IDE1LjQ1LTM3LjI2IDE1LjQ2LTE1LjE3IDM3LjU1LTE1LjE3IDIuMjYgMCAxNy45NSAyLjU2IDI2LjQ0IDguNDQgNTIuOTQgMTMuNjUgMjYuNSA1LjIyIDU0LjM3IDUuMjIgMjIuMDkgMCAzNy41NCAxNS40NiAxNS40NiAxNS40NiAxNS40NiAzNy41NCAwIDIyLjA5LTE1LjQ2IDM3LjU1LTE1LjQ1IDE1LjQ1LTM3LjU0IDE1LjQ1Wm0xNjAtMzIuNjVxLTIyLjA5IDAtMzcuNTQtMTUuNDUtMTUuNDYtMTUuNDYtMTUuNDYtMzcuNTV2LTE3M3EwLTIyLjA5IDE1LjQ2LTM3LjU0IDE1LjQ1LTE1LjQ2IDM3LjU0LTE1LjQ2aDE3M3EyMi4wOSAwIDM3LjU0IDE1LjQ2IDE1LjQ2IDE1LjQ1IDE1LjQ2IDM3LjU0dC0xNS40NiAzNy41NHEtMTUuNDUgMTUuNDYtMzcuNTQgMTUuNDZoLTQ1LjkxTDg0NS0xODcuMjZxMTQuOTYgMTQuOTYgMTUuMTggMzYuODMuMjEgMjEuODctMTUuMTggMzcuMjYtMTQuOTYgMTQuOTUtMzcuMDQgMTQuOTUtMjIuMDkgMC0zNy4wNS0xNC45NWwtODEuMTctODAuNjF2NDUuOTFxMCAyMi4wOS0xNS40NiAzNy41NS0xNS40NSAxNS40NS0zNy41NCAxNS40NVptLTQxNy45Ni03NS4wNHEtMTAuODIgMC0yMC44Ny00LjM1LTEwLjA0LTQuMzUtMTYuNzQtMTEuMDQtMzQuMTMtMzMuNy01OC45OC03My4xMS0yNC44NC0zOS40Mi00MC45Ny04NC4xMS0xLjQ0LTIuODctMy43LTE5LjA5IDAtMjIuMDkgMTUuNzQtMzcuNTQgMTUuNzQtMTUuNDYgMzcuODMtMTUuNDYgMTcuOTUgMCAzMS4zNCAxMC4yNiAxMy40IDEwLjI2IDE4LjUzIDI2LjIyIDEyIDMzLjg3IDMxIDYzLjMgMTkgMjkuNDQgNDMuODcgNTQuMzEgNy4yNiA2LjY5IDExLjYxIDE2LjQ1IDQuMzQgOS43NyA0LjM0IDIxLjE2IDAgMjIuMDgtMTUuNDUgMzcuNTQtMTUuNDYgMTUuNDYtMzcuNTUgMTUuNDZabTYyNC4xOC0yNTcuOTZxLTIyLjA5IDAtMzcuNTUtMTUuNDYtMTUuNDUtMTUuNDUtMTUuNDUtMzcuNTQgMC0yNy44Ny01LjUtNTQuMzctNS41LTI2LjUtMTMuOTQtNTIuOTMtLjg3LTEuNzQtMy4xMy0xOC41MyAwLTIyLjA4IDE1Ljc0LTM3LjU0dDM3LjgzLTE1LjQ2cTE3Ljk1IDAgMzEuMzQgMTAuMDUgMTMuNCAxMC4wNCAxOC41MyAyNiAxMy41NiAzNC4yNiAxOS4zNCA3MC4xNyA1Ljc5IDM1LjkxIDUuNzkgNzIuNjEgMCAyMi4wOS0xNS40NiAzNy41NC0xNS40NiAxNS40Ni0zNy41NCAxNS40NlptLTczMC40NC0zOC41NnEtMjIuMDkgMC0zNy41NC0xNS43NFE1OS41Mi00OTcuOTEgNTkuNTItNTIwdi02LjQzcTUuNDQtNDYuNyAyMS4yOC05My4wOSAxNS44NS00Ni4zOSA0MS41NS04Ni4wOSA2LjY5LTExLjM5IDE4LjgtMTguMyAxMi4xMS02LjkyIDI2LjUtNi45MiAyMi4wOSAwIDM3LjgzIDE1LjQ2IDE1Ljc0IDE1LjQ2IDE1Ljc0IDM3LjU0IDAgOC4yNi0yLjU3IDE1Ljk2LTIuNTYgNy43LTYuNjkgMTQuMzktMTkuNDQgMjkuODctMzEgNjMuMjQtMTEuNTcgMzMuMzctMTUuNDQgNjguODEtMiAyMC42NS0xNi45NSAzNC44Mi0xNC45NiAxNC4xOC0zNi4wNSAxNC4xOFpNNzM0LjctNjg2LjM5cS0xMC44MyAwLTIwLjg3LTQuMzUtMTAuMDUtNC4zNS0xNi43NC0xMS42MS0yNC44Ny0yNC4zLTU0LjMxLTQzLjg3LTI5LjQzLTE5LjU2LTYyLjc0LTMxLTE1Ljk1LTUuMTMtMjYuMjEtMTguOC0xMC4yNy0xMy42OC0xMC4yNy0zMS42MyAwLTIyLjA5IDE1LjQ2LTM3LjI2IDE1LjQ2LTE1LjE4IDM3LjU1LTE1LjE4IDEuNjkgMCAxOC41MiAzLjEzIDQ0LjY5IDE2LjEzIDg0LjY3IDQxLjI2IDM5Ljk4IDI1LjEzIDcxLjk4IDU5LjgzIDYuNyA2LjcgMTEuMDQgMTYuNDYgNC4zNSA5Ljc2IDQuMzUgMjAuNTggMCAyMi4wOS0xNS4xNyAzNy4yNy0xNS4xOCAxNS4xNy0zNy4yNiAxNS4xN1ptLTQ1My4yMi01MC41N3EtMjIuMDkgMC0zNy44My0xNS43NC0xNS43NC0xNS43My0xNS43NC0zNy44MiAwLTE0LjM5IDYuOTItMjYuNSA2LjkxLTEyLjExIDE4LjMtMTguODEgNDAuMjYtMjYuMjYgODUuNTItNDEuNTQgNDUuMjYtMTUuMjggOTMuMDktMjAuNzJoN3EyMi4wOSAwIDM3LjU0IDE1LjQ2IDE1LjQ2IDE1LjQ2IDE1LjQ2IDM3LjU0IDAgMjEuMDktMTMuODkgMzYuMDUtMTMuODkgMTQuOTUtMzMuOTggMTYuOTUtMzUuNDQgNS02OC44IDE1LjQ0LTMzLjM3IDEwLjQzLTYzLjI0IDI5Ljg3LTYuNyA0LjEzLTE0LjExIDYuOTgtNy40MiAyLjg0LTE2LjI0IDIuODRaIi8+PC9zdmc+');
6464
}

style/map.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
}
7575

7676
&__paging-button {
77-
.box-shadow;
77+
.box-shadow();
7878
align-self: center;
7979
cursor: pointer;
8080
align-items: center;

style/notification.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
cursor: pointer;
1414

1515
&::after {
16-
.box-shadow;
16+
.box-shadow();
1717
content: "";
1818
position: absolute;
1919
top: -4px;
@@ -58,7 +58,7 @@
5858
border-radius: 5px;
5959
cursor: auto;
6060
background: #f5f5f5;
61-
.box-shadow;
61+
.box-shadow();
6262
}
6363

6464
&__close {
@@ -97,7 +97,7 @@
9797
font-size: 1em;
9898
padding: 10px;
9999
border-radius: 5px;
100-
.box-shadow;
100+
.box-shadow();
101101
}
102102
}
103103

0 commit comments

Comments
 (0)