UI changes handoff - #16

Open

alegomonkey wants to merge 48 commits into

theSKAILab:mainfrom

Commits on Apr 21, 2026

Added dev templates and navbar support
JWLorenzo
committed
b4bacfa
Fixed spelling/punctuation
JWLorenzo
committed
746f9d4
Merge pull request #1 from JWLorenzo/b/jacobl/redesign
alegomonkey
authored
305665d

Commits on Apr 22, 2026

Add dropdown to nav
alegomonkey
committed
e24f343
Merge branch 'main' into JMS-edits
alegomonkey
authored
7ee38bb
Created branch of changes for current commit
JWLorenzo
committed
af16131
Merge pull request #3 from JWLorenzo/s/jacobl/suggestions
alegomonkey
authored
778ade9
Merge pull request #2 from JWLorenzo/JMS-edits
JWLorenzo
authored
f95df81
Saving Progres -- Basic Sidebar
JWLorenzo
committed
8248308

Commits on Apr 23, 2026

Isolating Changes
JWLorenzo
committed
10b35c5
Isolating
JWLorenzo
committed
3a3fc0f
Isolating
JWLorenzo
committed
c404fe4
Merge pull request #4 from JWLorenzo/b/jacobl/sidebar
alegomonkey
authored
aa28427
Help page
Ali Pourghasemi
committed
25b6196
Created Footer Element
JWLorenzo
committed
f4507f7

Commits on Apr 25, 2026

Created Front Page
JWLorenzo
committed
6330204

Commits on Apr 27, 2026

Add tree preference and inventory filter tables

Shadi
authored and
Shadi
committed
0c7c985
Major changes: layout now enforces the navbar, reflected in the other html pages. sidebar now shows the current module and is a dropdown that can be expanded to select other modules. Tree Inventory…
alegomonkey
committed
2fb22b0
Merge pull request #8 from JWLorenzo/JMS-treeInventory
JWLorenzo
authored
e79e88c
Merge remote-tracking branch 'origin/main' into f/jacobl/main_page
JWLorenzo
committed
c3d3005
Saving Changes
JWLorenzo
committed
c9a4950
Fixing index to align with main
JWLorenzo
committed
6ca240a
Saving
JWLorenzo
committed
0e873ba
Fixed Map
JWLorenzo
committed
ec28e9f
Merge pull request #7 from JWLorenzo/f/jacobl/main_page
alegomonkey
authored
9a4483b

Commits on Apr 28, 2026

Updated Spinner
JWLorenzo
committed
21901a7

Commits on May 4, 2026

Merge branch 'main' into help_page
alegomonkey
authored
2458a62
Merge pull request #9 from JWLorenzo/f/jacobl/loading
alegomonkey
authored
c32dafc

Commits on May 5, 2026

move the script into static/scripts

Ali Pourghasemi
authored and
Ali Pourghasemi
committed
34ca2c3
use rem instead of px

Ali Pourghasemi
authored and
Ali Pourghasemi
committed
fa610a7
Move CSS to site.css and JS to external file, convert to rem, remove duplicates

Shadi
authored and
Shadi
committed
4543d79
Resolve merge conflicts with main
shawd4586
committed
d0b92b9
Move treePreferencesTask CSS to site.css and JS to external file
shawd4586
committed
de60427
Remove unused treeInventoryTaskStyle.css
shawd4586
committed
e53b459
Moved HTML to the templates_dev directory. Only the treePreferencesTask.HTML will be visable. Tree inventory is now stored as treeInventoryTaksShadi.html for future integration. --NOTE: When mergin…
alegomonkey
committed
90c5e84
Created About Page
JWLorenzo
committed
795abf5
This branch is now up to date and ready to merge with the current main - working treeInventoryData query page - working and fixed scrolling behavior in environmental preferences page. CSS needs upd…
alegomonkey
committed
4100610
Merge pull request #11 from JWLorenzo/f/jacobl/about
alegomonkey
authored
ada5f45
Merge branch 'main' into shadi-tree-filter-table
alegomonkey
authored
ad22629

Commits on May 12, 2026

Commits on May 13, 2026

Changed the navbar so Digitial Forest name takes you to \home not #.
alegomonkey
committed
6f82f9b
Reverted Treeinventorytask
JWLorenzo
committed
44f1545
Merge pull request #13 from JWLorenzo/f/jacobl/fix_tree
alegomonkey
authored
11c4694

Commits on May 14, 2026

Merge branch 'Environmental-Data-Preferences'
alegomonkey
committed
19ee1e3

Commits on May 15, 2026

Merge remote-tracking branch 'upstream/main'
alegomonkey
committed
bf3c914

Commits on May 16, 2026

Merge pull request #14 from JWLorenzo/upstreamMerge
alegomonkey
authored
61b0de0