[Awards] PR #633 This makes Awards into a dropdown with options
Split award menu into dropdown and removed navbar form each award.
这个提交包含在:
		
						当前提交
						01e9c366ac
					
				
					共有  10 个文件被更改,包括 20 次插入 和 32 次删除
				
			
		|  | @ -2,8 +2,6 @@ | ||||||
| 
 | 
 | ||||||
|   <h2><?php echo $page_title?></h2>
 |   <h2><?php echo $page_title?></h2>
 | ||||||
| 
 | 
 | ||||||
|   <?php $this->load->view("awards/nav_bar")?>
 |  | ||||||
| 
 |  | ||||||
| <h3>CQ Zones worked:</h3> | <h3>CQ Zones worked:</h3> | ||||||
| 
 | 
 | ||||||
|     <ul class="nav nav-tabs" id="myTab" role="tablist"> |     <ul class="nav nav-tabs" id="myTab" role="tablist"> | ||||||
|  |  | ||||||
|  | @ -2,10 +2,6 @@ | ||||||
| <div class="container"> | <div class="container"> | ||||||
| 	<h2><?php echo $page_title; ?></h2>
 | 	<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"> | 	<table class="table table-sm table-striped table-hover"> | ||||||
| 	<thead> | 	<thead> | ||||||
|         <tr> |         <tr> | ||||||
|  |  | ||||||
|  | @ -2,9 +2,6 @@ | ||||||
| <div class="container"> | <div class="container"> | ||||||
|     <h2><?php echo $page_title; ?></h2>
 |     <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"> |     <form class="form" action="<?php echo site_url('awards/dxcc'); ?>" method="post" enctype="multipart/form-data"> | ||||||
|         <fieldset> |         <fieldset> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2,9 +2,6 @@ | ||||||
| <div class="container"> | <div class="container"> | ||||||
|     <h2><?php echo $page_title; ?></h2>
 |     <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"> |     <form class="form" action="<?php echo site_url('awards/iota'); ?>" method="post" enctype="multipart/form-data"> | ||||||
|         <fieldset> |         <fieldset> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2,10 +2,6 @@ | ||||||
| 
 | 
 | ||||||
| 	<h2><?php echo $page_title; ?></h2>
 | 	<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"> | 	<table class="table table-sm table-striped table-hover"> | ||||||
| 		 | 		 | ||||||
| 	<tr> | 	<tr> | ||||||
|  |  | ||||||
|  | @ -1,9 +1,6 @@ | ||||||
| <div class="container"> | <div class="container"> | ||||||
|     <h2><?php echo $page_title; ?></h2>
 |     <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"> |         <table class="table table-sm table-bordered table-hover table-striped table-condensed text-center"> | ||||||
|             <thead> |             <thead> | ||||||
|             <tr> |             <tr> | ||||||
|  |  | ||||||
|  | @ -2,10 +2,6 @@ | ||||||
| 
 | 
 | ||||||
| 	<h2><?php echo $page_title; ?></h2>
 | 	<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"> | 	<table class="table table-sm table-striped table-hover"> | ||||||
| 		 | 		 | ||||||
| 	<tr> | 	<tr> | ||||||
|  |  | ||||||
|  | @ -1,10 +1,6 @@ | ||||||
| <div id="container"> | <div id="container"> | ||||||
| 	<h1><?php echo $page_title; ?></h1>
 | 	<h1><?php echo $page_title; ?></h1>
 | ||||||
| 
 | 
 | ||||||
| 	<!-- Sub Nav for Awards --> |  | ||||||
| 	 |  | ||||||
|     <?php $this->load->view("awards/nav_bar")?>
 |  | ||||||
| 
 |  | ||||||
| 	<?php if ($wacral_all->num_rows() > 0) { ?>
 | 	<?php if ($wacral_all->num_rows() > 0) { ?>
 | ||||||
| 	<table width="100%" class="zebra-striped"> | 	<table width="100%" class="zebra-striped"> | ||||||
| 		 | 		 | ||||||
|  |  | ||||||
|  | @ -2,9 +2,6 @@ | ||||||
| <div class="container"> | <div class="container"> | ||||||
|     <h2><?php echo $page_title; ?></h2>
 |     <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"> |     <form class="form" action="<?php echo site_url('awards/was'); ?>" method="post" enctype="multipart/form-data"> | ||||||
|         <fieldset> |         <fieldset> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -89,8 +89,26 @@ | ||||||
| 				</div> | 				</div> | ||||||
|         	</li> |         	</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"> |         	<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> | 				<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Admin</a> | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用