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

new design

Browse Source
This commit is contained in:
Your Name
2020-05-18 18:03:51 +03:00
parent 76e8b41223
commit dacb071f5c
6 changed files with 169 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/apiclient.php
View File

@@ -52,7 +52,7 @@ function clientbuys_kuri($client_id, $page = 1, $category_id = 1, $group_id = nu
else else
$between = ''; $between = '';
$limit = 25; $limit = 28;
$countsql = " $countsql = "
SELECT SELECT
DISTINCT COUNT(buy_id) as count DISTINCT COUNT(buy_id) as count
@@ -226,7 +226,7 @@ function clientmail($mail, $hash){
//весь активный архив //весь активный архив
function clients_arch($page = 16, $category_id = 1, $filter = 'all'){ function clients_arch($page = 16, $category_id = 1, $filter = 'all'){
$limit = 25; $limit = 28;
if ($filter !== 'all'){ if ($filter !== 'all'){

127
app/pub/css/an.css
View File

@@ -3,6 +3,10 @@ header {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
header ul li {
list-style-type: none;
float:left;
}
header .lite-logo { header .lite-logo {
width:25%; width:25%;
} }
@@ -49,11 +53,88 @@ h1 {
} }
#auth a { #auth a {
color: #4d4e55; color: #4d4e55;
font-size:1.1em; font-size:1em;
font-weight:bold; font-weight:bold;
letter-spacing: 0.3px; letter-spacing: 0.3px;
text-transform: uppercase; text-transform: uppercase;
} }
#lk-menu {
display:flex;
justify-content: start;
align-items: center;
margin: 15px 0px 20px;
}
#lk-menu #menu_category, #lk-menu #menu_category ul {
padding: 0px;
}
#lk-menu #menu_category ul {
margin: 0px;
}
#lk-menu div, .header-div {
margin-right: 15px;
padding: 10px;
background: white;
border: 1px solid #b1bad0;
border-radius: 9px;
font-weight: bold;
}
#lk-menu div p, #lk-menu div a, .header-div a {
margin:0px;
color: #4d4e55;
}
#menu_category ul {
border-radius: 9px;
}
#menu_category ul li {
margin: 0px;
list-style-type: none;
float: left;
background: #7f7f7f;
}
#menu_category ul li:first-child{
border-radius: 9px 0px 0px 9px;
}
#menu_category ul li:last-child{
border-radius: 0px 9px 9px 0px;
}
#menu_category ul li.active {
background: #69c;
padding: 10px 20px;
}
#menu_category ul li a, #menu_category ul li {
color:white;
padding: 5px 10px;
display: block;
}
#lk-menu #years {
padding: 0px;
}
#lk-menu #years .fas {
position: relative;
right: 4px;
top: 2px;
}
#year_filter {
border: 0px;
background: white;
color: #4d4e55;
font-weight: bold;
font-size: 1em;
-ms-appearance: none;
appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
font-family: times;
padding: 10px;
border-radius: 9px;
cursor: pointer;
margin-right: -7px;
outline: none;
}
#year_filter::-ms-expand {
display: none;
}
#downloadtitle{ #downloadtitle{
width: 100%; width: 100%;
background: #69c; background: #69c;
@@ -198,15 +279,34 @@ input[type="email"],input[type="password"]{
} }
.lib_container { .lib_container {
display: grid; display: flex;
grid-gap: 5px; flex-direction: row;
grid-template-columns: repeat(auto-fit, 300px); justify-content: left;
grid-template-rows: repeat(2, 400px); flex-wrap: wrap;
}
.book_skeleton {
width:25%;
margin-bottom: 50px;
margin-top: 30px;
}
.book_mini {
width: 60%;
padding-bottom: 5px;
box-sizing: border-box;
background: white;
border-radius: 7px;
border: 1px solid #cdd8e2;
text-align: center;
font-weight: bold;
} }
.book_mini img{ .book_mini img{
border: 1px solid black; width:100%;
padding: 4px; border-radius: 7px 7px 0px 0px;
}
.book_mini p{
color: #4d4e55;
text-decoration: underline;
letter-spacing: 0.3px;
} }
#info { #info {
margin-top: 5%; margin-top: 5%;
@@ -232,17 +332,8 @@ input[type="email"],input[type="password"]{
font-size: 1.2em; font-size: 1.2em;
} }
@media screen and (max-width: 1260px) {
#pages{
}
#menu_category{
margin-bottom: 12px;
}
#year_filter{
margin-bottom: 12px;
} }
@media screen and (max-width: 1000px) { @media screen and (max-width: 1000px) {

70
app/views/allbooks.phtml
View File

@@ -1,43 +1,53 @@
<?if ($items['subscript'] == true):?> <div id="lk-menu">
<p>Вам доступен весь архив</p> <div id="menu_category">
<?else:?> <ul>
<!--<p>Всего покупок: <?=$items['count']?></p>--> <?if ($category == 'gazeta'):?>
<?endif?> <li class="active">Газета</li>
<li><a href="<?=SITE?>mybooks/books/all/1">Книги</a></li>
<?else:?>
<li><a href="<?=SITE?>mybooks/gazeta/all/1">Газета</a></li>
<li class="active">Книги</li>
<?endif?>
</ul>
</div>
<div id="menu_category"> <?if ($items['subscript'] == true):?>
<?if ($category == 'gazeta'):?> <div><p>Вам доступен весь архив</p></div>
<span>Газета</span> / <span><a href="<?=SITE?>mybooks/books/all/1">Книги</a></span>
<?else:?> <?else:?>
<span><a href="<?=SITE?>mybooks/gazeta/all/1">Газета</a></span> / <span>Книги</span> <div><p>Всего покупок: <?=$items['count']?></p></div>
<?endif?> <?endif?>
<?if ($category == 'gazeta'):?>
<div id="years">
<p>
<select id="year_filter" onchange="changeyear()">
<option value="all"<?=$selected?>>Все года</option>
<?for ($y = date('Y'); $y >= 2006; $y--):?>
<?$selected = ($filter == $y) ? ' selected' : ''?>
<option value="<?=$y?>"<?=$selected?>><?=$y?> год</option>
<?endfor?>
</select>
<i class="fas fa-chevron-down"></i>
</p>
</div>
<?endif?>
<div>
<a href="<?=SITE?>payments">Мои покупки</a>
</div>
</div> </div>
<?if ($category == 'gazeta'):?>
<div>
фильтр: <select id="year_filter" onchange="changeyear()">
<option value="all"<?=$selected?>>все года</option>
<?for ($y = date('Y'); $y >= 2006; $y--):?>
<?$selected = ($filter == $y) ? ' selected' : ''?>
<option value="<?=$y?>"<?=$selected?>><?=$y?> год</option>
<?endfor?>
</select>
</div>
<?endif?>
<div class="lib_container"> <div class="lib_container">
<?foreach ($items['books'] as $book):?> <?foreach ($items['books'] as $book):?>
<div class="book_skeleton">
<div class="book_mini"> <div class="book_mini">
<a href="<?=$book['link']?>"> <a href="<?=$book['link']?>">
<img src="<?=$book['pic']?>"> <img src="<?=$book['pic']?>">
<p class="book_mini_title"><?=$book['pricename']?></p> <p class="book_mini_title"><?=$book['pricename']?></p>
</a> </a>
</div>
</div> </div>
<?endforeach?> <?endforeach?>
</div> </div>

3
app/views/blocks/auth.phtml
View File

@@ -1,10 +1,9 @@
<?$checklogin = check_login_kuri();?> <?$checklogin = check_login_kuri();?>
<div id="auth"> <div id="auth">
<?if ($checklogin['error'] == 'client not found'):?> <?if ($checklogin['error'] == 'client not found'):?>
<a href="<?=SITE?>login">Войти</a> <a href="<?=SITE?>login">Войти</a>
<?else:?> <?else:?>
<a href="<?=SITE?>mybooks">Моя библиотека</a> /
<a href="<?=SITE?>payments">Покупки</a> /
<a href="<?=SITE?>out">Выйти</a> <a href="<?=SITE?>out">Выйти</a>
<?endif?> <?endif?>
</div> </div>

23
app/views/layout.phtml
View File

@@ -4,7 +4,7 @@
<//base href="<?=SITE?>"> <//base href="<?=SITE?>">
<script src="/pub/scripts/pdf.min.js"></script> <script src="/pub/scripts/pdf.min.js"></script>
<script src="/pub/scripts/anviewer.js?ver=51"></script> <script src="/pub/scripts/anviewer.js?ver=51"></script>
<link rel="stylesheet" type="text/css" href="/pub/css/an.css?ver=63"> <link rel="stylesheet" type="text/css" href="/pub/css/an.css?ver=141">
<link rel="icon" type="image/ico" href="https://argumenti.ru/favicon.ico"> <link rel="icon" type="image/ico" href="https://argumenti.ru/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/pub/fontawesome/css/all.css"> <link rel="stylesheet" href="/pub/fontawesome/css/all.css">
@@ -52,15 +52,24 @@ _tmr.push({id: "1069168", type: "pageView", start: (new Date()).getTime()});
ga('create', 'UA-11186859-1', 'auto'); ga('create', 'UA-11186859-1', 'auto');
ga('send', 'pageview'); ga('send', 'pageview');
</script><?print_r($checklogin)?> </script>
<header> <header>
<h1> <ul>
<a id="brand_title" href="https://argumenti.ru/"><span id="redb">А</span>ргументы <span id="redb">Н</span>едел<span id="redi">i</span></a> <li>
<?if ($title !== ''):?> <img style="width:200px;" alt="Аргументы Недели (argumenti.ru)" src="https://argumenti.ru/images/argumenti/AN2.gif">
→ <a id="page_title" href="<?=$baseurl?>"><?=$title?></a> </li>
<li class="header-div">
<i class="fas fa-arrow-right"></i>
<a href="<?=SITE?>mybooks">Моя библиотека</a>
</li>
<?if ($title !== '' and $title !== 'Моя библиотека'):?>
<li class="header-div">
<i class="fas fa-arrow-right"></i>
<a id="page_title" href="<?=$baseurl?>"><?=$title?></a>
</li>
<?endif?> <?endif?>
</h1> </ul>
<?include('blocks/auth.phtml')?> <?include('blocks/auth.phtml')?>
</header> </header>

2
app/views/layout_lite.phtml
View File

@@ -4,7 +4,7 @@
<title>Еженедельник Аргументы Недели - <?=$title?></title> <title>Еженедельник Аргументы Недели - <?=$title?></title>
<script src="/pub/scripts/pdf.min.js"></script> <script src="/pub/scripts/pdf.min.js"></script>
<script src="/pub/scripts/anviewer.js?ver=43"></script> <script src="/pub/scripts/anviewer.js?ver=43"></script>
<link rel="stylesheet" type="text/css" href="/pub/css/an.css?ver=72"> <link rel="stylesheet" type="text/css" href="/pub/css/an.css?ver=74">
<link rel="icon" type="image/ico" href="https://argumenti.ru/favicon.ico"> <link rel="icon" type="image/ico" href="https://argumenti.ru/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/pub/fontawesome/css/all.css"> <link rel="stylesheet" href="/pub/fontawesome/css/all.css">