delf/anpdf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gl.arguments.ru:2224/ak/anpdf

Browse Source
This commit is contained in:
Your Name
2020-05-27 11:29:02 +03:00
parent 4f7be0a99f a070cc1343
commit 0c9d435614
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/routes/anpdf.php
View File

@@ -85,7 +85,7 @@ function promo_kuri ($hash, $page = 0, $scale = 1, $promo = 'pr', $version = nu
$pagenum = 1; $pagenum = 1;
} }
if ($page > 1 or $promo){ if ($page > 1 or $promo == 'pr'){
$fullpdf = $pdfile; $fullpdf = $pdfile;
$downtitle = 'Если по какой-то причине у вас не загрузилась страница ниже, то нажмите сюда, чтобы скачать pdf'; $downtitle = 'Если по какой-то причине у вас не загрузилась страница ниже, то нажмите сюда, чтобы скачать pdf';
} }
@@ -96,7 +96,7 @@ function promo_kuri ($hash, $page = 0, $scale = 1, $promo = 'pr', $version = nu
$id = $price['price_id']; $id = $price['price_id'];
$title = $price['pricename']; $title = $price['pricename'];
if ($promo){ if ($promo == 'pr'){
$filedown = True; $filedown = True;
$baseurl = "/promo/$hash/"; $baseurl = "/promo/$hash/";
} }
@@ -177,7 +177,7 @@ function bookmark_set($hash, $page){
function read_kuri($hash, $page = 0, $promo = false, $version = null){ function read_kuri($hash, $page = 0, $promo = 'full', $version = null){
# test url http://klan.dv/promo/bac343b41b357fdc8243373a429caa62 (742.pdf source) # test url http://klan.dv/promo/bac343b41b357fdc8243373a429caa62 (742.pdf source)
@@ -287,7 +287,7 @@ function read_kuri($hash, $page = 0, $promo = false, $version = null){
$title = $price['pricename']; $title = $price['pricename'];
$prevpage = $page - 1; $prevpage = $page - 1;
$prevurl = "$baseurl$prevpage"; $prevurl = "$baseurl$prevpage";
if (!$promo){ if ($promo == 'full'){
$downtitle = 'Скачать в pdf формате'; $downtitle = 'Скачать в pdf формате';
} }
} }
@@ -306,7 +306,7 @@ function read_kuri($hash, $page = 0, $promo = false, $version = null){
} }
function readtext_kuri($hash, $page = 1, $promo = 'no'){ function readtext_kuri($hash, $page = 1, $promo = 'full'){
$price = api_pricehash($hash); $price = api_pricehash($hash);

8
app/views/antext.phtml
View File

@@ -7,6 +7,10 @@
</script> </script>
<p id="downloadtitle">
<a href="<?=$full_ver_url?>">Версия для компьютера</a>
<span id="downarrow">/ Мобильная версия</span>
</p>
<?include ('blocks/pgtextnav.phtml')?> <?include ('blocks/pgtextnav.phtml')?>
@@ -37,7 +41,3 @@
<?include ('blocks/pgtextnav.phtml')?> <?include ('blocks/pgtextnav.phtml')?>
<div class="header-div">
<a href="<?=$full_ver_url?>">Полная версия газеты</a>
</div>

12
app/views/blocks/downpanel.phtml Normal file
View File

@@ -0,0 +1,12 @@
<p id="downloadtitle">
<?if ($promo == 'pr'):?>
<a href="https://argumenti.ru/robomail/486?utm_source=argumenti.ru&utm_medium=subscript&utm_campaign=promo">Получайте «Газету на @email»</a>
<?else:?>
<?if ($filedown):?>
<a href="<?=$fullpdf?>"><?=$downtitle?></a>
<?endif?>
<?endif?>
<?if ($category == 1):?>
<span id="downarrow">/ <a href="<?=$htmlurl?>">html-версия</a></span>
<?endif?>
</p>