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
86387e73
Commit
86387e73
authored
Mar 27, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Правка класса для табл. статистики по клику
parent
770c45df
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
521 deletions
+2
-521
styles-feeds-system.css
src/public/css/styles-feeds-system.css
+0
-507
cabinet-feed-click-history.phtml
src/templates/app/user/cabinet-feed-click-history.phtml
+2
-14
No files found.
src/public/css/styles-feeds-system.css
deleted
100644 → 0
View file @
770c45df
/* Таблица стилей к странице фида */
.b-content__work.inner
{
max-width
:
1240px
;
margin
:
0
auto
;
}
.b-content__work.inner
input
[
type
=
"checkbox"
]
{
vertical-align
:
-2px
;
cursor
:
pointer
;
}
.b-clear
{
clear
:
both
;
}
.b-left
{
float
:
left
;
width
:
75%
;
padding-right
:
75px
;
}
.b-right
{
float
:
left
;
width
:
25%
;
}
.form-group
{
margin-bottom
:
5px
;
}
/* .feeds-cats */
.feed-title
{
font-size
:
16px
;
color
:
#2E6DA4
;
font-size
:
14px
;
font-style
:
italic
;
font-weight
:
bold
;
}
.table.feeds-cats
{
/*font-family: monospace;*/
font-family
:
'RobotoCondensed-Regular'
,
sans-serif
;
}
.table.feeds-cats
tbody
{
display
:
none
;
}
.table.feeds-cats.open
tbody
{
display
:
table-row-group
;
}
.table.feeds-cats
thead
th
.data
{
width
:
1px
;
min-width
:
80px
;
text-align
:
right
;
}
.table.feeds-cats
.cat-title-main
,
.table.feeds-cats
.cat-title
{
cursor
:
pointer
;
}
.table.feeds-cats
span
.group
{
display
:
inline-block
;
min-width
:
12px
;
color
:
#697075
;
cursor
:
pointer
;
}
.table.feeds-cats
tbody
tr
td
.percent
{
text-align
:
right
;
}
.table.feeds-cats
tbody
tr
td
.percent
.edited
{
cursor
:
pointer
;
border-bottom
:
1px
dashed
#697075
;
}
.table.feeds-cats
tbody
tr
td
.percent
.edited.was-edited
,
.table.feeds-cats
tbody
tr
td
.percent
.edited.was-changed
{
color
:
#009444
;
border-color
:
#009444
;
}
.table.feeds-cats
tbody
tr
td
.percent
.old-value
{
display
:
none
;
color
:
#697075
;
font-size
:
11px
;
text-decoration
:
line-through
;
}
.table.feeds-cats
tbody
tr
td
.percent
.editing-wrap
{
display
:
none
;
}
.table.feeds-cats
tbody
tr
td
.percent
input
.percent-input
{
margin-top
:
-2px
;
width
:
45px
;
text-align
:
right
;
}
.table.feeds-cats
tbody
tr
td
.percent
{
}
.table.feeds-cats
tbody
tr
td
.percent.own
{
font-family
:
'RobotoCondensed-Bold'
,
sans-serif
;
}
.table.feeds-cats
tbody
tr
td
.percent.inherited
{
font-family
:
'RobotoCondensed-Light'
,
sans-serif
;
}
.table.feeds-cats
tr
.feed-cat
{
display
:
none
;
}
.table.feeds-cats
tr
.feed-cat
[
data-parent
=
"0"
],
.table.feeds-cats
tr
.feed-cat.open
{
display
:
table-row
;
}
.table.feeds-cats
span
.group
b
.open
{
display
:
none
;
}
.table.feeds-cats
span
.group.open
b
.closed
{
display
:
none
;
}
.table.feeds-cats
span
.group.open
b
.open
{
display
:
inline
;
}
.table.feeds-cats
tr
.feed-cat
.foreign-id
{
font-family
:
'RobotoCondensed-Light'
,
sans-serif
;
font-size
:
14px
;
}
.form-actions
{
display
:
none
;
}
.table.feeds-cats
.form-actions
.btn
{
height
:
24px
;
line-height
:
12px
;
}
#period-stats
,
#report-cats
,
#viewid-stats
{
display
:
none
;
}
input
[
type
=
"checkbox"
]
{
vertical-align
:
-2px
;
}
.form-group
.form-control
{
font-family
:
monospace
;
}
.form-group
select
.form-control
{
height
:
34px
;
line-height
:
14px
;
padding-right
:
15px
;
border-color
:
#BDCED4
;
background
:
url(../img/icon-open-accordeon.svg)
right
4px
center
no-repeat
;
background-size
:
10px
;
cursor
:
pointer
;
}
.b-feeds-stat_data-loading
{
display
:
none
;
position
:
absolute
;
width
:
100%
;
height
:
100%
;
background
:
#FFF
url(../img/gif-load.gif)
center
200px
no-repeat
;
opacity
:
0.5
;
z-index
:
10
;
}
.b-feeds-stat_controls
{
margin-bottom
:
25px
;
height
:
34px
;
}
.b-feeds-stat_controls-report
{
float
:
left
;
}
.b-feeds-stat_controls-period
{
float
:
right
;
}
.b-feeds-stat_controls
input
.date-value
{
width
:
100px
;
}
.b-feeds-stat_controls
select
{
display
:
inline-block
;
margin
:
0
15px
0
2px
;
width
:
120px
;
height
:
30px
;
line-height
:
15px
;
}
.b-feeds-stat_controls
.stat-period
{
width
:
135px
;
}
.chart-graph-stat-info
,
.chart-graph-stat-error
,
.chart-graph-stat-loading
{
display
:
none
;
padding-top
:
160px
;
height
:
370px
;
text-align
:
center
;
}
.b-table_wrapp.report
{
display
:
none
;
margin-top
:
30px
;
}
.table.table-striped.admin.common
{
font-family
:
monospace
;
}
.table.table-striped.admin.transaction
{
font-size
:
13px
;
}
.table.table-striped.admin.transaction
thead
{
color
:
#337ab7
;
line-height
:
14px
;
font-weight
:
bold
;
}
table
.table-striped.admin.transaction
tbody
{
font-size
:
12px
;
}
.table.table-striped.admin
thead
.metric.sortable
tr
b
{
cursor
:
pointer
;
}
.table.table-striped.admin
thead
.metric.sortable
tr
b
.not-sorted
{
cursor
:
default
;
}
.table.table-striped.admin.common
thead
.metric.sortable
tr
b
.selected
{
color
:
#2CA02C
;
}
.table.table-striped.admin.common
thead
.metric.sortable
tr
span
{
display
:
inline-block
;
border-bottom
:
2px
solid
red
;
}
.table.table-striped.admin.transaction
thead
tr
th
.OrderSum
{
text-align
:
right
;
}
.table.table-striped.admin.viewid
thead
tr
th
,
.table.table-striped.admin.transaction.viewid
thead
tr
th
.OrderSum
{
width
:
1px
;
}
.table.table-striped.admin.transaction.viewid
thead
tr
th
.Basket
{
width
:
550px
;
}
/* .b-basket-content */
.table.table-striped.admin.transaction
thead
tr
th
.period
{
min-width
:
100px
;
}
.table.table-striped.admin
thead
tr
th
.Timestamp
{
width
:
100px
;
line-height
:
14px
;
}
.table.table-striped.admin
tbody
td
.Timestamp
{
line-height
:
13px
;
}
.table.table-striped.admin
thead
tr
th
.Basket
{
line-height
:
14px
;
}
.table.table-striped.admin
thead
tr
th
.Basket
.basket-link
,
.table.table-striped.admin
thead
tr
th
.Basket
.quantity
,
.table.table-striped.admin
thead
tr
th
.Basket
.price
{
display
:
inline-block
;
}
.table.table-striped.admin
thead
tr
th
.Basket
.basket-link
{
width
:
530px
;
}
.table.table-striped.admin.viewid
thead
tr
th
.Basket
.basket-link
{
width
:
450px
;
}
.table.table-striped.admin.viewid
thead
tr
th
.Basket
.quantity
,
.table.table-striped.admin.viewid
thead
tr
th
.Basket
.price
{
text-align
:
center
;
width
:
50px
;
}
.table.table-striped.admin
thead
tr
th
.Basket
.quantity
{
text-align
:
center
;
width
:
55px
;
}
.table.table-striped.admin.transaction
thead
tr
th
.OrderSum
{
width
:
100px
;
}
.table.table-striped.admin
td
.Basket
{
padding
:
2px
;
}
.table.table-striped.admin.transaction
td
.OrderSum
{
font-weight
:
bold
;
text-align
:
right
;
}
.table.table-striped.admin.transaction
td
.Pages
{
text-align
:
center
;
}
.table.table-striped.admin.transaction
tbody
tr
.total-orders
{
font-weight
:
bold
;
font-size
:
13px
;
}
.table.table-striped.admin.common
tbody
tr
.total
{
font-weight
:
bold
;
}
.table.table-striped
thead
tr
th
.period
b
:after
{
content
:
" / "
;
}
.table.table-striped
thead
tr
th
.period
b
:last-child:after
{
content
:
""
;
}
.b-basket-content
{
margin
:
4px
;
padding
:
2px
;
font-size
:
12px
;
line-height
:
14px
;
}
.b-basket-content
.basket-link
{
display
:
inline-block
;
width
:
540px
;
}
table
.viewid
.b-basket-content
.basket-link
{
display
:
inline-block
;
width
:
450px
;
font-size
:
11px
;
font-weight
:
bold
;
}
.b-basket-content
.view-id-url
{
display
:
inline-block
;
width
:
450px
;
margin-bottom
:
4px
;
word-break
:
break-word
;
}
table
.viewid
.b-basket-content
.quantity
,
table
.viewid
.b-basket-content
.price
{
width
:
50px
;
text-align
:
right
;
}
.b-basket-content
.quantity
{
display
:
inline-block
;
width
:
55px
;
text-align
:
center
;
}
.b-basket-content
.price
{
display
:
inline-block
;
width
:
100px
;
text-align
:
left
;
}
table
.viewid
.b-basket-content
.price
{
width
:
40px
;
}
.table.table-striped.admin
thead
.metric
tr
b
.arrow
{
display
:
none
;
}
.table.table-striped.admin
thead
.metric.sortable
tr
b
.selected
.arrow.asc
,
.table.table-striped.admin
thead
.metric.sortable
tr
b
.selected.desc
.arrow.desc
{
display
:
inline
;
}
.table.table-striped.admin
thead
.metric.sortable
tr
b
.selected
.arrow.desc
,
.table.table-striped.admin
thead
.metric.sortable
tr
b
.selected.desc
.arrow.asc
{
display
:
none
;
}
src/templates/app/user/cabinet-feed-click-history.phtml
View file @
86387e73
...
@@ -26,22 +26,10 @@
...
@@ -26,22 +26,10 @@
/** @var $this \Zend\View\Renderer\PhpRenderer */
/** @var $this \Zend\View\Renderer\PhpRenderer */
$this
->
headScript
()
$this
->
headScript
()
->
appendFile
(
'/js/underscore-min.js'
)
//->appendFile('/js/bootstrap.min.js')
->
appendFile
(
'/js/jquery.cookie.js'
)
->
appendFile
(
'/js/bootstrap.min.js'
)
->
appendFile
(
'/js/c3.min.js'
)
->
appendFile
(
'/js/d3.min.js'
)
->
appendFile
(
'/js/datepicker.min.js'
)
//->appendFile('/js/script-feeds-stat-charts.js')
//->appendFile('/js/script-feeds-stat-table.js')
//->appendFile('/js/script-feeds-stat.js')
//->appendFile('/js/adm/service-actions.js')
;
;
$this
->
headLink
()
$this
->
headLink
()
->
appendStylesheet
(
'/css/c3.css'
)
->
appendStylesheet
(
'/css/datepicker.min.css'
)
->
appendStylesheet
(
'/css/styles-feeds-stat.css'
)
->
appendStylesheet
(
'/css/styles-feeds-stat.css'
)
;
;
...
@@ -94,7 +82,7 @@ if (!$error) {
...
@@ -94,7 +82,7 @@ if (!$error) {
<?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>
<table id="
table
-
line
" class="
table
table
-
striped
admin
transaction
viewid
">
<table id="
table
-
line
" class="
table
table
-
striped
admin
transaction
s
viewid
">
<thead class="
metric
sortable
">
<thead class="
metric
sortable
">
<tr>
<tr>
<?php foreach(
$cats
as
$name
=>
$title
): ?>
<?php foreach(
$cats
as
$name
=>
$title
): ?>
...
...
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