From 59acc2afa47a99bd931990049f0321bf5153912b Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Tue, 29 Sep 2020 12:45:40 +0200
Subject: [PATCH] Split award menu into dropdown and removed navbar form each
 award. Done this to clean up pages and to save screen estate.

---
 application/views/awards/cq/index.php         |  2 --
 application/views/awards/dok/index.php        |  4 ----
 application/views/awards/dxcc/index.php       |  3 ---
 application/views/awards/iota/index.php       |  3 ---
 application/views/awards/sota/index.php       |  4 ----
 application/views/awards/vucc/index.php       |  3 ---
 application/views/awards/wab/index.php        |  4 ----
 application/views/awards/wacral/index.php     |  4 ----
 application/views/awards/was/index.php        |  3 ---
 application/views/interface_assets/header.php | 22 +++++++++++++++++--
 10 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php
index f224fe7b..0fc9fc35 100644
--- a/application/views/awards/cq/index.php
+++ b/application/views/awards/cq/index.php
@@ -2,8 +2,6 @@
 
   <h2><?php echo $page_title?></h2>
 
-  <?php $this->load->view("awards/nav_bar")?>
-
 <h3>CQ Zones worked:</h3>
 
     <ul class="nav nav-tabs" id="myTab" role="tablist">
diff --git a/application/views/awards/dok/index.php b/application/views/awards/dok/index.php
index 075ea6b1..f967d446 100644
--- a/application/views/awards/dok/index.php
+++ b/application/views/awards/dok/index.php
@@ -2,10 +2,6 @@
 <div class="container">
 	<h2><?php echo $page_title; ?></h2>
 
-	<!-- Sub Nav for Awards -->
-	
-    <?php $this->load->view("awards/nav_bar")?>
-    
 	<table class="table table-sm table-striped table-hover">
 	<thead>
         <tr>
diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php
index 98b7ff88..15f4e37c 100644
--- a/application/views/awards/dxcc/index.php
+++ b/application/views/awards/dxcc/index.php
@@ -2,9 +2,6 @@
 <div class="container">
     <h2><?php echo $page_title; ?></h2>
 
-    <!-- Sub Nav for Awards -->
-
-    <?php $this->load->view("awards/nav_bar")?>
     <form class="form" action="<?php echo site_url('awards/dxcc'); ?>" method="post" enctype="multipart/form-data">
         <fieldset>
 
diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php
index 75681124..2eb46dc7 100644
--- a/application/views/awards/iota/index.php
+++ b/application/views/awards/iota/index.php
@@ -2,9 +2,6 @@
 <div class="container">
     <h2><?php echo $page_title; ?></h2>
 
-    <!-- Sub Nav for Awards -->
-
-    <?php $this->load->view("awards/nav_bar")?>
     <form class="form" action="<?php echo site_url('awards/iota'); ?>" method="post" enctype="multipart/form-data">
         <fieldset>
 
diff --git a/application/views/awards/sota/index.php b/application/views/awards/sota/index.php
index b8080d8f..a3e096e8 100644
--- a/application/views/awards/sota/index.php
+++ b/application/views/awards/sota/index.php
@@ -2,10 +2,6 @@
 
 	<h2><?php echo $page_title; ?></h2>
 	
-	<!-- Sub Nav for Awards -->
-	
-    <?php $this->load->view("awards/nav_bar")?>
-	
 	<table class="table table-sm table-striped table-hover">
 		
 	<tr>
diff --git a/application/views/awards/vucc/index.php b/application/views/awards/vucc/index.php
index b52a2d50..bf605056 100644
--- a/application/views/awards/vucc/index.php
+++ b/application/views/awards/vucc/index.php
@@ -1,9 +1,6 @@
 <div class="container">
     <h2><?php echo $page_title; ?></h2>
 
-    <!-- Sub Nav for Awards -->
-
-    <?php $this->load->view("awards/nav_bar")?>
         <table class="table table-sm table-bordered table-hover table-striped table-condensed text-center">
             <thead>
             <tr>
diff --git a/application/views/awards/wab/index.php b/application/views/awards/wab/index.php
index 9fb7b330..81e6a690 100644
--- a/application/views/awards/wab/index.php
+++ b/application/views/awards/wab/index.php
@@ -2,10 +2,6 @@
 
 	<h2><?php echo $page_title; ?></h2>
 
-	<!-- Sub Nav for Awards -->
-	
-    <?php $this->load->view("awards/nav_bar")?>
-
 	<table class="table table-sm table-striped table-hover">
 		
 	<tr>
diff --git a/application/views/awards/wacral/index.php b/application/views/awards/wacral/index.php
index d38f5eb0..388350ba 100644
--- a/application/views/awards/wacral/index.php
+++ b/application/views/awards/wacral/index.php
@@ -1,10 +1,6 @@
 <div id="container">
 	<h1><?php echo $page_title; ?></h1>
 
-	<!-- Sub Nav for Awards -->
-	
-    <?php $this->load->view("awards/nav_bar")?>
-
 	<?php if ($wacral_all->num_rows() > 0) { ?>
 	<table width="100%" class="zebra-striped">
 		
diff --git a/application/views/awards/was/index.php b/application/views/awards/was/index.php
index 299a3cda..6f405103 100644
--- a/application/views/awards/was/index.php
+++ b/application/views/awards/was/index.php
@@ -2,9 +2,6 @@
 <div class="container">
     <h2><?php echo $page_title; ?></h2>
 
-    <!-- Sub Nav for Awards -->
-
-    <?php $this->load->view("awards/nav_bar")?>
     <form class="form" action="<?php echo site_url('awards/was'); ?>" method="post" enctype="multipart/form-data">
         <fieldset>
 
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 82c39c7c..f284f92f 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -89,8 +89,26 @@
 				</div>
         	</li>
 
-        	<a class="nav-link" href="<?php echo site_url('awards/dxcc');?>">Awards</a>
-
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Awards</a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+        	        <a class="dropdown-item" href="<?php echo site_url('awards/dxcc');?>">DXCC</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/vucc');?>">VUCC</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/was');?>">WAS</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/cq');?>">CQ</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/iota');?>">IOTA</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/wab');?>">WAB</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/sota');?>">SOTA</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/dok');?>">DOK</a>
+                </div>
+            </li>
         	
         	<li class="nav-item dropdown">
 				<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Admin</a>