diff --git a/cmp/urls.py b/cmp/urls.py index 6a59e96..3b05c3e 100644 --- a/cmp/urls.py +++ b/cmp/urls.py @@ -107,7 +107,9 @@ def protect_patterns(patterns): path('acknowledgements/', views.acknowledgements, name='acknowledgements'), path('ww1-diaries/', views.ww1_diaries, name='ww1-diaries'), + path('inter-war/', views.inter_war, name='inter-war'), path('ww2-diaries/', views.ww2_diaries, name='ww2-diaries'), + path('post-ww2/', views.post_ww2, name='post-ww2'), path('accounts/', include('allauth.urls')), path('', include(protect_patterns(mgmt_patterns))), diff --git a/cmp/views.py b/cmp/views.py index 1af525f..9810173 100644 --- a/cmp/views.py +++ b/cmp/views.py @@ -1050,9 +1050,15 @@ def war_diaries(request): def ww1_diaries(request): return render(request, 'cmp/ww1-diaries.html') +def inter_war(request): + return render(request, 'cmp/inter-war.html') + def ww2_diaries(request): return render(request, 'cmp/ww2-diaries.html') +def post_ww2(request): + return render(request, 'cmp/post-ww2.html') + def decorations_report(request): # Get top 10 soldiers with most decorations soldiers_with_decorations = Soldier.objects.annotate( diff --git a/templates/cmp/inter-war.html b/templates/cmp/inter-war.html new file mode 100644 index 0000000..744f107 --- /dev/null +++ b/templates/cmp/inter-war.html @@ -0,0 +1,70 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}Inter-War Period{% endblock %} + +{% block content %} + + +
+ The badge of the Royal Military Police +

Corps of Military Police

+{% include 'navbar.html' %} +
+ +
+

Inter-War Period

+
+ +
+
+ +{% endblock %} \ No newline at end of file diff --git a/templates/cmp/post-ww2.html b/templates/cmp/post-ww2.html new file mode 100644 index 0000000..2eb563f --- /dev/null +++ b/templates/cmp/post-ww2.html @@ -0,0 +1,62 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}Post World War II Diaries{% endblock %} + +{% block content %} + + +
+ The badge of the Royal Military Police +

Corps of Military Police

+{% include 'navbar.html' %} +
+ +
+

Post World War II

+
+ +
+
+ +{% endblock %} \ No newline at end of file diff --git a/templates/cmp/ww1-diaries.html b/templates/cmp/ww1-diaries.html index d65556d..027ff52 100644 --- a/templates/cmp/ww1-diaries.html +++ b/templates/cmp/ww1-diaries.html @@ -46,6 +46,14 @@

Corps of Military Police

+

Pre 1914

+
+
+

World War I

War Diaries
@@ -58,13 +66,16 @@
War Diaries
Miscellaneous Information
diff --git a/templates/cmp/ww2-diaries.html b/templates/cmp/ww2-diaries.html index 238ea7c..911618d 100644 --- a/templates/cmp/ww2-diaries.html +++ b/templates/cmp/ww2-diaries.html @@ -73,32 +73,29 @@
Unit Histories
  • 111 Provost Company
  • 247 Provost Company (Berlin)
  • Auxiliary Territorial Service Provost
    • +
  • 53 (Welch) Division Provost Company
    • Miscellaneous Information
    diff --git a/templates/navbar.html b/templates/navbar.html index 4edc35f..3de3544 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -12,13 +12,13 @@ World War I
  • - Inter-War Period + Inter-War Period
  • World War II
  • - Post World War II + Post World War II