Merge remote-tracking branch 'upstream/dev' into eqslCardDownload

application/controllers/Kmlexport.php

@@ -90,17 +90,8 @@ class Kmlexport extends CI_Controller {
 		$output .= "</Document>";
 		$output .= "</kml>";
 
-        if (!file_exists('kml')) {
-            mkdir('kml', 0755, true);
-        }
-
-		if ( ! write_file('kml/qsos.kml', $output)) {
-		     echo 'Unable to write the file. Make sure the folder KML has write permissions.';
-		}
-		else {
-		    header("Content-Disposition: attachment; filename=\"qsos.kml\"");
-			echo $output;
-		}
+		header("Content-Disposition: attachment; filename=\"qsos.kml\"");
+		echo $output;
 
 	}
-}
+}

application/language/english/menu_lang.php

@@ -0,0 +1,78 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['menu_badge_developer_mode'] = 'Developer Mode';
+
+$lang['menu_logbook'] = 'Logbook';
+$lang['menu_overview'] = 'Overview';
+$lang['menu_advanced'] = 'Advanced';
+
+$lang['menu_qso'] = 'QSO';
+$lang['menu_live_qso'] = 'Live QSO';
+$lang['menu_post_qso'] = 'Post QSO';
+$lang['menu_live_contest_logging'] = 'Live Contest Logging';
+$lang['menu_post_contest_logging'] = 'Post Contest Logging';
+$lang['menu_view_qsl'] = 'View QSL';
+
+$lang['menu_analytics'] = 'Analytics';
+$lang['menu_statistics'] = 'Statistics';
+$lang['menu_gridsquares'] = 'Gridsquares';
+$lang['menu_activated_gridsquares'] = 'Activated Gridsquares';
+$lang['menu_gridsquare_activators'] = 'Gridsquare Activators';
+$lang['menu_distances_worked'] = 'Distances Worked';
+$lang['menu_days_with_qsos'] = 'Days with QSOs';
+$lang['menu_timeline'] = 'Timeline';
+$lang['menu_accumulated_statistics'] = 'Accumulated Statistics';
+$lang['menu_timeplotter'] = 'Timeplotter';
+$lang['menu_custom_maps'] = 'Custom Maps';
+$lang['menu_continents'] = 'Continents';
+
+$lang['menu_awards'] = 'Awards';
+$lang['menu_cq'] = 'CQ';
+$lang['menu_dok'] = 'DOK';
+$lang['menu_dxcc'] = 'DXCC';
+$lang['menu_iota'] = 'IOTA';
+$lang['menu_pota'] = 'POTA';
+$lang['menu_sig'] = 'SIG';
+$lang['menu_sota'] = 'SOTA';
+$lang['menu_us_counties'] = 'US Counties';
+$lang['menu_vucc'] = 'VUCC';
+$lang['menu_was'] = 'WAS';
+$lang['menu_wwff'] = 'WWFF';
+
+$lang['menu_admin'] = 'Admin';
+$lang['menu_user_account'] = 'User Accounts';
+$lang['menu_global_options'] = 'Global Options';
+$lang['menu_modes'] = 'Modes';
+$lang['menu_contests'] = 'Contests';
+$lang['menu_themes'] = 'Themes';
+$lang['menu_backup'] = 'Backup';
+$lang['menu_update_country_files'] = 'Update Country Files';
+$lang['menu_debug_information'] = 'Debug Information';
+
+$lang['menu_search_text'] = 'Search Callsign';
+
+$lang['menu_search_button'] = 'Search';
+$lang['menu_login_button'] = 'Login';
+
+$lang['menu_account'] = 'Account';
+$lang['menu_station_logbooks'] = 'Station Logbooks';
+$lang['menu_station_locations'] = 'Station Locations';
+$lang['menu_bands'] = 'Bands';
+$lang['menu_adif_import_export'] = 'ADIF Import / Export';
+$lang['menu_kml_export'] = 'KML Export';
+$lang['menu_dx_atlas_gridsquare_export'] = 'DX Atlas Gridsquare Export';
+$lang['menu_sota_csv_export'] = 'SOTA CSV Export';
+$lang['menu_cabrillo_export'] = 'Cabrillo Export';
+$lang['menu_oqrs_requests'] = 'OQRS Requests';
+$lang['menu_print_requested_qsls'] = 'Print Requested QSLs';
+$lang['menu_logbook_of_the_world'] = 'Logbook of the World';
+$lang['menu_eqsl_import_export'] = 'eQSL Import / Export';
+$lang['menu_qrz_logbook'] = 'QRZ Logbook';
+$lang['menu_qo_100_dx_club_upload'] = 'QO-100 Dx Club Upload';
+$lang['menu_api_keys'] = 'API Keys';
+$lang['menu_hardware_interfaces'] = 'Hardware Interfaces';
+$lang['menu_help'] = 'Help';
+$lang['menu_forum'] = 'Forum';
+$lang['menu_logout'] = 'Logout';

application/language/german/menu_lang.php

@@ -0,0 +1,78 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['menu_badge_developer_mode'] = 'Entwickler-Modus';
+
+$lang['menu_logbook'] = 'Logbuch';
+$lang['menu_overview'] = 'Übersicht';
+$lang['menu_advanced'] = 'Erweitert';
+
+$lang['menu_qso'] = 'QSO';
+$lang['menu_live_qso'] = 'Live QSO';
+$lang['menu_post_qso'] = 'Zeitversetztes QSO';
+$lang['menu_live_contest_logging'] = 'Live Contest Logging';
+$lang['menu_post_contest_logging'] = 'Zeitversetztes Contest Logging';
+$lang['menu_view_qsl'] = 'QSL Ansicht';
+
+$lang['menu_analytics'] = 'Analysen';
+$lang['menu_statistics'] = 'Statistik';
+$lang['menu_gridsquares'] = 'Planquadrate';
+$lang['menu_activated_gridsquares'] = 'Aktivierte Planquadrate';
+$lang['menu_gridsquare_activators'] = 'Planquadrat-Aktivierer';
+$lang['menu_distances_worked'] = 'Gearbeitete Entfernungen';
+$lang['menu_days_with_qsos'] = 'Tage mit QSOs';
+$lang['menu_timeline'] = 'Zeitleiste';
+$lang['menu_accumulated_statistics'] = 'Kumulierte Statistiken';
+$lang['menu_timeplotter'] = 'Zeitplotter';
+$lang['menu_custom_maps'] = 'Benutzerdefinierte Karte';
+$lang['menu_continents'] = 'Kontinente';
+
+$lang['menu_awards'] = 'Auszeichnungen';
+$lang['menu_cq'] = 'CQ';
+$lang['menu_dok'] = 'DOK';
+$lang['menu_dxcc'] = 'DXCC';
+$lang['menu_iota'] = 'IOTA';
+$lang['menu_pota'] = 'POTA';
+$lang['menu_sig'] = 'SIG';
+$lang['menu_sota'] = 'SOTA';
+$lang['menu_us_counties'] = 'US Grafschaften';
+$lang['menu_vucc'] = 'VUCC';
+$lang['menu_was'] = 'WAS';
+$lang['menu_wwff'] = 'WWFF';
+
+$lang['menu_admin'] = 'Admin';
+$lang['menu_user_account'] = 'Benutzerkonten';
+$lang['menu_global_options'] = 'Globale Optionen';
+$lang['menu_modes'] = 'Modi';
+$lang['menu_contests'] = 'Conteste';
+$lang['menu_themes'] = 'Layouts';
+$lang['menu_backup'] = 'Backup';
+$lang['menu_update_country_files'] = 'Update Länderinformationen';
+$lang['menu_debug_information'] = 'Debug Informationen';
+
+$lang['menu_search_text'] = 'Rufzeichensuche';
+
+$lang['menu_search_button'] = 'Suche';
+$lang['menu_login_button'] = 'Login';
+
+$lang['menu_account'] = 'Konto';
+$lang['menu_station_logbooks'] = 'Stationslogbücher';
+$lang['menu_station_locations'] = 'Stationsstandorte';
+$lang['menu_bands'] = 'Bänder';
+$lang['menu_adif_import_export'] = 'ADIF Import / Export';
+$lang['menu_kml_export'] = 'KML Export';
+$lang['menu_dx_atlas_gridsquare_export'] = 'DX Atlas Planquadrat Export';
+$lang['menu_sota_csv_export'] = 'SOTA CSV Export';
+$lang['menu_cabrillo_export'] = 'Cabrillo Export';
+$lang['menu_oqrs_requests'] = 'OQRS Anforderungen';
+$lang['menu_print_requested_qsls'] = 'Druck angeforderter QSLs';
+$lang['menu_logbook_of_the_world'] = 'Logbook of the World';
+$lang['menu_eqsl_import_export'] = 'eQSL Import / Export';
+$lang['menu_qrz_logbook'] = 'QRZ Logbuch';
+$lang['menu_qo_100_dx_club_upload'] = 'QO-100 Dx Club Upload';
+$lang['menu_api_keys'] = 'API-Schlüssel';
+$lang['menu_hardware_interfaces'] = 'Hardware-Schnittstellen';
+$lang['menu_help'] = 'Hilfe';
+$lang['menu_forum'] = 'Forum';
+$lang['menu_logout'] = 'Logout';

application/language/russian/general_words_lang.php

@@ -97,6 +97,7 @@ $lang['gen_hamradio_logbook'] = 'Журнал';
 
 $lang['gen_hamradio_cq_zone'] = 'CQ Zone';
 $lang['gen_hamradio_dxcc'] = 'DXCC';
+$lang['gen_hamradio_deleted_dxcc'] = 'Удалённые DXCC';
 $lang['gen_hamradio_continent'] = 'Континент';
 $lang['gen_hamradio_usa_state'] = 'Штат США';
 $lang['gen_hamradio_county_reference'] = 'Графство США';

application/language/russian/menu_lang.php

@@ -0,0 +1,78 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['menu_badge_developer_mode'] = 'Режим разработчика';
+
+$lang['menu_logbook'] = 'Журнал';
+$lang['menu_overview'] = 'Обзор';
+$lang['menu_advanced'] = 'Расширенный';
+
+$lang['menu_qso'] = 'QSO';
+$lang['menu_live_qso'] = 'добавить QSO';
+$lang['menu_post_qso'] = 'добавить прошедшее QSO';
+$lang['menu_live_contest_logging'] = 'Журнал соревнований';
+$lang['menu_post_contest_logging'] = 'Журнал прошедших соревнований';
+$lang['menu_view_qsl'] = 'Просмотр QSL';
+
+$lang['menu_analytics'] = 'Аналитика';
+$lang['menu_statistics'] = 'Статистика';
+$lang['menu_gridsquares'] = 'Квадраты';
+$lang['menu_activated_gridsquares'] = 'Активированные квадраты';
+$lang['menu_gridsquare_activators'] = 'Активаторы квадратов';
+$lang['menu_distances_worked'] = 'Сработанные дистанции';
+$lang['menu_days_with_qsos'] = 'Дней с QSO';
+$lang['menu_timeline'] = 'Лента событий';
+$lang['menu_accumulated_statistics'] = 'Объединённая статистика';
+$lang['menu_timeplotter'] = 'Графики';
+$lang['menu_custom_maps'] = 'Карты';
+$lang['menu_continents'] = 'Континенты';
+
+$lang['menu_awards'] = 'Дипломы';
+$lang['menu_cq'] = 'CQ';
+$lang['menu_dok'] = 'DOK';
+$lang['menu_dxcc'] = 'DXCC';
+$lang['menu_iota'] = 'IOTA';
+$lang['menu_pota'] = 'POTA';
+$lang['menu_sig'] = 'SIG';
+$lang['menu_sota'] = 'SOTA';
+$lang['menu_us_counties'] = 'US Counties';
+$lang['menu_vucc'] = 'VUCC';
+$lang['menu_was'] = 'WAS';
+$lang['menu_wwff'] = 'WWFF';
+
+$lang['menu_admin'] = 'Администрирование';
+$lang['menu_user_account'] = 'Аккаунты пользователей';
+$lang['menu_global_options'] = 'Общие настройки';
+$lang['menu_modes'] = 'Виды модуляции';
+$lang['menu_contests'] = 'Соревнования';
+$lang['menu_themes'] = 'Темы оформления';
+$lang['menu_backup'] = 'Резервное копирование';
+$lang['menu_update_country_files'] = 'Обновить файлы стран';
+$lang['menu_debug_information'] = 'Отладочная информация';
+
+$lang['menu_search_text'] = 'Поиск позывного';
+
+$lang['menu_search_button'] = 'Поиск';
+$lang['menu_login_button'] = 'Вход';
+
+$lang['menu_account'] = 'Аккаунт';
+$lang['menu_station_logbooks'] = 'Аппаратные журналы';
+$lang['menu_station_locations'] = 'Расположения станции';
+$lang['menu_bands'] = 'Диапазоны';
+$lang['menu_adif_import_export'] = 'Импорт / экспорт ADIF';
+$lang['menu_kml_export'] = 'Экспорт KML';
+$lang['menu_dx_atlas_gridsquare_export'] = 'Экспорт квадратов DX Atlas';
+$lang['menu_sota_csv_export'] = 'Экспорт SOTA CSV';
+$lang['menu_cabrillo_export'] = 'Экспорт Cabrillo';
+$lang['menu_oqrs_requests'] = 'Запросы OQRS';
+$lang['menu_print_requested_qsls'] = 'Распечатать запрошенные QSL';
+$lang['menu_logbook_of_the_world'] = 'Logbook of the World';
+$lang['menu_eqsl_import_export'] = 'Импорт / экспорт eQSL';
+$lang['menu_qrz_logbook'] = 'QRZ Logbook';
+$lang['menu_qo_100_dx_club_upload'] = 'Загрузка в QO-100 Dx Club';
+$lang['menu_api_keys'] = 'ключи API';
+$lang['menu_hardware_interfaces'] = 'Аппаратные интерфейсы';
+$lang['menu_help'] = 'Помощь';
+$lang['menu_forum'] = 'Форум';
+$lang['menu_logout'] = 'Выход';

application/views/interface_assets/footer.php

@@ -2186,7 +2186,7 @@ $(document).ready(function(){
 function viewQsl(picture, callsign) {
             var baseURL= "<?php echo base_url();?>";
             var $textAndPic = $('<div></div>');
-                $textAndPic.append('<img class="img-fluid" style="height:auto;width:auto;"src="'+baseURL+'/assets/qslcard/'+picture+'" />');
+                $textAndPic.append('<img class="img-fluid w-qsl" style="height:auto;width:auto;"src="'+baseURL+'/assets/qslcard/'+picture+'" />');
             var title = '';
             if (callsign == null) {
                 title = 'QSL Card';
@@ -2340,7 +2340,7 @@ function viewEqsl(picture, callsign) {
                             '</tr>');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<div class="carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="d-block w-100" src="'+baseURL+'/assets/qslcard/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
+                        $(".carousel-inner").append('<div class="carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
                         $("#qslcardfront").val(null);
                     }
                     else {
@@ -2360,7 +2360,7 @@ function viewEqsl(picture, callsign) {
                         $('.qslcardtab').removeAttr('hidden');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li class="active" data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<div class="active carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="d-block w-100" src="'+baseURL+'/assets/qslcard/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
+                        $(".carousel-inner").append('<div class="active carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
                         $(".carouselExampleIndicators").carousel();
                         $("#qslcardfront").val(null);
                     }
@@ -2379,7 +2379,7 @@ function viewEqsl(picture, callsign) {
                             '</tr>');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<div class="carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="d-block w-100" src="'+baseURL+'/assets/qslcard/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
+                        $(".carousel-inner").append('<div class="carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
                         $("#qslcardback").val(null);
                     }
                     else {
@@ -2399,7 +2399,7 @@ function viewEqsl(picture, callsign) {
                         $('.qslcardtab').removeAttr('hidden');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li class="active" data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<div class="active carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="d-block w-100" src="'+baseURL+'/assets/qslcard/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
+                        $(".carousel-inner").append('<div class="active carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
                         $(".carouselExampleIndicators").carousel();
                         $("#qslcardback").val(null);
                     }

application/views/interface_assets/header.php

@@ -51,7 +51,7 @@
 
 <nav class="navbar navbar-expand-lg navbar-light bg-light main-nav">
 <div class="container">
-		<a class="navbar-brand" href="<?php echo site_url(); ?>">Cloudlog</a> <?php if(ENVIRONMENT == "development") { ?><span class="badge badge-danger">Developer Mode</span><?php } ?>
+		<a class="navbar-brand" href="<?php echo site_url(); ?>">Cloudlog</a> <?php if(ENVIRONMENT == "development") { ?><span class="badge badge-danger"><?php echo $this->lang->line('menu_badge_developer_mode'); ?></span><?php } ?>
 
 		<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
 
@@ -60,28 +60,28 @@
     <ul class="navbar-nav">
       <li class="nav-item active">
         <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">Logbook</a>
+           <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <?php echo $this->lang->line('menu_logbook'); ?></a>
            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-              <a class="dropdown-item" href="<?php echo site_url('logbook');?>"><i class="fas fa-book"></i> Overview</a>
+              <a class="dropdown-item" href="<?php echo site_url('logbook');?>"><i class="fas fa-book"></i> <?php echo $this->lang->line('menu_overview'); ?></a>
               <div class="dropdown-divider"></div>
-              <a class="dropdown-item" href="<?php echo site_url('logbookadvanced');?>"><i class="fas fa-book-open"></i> Advanced</a>
+              <a class="dropdown-item" href="<?php echo site_url('logbookadvanced');?>"><i class="fas fa-book-open"></i> <?php echo $this->lang->line('menu_advanced'); ?></a>
            </div>
         </li>
 
         <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
         	<!-- QSO Menu 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">QSO</a>
+						<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo $this->lang->line('menu_qso'); ?></a>
 						<div class="dropdown-menu" aria-labelledby="navbarDropdown">
-							<a class="dropdown-item" href="<?php echo site_url('qso?manual=0');?>" title="Log Live QSOs"><i class="fas fa-list"></i> Live QSO</a>
+							<a class="dropdown-item" href="<?php echo site_url('qso?manual=0');?>" title="Log Live QSOs"><i class="fas fa-list"></i> <?php echo $this->lang->line('menu_live_qso'); ?></a>
 							<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="<?php echo site_url('qso?manual=1');?>" title="Log QSO made in the past"><i class="fas fa-list"></i> Post QSO</a>
+							<a class="dropdown-item" href="<?php echo site_url('qso?manual=1');?>" title="Log QSO made in the past"><i class="fas fa-list"></i> <?php echo $this->lang->line('menu_post_qso'); ?></a>
 							<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="<?php echo site_url('contesting?manual=0');?>" title="Live contest QSOs"><i class="fas fa-list"></i> Live Contest Logging</a>
+							<a class="dropdown-item" href="<?php echo site_url('contesting?manual=0');?>" title="Live contest QSOs"><i class="fas fa-list"></i> <?php echo $this->lang->line('menu_live_contest_logging'); ?></a>
 							<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="<?php echo site_url('contesting?manual=1');?>" title="Post contest QSOs"><i class="fas fa-list"></i> Post Contest Logging</a>
+							<a class="dropdown-item" href="<?php echo site_url('contesting?manual=1');?>" title="Post contest QSOs"><i class="fas fa-list"></i> <?php echo $this->lang->line('menu_post_contest_logging'); ?></a>
 							<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="<?php echo site_url('qsl');?>" title="QSL"><i class="fa fa-id-card"></i> View QSL</a>
+							<a class="dropdown-item" href="<?php echo site_url('qsl');?>" title="QSL"><i class="fa fa-id-card"></i> <?php echo $this->lang->line('menu_view_qsl'); ?></a>
 							<div class="dropdown-divider"></div>
 							<a class="dropdown-item" href="<?php echo site_url('eqsl');?>" title="eQSL"><i class="fa fa-id-card"></i> View eQSL</a>
 						</div>
@@ -92,93 +92,93 @@
         	<a class="nav-link" href="<?php echo site_url('notes');?>">Notes</a>
 		<?php } ?>
         	<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">Analytics</a>
+				<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo $this->lang->line('menu_analytics'); ?></a>
 				<div class="dropdown-menu" aria-labelledby="navbarDropdown">
-					<a class="dropdown-item" href="<?php echo site_url('statistics');?>" title="Statistics"><i class="fas fa-chart-area"></i> Statistics</a>
+					<a class="dropdown-item" href="<?php echo site_url('statistics');?>" title="Statistics"><i class="fas fa-chart-area"></i> <?php echo $this->lang->line('menu_statistics'); ?></a>
 					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="<?php echo site_url('gridsquares');?>" title="Gridsquares"><i class="fas fa-globe-europe"></i> Gridsquares</a>
+					<a class="dropdown-item" href="<?php echo site_url('gridsquares');?>" title="Gridsquares"><i class="fas fa-globe-europe"></i> <?php echo $this->lang->line('menu_gridsquares'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('activated_grids');?>" title="Activated Gridsquares"><i class="fas fa-globe-europe"></i> Activated Gridsquares</a>
+                    <a class="dropdown-item" href="<?php echo site_url('activated_grids');?>" title="Activated Gridsquares"><i class="fas fa-globe-europe"></i> <?php echo $this->lang->line('menu_activated_gridsquares'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('activators');?>" title="Gridsquare Activators"><i class="fas fa-globe-europe"></i> Gridsquare Activators</a>
+                    <a class="dropdown-item" href="<?php echo site_url('activators');?>" title="Gridsquare Activators"><i class="fas fa-globe-europe"></i> <?php echo $this->lang->line('menu_gridsquare_activators'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('distances');?>" title="Distances"><i class="fas fa-chart-area"></i> Distances Worked</a>
+                    <a class="dropdown-item" href="<?php echo site_url('distances');?>" title="Distances"><i class="fas fa-chart-area"></i> <?php echo $this->lang->line('menu_distances_worked'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('dayswithqso');?>" title="Days with QSOs"><i class="fas fa-chart-area"></i> Days with QSOs</a>
+                    <a class="dropdown-item" href="<?php echo site_url('dayswithqso');?>" title="Days with QSOs"><i class="fas fa-chart-area"></i> <?php echo $this->lang->line('menu_days_with_qsos'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('timeline');?>" title="Timeline"><i class="fas fa-chart-area"></i> Timeline</a>
+                    <a class="dropdown-item" href="<?php echo site_url('timeline');?>" title="Timeline"><i class="fas fa-chart-area"></i> <?php echo $this->lang->line('menu_timeline'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('accumulated');?>" title="Accumulated Statistics"><i class="fas fa-chart-area"></i> Accumulated Statistics</a>
+                    <a class="dropdown-item" href="<?php echo site_url('accumulated');?>" title="Accumulated Statistics"><i class="fas fa-chart-area"></i> <?php echo $this->lang->line('menu_accumulated_statistics'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('timeplotter');?>" title="View time when worked"><i class="fas fa-chart-area"></i> Timeplotter</a>
+                    <a class="dropdown-item" href="<?php echo site_url('timeplotter');?>" title="View time when worked"><i class="fas fa-chart-area"></i> <?php echo $this->lang->line('menu_timeplotter'); ?></a>
 					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="<?php echo site_url('map/custom');?>" title="Custom Maps of QSOs"><i class="fas fa-globe-europe"></i> Custom Maps</a>
+					<a class="dropdown-item" href="<?php echo site_url('map/custom');?>" title="Custom Maps of QSOs"><i class="fas fa-globe-europe"></i> <?php echo $this->lang->line('menu_custom_maps'); ?></a>
 					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="<?php echo site_url('continents');?>" title="Continents"><i class="fas fa-globe-europe"></i> Continents</a>
+					<a class="dropdown-item" href="<?php echo site_url('continents');?>" title="Continents"><i class="fas fa-globe-europe"></i> <?php echo $this->lang->line('menu_continents'); ?></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">Awards</a>
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo $this->lang->line('menu_awards'); ?></a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                    <a class="dropdown-item" href="<?php echo site_url('awards/cq');?>"><i class="fas fa-trophy"></i> CQ</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/cq');?>"><i class="fas fa-trophy"></i> <?php echo $this->lang->line('menu_cq'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/dok');?>"><i class="fas fa-trophy"></i> DOK</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/dok');?>"><i class="fas fa-trophy"></i> <?php echo $this->lang->line('menu_dok'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/dxcc');?>"><i class="fas fa-trophy"></i> DXCC</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/dxcc');?>"><i class="fas fa-trophy"></i> <?php echo $this->lang->line('menu_dxcc'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/iota');?>"><i class="fas fa-trophy"></i> IOTA</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/iota');?>"><i class="fas fa-trophy"></i> <?php echo $this->lang->line('menu_iota'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/pota');?>"><i class="fas fa-trophy"></i> POTA</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/pota');?>"><i class="fas fa-trophy"></i> <?php echo $this->lang->line('menu_pota'); ?></a>
 					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="<?php echo site_url('awards/sig');?>"><i class="fas fa-trophy"></i> SIG</a>
+					<a class="dropdown-item" href="<?php echo site_url('awards/sig');?>"><i class="fas fa-trophy"></i> <?php echo $this->lang->line('menu_sig'); ?></a>
 					<div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/sota');?>"><i class="fas fa-trophy"></i> SOTA</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/sota');?>"><i class="fas fa-trophy"></i> <?php echo $this->lang->line('menu_sota'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/counties');?>"><i class="fas fa-trophy"></i> US Counties</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/counties');?>"><i class="fas fa-trophy"></i> <?php echo $this->lang->line('menu_us_counties'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/vucc');?>"><i class="fas fa-trophy"></i> VUCC</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/vucc');?>"><i class="fas fa-trophy"></i> <?php echo $this->lang->line('menu_vucc'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/was');?>"><i class="fas fa-trophy"></i> WAS</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/was');?>"><i class="fas fa-trophy"></i> <?php echo $this->lang->line('menu_was'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/wwff');?>"><i class="fas fa-trophy"></i> WWFF</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/wwff');?>"><i class="fas fa-trophy"></i> <?php echo $this->lang->line('menu_wwff'); ?></a>
                 </div>
             </li>
 
 			<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') == 99)) { ?>
         	<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"><?php echo $this->lang->line('menu_admin'); ?></a>
 
 				<div class="dropdown-menu" aria-labelledby="navbarDropdown">
-					<a class="dropdown-item" href="<?php echo site_url('user');?>" title="Manage user accounts"><i class="fas fa-user"></i> User Accounts</a>
+					<a class="dropdown-item" href="<?php echo site_url('user');?>" title="Manage user accounts"><i class="fas fa-user"></i> <?php echo $this->lang->line('menu_user_account'); ?></a>
 
 					<div class="dropdown-divider"></div>
 
-					<a class="dropdown-item" href="<?php echo site_url('options');?>" title="Manage global options"><i class="fas fa-cog"></i> Global Options</a>
+					<a class="dropdown-item" href="<?php echo site_url('options');?>" title="Manage global options"><i class="fas fa-cog"></i> <?php echo $this->lang->line('menu_global_options'); ?></a>
 
 					<div class="dropdown-divider"></div>
 
-					<a class="dropdown-item" href="<?php echo site_url('mode');?>" title="Manage QSO modes"><i class="fas fa-broadcast-tower"></i> Modes</a>
+					<a class="dropdown-item" href="<?php echo site_url('mode');?>" title="Manage QSO modes"><i class="fas fa-broadcast-tower"></i> <?php echo $this->lang->line('menu_modes'); ?></a>
 
 					<div class="dropdown-divider"></div>
 
-					<a class="dropdown-item" href="<?php echo site_url('contesting/add');?>" title="Manage Contest names"><i class="fas fa-broadcast-tower"></i> Contests</a>
+					<a class="dropdown-item" href="<?php echo site_url('contesting/add');?>" title="Manage Contest names"><i class="fas fa-broadcast-tower"></i> <?php echo $this->lang->line('menu_contests'); ?></a>
 
 					<div class="dropdown-divider"></div>
 
-					<a class="dropdown-item" href="<?php echo site_url('themes');?>" title="Manage Themes"><i class="fas fa-cog"></i> Themes</a>
+					<a class="dropdown-item" href="<?php echo site_url('themes');?>" title="Manage Themes"><i class="fas fa-cog"></i> <?php echo $this->lang->line('menu_themes'); ?></a>
 
 					<div class="dropdown-divider"></div>
 
-					<a class="dropdown-item" href="<?php echo site_url('backup');?>" title="Backup Cloudlog content"><i class="fas fa-save"></i> Backup</a>
+					<a class="dropdown-item" href="<?php echo site_url('backup');?>" title="Backup Cloudlog content"><i class="fas fa-save"></i> <?php echo $this->lang->line('menu_backup'); ?></a>
 
 					<div class="dropdown-divider"></div>
 
-					<a class="dropdown-item" href="<?php echo site_url('update');?>" title="Update Country Files"><i class="fas fa-sync"></i> Update Country Files</a>
+					<a class="dropdown-item" href="<?php echo site_url('update');?>" title="Update Country Files"><i class="fas fa-sync"></i> <?php echo $this->lang->line('menu_update_country_files'); ?></a>
 
 					<div class="dropdown-divider"></div>
 
-					<a class="dropdown-item" href="<?php echo site_url('debug');?>" title="Debug Information"><i class="fas fa-tools"></i> Debug Information</a>
+					<a class="dropdown-item" href="<?php echo site_url('debug');?>" title="Debug Information"><i class="fas fa-tools"></i> <?php echo $this->lang->line('menu_debug_information'); ?></a>
 					
 				</div>
         	</li>
@@ -188,9 +188,9 @@
 
      <?php if($this->optionslib->get_option('global_search') != "false" || $this->session->userdata('user_type') >= 2) { ?>
 		<form method="post" action="<?php echo site_url('search'); ?>" class="form-inline">
-		<input class="form-control mr-sm-2" id="nav-bar-search-input" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search">
+		<input class="form-control mr-sm-2" id="nav-bar-search-input" type="search" name="callsign" placeholder="<?php echo $this->lang->line('menu_search_text'); ?>" aria-label="Search">
 
-		<button class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> Search</button>
+		<button class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> <?php echo $this->lang->line('menu_search_button'); ?></button>
 		</form>
 	<?php } ?>
 
@@ -202,7 +202,7 @@
 			<input class="form-control mr-sm-2" type="text" name="user_name" placeholder="Username" aria-label="Username">
 			<input class="form-control mr-sm-2" type="password" name="user_password" placeholder="Password" aria-label="Password">
 			<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
-      <button class="btn btn-outline-success mr-sm-2" type="submit">Login</button>
+      <button class="btn btn-outline-success mr-sm-2" type="submit"><?php echo $this->lang->line('menu_login_button'); ?></button>
 	</form>
 	<?php } ?>
 
@@ -213,25 +213,25 @@
 			<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-user"></i> <?php echo $this->session->userdata('user_callsign'); ?></a>
 
 			<div class="dropdown-menu" aria-labelledby="navbarDropdown">
-				<a class="dropdown-item" href="<?php echo site_url('user/edit')."/".$this->session->userdata('user_id'); ?>" title="Account"><i class="fas fa-user"></i> Account</a>
+				<a class="dropdown-item" href="<?php echo site_url('user/edit')."/".$this->session->userdata('user_id'); ?>" title="Account"><i class="fas fa-user"></i> <?php echo $this->lang->line('menu_account'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('logbooks');?>" title="Manage station logbooks"><i class="fas fa-home"></i> Station Logbooks</a>
+				<a class="dropdown-item" href="<?php echo site_url('logbooks');?>" title="Manage station logbooks"><i class="fas fa-home"></i> <?php echo $this->lang->line('menu_station_logbooks'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('station');?>" title="Manage station locations"><i class="fas fa-home"></i> Station Locations</a>
+				<a class="dropdown-item" href="<?php echo site_url('station');?>" title="Manage station locations"><i class="fas fa-home"></i> <?php echo $this->lang->line('menu_station_locations'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('band');?>" title="Manage Bands"><i class="fas fa-cog"></i> Bands</a>
+				<a class="dropdown-item" href="<?php echo site_url('band');?>" title="Manage Bands"><i class="fas fa-cog"></i> <?php echo $this->lang->line('menu_bands'); ?></a>
 
 				<div class="dropdown-divider"></div>
 
-				<a class="dropdown-item" href="<?php echo site_url('adif');?>" title="Amateur Data Interchange Format (ADIF) import / export"><i class="fas fa-sync"></i> ADIF Import / Export</a>
+				<a class="dropdown-item" href="<?php echo site_url('adif');?>" title="Amateur Data Interchange Format (ADIF) import / export"><i class="fas fa-sync"></i> <?php echo $this->lang->line('menu_adif_import_export'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('kmlexport');?>" title="KML Export for Google Earth"><i class="fas fa-sync"></i> KML Export</a>
+				<a class="dropdown-item" href="<?php echo site_url('kmlexport');?>" title="KML Export for Google Earth"><i class="fas fa-sync"></i> <?php echo $this->lang->line('menu_kml_export'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('dxatlas');?>" title="DX Atlas Gridsquare Export"><i class="fas fa-sync"></i> DX Atlas Gridsquare Export</a>
+				<a class="dropdown-item" href="<?php echo site_url('dxatlas');?>" title="DX Atlas Gridsquare Export"><i class="fas fa-sync"></i> <?php echo $this->lang->line('menu_dx_atlas_gridsquare_export'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('csv');?>" title="SOTA CSV Export"><i class="fas fa-sync"></i> SOTA CSV Export</a>
+				<a class="dropdown-item" href="<?php echo site_url('csv');?>" title="SOTA CSV Export"><i class="fas fa-sync"></i> <?php echo $this->lang->line('menu_sota_csv_export'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('cabrillo');?>" title="Cabrillo Export"><i class="fas fa-sync"></i> Cabrillo Export</a>
+				<a class="dropdown-item" href="<?php echo site_url('cabrillo');?>" title="Cabrillo Export"><i class="fas fa-sync"></i> <?php echo $this->lang->line('menu_cabrillo_export'); ?></a>
 
 				<div class="dropdown-divider"></div>
 
@@ -248,35 +248,35 @@ if ($logbooks_locations_array) {
 
 $oqrs_requests = $CI->oqrs_model->oqrs_requests($location_list);
 ?>
-				<a class="dropdown-item" href="<?php echo site_url('oqrs/requests');?>" title="OQRS Requests"><i class="fa fa-id-card"></i> OQRS Requests <?php if ($oqrs_requests > 0) { echo "<span class=\"badge badge-light\">".$oqrs_requests."</span>"; } ?></a>
+				<a class="dropdown-item" href="<?php echo site_url('oqrs/requests');?>" title="OQRS Requests"><i class="fa fa-id-card"></i> <?php echo $this->lang->line('menu_oqrs_requests'); ?> <?php if ($oqrs_requests > 0) { echo "<span class=\"badge badge-light\">".$oqrs_requests."</span>"; } ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('qslprint');?>" title="Print Requested QSLs"><i class="fas fa-print"></i> Print Requested QSLs</a>
+				<a class="dropdown-item" href="<?php echo site_url('qslprint');?>" title="Print Requested QSLs"><i class="fas fa-print"></i> <?php echo $this->lang->line('menu_print_requested_qsls'); ?></a>
 
 				<div class="dropdown-divider"></div>
 
-				<a class="dropdown-item" href="<?php echo site_url('lotw');?>" title="Synchronise with Logbook of the World (LoTW)"><i class="fas fa-sync"></i> Logbook of the World</a>
+				<a class="dropdown-item" href="<?php echo site_url('lotw');?>" title="Synchronise with Logbook of the World (LoTW)"><i class="fas fa-sync"></i> <?php echo $this->lang->line('menu_logbook_of_the_world'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('eqsl/import');?>" title="eQSL import / export"><i class="fas fa-sync"></i> eQSL Import / Export</a>
+				<a class="dropdown-item" href="<?php echo site_url('eqsl/import');?>" title="eQSL import / export"><i class="fas fa-sync"></i> <?php echo $this->lang->line('menu_eqsl_import_export'); ?></a>
 
-                <a class="dropdown-item" href="<?php echo site_url('qrz/export');?>" title="Upload to QRZ.com logbook"><i class="fas fa-sync"></i> QRZ Logbook</a>
+                <a class="dropdown-item" href="<?php echo site_url('qrz/export');?>" title="Upload to QRZ.com logbook"><i class="fas fa-sync"></i> <?php echo $this->lang->line('menu_qrz_logbook'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('webadif/export');?>" title="Upload to webADIF"><i class="fas fa-sync"></i> QO-100 Dx Club Upload</a>
+				<a class="dropdown-item" href="<?php echo site_url('webadif/export');?>" title="Upload to webADIF"><i class="fas fa-sync"></i> <?php echo $this->lang->line('menu_qo_100_dx_club_upload'); ?></a>
 
 				<div class="dropdown-divider"></div>
 
-				<a class="dropdown-item" href="<?php echo site_url('api/help');?>" title="Manage API keys"><i class="fas fa-key"></i> API Keys</a>
+				<a class="dropdown-item" href="<?php echo site_url('api/help');?>" title="Manage API keys"><i class="fas fa-key"></i> <?php echo $this->lang->line('menu_api_keys'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('radio');?>" title="Interface with one or more radios"><i class="fas fa-broadcast-tower"></i> Hardware Interfaces</a>
+				<a class="dropdown-item" href="<?php echo site_url('radio');?>" title="Interface with one or more radios"><i class="fas fa-broadcast-tower"></i> <?php echo $this->lang->line('menu_hardware_interfaces'); ?></a>
 
 				<div class="dropdown-divider"></div>
 
-				<a class="dropdown-item" target="_blank" href="https://github.com/magicbug/Cloudlog/wiki" title="Help"><i class="fas fa-question"></i> Help</a>
+				<a class="dropdown-item" target="_blank" href="https://github.com/magicbug/Cloudlog/wiki" title="Help"><i class="fas fa-question"></i> <?php echo $this->lang->line('menu_help'); ?></a>
 
-				<a class="dropdown-item" target="_blank" href="https://github.com/magicbug/Cloudlog/discussions" title="Forum"><i class="far fa-comment-dots"></i> Forum</a>
+				<a class="dropdown-item" target="_blank" href="https://github.com/magicbug/Cloudlog/discussions" title="Forum"><i class="far fa-comment-dots"></i> <?php echo $this->lang->line('menu_forum'); ?></a>
 
 				<div class="dropdown-divider"></div>
 
-				<a class="dropdown-item" href="<?php echo site_url('user/logout');?>" title="Logout"><i class="fas fa-sign-out-alt"></i> Logout</a>
+				<a class="dropdown-item" href="<?php echo site_url('user/logout');?>" title="Logout"><i class="fas fa-sign-out-alt"></i> <?php echo $this->lang->line('menu_logout'); ?></a>
 			</div>
         </li>
     	</ul>

application/views/view_log/qso.php

@@ -550,7 +550,7 @@
                             echo ' active';
                         }
                         echo '">';
-                        echo '<img class="d-block w-100" src="' . base_url() . '/assets/qslcard/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
+                        echo '<img class="img-fluid w-qsl" src="' . base_url() . '/assets/qslcard/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
                         echo '</div>';
                     }
                     ?>

assets/css/general.css

@@ -431,4 +431,9 @@ div#station_logbooks_linked_table_paginate {
 
 .activeRow a {
     color: #fff !important;
+}
+
+.w-qsl{
+    max-height: calc(100vh - 270px);
+	overflow-y: auto;
 }

system/core/Controller.php

@@ -84,6 +84,11 @@ class CI_Controller {
 
 		$this->load =& load_class('Loader', 'core');
 		$this->load->initialize();
+
+		$this->lang->load(array(
+			'menu'
+		));
+
 		log_message('info', 'Controller Class Initialized');
 	}