Merge pull request #107 from phl0/refactorStationLogbookHint

Make clearer that overview filters on logbook rather than locations

application/language/bulgarian/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = 'Име на сателита';
 $lang['gen_hamradio_satellite_mode'] = 'Режим на сателита';
 
 $lang['gen_hamradio_logbook'] = 'Дневник';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_award'] = "Award";
 
 $lang['gen_hamradio_zones'] = 'Zones';

application/language/chinese_simplified/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = '卫星名称';
 $lang['gen_hamradio_satellite_mode'] = '卫星模式';
 
 $lang['gen_hamradio_logbook'] = '日志簿';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_award'] = "奖项";
 
 $lang['gen_hamradio_zones'] = '分区';

application/language/czech/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = 'Název satelitu';
 $lang['gen_hamradio_satellite_mode'] = 'Režim satelitu';
 
 $lang['gen_hamradio_logbook'] = 'Logbook';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_award'] = "Award";
 
 $lang['gen_hamradio_zones'] = 'Zones';

application/language/dutch/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = 'Satelliet Naam';
 $lang['gen_hamradio_satellite_mode'] = 'Satelliet Mode';
 
 $lang['gen_hamradio_logbook'] = 'Logboek';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_award'] = "Award";
 
 $lang['gen_hamradio_zones'] = 'Zones';

application/language/english/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = 'Satellite Name';
 $lang['gen_hamradio_satellite_mode'] = 'Satellite Mode';
 
 $lang['gen_hamradio_logbook'] = 'Logbook';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_award'] = "Award";
 
 $lang['gen_hamradio_zones'] = 'Zones';

application/language/finnish/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = 'Satelliitti';
 $lang['gen_hamradio_satellite_mode'] = 'Satelliitin Mode';
 
 $lang['gen_hamradio_logbook'] = 'Lokikirja';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_award'] = "Award";
 
 $lang['gen_hamradio_zones'] = 'Zones';

application/language/french/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = "Nom du Satellite";
 $lang['gen_hamradio_satellite_mode'] = "Mode du Satellite";
 
 $lang['gen_hamradio_logbook'] = "Journal de trafic";
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_award'] = "Award";
 
 $lang['gen_hamradio_zones'] = "Zones";

application/language/german/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = 'Satellit';
 $lang['gen_hamradio_satellite_mode'] = 'Satellitenmodus';
 
 $lang['gen_hamradio_logbook'] = 'Logbuch';
+$lang['gen_hamradio_active_logbook'] = 'Aktives Logbuch';
+$lang['gen_hamradio_active_logbook_hint'] = "Es werden alle QSO von Stationsstandorten angezeigt, welche mit diesem Logbuch verknüpft sind.";
 $lang['gen_hamradio_award'] = "Diplom";
 
 $lang['gen_hamradio_zones'] = 'Zonen';

application/language/greek/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = 'Όνομα δορυφόρου';
 $lang['gen_hamradio_satellite_mode'] = 'Λειτουργία δορυφόρου';
 
 $lang['gen_hamradio_logbook'] = 'Αρχείο επαφών';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_award'] = "Award";
 
 $lang['gen_hamradio_zones'] = 'Zones';

application/language/italian/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = 'Nome Satellite';
 $lang['gen_hamradio_satellite_mode'] = 'Modo Satellite';
 
 $lang['gen_hamradio_logbook'] = 'Logbook';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_award'] = "Award";
 
 $lang['gen_hamradio_zones'] = 'Zones';

application/language/polish/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = 'Nazwa satelity';
 $lang['gen_hamradio_satellite_mode'] = 'modulacja satelity';
 
 $lang['gen_hamradio_logbook'] = 'Log';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_award'] = "Award";
 
 $lang['gen_hamradio_zones'] = 'Zones';

application/language/russian/general_words_lang.php

@@ -156,7 +156,9 @@ $lang['gen_hamradio_satellite_name'] = 'Название спутника';
 $lang['gen_hamradio_satellite_mode'] = 'Режим работы спутника';
 
 $lang['gen_hamradio_award'] = "Диплом";
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_logbook'] = 'Журнал';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
 $lang['gen_hamradio_zones'] = 'Зоны';
 
 $lang['gen_hamradio_itu_zone'] = 'Зона ITU';

application/language/spanish/general_words_lang.php

@@ -156,6 +156,8 @@ $lang['gen_hamradio_satellite_name'] = 'Nombre del Satélite';
 $lang['gen_hamradio_satellite_mode'] = 'Modo del Satélite';
 
 $lang['gen_hamradio_logbook'] = 'Libro de Guardia';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
 $lang['gen_hamradio_award'] = "Premio";
 
 $lang['gen_hamradio_zones'] = 'Zonas';

application/language/swedish/general_words_lang.php

@@ -17,7 +17,7 @@ $lang['general_word_choose_file'] = 'Välj fil';
 $lang['general_word_next'] = 'Next';
 $lang['general_word_previous'] = 'Previous';
 $lang['general_word_not_display'] = "Not display";
-$lang['general_word_show'] = "Show";
+$lang['general_word_show'] = "Show";
 $lang['general_word_icon'] = "Icon";
 
 $lang['general_word_cancel'] = "Cancel";
@@ -52,9 +52,9 @@ $lang['general_word_city'] = 'City';
 $lang['general_word_total'] = 'Totalt';
 $lang['general_word_day'] = "Day";
 $lang['general_word_days'] = "Days";
-$lang['general_word_period'] = "Period";
-$lang['general_word_yearly'] = "Yearly";
-$lang['general_word_monthly'] = "Monthly";
+$lang['general_word_period'] = "Period";
+$lang['general_word_yearly'] = "Yearly";
+$lang['general_word_monthly'] = "Monthly";
 $lang['general_word_year'] = 'I år';
 $lang['general_word_month'] = 'Denna månad';
 
@@ -156,7 +156,9 @@ $lang['gen_hamradio_satellite_name'] = 'Satellitnamn';
 $lang['gen_hamradio_satellite_mode'] = 'Satellite-mode';
 
 $lang['gen_hamradio_award'] = "Award";
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_logbook'] = 'Loggbok';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
 
 $lang['gen_hamradio_zones'] = 'Zones';
 $lang['gen_hamradio_cq_zone'] = 'CQ Zone';

application/language/turkish/general_words_lang.php

@@ -155,6 +155,8 @@ $lang['gen_hamradio_satellite_name'] = 'Uydu Adı';
 $lang['gen_hamradio_satellite_mode'] = 'Uydu Modu';
 
 $lang['gen_hamradio_logbook'] = 'Kayıt defteri';
+$lang['gen_hamradio_active_logbook'] = 'Active Logbook';
+$lang['gen_hamradio_active_logbook_hint'] = "Displaying all QSOs of station locations which are linked to this logbook";
 $lang['gen_hamradio_award'] = "Award";
 
 $lang['gen_hamradio_zones'] = 'Zones';

application/views/view_log/index.php

@@ -1,25 +1,25 @@
 <div class="alert alert-secondary" role="alert" style="margin-bottom: 0px !important;">
-<div class="container">
-	<?php if ($results) { ?>
-		<p style="margin-bottom: 0px !important;"><?php echo lang('gen_hamradio_logbook'); ?>: <span class="badge text-bg-info"><?php echo $this->logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?></span> <?php echo lang('general_word_location'); ?>: <span class="badge text-bg-info"><?php echo $this->stations->find_name(); ?></span></p>
-	<?php } ?>
-</div>
+	<div class="container">
+		<?php if ($results) { ?>
+			<p style="margin-bottom: 0px !important;"><?php echo lang('gen_hamradio_active_logbook'); ?>: <span class="badge text-bg-info ms-1"><?php echo $this->logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?></span><i id="directory_tooltip" data-bs-toggle="tooltip" data-bs-placement="right" class="fas fa-question-circle text-muted ms-2" data-bs-custom-class="custom-tooltip" data-bs-html="true" data-bs-title="<?php echo lang('gen_hamradio_active_logbook_hint'); ?>"></i> </p>
+		<?php } ?>
+	</div>
 </div>
 
 <div class="container logbook">
 
 	<h2><?php echo lang('gen_hamradio_logbook'); ?></h2>
-	<?php if($this->session->flashdata('notice')) { ?>
-	<div class="alert alert-info" role="alert">
-	  <?php echo $this->session->flashdata('notice'); ?>
-	</div>
+	<?php if ($this->session->flashdata('notice')) { ?>
+		<div class="alert alert-info" role="alert">
+			<?php echo $this->session->flashdata('notice'); ?>
+		</div>
 	<?php } ?>
 </div>
-	
-<?php if($this->optionslib->get_option('logbook_map') != "false") { ?>
+
+<?php if ($this->optionslib->get_option('logbook_map') != "false") { ?>
 	<!-- Map -->
 	<div id="map" class="map-leaflet" style="width: 100%; height: 350px"></div>
 <?php } ?>
 
 <div style="padding-top: 10px; margin-top: 0px;" class="container logbook">
-	<?php $this->load->view('view_log/partial/log_ajax') ?>
+	<?php $this->load->view('view_log/partial/log_ajax') ?>