Skip to content

A
addcpm-json
Commit 2bf47c8b authored by Александр Чаплыгин's avatar Александр Чаплыгин
Browse files
Options

remove inline-styles into css

parent 8487bb1f
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 59 deletions
src/public/css/404.css
View file @ 2bf47c8b
......@@ -39,6 +39,9 @@
max-width: 600px;
margin: 0 auto 2vh;
}
p.link-wrap {
text-align: center;
}
.link {
color: #337ab7;
}
......
src/public/css/styles-feeds-cats.css
View file @ 2bf47c8b
/* Таблица стилей к странице категорий фида */
.b-content__work .wrapp
{
margin-bottom: 10px;
}
.description-info
{
float: right;
font-size: 12px;
color: #697075;
font-style: italic;
}
/* .feeds-cats */
.feed-title
......
src/public/css/styles-feeds-stat.css
View file @ 2bf47c8b
......@@ -18,6 +18,18 @@
cursor: pointer;
}
.b-content__work .wrapp
{
position: relative;
}
.b-content__work.error .wrapp
{
margin: 100px auto;
min-height: 300px;
text-align: center;
}
.b-clear
{
clear: both;
......@@ -159,6 +171,11 @@ input[type="checkbox"]
text-align: center;
}
#chart-graph-stat
{
height: 370px;
}
.b-table_wrapp.report
{
display: none;
......@@ -267,6 +284,8 @@ input[type="checkbox"]
width: 550px;
}
.table.table-striped.admin.transactions tbody tr td.StartTime span,
.table.table-striped.admin.transactions tbody tr td.EndTime span,
.table.table-striped.admin.transactions tbody tr td span.order-id
{
white-space: nowrap;
......@@ -280,11 +299,6 @@ input[type="checkbox"]
width: 1px;
}
.table.table-striped.admin.transactions thead tr th.status b
{
}
.table.table-striped.admin thead tr th.Timestamp
{
width: 1px;
......
src/src/App/Action/User/Cabinet.php
View file @ 2bf47c8b
......@@ -105,7 +105,6 @@ class Cabinet extends Common
/** @var \App\Model\Feeds $feedsModel */
$feedsModel = $this->container->get(Feeds::class);
$feeds = $feedsModel->findAll(['clientid' => $userId])->toArray();
//$feed_id_list = $feedsModel->getIdListByUser($userId);
if ($feeds) {
......
src/templates/app/user/cabinet-cats.phtml
View file @ 2bf47c8b
......@@ -48,8 +48,8 @@ if (!$error) {
<?php if($error): ?>
<section class="b-content__work">
<div class="wrapp" style="margin: 100px auto; text-align: center;">
<section class="b-content__work error">
<div class="wrapp">
<h1><?= $error?></h1>
</div>
</section>
......@@ -57,7 +57,7 @@ if (!$error) {
<?php else: ?>
<section class="b-content__work">
<div class="wrapp" style="position: relative; margin-bottom: 10px;">
<div class="wrapp">
<div class="b-feeds-stat_controls form-group">
<?php /* Переключатель страниц */ ?>
......@@ -70,7 +70,7 @@ if (!$error) {
</div>
<?php if ($edit_enable): ?>
<div style="float: right; font-size: 12px; color: #697075; font-style: italic;">
<div class="description-info">
Значение указывается с точностью 0.1 %
</div>
<?php endif; ?>
......
src/templates/app/user/cabinet-feed-click-history.phtml
View file @ 2bf47c8b
......@@ -54,8 +54,8 @@ if (!$error) {
<?php if($error): ?>
<section class="b-content__work">
<div class="wrapp" style="margin: 100px auto; text-align: center;">
<section class="b-content__work error">
<div class="wrapp">
<h1><?= $error?></h1>
</div>
</section>
......@@ -64,7 +64,7 @@ if (!$error) {
<section class="b-content__work">
<div class="wrapp" style="position: relative;">
<div class="wrapp">
<?php //var_dump($viewIdStats) ?>
......@@ -115,11 +115,11 @@ if (!$error) {
<?php foreach($cats as $name => $title): ?>
<td class="<?= $name ?>" data-id="<?= $name ?>">
<?php if($name == 'StartTime' || $name == 'EndTime' || $name == 'Timestamp'): ?>
<?php if(in_array($name, ['StartTime', 'EndTime', 'Timestamp'])): ?>
<?php
$date_time = explode(" ", $view_id[$name]);
?>
<span style="white-space: nowrap;">
<span>
<b><?= $date_time[1] ?></b>
<span><?= $date_time[0] ?></span>
</span>
......
src/templates/app/user/cabinet-feed.phtml
View file @ 2bf47c8b
......@@ -79,26 +79,10 @@ if (!$error) {
?>
<?php /* ?>
<section class="b-content__title">
<div class="wrapp">
<!-- Вход произведен -->
<picture>
<img src="/img/bg-img-logo.svg" alt="No logo">
</picture>
<p class="lead"><?= $identity->getEmail() ?></p>
<p class="b-content__title-settings">
<a href="<?= $this->url('user.cabinet.profile', ['lang' => $this->lang]) ?>" title="" class="annotation"><?= _t("Настройки профиля") ?></a>
<a href="<?= $this->url('logout', ['lang' => $this->lang]) ?>" title="" class="annotation"><?= _t("Выход") ?></a>
</p>
</div>
</section>
<?php */ ?>
<?php if($error): ?>
<section class="b-content__work">
<div class="wrapp" style="margin: 100px auto; text-align: center;">
<section class="b-content__work error">
<div class="wrapp">
<h1><?= $error?></h1>
</div>
</section>
......@@ -109,7 +93,7 @@ if (!$error) {
<textarea id="report-cats"><?= ($report_cats ? json_encode($report_cats, JSON_UNESCAPED_UNICODE) : '')?></textarea>
<section class="b-content__work">
<div class="wrapp" style="position: relative;">
<div class="wrapp">
<div class="b-feeds-stat_data-loading"></div>
<?php /* ?>
......@@ -117,23 +101,6 @@ if (!$error) {
<?php */ ?>
<div class="b-feeds-stat_controls form-group">
<?php /* Переключатель страниц */ ?>
<?php /* ?>
<div class="b-feeds-stat_controls-report">
<div class="dropdown" style="display:inline-block;">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<?= _t($report_title) ?>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu">
<?php foreach($reports_list as $report_name => $report_title): ?>
<li><a href="<?= $this->url('user.cabinet', ['lang' => $this->lang, 'report' => $report_name]) ?>" <?php if($current_report == $report_name): ?>class="current"<?php endif; ?> report="<?= $report_name ?>"><?= _t($report_title) ?></a></li>
<?php endforeach; ?>
</ul>
</div>
</div>
<?php */ ?>
<?php /* Переключатель отчеты категории */ ?>
<div class="b-filter__switch display">
<?php foreach($reports_list as $report_name => $report_title): ?>
......@@ -144,7 +111,7 @@ if (!$error) {
<?php /* Выбор дат */ ?>
<span class="b-feeds-stat_controls-period">
<div style="display:inline-block;">Дата: </div>
<span>Дата: </span>
<input type='text' id="date-value-1" class="btn btn-default date-value" value="<?=$dates[0] ?>"/> &ndash;
<input type='text' id="date-value-2" class="btn btn-default date-value" value="<?=$dates[1] ?>"/>
......@@ -169,7 +136,7 @@ if (!$error) {
<?php /* График */ ?>
<?php if ($current_report == 'common'): ?>
<div id="chart-graph-stat" style="height: 370px;" data-colors=<?= ($colors_active_lines ? json_encode($colors_active_lines) : '')?>></div>
<div id="chart-graph-stat" data-colors=<?= ($colors_active_lines ? json_encode($colors_active_lines) : '')?>></div>
<?php endif ?>
<?php /* Таблица */ ?>
......
src/templates/app/user/feeds.phtml
View file @ 2bf47c8b
......@@ -33,7 +33,6 @@ $this->headScript()
$this->headLink()
->appendStylesheet('/css/styles-cabinet.css')
//->appendStylesheet('/css/styles-cabinet-550.css', 'all and (max-width: 550px)')
;
/** @var \App\Entity\IdentityInterface $identity */
......
src/templates/app/user/nodata.phtml
View file @ 2bf47c8b
......@@ -33,7 +33,6 @@ $this->headScript()
$this->headLink()
->appendStylesheet('/css/styles-cabinet.css')
//->appendStylesheet('/css/styles-cabinet-550.css', 'all and (max-width: 550px)')
;
/** @var \App\Entity\IdentityInterface $identity */
......@@ -60,7 +59,7 @@ $lang = $this->lang;
<section class="b-content__work" style="margin-top: 10px;">
<h1 style="text-align: center;"><?= _t('У пользователя нет закрепленых за ним сайтов, кодов, фидов') ?></h1>
<h1 style="text-align: center;"><?= _t('У пользователя нет закрепленых за ним магазинов') ?></h1>
</section>
src/templates/error/404.phtml
View file @ 2bf47c8b
......@@ -16,7 +16,7 @@ $this->headTitle(_t('404 Not Found'));
<h1><?= _t('Страница не найдена') ?></h1>
<p class="icon"></p>
<p class="lead"><?= _t('Скорее всего, страница более недоступна или допущена опечатка при вводе адреса.') ?></p>
<p style="text-align: center;"><a href="<?php echo $this->url('home', ['lang' => $this->lang]) ?>" class="link"><?= _t('Перейти на главную страницу') ?></a></p>
<p class="link-wrap"><a href="<?php echo $this->url('home', ['lang' => $this->lang]) ?>" class="link"><?= _t('Перейти на главную страницу') ?></a></p>
</div>
src/templates/layout/layout-main.phtml
View file @ 2bf47c8b
......@@ -92,8 +92,6 @@ $urlHome = $this->url('home',['lang' => $lang]);
<img src="/img/bg-img-logo.svg" alt="No logo">
</picture>
<?php
//$urlCabinet = $this->url(in_array($identityRole, [\App\Acl\Roles::ROLE_ADMIN,\App\Acl\Roles::ROLE_MANAGER]) ? 'adm.index' : 'user.cabinet', ['lang' => $lang]);
//$urlCabinet = $this->url('user.cabinet',['lang' => $lang]);
$urlCabinet = $this->url('user.cabinet.profile',['lang' => $lang]);
?>
<a href="<?= $urlCabinet ?>" class="annotation" title="<?= _t("Настройки профиля") ?>"><?= $identity->getEmail() ?></a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment