Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
A
addcpm-json
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Александр Чаплыгин
addcpm-json
Commits
723d395c
Commit
723d395c
authored
Apr 15, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Инфо сообщение об отсутствии истории по клику, правка ширины ячеек
parent
0ccd5763
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
20 deletions
+31
-20
styles-feeds-stat.css
src/public/css/styles-feeds-stat.css
+24
-10
cabinet-feed-click-history.phtml
src/templates/app/user/cabinet-feed-click-history.phtml
+7
-10
No files found.
src/public/css/styles-feeds-stat.css
View file @
723d395c
...
@@ -209,7 +209,15 @@ input[type="checkbox"]
...
@@ -209,7 +209,15 @@ input[type="checkbox"]
border-bottom
:
2px
solid
red
;
border-bottom
:
2px
solid
red
;
}
}
.table.table-striped.admin.transactions
thead
tr
th
.OrderSum
.table.table-striped.admin.transactions
thead
tr
th
.ViewID
,
.table.table-striped.admin.transactions
thead
tr
th
.OrderSum
,
.table.table-striped.admin.transactions
thead
tr
th
.AdMoney
{
width
:
1px
;
}
.table.table-striped.admin.transactions
thead
tr
th
.OrderSum
,
.table.table-striped.admin.transactions
thead
tr
th
.AdMoney
{
{
text-align
:
right
;
text-align
:
right
;
}
}
...
@@ -228,12 +236,12 @@ input[type="checkbox"]
...
@@ -228,12 +236,12 @@ input[type="checkbox"]
/* .b-basket-content */
/* .b-basket-content */
.table.table-striped.admin.transactions
thead
tr
th
.period
.table.table-striped.admin.transactions
thead
tr
th
.period
{
{
min-width
:
100
px
;
width
:
1
px
;
}
}
.table.table-striped.admin
thead
tr
th
.Timestamp
.table.table-striped.admin
thead
tr
th
.Timestamp
{
{
width
:
1
00
px
;
width
:
1px
;
line-height
:
14px
;
line-height
:
14px
;
}
}
...
@@ -242,6 +250,11 @@ input[type="checkbox"]
...
@@ -242,6 +250,11 @@ input[type="checkbox"]
line-height
:
13px
;
line-height
:
13px
;
}
}
.table.table-striped.admin
tbody
td
.Timestamp
span
{
white-space
:
nowrap
;
}
.table.table-striped.admin
thead
tr
th
.Basket
.table.table-striped.admin
thead
tr
th
.Basket
{
{
line-height
:
14px
;
line-height
:
14px
;
...
@@ -277,13 +290,6 @@ input[type="checkbox"]
...
@@ -277,13 +290,6 @@ input[type="checkbox"]
width
:
55px
;
width
:
55px
;
}
}
.table.table-striped.admin.transactions
thead
tr
th
.OrderSum
{
width
:
100px
;
}
.table.table-striped.admin
td
.Basket
.table.table-striped.admin
td
.Basket
{
{
padding
:
2px
;
padding
:
2px
;
...
@@ -470,3 +476,10 @@ input[type="checkbox"]
...
@@ -470,3 +476,10 @@ input[type="checkbox"]
{
{
text-decoration
:
none
;
text-decoration
:
none
;
}
}
.click-history-info
{
height
:
400px
;
padding-top
:
200px
;
text-align
:
center
;
}
\ No newline at end of file
src/templates/app/user/cabinet-feed-click-history.phtml
View file @
723d395c
...
@@ -45,10 +45,8 @@ $src = $sxml['src'];
...
@@ -45,10 +45,8 @@ $src = $sxml['src'];
$error
=
$this
->
error
;
$error
=
$this
->
error
;
if
(
!
$error
)
{
if
(
!
$error
)
{
$viewIdStats
=
$this
->
viewIdStats
;
$viewIdStats
=
$this
->
viewIdStats
;
$cats
=
$this
->
cats
;
$cats
=
$this
->
cats
;
}
}
?>
?>
...
@@ -67,18 +65,16 @@ if (!$error) {
...
@@ -67,18 +65,16 @@ if (!$error) {
<section
class=
"b-content__work"
>
<section
class=
"b-content__work"
>
<div
class=
"wrapp"
style=
"position: relative;"
>
<div
class=
"wrapp"
style=
"position: relative;"
>
<
div
class=
"b-feeds-stat_data-loading"
></div
>
<
?php
//var_dump($viewIdStats) ?
>
<?php
//print_r($viewIdStats)
?>
<?
php
if
(
!
$viewIdStats
)
:
?>
<
div
class
="
chart
-
graph
-
stat
-
info
">
<div
class=
"click-history-info"
>
<h2>По заданным параметрам статистика отсутствует</h2>
<h2>
Извините, история по клику недоступна
</h2>
</div>
<div class="
chart
-
graph
-
stat
-
error
">
<h2>Ошибка в статистике</h2>
<div class="
message
"></div>
</div>
</div>
<?php
else
:
?>
<?php
/* Таблица */
?>
<?php
/* Таблица */
?>
<div
id=
"table-stat"
class=
"b-table_wrapp"
>
<div
id=
"table-stat"
class=
"b-table_wrapp"
>
<div
class=
"b-content__loading"
></div>
<div
class=
"b-content__loading"
></div>
...
@@ -140,6 +136,7 @@ if (!$error) {
...
@@ -140,6 +136,7 @@ if (!$error) {
</table>
</table>
</div>
</div>
<?php
endif
;
?>
</div>
</div>
</section>
</section>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment