Skip to content
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

Kallewesterling/issue2 #177

Closed
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
da771af
scroll adjust works but ticks missing
edwardchalstrey1 Jun 27, 2024
18d433e
yearTickmarkValues above slider
edwardchalstrey1 Jul 1, 2024
ea5071d
400% width
edwardchalstrey1 Jul 1, 2024
e471cca
adjust scroll on every plot polities
edwardchalstrey1 Jul 1, 2024
8400e46
increase tickmarks to 100
edwardchalstrey1 Jul 1, 2024
188d030
ensure slider value never off screen
edwardchalstrey1 Jul 1, 2024
b1f4ca7
massive year
edwardchalstrey1 Jul 1, 2024
e81db0c
move year controls to bottom
edwardchalstrey1 Jul 1, 2024
b42797a
switch font
edwardchalstrey1 Jul 1, 2024
2c60039
add increment
edwardchalstrey1 Jul 1, 2024
c80889f
increment controls play rate
edwardchalstrey1 Jul 1, 2024
944dcce
add start and end buttons
edwardchalstrey1 Jul 1, 2024
a025efe
adjust date percent left
edwardchalstrey1 Jul 1, 2024
e8caba2
swap order of play rate and animation
edwardchalstrey1 Jul 2, 2024
123f2ac
use 80 ticks for world map
edwardchalstrey1 Jul 2, 2024
fd45160
reposition date further from left
edwardchalstrey1 Jul 2, 2024
6ce53b0
fit controls neatly
edwardchalstrey1 Jul 2, 2024
3188a2b
add white background date
edwardchalstrey1 Jul 2, 2024
133bd76
move sliderDate up
edwardchalstrey1 Jul 2, 2024
1cac35e
consistent transparancy
edwardchalstrey1 Jul 2, 2024
424efc0
consistent background colours
edwardchalstrey1 Jul 2, 2024
5de1940
adjust positioning
edwardchalstrey1 Jul 2, 2024
7b10b25
add popup to side panel
edwardchalstrey1 Jul 2, 2024
642b8d2
add link to polity page
edwardchalstrey1 Jul 2, 2024
2dd47f2
fit popup
edwardchalstrey1 Jul 2, 2024
83f7985
adjust popup position and padding
edwardchalstrey1 Jul 2, 2024
0eacfac
add coloured borders to panel
edwardchalstrey1 Jul 2, 2024
34f3b14
round edges
edwardchalstrey1 Jul 2, 2024
99d618f
put popup in top left of map
edwardchalstrey1 Jul 2, 2024
2a69a2a
accent-color: teal
edwardchalstrey1 Jul 2, 2024
650a4a0
use proper colour for basemap
edwardchalstrey1 Jul 2, 2024
d4590e1
combine to single click func
edwardchalstrey1 Jul 2, 2024
62f1b35
add clear selection button
edwardchalstrey1 Jul 2, 2024
0966231
turn off personal union clicking
edwardchalstrey1 Jul 2, 2024
ba6a2b1
clear selection on variable dropdown
edwardchalstrey1 Jul 2, 2024
d40a61a
add initial polity to popup
edwardchalstrey1 Jul 2, 2024
9656ecf
remove start and end buttons from polity map
edwardchalstrey1 Jul 2, 2024
604408c
reorder buttons
edwardchalstrey1 Jul 2, 2024
d3ac4e5
accent-color: teal;
edwardchalstrey1 Jul 2, 2024
af99c13
Merge pull request #5 from Seshat-Global-History-Databank/scrollable-…
edwardchalstrey1 Jul 2, 2024
bc2967a
Fixing up unnecessary `docs` import causing docs rendering issues
kallewesterling Jul 4, 2024
7ddd3b1
Create issue templates
kallewesterling Jul 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add coloured borders to panel
  • Loading branch information
edwardchalstrey1 committed Jul 2, 2024
commit 0eacfac53c24a47997b1ab2453e8d1a19eb35114
8 changes: 8 additions & 0 deletions seshat/apps/core/templates/core/world_map.html
Original file line number Diff line number Diff line change
@@ -130,6 +130,8 @@
height: 20%;
overflow: auto;
padding: 10px;
border-style: solid;
border-width: 0px;
}

</style>
@@ -660,6 +662,8 @@ <h1 class="text-teal federicka-huge" id="sliderDate"></h1>
layer.feature.properties.seshat_id = shape.seshat_id || '';
// Add polity name to the layer
layer.feature.properties.polity = shape.polity;
// Add the colour to the layer
layer.feature.properties.colour = shapeColour;

var popupContent = `
<table>
@@ -799,6 +803,10 @@ <h1 class="text-teal federicka-huge" id="sliderDate"></h1>
// Add the popup to the popup div
layer.on('click', function (e) {
document.getElementById('popup').innerHTML = popupContent;
// Set the border colour of the popup div
document.getElementById('popup').style.borderColor = layer.feature.properties.colour;
// Increase the border width of the popup div
document.getElementById('popup').style.borderWidth = '4px';
});

// Listen for the click event on the layer