Merge pull request #626 from AndreasK79/awards_compact_tables
Changed to h2 for title, and table-sm for table to compacts tables a …
这个提交包含在:
		
						当前提交
						aea14b3f9a
					
				
					共有  9 个文件被更改,包括 21 次插入 和 23 次删除
				
			
		|  | @ -1,6 +1,6 @@ | ||||||
| <div class="container"> | <div class="container"> | ||||||
| 
 | 
 | ||||||
|   <h1><?php echo $page_title?></h1>
 |   <h2><?php echo $page_title?></h2>
 | ||||||
| 
 | 
 | ||||||
|   <?php $this->load->view("awards/nav_bar")?>
 |   <?php $this->load->view("awards/nav_bar")?>
 | ||||||
| 
 | 
 | ||||||
|  | @ -146,7 +146,7 @@ | ||||||
|     $i = 1; |     $i = 1; | ||||||
|     if ($cq_array) { |     if ($cq_array) { | ||||||
|     echo ' |     echo ' | ||||||
|     <table class="table 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> | ||||||
|             <td>#</td>
 |             <td>#</td>
 | ||||||
|  |  | ||||||
|  | @ -1,12 +1,12 @@ | ||||||
| 
 | 
 | ||||||
| <div class="container"> | <div class="container"> | ||||||
| 	<h1><?php echo $page_title; ?></h1>
 | 	<h2><?php echo $page_title; ?></h2>
 | ||||||
| 
 | 
 | ||||||
| 	<!-- Sub Nav for Awards --> | 	<!-- Sub Nav for Awards --> | ||||||
| 	 | 	 | ||||||
|     <?php $this->load->view("awards/nav_bar")?>
 |     <?php $this->load->view("awards/nav_bar")?>
 | ||||||
|      |      | ||||||
| 	<table class="table table-striped table-hover"> | 	<table class="table table-sm table-striped table-hover"> | ||||||
| 	<thead> | 	<thead> | ||||||
|         <tr> |         <tr> | ||||||
|         <td style="width:225px">DOKs (<?php echo count($doks)?>)</td>
 |         <td style="width:225px">DOKs (<?php echo count($doks)?>)</td>
 | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| 
 | 
 | ||||||
| <div class="container"> | <div class="container"> | ||||||
|     <h1><?php echo $page_title; ?></h1>
 |     <h2><?php echo $page_title; ?></h2>
 | ||||||
| 
 | 
 | ||||||
|     <!-- Sub Nav for Awards --> |     <!-- Sub Nav for Awards --> | ||||||
| 
 | 
 | ||||||
|  | @ -8,7 +8,6 @@ | ||||||
|     <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> | ||||||
| 
 | 
 | ||||||
|             <!-- Multiple Checkboxes (inline) --> |  | ||||||
|             <div class="form-group row"> |             <div class="form-group row"> | ||||||
|                 <div class="col-md-2 control-label" for="checkboxes">Deleted DXCC</div> |                 <div class="col-md-2 control-label" for="checkboxes">Deleted DXCC</div> | ||||||
|                 <div class="col-md-10"> |                 <div class="col-md-10"> | ||||||
|  | @ -116,8 +115,7 @@ | ||||||
|     $i = 1; |     $i = 1; | ||||||
|     if ($dxcc_array) { |     if ($dxcc_array) { | ||||||
|         echo ' |         echo ' | ||||||
|                  |                 <table class="table-sm table tabledxcc table-bordered table-hover table-striped table-condensed text-center"> | ||||||
|                 <table class="table table-bordered table-hover table-striped table-condensed text-center"> |  | ||||||
|                     <thead> |                     <thead> | ||||||
|                     <tr> |                     <tr> | ||||||
|                         <td>#</td>
 |                         <td>#</td>
 | ||||||
|  | @ -141,9 +139,9 @@ | ||||||
|             echo '</tr>'; |             echo '</tr>'; | ||||||
|         } |         } | ||||||
|         echo '</table> |         echo '</table> | ||||||
|         <h1>Summary</h1> |         <h2>Summary</h2> | ||||||
| 
 | 
 | ||||||
|         <table class="table table-bordered table-hover table-striped table-condensed text-center"> |         <table class="table-sm table table-bordered table-hover table-striped table-condensed text-center"> | ||||||
|         <thead> |         <thead> | ||||||
|         <tr><td></td>'; |         <tr><td></td>'; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| 
 | 
 | ||||||
| <div class="container"> | <div class="container"> | ||||||
|     <h1><?php echo $page_title; ?></h1>
 |     <h2><?php echo $page_title; ?></h2>
 | ||||||
| 
 | 
 | ||||||
|     <!-- Sub Nav for Awards --> |     <!-- Sub Nav for Awards --> | ||||||
| 
 | 
 | ||||||
|  | @ -103,7 +103,7 @@ | ||||||
|     if ($iota_array) { |     if ($iota_array) { | ||||||
|         echo ' |         echo ' | ||||||
|                  |                  | ||||||
|                 <table class="table 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> | ||||||
|                         <td>#</td>
 |                         <td>#</td>
 | ||||||
|  |  | ||||||
|  | @ -1,12 +1,12 @@ | ||||||
| <div class="container"> | <div class="container"> | ||||||
| 
 | 
 | ||||||
| 	<h1><?php echo $page_title; ?></h1>
 | 	<h2><?php echo $page_title; ?></h2>
 | ||||||
| 	 | 	 | ||||||
| 	<!-- Sub Nav for Awards --> | 	<!-- Sub Nav for Awards --> | ||||||
| 	 | 	 | ||||||
|     <?php $this->load->view("awards/nav_bar")?>
 |     <?php $this->load->view("awards/nav_bar")?>
 | ||||||
| 	 | 	 | ||||||
| 	<table class="table table-striped table-hover"> | 	<table class="table table-sm table-striped table-hover"> | ||||||
| 		 | 		 | ||||||
| 	<tr> | 	<tr> | ||||||
| 		<td>Reference</td> | 		<td>Reference</td> | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
|     <?php |     <?php | ||||||
|     $i = 1; |     $i = 1; | ||||||
|     if ($vucc_array) { |     if ($vucc_array) { | ||||||
|         echo '<table class="table table-bordered table-hover table-striped table-condensed text-center"> |         echo '<table class="table table-sm tablevucc table-bordered table-hover table-striped table-condensed text-center"> | ||||||
|         <thead> |         <thead> | ||||||
|         <tr> |         <tr> | ||||||
|             <td>#</td>
 |             <td>#</td>
 | ||||||
|  |  | ||||||
|  | @ -1,10 +1,10 @@ | ||||||
| <div class="container"> | <div class="container"> | ||||||
|     <h1><?php echo $page_title; ?></h1>
 |     <h2><?php echo $page_title; ?></h2>
 | ||||||
| 
 | 
 | ||||||
|     <!-- Sub Nav for Awards --> |     <!-- Sub Nav for Awards --> | ||||||
| 
 | 
 | ||||||
|     <?php $this->load->view("awards/nav_bar")?>
 |     <?php $this->load->view("awards/nav_bar")?>
 | ||||||
|         <table class="table 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> | ||||||
|                 <td>Band</td> |                 <td>Band</td> | ||||||
|  |  | ||||||
|  | @ -1,12 +1,12 @@ | ||||||
| <div class="container"> | <div class="container"> | ||||||
| 
 | 
 | ||||||
| 	<h1><?php echo $page_title; ?></h1>
 | 	<h2><?php echo $page_title; ?></h2>
 | ||||||
| 
 | 
 | ||||||
| 	<!-- Sub Nav for Awards --> | 	<!-- Sub Nav for Awards --> | ||||||
| 	 | 	 | ||||||
|     <?php $this->load->view("awards/nav_bar")?>
 |     <?php $this->load->view("awards/nav_bar")?>
 | ||||||
| 
 | 
 | ||||||
| 	<table class="table table-striped table-hover"> | 	<table class="table table-sm table-striped table-hover"> | ||||||
| 		 | 		 | ||||||
| 	<tr> | 	<tr> | ||||||
| 		<td>Square</td> | 		<td>Square</td> | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| 
 | 
 | ||||||
| <div class="container"> | <div class="container"> | ||||||
|     <h1><?php echo $page_title; ?></h1>
 |     <h2><?php echo $page_title; ?></h2>
 | ||||||
| 
 | 
 | ||||||
|     <!-- Sub Nav for Awards --> |     <!-- Sub Nav for Awards --> | ||||||
| 
 | 
 | ||||||
|  | @ -71,7 +71,7 @@ | ||||||
|     if ($was_array) { |     if ($was_array) { | ||||||
|         $i = 1; |         $i = 1; | ||||||
|     echo ' |     echo ' | ||||||
|     <table class="table 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> | ||||||
|             <td>#</td>
 |             <td>#</td>
 | ||||||
|  | @ -94,9 +94,9 @@ | ||||||
|         } |         } | ||||||
|         echo '</table> |         echo '</table> | ||||||
| 
 | 
 | ||||||
|         <h1>Summary</h1> |         <h2>Summary</h2> | ||||||
| 
 | 
 | ||||||
|         <table class="table 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><td></td>'; |         <tr><td></td>'; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用