From 91d142fc9dac741cad3cb6cf531f7d569adb7a7e Mon Sep 17 00:00:00 2001 From: CB9TOIIIA Date: Wed, 24 May 2017 10:46:19 +0300 Subject: [PATCH] fix @media - for small display fix @media - for small display --- assets/css/articles.css | 2 + assets/css/auhorsprofile.css | 2 + assets/css/autors.css | 2 + assets/css/datepick.css | 2 + assets/css/disqus.css | 2 + assets/css/jquery.dataTables.min.css | 2 + assets/css/metrika.css | 2 + assets/css/social.css | 2 + assets/css/sort.css | 2 + myjbzoostat.xml | 2 +- updatemyjbzoostat.xml | 4 +- views/articles/tmpl/default.php | 1 + views/auhorsprofile/tmpl/default.php | 2 +- views/autors/tmpl/default.php | 2 +- views/checkoneurl/tmpl/default.php | 2 + views/disqus/tmpl/default.php | 2 +- views/index/tmpl/default.php | 2 + views/nodubles/index.html | 0 views/nodubles/tmpl/default.php | 151 +++++++++++++++++++++++++++ views/nodubles/tmpl/index.html | 0 views/nodubles/view.html.php | 126 ++++++++++++++++++++++ views/orders/tmpl/default.php | 2 +- views/report/tmpl/default.php | 2 +- views/reportauthors/tmpl/default.php | 2 +- views/social/tmpl/default.php | 1 + views/tags/tmpl/default.php | 2 +- 26 files changed, 311 insertions(+), 10 deletions(-) create mode 100644 views/nodubles/index.html create mode 100644 views/nodubles/tmpl/default.php create mode 100644 views/nodubles/tmpl/index.html create mode 100644 views/nodubles/view.html.php diff --git a/assets/css/articles.css b/assets/css/articles.css index 52427d8..34801b4 100644 --- a/assets/css/articles.css +++ b/assets/css/articles.css @@ -1,3 +1,5 @@ +@media screen and (max-width: 1600px) { .uk-text-center table tr { display: inline-grid !important;} } + .tagsstat .zebra { display: inline-flex; flex-wrap: wrap; width: 98%; height: 200px; flex-direction: column; list-style: none; padding: 0;} .tagsstat .zebra li { padding: 5px; margin-right: 5px; } .tagsstat .zebra li:nth-child(odd) { background: #EFEFEF; } .tagsstat .zebra li:nth-child(even) { background: white; } .zebratable {width: 98%; margin: 0 auto;} .zebratable td {padding: 5px;} diff --git a/assets/css/auhorsprofile.css b/assets/css/auhorsprofile.css index 5a8828e..6277658 100644 --- a/assets/css/auhorsprofile.css +++ b/assets/css/auhorsprofile.css @@ -1,3 +1,5 @@ +@media screen and (max-width: 1600px) { .uk-text-center table tr { display: inline-grid !important;} } + .tagsstat .zebra { display: inline-flex; flex-wrap: wrap; width: 98%; height: 200px; flex-direction: column; list-style: none; padding: 0;} .tagsstat .zebra li { padding: 5px; margin-right: 5px; } .tagsstat .zebra li:nth-child(odd) { background: #EFEFEF; } .tagsstat .zebra li:nth-child(even) { background: white; } .zebratable {width: 98%; margin: 0 auto;} .zebratable td {padding: 5px;} diff --git a/assets/css/autors.css b/assets/css/autors.css index 0b2d6f4..93dafc4 100644 --- a/assets/css/autors.css +++ b/assets/css/autors.css @@ -1,3 +1,5 @@ +@media screen and (max-width: 1600px) { .uk-text-center table tr { display: inline-grid !important;} } + .tagsstat .zebra { display: inline-flex; flex-wrap: wrap; width: 98%; height: 500px; flex-direction: column; list-style: none; padding: 0;} .tagsstat .zebra li { padding: 5px; margin-right: 5px; } .tagsstat .zebra li:nth-child(odd) { background: #EFEFEF; } .tagsstat .zebra li:nth-child(even) { background: white; } .zebratable {width: 98%; margin: 0 auto;} .zebratable td {padding: 5px;} diff --git a/assets/css/datepick.css b/assets/css/datepick.css index caf2116..ef28b84 100644 --- a/assets/css/datepick.css +++ b/assets/css/datepick.css @@ -1,3 +1,5 @@ +@media screen and (max-width: 1600px) { .uk-text-center table tr { display: inline-grid !important;} } + #mask-date-calendarstart, #mask-date-calendarend {width: 90px; margin-left: 5px; margin-right: 5px} input#togglecalend { diff --git a/assets/css/disqus.css b/assets/css/disqus.css index ecee6ec..984f209 100644 --- a/assets/css/disqus.css +++ b/assets/css/disqus.css @@ -1,3 +1,5 @@ +@media screen and (max-width: 1600px) { .uk-text-center table tr { display: inline-grid !important;} } + .clrred{color:red} blockquote.postaclass{margin-bottom:30px} li.inforepsmile img:not(:first-child),.messageauthor + img + img,.messageauthorafds + li img:not(:first-child){margin-left:10px} diff --git a/assets/css/jquery.dataTables.min.css b/assets/css/jquery.dataTables.min.css index 781de6b..5a84724 100644 --- a/assets/css/jquery.dataTables.min.css +++ b/assets/css/jquery.dataTables.min.css @@ -1 +1,3 @@ +@media screen and (max-width: 1600px) { .uk-text-center table tr { display: inline-grid !important;} } + table.dataTable{width:100%;margin:0 auto;clear:both;border-collapse:separate;border-spacing:0}table.dataTable thead th,table.dataTable tfoot th{font-weight:bold}table.dataTable thead th,table.dataTable thead td{padding:10px 18px;border-bottom:1px solid #111}table.dataTable thead th:active,table.dataTable thead td:active{outline:none}table.dataTable tfoot th,table.dataTable tfoot td{padding:10px 18px 6px 18px;border-top:1px solid #111}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc{cursor:pointer;*cursor:hand}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{background-repeat:no-repeat;background-position:center right}table.dataTable thead .sorting{background-image:url("../images/sort_both.png")}table.dataTable thead .sorting_asc{background-image:url("../images/sort_asc.png")}table.dataTable thead .sorting_desc{background-image:url("../images/sort_desc.png")}table.dataTable thead .sorting_asc_disabled{background-image:url("../images/sort_asc_disabled.png")}table.dataTable thead .sorting_desc_disabled{background-image:url("../images/sort_desc_disabled.png")}table.dataTable tbody tr{background-color:#ffffff}table.dataTable tbody tr.selected{background-color:#B0BED9}table.dataTable tbody th,table.dataTable tbody td{padding:8px 10px}table.dataTable.row-border tbody th,table.dataTable.row-border tbody td,table.dataTable.display tbody th,table.dataTable.display tbody td{border-top:1px solid #ddd}table.dataTable.row-border tbody tr:first-child th,table.dataTable.row-border tbody tr:first-child td,table.dataTable.display tbody tr:first-child th,table.dataTable.display tbody tr:first-child td{border-top:none}table.dataTable.cell-border tbody th,table.dataTable.cell-border tbody td{border-top:1px solid #ddd;border-right:1px solid #ddd}table.dataTable.cell-border tbody tr th:first-child,table.dataTable.cell-border tbody tr td:first-child{border-left:1px solid #ddd}table.dataTable.cell-border tbody tr:first-child th,table.dataTable.cell-border tbody tr:first-child td{border-top:none}table.dataTable.stripe tbody tr.odd,table.dataTable.display tbody tr.odd{background-color:#f9f9f9}table.dataTable.stripe tbody tr.odd.selected,table.dataTable.display tbody tr.odd.selected{background-color:#acbad4}table.dataTable.hover tbody tr:hover,table.dataTable.display tbody tr:hover{background-color:#f6f6f6}table.dataTable.hover tbody tr:hover.selected,table.dataTable.display tbody tr:hover.selected{background-color:#aab7d1}table.dataTable.order-column tbody tr>.sorting_1,table.dataTable.order-column tbody tr>.sorting_2,table.dataTable.order-column tbody tr>.sorting_3,table.dataTable.display tbody tr>.sorting_1,table.dataTable.display tbody tr>.sorting_2,table.dataTable.display tbody tr>.sorting_3{background-color:#fafafa}table.dataTable.order-column tbody tr.selected>.sorting_1,table.dataTable.order-column tbody tr.selected>.sorting_2,table.dataTable.order-column tbody tr.selected>.sorting_3,table.dataTable.display tbody tr.selected>.sorting_1,table.dataTable.display tbody tr.selected>.sorting_2,table.dataTable.display tbody tr.selected>.sorting_3{background-color:#acbad5}table.dataTable.display tbody tr.odd>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd>.sorting_1{background-color:#f1f1f1}table.dataTable.display tbody tr.odd>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd>.sorting_2{background-color:#f3f3f3}table.dataTable.display tbody tr.odd>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd>.sorting_3{background-color:whitesmoke}table.dataTable.display tbody tr.odd.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_1{background-color:#a6b4cd}table.dataTable.display tbody tr.odd.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_2{background-color:#a8b5cf}table.dataTable.display tbody tr.odd.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_3{background-color:#a9b7d1}table.dataTable.display tbody tr.even>.sorting_1,table.dataTable.order-column.stripe tbody tr.even>.sorting_1{background-color:#fafafa}table.dataTable.display tbody tr.even>.sorting_2,table.dataTable.order-column.stripe tbody tr.even>.sorting_2{background-color:#fcfcfc}table.dataTable.display tbody tr.even>.sorting_3,table.dataTable.order-column.stripe tbody tr.even>.sorting_3{background-color:#fefefe}table.dataTable.display tbody tr.even.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_1{background-color:#acbad5}table.dataTable.display tbody tr.even.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_2{background-color:#aebcd6}table.dataTable.display tbody tr.even.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_3{background-color:#afbdd8}table.dataTable.display tbody tr:hover>.sorting_1,table.dataTable.order-column.hover tbody tr:hover>.sorting_1{background-color:#eaeaea}table.dataTable.display tbody tr:hover>.sorting_2,table.dataTable.order-column.hover tbody tr:hover>.sorting_2{background-color:#ececec}table.dataTable.display tbody tr:hover>.sorting_3,table.dataTable.order-column.hover tbody tr:hover>.sorting_3{background-color:#efefef}table.dataTable.display tbody tr:hover.selected>.sorting_1,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_1{background-color:#a2aec7}table.dataTable.display tbody tr:hover.selected>.sorting_2,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_2{background-color:#a3b0c9}table.dataTable.display tbody tr:hover.selected>.sorting_3,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_3{background-color:#a5b2cb}table.dataTable.no-footer{border-bottom:1px solid #111}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}table.dataTable.compact thead th,table.dataTable.compact thead td{padding:4px 17px 4px 4px}table.dataTable.compact tfoot th,table.dataTable.compact tfoot td{padding:4px}table.dataTable.compact tbody th,table.dataTable.compact tbody td{padding:4px}table.dataTable th.dt-left,table.dataTable td.dt-left{text-align:left}table.dataTable th.dt-center,table.dataTable td.dt-center,table.dataTable td.dataTables_empty{text-align:center}table.dataTable th.dt-right,table.dataTable td.dt-right{text-align:right}table.dataTable th.dt-justify,table.dataTable td.dt-justify{text-align:justify}table.dataTable th.dt-nowrap,table.dataTable td.dt-nowrap{white-space:nowrap}table.dataTable thead th.dt-head-left,table.dataTable thead td.dt-head-left,table.dataTable tfoot th.dt-head-left,table.dataTable tfoot td.dt-head-left{text-align:left}table.dataTable thead th.dt-head-center,table.dataTable thead td.dt-head-center,table.dataTable tfoot th.dt-head-center,table.dataTable tfoot td.dt-head-center{text-align:center}table.dataTable thead th.dt-head-right,table.dataTable thead td.dt-head-right,table.dataTable tfoot th.dt-head-right,table.dataTable tfoot td.dt-head-right{text-align:right}table.dataTable thead th.dt-head-justify,table.dataTable thead td.dt-head-justify,table.dataTable tfoot th.dt-head-justify,table.dataTable tfoot td.dt-head-justify{text-align:justify}table.dataTable thead th.dt-head-nowrap,table.dataTable thead td.dt-head-nowrap,table.dataTable tfoot th.dt-head-nowrap,table.dataTable tfoot td.dt-head-nowrap{white-space:nowrap}table.dataTable tbody th.dt-body-left,table.dataTable tbody td.dt-body-left{text-align:left}table.dataTable tbody th.dt-body-center,table.dataTable tbody td.dt-body-center{text-align:center}table.dataTable tbody th.dt-body-right,table.dataTable tbody td.dt-body-right{text-align:right}table.dataTable tbody th.dt-body-justify,table.dataTable tbody td.dt-body-justify{text-align:justify}table.dataTable tbody th.dt-body-nowrap,table.dataTable tbody td.dt-body-nowrap{white-space:nowrap}table.dataTable,table.dataTable th,table.dataTable td{-webkit-box-sizing:content-box;box-sizing:content-box}.dataTables_wrapper{position:relative;clear:both;*zoom:1;zoom:1}.dataTables_wrapper .dataTables_length{float:left}.dataTables_wrapper .dataTables_filter{float:right;text-align:right}.dataTables_wrapper .dataTables_filter input{margin-left:0.5em}.dataTables_wrapper .dataTables_info{clear:both;float:left;padding-top:0.755em}.dataTables_wrapper .dataTables_paginate{float:right;text-align:right;padding-top:0.25em}.dataTables_wrapper .dataTables_paginate .paginate_button{box-sizing:border-box;display:inline-block;min-width:1.5em;padding:0.5em 1em;margin-left:2px;text-align:center;text-decoration:none !important;cursor:pointer;*cursor:hand;color:#333 !important;border:1px solid transparent;border-radius:2px}.dataTables_wrapper .dataTables_paginate .paginate_button.current,.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover{color:#333 !important;border:1px solid #979797;background-color:white;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fff), color-stop(100%, #dcdcdc));background:-webkit-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-moz-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-ms-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-o-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:linear-gradient(to bottom, #fff 0%, #dcdcdc 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button.disabled,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active{cursor:default;color:#666 !important;border:1px solid transparent;background:transparent;box-shadow:none}.dataTables_wrapper .dataTables_paginate .paginate_button:hover{color:white !important;border:1px solid #111;background-color:#585858;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #585858), color-stop(100%, #111));background:-webkit-linear-gradient(top, #585858 0%, #111 100%);background:-moz-linear-gradient(top, #585858 0%, #111 100%);background:-ms-linear-gradient(top, #585858 0%, #111 100%);background:-o-linear-gradient(top, #585858 0%, #111 100%);background:linear-gradient(to bottom, #585858 0%, #111 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button:active{outline:none;background-color:#2b2b2b;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c));background:-webkit-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-moz-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-ms-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-o-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%);box-shadow:inset 0 0 3px #111}.dataTables_wrapper .dataTables_paginate .ellipsis{padding:0 1em}.dataTables_wrapper .dataTables_processing{position:absolute;top:50%;left:50%;width:100%;height:40px;margin-left:-50%;margin-top:-25px;padding-top:20px;text-align:center;font-size:1.2em;background-color:white;background:-webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));background:-webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%)}.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter,.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_processing,.dataTables_wrapper .dataTables_paginate{color:#333}.dataTables_wrapper .dataTables_scroll{clear:both}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody{*margin-top:-1px;-webkit-overflow-scrolling:touch}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td{vertical-align:middle}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th>div.dataTables_sizing,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td>div.dataTables_sizing{height:0;overflow:hidden;margin:0 !important;padding:0 !important}.dataTables_wrapper.no-footer .dataTables_scrollBody{border-bottom:1px solid #111}.dataTables_wrapper.no-footer div.dataTables_scrollHead table,.dataTables_wrapper.no-footer div.dataTables_scrollBody table{border-bottom:none}.dataTables_wrapper:after{visibility:hidden;display:block;content:"";clear:both;height:0}@media screen and (max-width: 767px){.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_paginate{float:none;text-align:center}.dataTables_wrapper .dataTables_paginate{margin-top:0.5em}}@media screen and (max-width: 640px){.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter{float:none;text-align:center}.dataTables_wrapper .dataTables_filter{margin-top:0.5em}} diff --git a/assets/css/metrika.css b/assets/css/metrika.css index b59ed2c..0b92585 100644 --- a/assets/css/metrika.css +++ b/assets/css/metrika.css @@ -1,3 +1,5 @@ +@media screen and (max-width: 1600px) { .uk-text-center table tr { display: inline-grid !important;} } + .vergit { clear: both; float: right; diff --git a/assets/css/social.css b/assets/css/social.css index eb5a934..66eb6aa 100644 --- a/assets/css/social.css +++ b/assets/css/social.css @@ -1,3 +1,5 @@ +@media screen and (max-width: 1600px) { .uk-text-center table tr { display: inline-grid !important;} } + /*! * grid Bootstrap v3.3.5 (http://getbootstrap.com) */ .container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}.clearfix:before,.clearfix:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after{content:" ";display:table}.clearfix:after,.container:after,.container-fluid:after,.row:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important}.affix{position:fixed} .row { diff --git a/assets/css/sort.css b/assets/css/sort.css index de8b52b..6517e41 100644 --- a/assets/css/sort.css +++ b/assets/css/sort.css @@ -1,3 +1,5 @@ +@media screen and (max-width: 1600px) { .uk-text-center table tr { display: inline-grid !important;} } + .tagsstat .zebra { display: inline-flex; flex-wrap: wrap; width: 98%; height: 200px; flex-direction: column; list-style: none; padding: 0;} .tagsstat .zebra li { padding: 5px; margin-right: 5px; } .tagsstat .zebra li:nth-child(odd) { background: #EFEFEF; } .tagsstat .zebra li:nth-child(even) { background: white; } b > big { text-transform: uppercase; } .zebratable {width: 98%; margin: 0 auto;} diff --git a/myjbzoostat.xml b/myjbzoostat.xml index c3718af..8a52229 100644 --- a/myjbzoostat.xml +++ b/myjbzoostat.xml @@ -6,7 +6,7 @@ http://cb9t.ru - 2.6.0 + 2.7.0
]]> 28 June 2016 diff --git a/updatemyjbzoostat.xml b/updatemyjbzoostat.xml index 59d793e..e44e9e5 100644 --- a/updatemyjbzoostat.xml +++ b/updatemyjbzoostat.xml @@ -5,12 +5,12 @@ MyJBZooStat com_myjbzoostat component - 2.6.0 + 2.7.0 https://github.com/CB9TOIIIA/MyJBZooStat/ - + diff --git a/views/articles/tmpl/default.php b/views/articles/tmpl/default.php index 92ebf27..fbf6aed 100644 --- a/views/articles/tmpl/default.php +++ b/views/articles/tmpl/default.php @@ -20,6 +20,7 @@ $JBZooSEFzoo_route_caching = $checkJBZooSEF->get('zoo_route_caching'); } +JHtml::_('jquery.framework'); require_once JPATH_ADMINISTRATOR . '/components/com_myjbzoostat/elements/paramsetc.php'; if (empty($threshold)) { diff --git a/views/auhorsprofile/tmpl/default.php b/views/auhorsprofile/tmpl/default.php index 195d3d2..55a5870 100644 --- a/views/auhorsprofile/tmpl/default.php +++ b/views/auhorsprofile/tmpl/default.php @@ -19,7 +19,7 @@ $JBZooSEFzoo_route_caching = $checkJBZooSEF->get('zoo_route_caching'); } - +JHtml::_('jquery.framework'); ?> diff --git a/views/autors/tmpl/default.php b/views/autors/tmpl/default.php index 575b6cc..ed3b14b 100644 --- a/views/autors/tmpl/default.php +++ b/views/autors/tmpl/default.php @@ -21,7 +21,7 @@ } - +JHtml::_('jquery.framework'); require_once JPATH_ADMINISTRATOR . '/components/com_myjbzoostat/elements/paramsetc.php'; $document->addStyleSheet(JUri::root().'administrator/components/com_myjbzoostat/assets/css/autors.css'); diff --git a/views/checkoneurl/tmpl/default.php b/views/checkoneurl/tmpl/default.php index 7cd2116..d2194a2 100644 --- a/views/checkoneurl/tmpl/default.php +++ b/views/checkoneurl/tmpl/default.php @@ -17,6 +17,8 @@ $JBZooSEFzoo_route_caching = $checkJBZooSEF->get('zoo_route_caching'); } +JHtml::_('jquery.framework'); + jimport('joomla.html.html.bootstrap'); require_once JPATH_ADMINISTRATOR . '/components/com_myjbzoostat/elements/paramsetc.php'; diff --git a/views/disqus/tmpl/default.php b/views/disqus/tmpl/default.php index 032f6ac..55804fa 100644 --- a/views/disqus/tmpl/default.php +++ b/views/disqus/tmpl/default.php @@ -20,7 +20,7 @@ $JBZooSEFzoo_route_caching = $checkJBZooSEF->get('zoo_route_caching'); } - +JHtml::_('jquery.framework'); preg_match("/\d{1,}.\d{1,}.\d{1,}/", PHP_VERSION, $MyPHPver); $MyPHPv = $MyPHPver[0]; diff --git a/views/index/tmpl/default.php b/views/index/tmpl/default.php index 9a99aaa..ec18f89 100644 --- a/views/index/tmpl/default.php +++ b/views/index/tmpl/default.php @@ -17,6 +17,7 @@ $JBZooSEFzoo_route_caching = $checkJBZooSEF->get('zoo_route_caching'); } +JHtml::_('jquery.framework'); jimport('joomla.html.html.bootstrap'); require_once JPATH_ADMINISTRATOR . '/components/com_myjbzoostat/elements/paramsetc.php'; @@ -87,6 +88,7 @@ $document->addStyleSheet(JUri::root().'administrator/components/com_myjbzoostat/assets/css/uikit.min.css'); $document->addScript(JUri::root().'administrator/components/com_myjbzoostat/assets/js/chart.js'); + echo " "; if (!empty($disqusApiShort)) { echo ""; diff --git a/views/nodubles/index.html b/views/nodubles/index.html new file mode 100644 index 0000000..e69de29 diff --git a/views/nodubles/tmpl/default.php b/views/nodubles/tmpl/default.php new file mode 100644 index 0000000..06321d6 --- /dev/null +++ b/views/nodubles/tmpl/default.php @@ -0,0 +1,151 @@ +div#system-message-container {display:none;}"; +} + +JHtml::_('jquery.framework'); + +?> + + + +addStyleSheet(JUri::root().'administrator/components/com_myjbzoostat/assets/css/metrika.css'); + +$document->addStyleSheet(JUri::root().'administrator/components/com_myjbzoostat/assets/css/datepick.css'); + +$document->addScript(JUri::root().'administrator/components/com_myjbzoostat/assets/js/metrika.js'); + +$document->addStyleSheet(JUri::root().'administrator/components/com_myjbzoostat/assets/css/jquery.dataTables.min.css'); + +$document->addScript(JUri::root().'administrator/components/com_myjbzoostat/assets/js/jquery.dataTables.min.js'); + +$document->addScript(JUri::root().'administrator/components/com_myjbzoostat/assets/js/datepicker.min.js'); + +?> + + + +get('yamonth', NULL, 'string'); +$yayear = $input->get('yayear', NULL, 'string'); +$NeedGeo = $input->get('NeedGeo', NULL, 'string'); +$NeedPop = $input->get('NeedPop', NULL, 'string'); +$NeedCountry = $input->get('NeedCountry', NULL, 'string'); +$nowYearglobal = date('Y'); +$nowMonthglobal = date('m'); +$minYearleft = $nowYearglobal - 2; +$calendstart = $input->get('calendstart', NULL, 'string'); +$calendend = $input->get('calendend', NULL, 'string'); +$needcalend = $input->get('needcalend', NULL, 'string'); + +$month = $input->get('month', date('m'), 'string'); +$year = $input->get('year', date('Y'), 'string'); +echo '
'; +echo '
'; +echo "
"; +echo ''; +echo ''; +echo '
'; +echo '
'; +echo '
'; + +if (!empty($yayear) && !empty($yamonth) && empty($calendstart) && empty($calendend)) { + + $date1 = $yayear . $yamonth . '01'; + $nextmonth = $yamonth + 1; + $dayendmonth = date('d', mktime(0,0,0,$nextmonth,0,2016)); + $date2 = $yayear . $yamonth . $dayendmonth; + $ModDate1 = $date1; + $ModDate2 = $date2; + + // dump($yamonth,0,'$yamonth'); + +} + +if (!empty($calendstart) && !empty($calendend)) { + $date1 = date('Ymd',strtotime($calendstart)); + $date2 = date('Ymd',strtotime($calendend)); + $ModDate1 = $date1; + $ModDate2 = $date2; + // dump($yamonth,0,'$yamonth'); +} + +$articlesmonthtag = "SELECT id" +." FROM " . ZOO_TABLE_ITEM +." WHERE type = '".$TypeArticleorProduct."' AND state = '1' AND access = '1' AND publish_up BETWEEN '".$year."-".$month."-01 00:00:00' AND '".$year."-".$month."-31 23:59:59'"; + +$Arrayarticlesmonthtag = array($app->table->tag->database->queryResultArray($articlesmonthtag)); +echo "

Детектор дублей

"; +echo "
    "; +$itemid = NULL; +$val = NULL; +if (!empty($Arrayarticlesmonthtag[0])) { + foreach ($Arrayarticlesmonthtag as $keyidarticles => $valueddid) { + + foreach ($valueddid as $valueddidz) { + $item = $app->table->item->get($valueddidz); + $itemid = $item->id; + $itemstate = $item->state; + + if ($itemstate == 1) { + $element = $item->getElement('1331309a-133d-4208-9250-4330706af965'); // element id получаем так + $data = (array)$element->data(); // получаем данные + $tels[] = $data[0]['value']; // смотрим что там хранится + $dubles = array_unique(array_count_values($tels),SORT_REGULAR); + foreach ($dubles as $key => $value) { + if ($value == 2) { + $val[] .= $key; + } + + } + } + + + } + + } +} +@$dublesd = array_unique(($val),SORT_REGULAR); +if (!empty($dublesd)) { +foreach ($dublesd as $keyg) { + $urll = urlencode($keyg); + echo '
  • '.$keyg.'
    • '; +} +} + + +echo "
"; +?> +
+ + +
diff --git a/views/nodubles/tmpl/index.html b/views/nodubles/tmpl/index.html new file mode 100644 index 0000000..e69de29 diff --git a/views/nodubles/view.html.php b/views/nodubles/view.html.php new file mode 100644 index 0000000..f70e3b8 --- /dev/null +++ b/views/nodubles/view.html.php @@ -0,0 +1,126 @@ +_setToolBar(); + parent::display( $tpl ); + } + /** + * Method to display the toolbar + */ + protected function _setToolBar() + { + JToolBarHelper::title( JText::_( 'Детектор Дублей' ) ); + JToolbarHelper::divider(); + + $component = JComponentHelper::getComponent('com_myjbzoostat'); + $params = json_decode($component->params); + $StatOrProduct = $params->statorproduct; + $enablecommerce = $params->enablecommerce; + + + if ($StatOrProduct == 'stat') { $StatOrProduct = 'Статьи';} + if ($StatOrProduct == 'product') { $StatOrProduct = 'Товары';} + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_('Панель управления'); + $dhtml = "$title"; + $bar->appendButton('Custom', $dhtml, 'list'); + + JToolBarHelper::divider(); + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_($StatOrProduct.' JBZoo'); + $dhtml = "$title"; + if (JComponentHelper::isEnabled('com_zoo') == '1') { $bar->appendButton('Custom', $dhtml, 'list'); } + + JToolBarHelper::divider(); + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_('Посещаемость'); + $dhtml = "$title"; + if (JComponentHelper::isEnabled('com_zoo') == '1') { $bar->appendButton('Custom', $dhtml, 'list'); } + + JToolBarHelper::divider(); + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_('Теги'); + $dhtml = "$title"; + if (JComponentHelper::isEnabled('com_zoo') == '1') { $bar->appendButton('Custom', $dhtml, 'list'); } + + JToolBarHelper::divider(); + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_('Заказы'); + $dhtml = "$title"; + if (JComponentHelper::isEnabled('com_zoo') == '1' && $enablecommerce == 'yes') { $bar->appendButton('Custom', $dhtml, 'list'); } + + JToolBarHelper::divider(); + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_($StatOrProduct); + $dhtml = "$title"; + if (JComponentHelper::isEnabled('com_zoo') == '1') { $bar->appendButton('Custom', $dhtml, 'list'); } + + JToolBarHelper::divider(); + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_('Авторы'); + $dhtml = "$title"; + if (JComponentHelper::isEnabled('com_zoo') == '1') { $bar->appendButton('Custom', $dhtml, 'list'); } + + JToolBarHelper::divider(); + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_('Статистика авторов'); + $dhtml = "$title"; + if (JComponentHelper::isEnabled('com_zoo') == '1') { $bar->appendButton('Custom', $dhtml, 'list'); } + + + JToolBarHelper::divider(); + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_('Профиль автора'); + $dhtml = "$title"; + if (JComponentHelper::isEnabled('com_zoo') == '1') { $bar->appendButton('Custom', $dhtml, 'list'); } + + + JToolBarHelper::divider(); + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_('Disqus'); + $dhtml = "$title"; + $bar->appendButton('Custom', $dhtml, 'list'); + + JToolBarHelper::divider(); + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_('Социальные сети'); + $dhtml = "$title"; + $bar->appendButton('Custom', $dhtml, 'list'); + + JToolBarHelper::divider(); + + + $bar = JToolBar::getInstance('toolbar'); + $title = JText::_('Детектор Дублей'); + $dhtml = "$title"; + $bar->appendButton('Custom', $dhtml, 'list'); + + JToolBarHelper::preferences('com_myjbzoostat'); + + + } + +} diff --git a/views/orders/tmpl/default.php b/views/orders/tmpl/default.php index 0d0b496..655ffd5 100644 --- a/views/orders/tmpl/default.php +++ b/views/orders/tmpl/default.php @@ -24,7 +24,7 @@ $JBZooSEFzoo_route_caching = $checkJBZooSEF->get('zoo_route_caching'); } - +JHtml::_('jquery.framework'); $document->addStyleSheet(JUri::root().'administrator/components/com_myjbzoostat/assets/css/sort.css'); diff --git a/views/report/tmpl/default.php b/views/report/tmpl/default.php index 804fc69..302f1d7 100644 --- a/views/report/tmpl/default.php +++ b/views/report/tmpl/default.php @@ -17,7 +17,7 @@ $JBZooSEFzoo_route_caching = $checkJBZooSEF->get('zoo_route_caching'); } - +JHtml::_('jquery.framework'); jimport('joomla.html.html.bootstrap'); diff --git a/views/reportauthors/tmpl/default.php b/views/reportauthors/tmpl/default.php index 90ad557..2ae3ae4 100644 --- a/views/reportauthors/tmpl/default.php +++ b/views/reportauthors/tmpl/default.php @@ -20,7 +20,7 @@ $JBZooSEFzoo_route_caching = $checkJBZooSEF->get('zoo_route_caching'); } - +JHtml::_('jquery.framework'); require_once JPATH_ADMINISTRATOR . '/components/com_myjbzoostat/elements/paramsetc.php'; $document->addStyleSheet(JUri::root().'administrator/components/com_myjbzoostat/assets/css/articles.css'); diff --git a/views/social/tmpl/default.php b/views/social/tmpl/default.php index c45cd4c..a86af26 100644 --- a/views/social/tmpl/default.php +++ b/views/social/tmpl/default.php @@ -21,6 +21,7 @@ $JBZooSEFzoo_route_caching = $checkJBZooSEF->get('zoo_route_caching'); } +JHtml::_('jquery.framework'); require_once JPATH_ADMINISTRATOR . '/components/com_myjbzoostat/elements/paramsetc.php'; require_once JPATH_ADMINISTRATOR . '/components/com_myjbzoostat/vendor/autoload.php'; // composer autoload.php diff --git a/views/tags/tmpl/default.php b/views/tags/tmpl/default.php index 8dacc43..af29687 100644 --- a/views/tags/tmpl/default.php +++ b/views/tags/tmpl/default.php @@ -20,7 +20,7 @@ $JBZooSEFzoo_route_caching = $checkJBZooSEF->get('zoo_route_caching'); } - +JHtml::_('jquery.framework'); require_once JPATH_ADMINISTRATOR . '/components/com_myjbzoostat/elements/paramsetc.php';