From 89b5457872b088991767bdaab3ce7de9f60836bf Mon Sep 17 00:00:00 2001 From: Michael Romashov Date: Thu, 1 Apr 2021 00:58:45 -0400 Subject: [PATCH] VATMEX acquisition. --- .idea/misc.xml | 2 +- .idea/runConfigurations/beta_zhuartcc_org.xml | 4 +- .idea/zhuartcc.org.iml | 2 +- .../administration/templates/admin_panel.html | 32 ++++----- apps/administration/views.py | 2 +- apps/api/templates/statistics.html | 30 ++++----- apps/api/views.py | 2 +- apps/event/templates/events.html | 2 +- apps/event/views.py | 27 +++----- apps/pilots/templates/scenery.html | 2 +- apps/pilots/views.py | 2 +- apps/resource/templates/resources.html | 10 +-- apps/resource/views.py | 2 +- apps/training/templates/training_center.html | 34 +++++----- apps/training/views.py | 2 +- apps/user/templates/profile.html | 52 +++++++-------- apps/user/templates/roster.html | 8 +-- apps/user/templates/staff.html | 36 +++++------ apps/user/views.py | 4 +- static/css/index.css | 3 +- static/css/index.min.css | 2 +- static/img/homepage-bg.jpg | Bin 116363 -> 2637983 bytes static/img/zhulogo-dark.png | Bin 59107 -> 0 bytes static/img/zhulogo-light.png | Bin 50270 -> 0 bytes static/img/zhulogo.png | Bin 60796 -> 230654 bytes templates/homepage.html | 61 +++++++++++------- templates/partials/footer.html | 10 +-- templates/partials/navbar.html | 47 +++++++------- 28 files changed, 192 insertions(+), 186 deletions(-) delete mode 100644 static/img/zhulogo-dark.png delete mode 100644 static/img/zhulogo-light.png diff --git a/.idea/misc.xml b/.idea/misc.xml index c5feb0b..f5431f7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/.idea/runConfigurations/beta_zhuartcc_org.xml b/.idea/runConfigurations/beta_zhuartcc_org.xml index 6abdab9..26b3cd1 100644 --- a/.idea/runConfigurations/beta_zhuartcc_org.xml +++ b/.idea/runConfigurations/beta_zhuartcc_org.xml @@ -7,9 +7,9 @@ -