mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #2143 from cats-shadow/qsl-view 

[QSL Card] Centered QSL image at QSO data block.
pull/2147/head
Andreas Kristiansen 2023-05-16 13:36:02 +02:00 zatwierdzone przez GitHub
rodzic 9c4eb203a5 26f1e75fa5
commit 181008b658
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 7 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
application/views/interface_assets/footer.php
Wyświetl plik

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

4
application/views/view_log/qso.php
Wyświetl plik

@ -545,13 +545,13 @@
<?php <?php
$i = 1; $i = 1;
foreach ($qslimages as $image) { foreach ($qslimages as $image) {
echo '<div class="carousel-item carouselimageid_' . $image->id; echo '<center><div class="carousel-item carouselimageid_' . $image->id;
if ($i == 1) { if ($i == 1) {
echo ' active'; echo ' active';
} }
echo '">'; echo '">';
echo '<img class="img-fluid w-qsl" 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>'; echo '</div></center>';
} }
?> ?>
</div> </div>