-
Notifications
You must be signed in to change notification settings - Fork 12
Web Improvements including Cloud Tiling #42
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
indig0fox
wants to merge
31
commits into
main
Choose a base branch
from
ind/leaflet-functionality
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
3de757b
number of improvements
indig0fox b349edd
visual improvements, cloud tiling
indig0fox 0092ceb
enough for now
indig0fox 31f0ed4
more
indig0fox e993e99
adds generalEvent for custom event announcements in timeline
indig0fox 7fd1d89
fix markers
indig0fox 1ee3b30
fix for sideLogic units
indig0fox ae09630
small ui changes
indig0fox e80afaa
changes to new topo modes
indig0fox 0c15566
fixes cloud tiling CORS issues
indig0fox 4f540e7
Merge remote-tracking branch 'origin/main' into ind/leaflet-functiona…
indig0fox 2e7dbd2
now uses https map.json fetch
indig0fox 9897139
crisper entity popup text
indig0fox e8d662a
hide AI names by default, more work needed
indig0fox b3cce90
hotfix leaflet.pattern failure
indig0fox a10d227
minor index cleanup
indig0fox 77d3092
Update static/scripts/localizable.js
indig0fox ae41485
Update static/scripts/localizable.js
indig0fox 35528a4
use cloud tiles as fallback (#44)
a-sync 4195095
fix vehicle crew display, dont carry d/c deaths to rejoined players
indig0fox 2e0c70c
ignore data and maps files in git
indig0fox d844668
ensure that groups in left pane are ordered alphabetically
indig0fox 072b1b4
update missing tiles URL
indig0fox f4f3659
Merge remote-tracking branch 'origin/main' into ind/leaflet-functiona…
indig0fox 15f5b6d
update data and maps ignores
indig0fox 09697e4
fix basemaps control file reference
indig0fox c397022
addon and extension version in info screen
JessevGool b913af2
Merge branch 'web-ui' into ind/leaflet-functionality
indig0fox 5d40851
8767500
fix loading share URL, fix websiteLogo position
indig0fox 70e64e6
fix fetch exception for loading without a rendered map
indig0fox File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Empty file.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {\rtf1} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |
| "customize": { | ||
| "websiteURL": "", | ||
| "websiteLogo": "", | ||
| "websiteLogoSize": "128px", | ||
| "disableKillCount": false | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "listen": "127.0.0.1:5000", | ||
| "secret": "same-secret", | ||
| "logger": true, | ||
| "customize": { | ||
| "websiteURL": "", | ||
| "websiteLogo": "", | ||
| "websiteLogoSize": "128px", | ||
| "disableKillCount": false | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,129 +1,156 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>OCAP</title> | ||
| <meta charset="utf-8"/> | ||
| <meta name="viewport" content="initial-scale=1.0, user-scalable=no"/> | ||
| <link rel="stylesheet" href="leaflet/leaflet.css" /> | ||
| <link rel="stylesheet" href="style/common.css" /> | ||
| <link rel="stylesheet" href="style/index.css" /> | ||
| <link rel="icon" type="img/png" href="images/favicon.png" /> | ||
| <script src="leaflet/leaflet-src.js"></script> | ||
| <script src="leaflet/leaflet.rotatedMarker.js"></script> | ||
| <script src="leaflet/leaflet.svgIcon.js"></script> | ||
| <script src="leaflet/leaflet.pattern.js"></script> | ||
| <script src="leaflet/L.Icon.Pulse.js"></script> | ||
| <link rel="stylesheet" href="leaflet/L.Icon.Pulse.css" /> | ||
| <script src="scripts/ocap.marker.js"></script> | ||
| <script src="scripts/ocap.entity.js"></script> | ||
| <script src="scripts/ocap.event.js"></script> | ||
| <script src="scripts/ocap.group.js"></script> | ||
| <script src="scripts/ocap.groups.js"></script> | ||
| <script src="scripts/ocap.vehicle.js"></script> | ||
| <script src="scripts/ocap.unit.js"></script> | ||
| <script src="scripts/ocap.ui.js"></script> | ||
| <script src="scripts/ocap.js"></script> | ||
| </head> | ||
| <body> | ||
| <div id="container"> | ||
| <div id="map"></div> | ||
| <div id="topPanel"> | ||
| <div id="shareButton" class="bold button"></div> | ||
| <div id="aboutButton" class="bold button">i</div> | ||
| <div id="statsButton" class="bold button hiddenExperimental">S</div> | ||
| <span id="missionName" class="medium"></span> | ||
| </div> | ||
| <div id="leftPanel"> | ||
| <div class="title bold" data-lb="players"></div> | ||
| <div class="panelContent"> | ||
| <ul id="listWest"></ul> | ||
| <ul id="listEast"></ul> | ||
| <ul id="listGuer"></ul> | ||
| <ul id="listCiv"></ul> | ||
| </div> | ||
| <div id="controlSide"> | ||
| <div id="sideWest" class="blufor sideTitle">BLUFOR</div> | ||
| <div id="sideEast" class="opfor sideTitle">OPFOR</div> | ||
| <div id="sideGuer" class="ind sideTitle">IND</div> | ||
| <div id="sideCiv" class="civ sideTitle">CIV</div> | ||
| </div> | ||
| </div> | ||
| <div id="rightPanel"> | ||
| <div class="title bold" data-lb="events"></div> | ||
| <div class="filterBox"> | ||
| <div id="filterHitEventsButton" class="filterHit"></div> | ||
| <div id="filterConnectEventsButton" class="filterConnect"></div> | ||
| <input type="text" id="filterEventsInput" placeholder="" data-lb="filter"/> | ||
| </div> | ||
| <div class="panelContent"> | ||
| <ul id="eventList"></ul> | ||
| </div> | ||
| </div> | ||
| <div class="extraInfoBox"> | ||
| <div class="extraInfoBoxContent"> | ||
| <span class="bold">Cursor target: </span><span id="cursorTargetBox">None</span> | ||
| </div> | ||
| </div> | ||
| <div id="bottomPanel"> | ||
| <div id="frameSliderContainer"> | ||
| <div id="eventTimeline"></div> | ||
| <div class="frameSliderContainer2"> | ||
| <input type="range" id="frameSlider" min="0" value="0"> | ||
| </div> | ||
| </div> | ||
| <div class="panelContent"> | ||
| <div id="playPauseButton" onclick="playPause()"> | ||
| </div> | ||
| <div id="timecodeContainer" class="medium"> | ||
| <span id="missionCurTime">0:00:00</span> | ||
| <span>/</span> | ||
| <span id="missionEndTime">0:00:00</span> | ||
| </div> | ||
| <div class="fullscreenButton" onclick="goFullscreen()"></div> | ||
| <div id="playbackSpeedSliderContainer"> | ||
| <span id="playbackSpeedVal">10x</span> | ||
| <input type="range" id="playbackSpeedSlider" /> | ||
| </div> | ||
| <span id="toggleFirelines"></span> | ||
| <span id="toggleNickname"></span> | ||
| <span id="toggleMapMarker"></span> | ||
| <span class="a3-theme select toggleTime"> | ||
| <select id="toggleTime"></select> | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <head> | ||
| <title>OCAP</title> | ||
| <meta charset="utf-8" /> | ||
| <meta name="viewport" content="initial-scale=1.0, user-scalable=no" /> | ||
| <link rel="stylesheet" href="leaflet/leaflet.css" /> | ||
| <link rel="stylesheet" href="style/common.css" /> | ||
| <link rel="stylesheet" href="style/index.css" /> | ||
| <link rel="icon" type="img/png" href="images/favicon.png" /> | ||
| <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script> | ||
| <script src="leaflet/leaflet.js"></script> | ||
| <!-- <script src="https://unpkg.com/leaflet@0.7.0/dist/leaflet.js"></script> --> | ||
| <script src="leaflet/leaflet.rotatedMarker.js"></script> | ||
| <script src="leaflet/leaflet.svgIcon.js"></script> | ||
| <script src="leaflet/leaflet.pattern.js"></script> | ||
| <link rel="stylesheet" href="leaflet/L.Icon.Pulse.css" /> | ||
| <script src="leaflet/L.Icon.Pulse.js"></script> | ||
| <link rel="stylesheet" href="leaflet/L.Control.Zoominfo.css" /> | ||
| <script src="leaflet/L.Control.Zoominfo.js"></script> | ||
| <link rel="stylesheet" href="leaflet/L.Control.Basemaps.css" /> | ||
| <script src="leaflet/L.Control.Basemaps.js"></script> | ||
| <script src="scripts/ocap.marker.js"></script> | ||
| <script src="scripts/ocap.entity.js"></script> | ||
| <script src="scripts/ocap.event.js"></script> | ||
| <script src="scripts/ocap.group.js"></script> | ||
| <script src="scripts/ocap.groups.js"></script> | ||
| <script src="scripts/ocap.vehicle.js"></script> | ||
| <script src="scripts/ocap.unit.js"></script> | ||
| <script src="scripts/ocap.ui.js"></script> | ||
| <script src="scripts/ocap.js"></script> | ||
| </head> | ||
| <body> | ||
| <div id="container"> | ||
| <div id="map"></div> | ||
| <div id="topPanel"> | ||
| <div id="shareButton" class="bold button"></div> | ||
| <div id="aboutButton" class="bold button">i</div> | ||
| <div id="statsButton" class="bold button hiddenExperimental">S</div> | ||
| <span id="missionName" class="medium"></span> | ||
| </div> | ||
| <div id="leftPanel"> | ||
| <div class="title bold" data-lb="players"></div> | ||
| <div class="panelContent"> | ||
| <ul id="listWest"></ul> | ||
| <ul id="listEast"></ul> | ||
| <ul id="listGuer"></ul> | ||
| <ul id="listCiv"></ul> | ||
| </div> | ||
| <div id="controlSide"> | ||
| <div id="sideWest" class="blufor sideTitle">BLUFOR</div> | ||
| <div id="sideEast" class="opfor sideTitle">OPFOR</div> | ||
| <div id="sideGuer" class="ind sideTitle">IND</div> | ||
| <div id="sideCiv" class="civ sideTitle">CIV</div> | ||
| </div> | ||
| </div> | ||
| <div id="rightPanel"> | ||
| <div class="title bold" data-lb="events"></div> | ||
| <div class="filterBox"> | ||
| <div id="filterHitEventsButton" class="filterHit"></div> | ||
| <div id="filterConnectEventsButton" class="filterConnect"></div> | ||
| <input | ||
| type="text" | ||
| id="filterEventsInput" | ||
| placeholder="" | ||
| data-lb="filter" | ||
| /> | ||
| </div> | ||
| <div class="panelContent"> | ||
| <ul id="eventList"></ul> | ||
| </div> | ||
| </div> | ||
| <div class="extraInfoBox"> | ||
| <div class="extraInfoBoxContent"> | ||
| <span class="bold">Cursor target: </span | ||
| ><span id="cursorTargetBox">None</span> | ||
| </div> | ||
| </div> | ||
| <div id="bottomPanel"> | ||
| <div id="frameSliderContainer"> | ||
| <div id="eventTimeline"></div> | ||
| <div class="frameSliderContainer2"> | ||
| <input type="range" id="frameSlider" min="0" value="0" /> | ||
| </div> | ||
| </div> | ||
| <div class="panelContent"> | ||
| <div id="playPauseButton" onclick="playPause()"></div> | ||
| <div id="timecodeContainer" class="medium"> | ||
| <span id="missionCurTime">0:00:00</span> | ||
| <span>/</span> | ||
| <span id="missionEndTime">0:00:00</span> | ||
| </div> | ||
| <div class="fullscreenButton" onclick="goFullscreen()"></div> | ||
| <div id="playbackSpeedSliderContainer"> | ||
| <span id="playbackSpeedVal">10x</span> | ||
| <input type="range" id="playbackSpeedSlider" /> | ||
| </div> | ||
| <span id="toggleFirelines"></span> | ||
| <span id="toggleNickname"></span> | ||
| <span id="toggleMapMarker"></span> | ||
| <span class="a3-theme select toggleTime"> | ||
| <select id="toggleTime"></select> | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div id="modal" class="modal"> | ||
| <div class="modalContent"> | ||
| <div id="modalHeader" class="modalHeader medium">Header</div> | ||
| <div id="modalFilter" class="modalFilter"> | ||
| <span class="a3-theme select filterTagGameInput"> | ||
| <select id="filterTagGameInput"></select> | ||
| </span> | ||
| <input type="text" id="filterGameInput" class="a3-theme input" placeholder="" data-lb="name_missions" /> | ||
| <input type="date" id="calendar1" class="a3-theme input" value="2017-06-01"> | ||
| <input type="date" id="calendar2" class="a3-theme input" value="2099-12-12"> | ||
| <div id="filterSubmit"></div> | ||
| </div> | ||
| <div id="modalBody" class="modalBody">Body</div> | ||
| <div id="modalButtons" class="modalButtons"></div> | ||
| </div> | ||
| </div> | ||
| <div id="modal" class="modal"> | ||
| <div class="modalContent"> | ||
| <div id="modalHeader" class="modalHeader medium">Header</div> | ||
| <div id="modalFilter" class="modalFilter"> | ||
| <span class="a3-theme select filterTagGameInput"> | ||
| <select id="filterTagGameInput"></select> | ||
| </span> | ||
| <input | ||
| type="text" | ||
| id="filterGameInput" | ||
| class="a3-theme input" | ||
| placeholder="" | ||
| data-lb="name_missions" | ||
| /> | ||
| <input | ||
| type="date" | ||
| id="calendar1" | ||
| class="a3-theme input" | ||
| value="2017-06-01" | ||
| /> | ||
| <input | ||
| type="date" | ||
| id="calendar2" | ||
| class="a3-theme input" | ||
| value="2099-12-12" | ||
| /> | ||
| <div id="filterSubmit"></div> | ||
| </div> | ||
| <div id="modalBody" class="modalBody">Body</div> | ||
| <div id="modalButtons" class="modalButtons"></div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div id="stats" class="modalDialog closed"> | ||
| <div class="dialogBase"> | ||
| <div id="statsHeader" class="dialogHeader">Statistics</div> | ||
| <div id="statsBody" class="dialogBody">Body</div> | ||
| <div id="statsFooter" class="dialogFooter"></div> | ||
| </div> | ||
| </div> | ||
| <div id="stats" class="modalDialog closed"> | ||
| <div class="dialogBase"> | ||
| <div id="statsHeader" class="dialogHeader">Statistics</div> | ||
| <div id="statsBody" class="dialogBody">Body</div> | ||
| <div id="statsFooter" class="dialogFooter"></div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div id="hint" class="hint">Test popup</div> | ||
| <div id="hint" class="hint">Test popup</div> | ||
|
|
||
| <script src="scripts/localizable.js"></script> | ||
| <script> | ||
| initOCAP(); | ||
| </script> | ||
| </body> | ||
| <script src="scripts/localizable.js"></script> | ||
| <script> | ||
| initOCAP(); | ||
| </script> | ||
| </body> | ||
| </html> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| .basemaps { | ||
| padding: 4px; | ||
| } | ||
| .basemaps.closed .basemap { | ||
| display: none; | ||
| } | ||
| .basemaps.closed .basemap.alt { | ||
| display: inline-block; | ||
| } | ||
| .basemaps.closed .basemap.alt h4 { | ||
| display: none; | ||
| } | ||
|
|
||
| .basemap { | ||
| display: inline-block; /* todo: flexbox? */ | ||
| cursor: pointer; | ||
| } | ||
| .basemap.active img { | ||
| border-color: orange; | ||
| box-shadow: 2px 2px 4px #000; | ||
| } | ||
| .basemap img { | ||
| width: 64px; | ||
| border: 2px solid #FFF; | ||
| margin: 0 2px; | ||
| border-radius: 40px; | ||
| box-shadow: 0 1px 5px rgba(0,0,0,0.65) | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In html a / at the end of an element is not needed, its only part of the xhtml specification