From 74dfcc27adbc7a7b20e80564d34b5b0342290250 Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Tue, 26 May 2020 21:23:04 +0300 Subject: [PATCH 1/8] pdf version in text-version --- app/views/anpdf3.phtml | 13 +------------ app/views/antext.phtml | 4 ++++ app/views/blocks/downpanel.phtml | 12 ++++++++++++ 3 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 app/views/blocks/downpanel.phtml diff --git a/app/views/anpdf3.phtml b/app/views/anpdf3.phtml index f745d5e..925cf2a 100644 --- a/app/views/anpdf3.phtml +++ b/app/views/anpdf3.phtml @@ -11,18 +11,7 @@ prevurl = ''; -

- - Получайте «Газету на @email» - - - - - - - / html-версия - -

+
diff --git a/app/views/antext.phtml b/app/views/antext.phtml index 466301f..2db45de 100644 --- a/app/views/antext.phtml +++ b/app/views/antext.phtml @@ -7,6 +7,10 @@ +

+ PDF-версия + / html-версия +

diff --git a/app/views/blocks/downpanel.phtml b/app/views/blocks/downpanel.phtml new file mode 100644 index 0000000..6b382fd --- /dev/null +++ b/app/views/blocks/downpanel.phtml @@ -0,0 +1,12 @@ +

+ + Получайте «Газету на @email» + + + + + + + / html-версия + +

\ No newline at end of file From 171abc394bbb1229968f61d6bde583c72a420b7e Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Tue, 26 May 2020 21:24:47 +0300 Subject: [PATCH 2/8] delete footer text version --- app/views/antext.phtml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/views/antext.phtml b/app/views/antext.phtml index 2db45de..3743563 100644 --- a/app/views/antext.phtml +++ b/app/views/antext.phtml @@ -41,7 +41,3 @@ -
- Полная версия газеты -
- From dc3fec160294a422a7b2494939e53b2e6f37e613 Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Tue, 26 May 2020 21:54:07 +0300 Subject: [PATCH 3/8] add full version --- app/routes/anpdf.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routes/anpdf.php b/app/routes/anpdf.php index d172cb0..f1daa56 100644 --- a/app/routes/anpdf.php +++ b/app/routes/anpdf.php @@ -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) @@ -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); From 69a5237b4122b3bbf458c41ef91e9dca596de45e Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Tue, 26 May 2020 21:57:41 +0300 Subject: [PATCH 4/8] correct pr --- app/routes/anpdf.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routes/anpdf.php b/app/routes/anpdf.php index f1daa56..2480539 100644 --- a/app/routes/anpdf.php +++ b/app/routes/anpdf.php @@ -85,7 +85,7 @@ function promo_kuri ($hash, $page = 0, $scale = 1, $promo = 'pr', $version = nu $pagenum = 1; } - if ($page > 1 or $promo){ + if ($page > 1 or $promo == 'pr'){ $fullpdf = $pdfile; $downtitle = 'Если по какой-то причине у вас не загрузилась страница ниже, то нажмите сюда, чтобы скачать pdf'; } @@ -96,7 +96,7 @@ function promo_kuri ($hash, $page = 0, $scale = 1, $promo = 'pr', $version = nu $id = $price['price_id']; $title = $price['pricename']; - if ($promo){ + if ($promo == 'pr'){ $filedown = True; $baseurl = "/promo/$hash/"; } From 38e223d4326290bb537bbbebb1c316475e6cde1e Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Tue, 26 May 2020 22:00:05 +0300 Subject: [PATCH 5/8] add downtitle in pdf --- app/views/anpdf3.phtml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/views/anpdf3.phtml b/app/views/anpdf3.phtml index 925cf2a..1dfae55 100644 --- a/app/views/anpdf3.phtml +++ b/app/views/anpdf3.phtml @@ -11,7 +11,18 @@ prevurl = ''; - +

+ + Получайте «Газету на @email» + + + + + + + / html-версия + +

From 83384db6c68b46ff638b12805848ff16a4d7b241 Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Tue, 26 May 2020 22:04:55 +0300 Subject: [PATCH 6/8] correct promo full --- app/routes/anpdf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes/anpdf.php b/app/routes/anpdf.php index 2480539..42ee793 100644 --- a/app/routes/anpdf.php +++ b/app/routes/anpdf.php @@ -287,7 +287,7 @@ function read_kuri($hash, $page = 0, $promo = 'full', $version = null){ $title = $price['pricename']; $prevpage = $page - 1; $prevurl = "$baseurl$prevpage"; - if (!$promo){ + if ($promo == 'full'){ $downtitle = 'Скачать в pdf формате'; } } From ffd25b8e80943f2aeef9bfbdbc06c26843ea9347 Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Wed, 27 May 2020 10:03:47 +0300 Subject: [PATCH 7/8] add mob ver title --- app/views/antext.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/antext.phtml b/app/views/antext.phtml index 3743563..09d9bc5 100644 --- a/app/views/antext.phtml +++ b/app/views/antext.phtml @@ -9,7 +9,7 @@

PDF-версия - / html-версия + / Мобильная версия

From a070cc1343c53948239f0cb39983427f32d17b52 Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Wed, 27 May 2020 10:52:33 +0300 Subject: [PATCH 8/8] add versuon PC --- app/views/antext.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/antext.phtml b/app/views/antext.phtml index 09d9bc5..fe59883 100644 --- a/app/views/antext.phtml +++ b/app/views/antext.phtml @@ -8,7 +8,7 @@

- PDF-версия + Версия для компьютера / Мобильная версия