Merge branch 'master' of https://github.com/unaio/una

inc/classes/BxDolPage.php

@@ -297,7 +297,7 @@ class BxDolPage extends BxDolFactory implements iBxDolFactoryObject, iBxDolRepla
                 $iPrivacy = $oContentInfo->getContentPrivacy($aQueryParams['id']);
                 if (0 > $iPrivacy) {
                     $oProfile = BxDolProfile::getInstance(abs($iPrivacy));
-                    if (BX_MULTISITE_MODULE == $oProfile->getModule())
+                    if ($oProfile && BX_MULTISITE_MODULE == $oProfile->getModule())
                         $sMultisiteDomain = $oProfile->getDisplayName();
                 }
             }

inc/utils.inc.php

@@ -2278,7 +2278,7 @@ function bx_setcookie($sName, $sValue = "", $oExpiresOrOptions = 0, $sPath = 'au
         $bSecure = 0 === strcasecmp('https', $aUrl['scheme']);
 
     if (PHP_VERSION_ID < 70300) {
-        if ('memberPassword' == $sName || 'memberSession' == $sName)
+        if (!defined('BX_MULTISITE_URL_COOKIE') && ('memberPassword' == $sName || 'memberSession' == $sName))
             $sPath .= '; SameSite=' . getParam('sys_samesite_cookies');
         return setcookie($sName, $sValue, $oExpiresOrOptions, $sPath, $sDomain, $bSecure, $bHttpOnly);
     } 
@@ -2290,7 +2290,7 @@ function bx_setcookie($sName, $sValue = "", $oExpiresOrOptions = 0, $sPath = 'au
             'secure' => $bSecure, 
             'httponly' => $bHttpOnly,
         ];
-        if (!isset($aOptions['samesite']) && ('memberPassword' == $sName || 'memberSession' == $sName))
+        if (!defined('BX_MULTISITE_URL_COOKIE') && !isset($aOptions['samesite']) && ('memberPassword' == $sName || 'memberSession' == $sName))
             $aOptions['samesite'] = getParam('sys_samesite_cookies');
 
         return setcookie($sName, $sValue, $aOptions);

modules/boonex/analytics/js/analytics.js

@@ -78,8 +78,6 @@ BxAnalytics.prototype.reloadData = function () {
                 return label;
         };
 
-        
-        
         bx_loading($($this._sContainerDataSelector), false);
         var oDataForChart = oData.data || false;
         var oChartOptions = oData.options || oOptionsDefault;
@@ -144,7 +142,7 @@ BxAnalytics.prototype.dataToTable = function (oDataIn) {
     if (oDataIn.options.scales.xAxes[0].type == 'time') {
         $aOrder = [[0, 'desc']];
     }
-    $this._oTable = $('.bx_analytics_table').DataTable({ dom: '<"top"i>rt<"bottom"flp><"clear">', paging: true, searching: false, ordering: true, order: $aOrder });
+    $this._oTable = $('.bx_analytics_table').DataTable({ "stripeClasses": ['bx-def-color-bg-hl', ''], dom: '<"top"i>rt<"bottom"flp><"clear">', paging: true, searching: false, ordering: true, order: $aOrder });
    
 };
 

modules/boonex/analytics/template/canvas.html

@@ -28,13 +28,13 @@
     </div>
     <div class="bx_analytics_data">
         <div class="bx_analytics_grath_cnt bx-def-margin-top">
-            <canvas class="bx_analytics_grath"></canvas>
+            <canvas class="bx_analytics_grath bx-canvas"></canvas>
         </div>
         <div class="bx-def-margin-top bx-grid-table">
             <table class="bx_analytics_table" width="100%"></table>
         </div>
     </div>
-    <p>
+    <div class="bx-def-margin-top">
         <a href="javascript:" class="bx_analytics_export_url">__export_to_csv_title__</a>
-    </p>
+    </div>
 </div>

modules/boonex/analytics/template/css/main.css

@@ -49,7 +49,9 @@
     background-color: rgba(210, 230, 250, 0.3);
 }
 .bx_analytics_data .bottom {
-    margin-top:1rem;
+    display: flex;
+    justify-content: space-between;
+    margin-top: 1rem;
 }
 /* datatables fix*/
 table.dataTable thead .sorting:after { margin-left:10px; font-family: "sys-user", "sys-user-fal", sans-serif; content: "\f0dc"; display:inline-block }
@@ -61,4 +63,26 @@ table.dataTable thead .sorting {background-image: none !important}
 .bx-media-phone #bx_analytics_container .bx-grid-table 
 {
 	min-width: inherit !important;
-}
+}
+.dataTables_wrapper .dataTables_length, .dataTables_wrapper .dataTables_filter, .dataTables_wrapper .dataTables_info, .dataTables_wrapper .dataTables_processing, .dataTables_wrapper .dataTables_paginate{
+    color:inherit !important;
+}
+.dataTables_wrapper .dataTables_paginate .paginate_button{
+    padding: 0em 0.25em !important;
+    background: none !important;
+    border: none !important;
+}
+.dataTables_wrapper .dataTables_paginate .paginate_button:hover,
+.dataTables_wrapper .dataTables_paginate .paginate_button:active{
+    cursor: pointer;
+    color: inherit !important;
+    border: none !important;
+}
+html.dark .bx-canvas {
+    filter: invert(1) hue-rotate(180deg);
+}
+html.dark .dataTables_wrapper select{
+    background-color: #11182780;
+    border:1px solid rgb(55 65 81);
+    margin: 0px 0.5rem;
+}    

template/chart_growth.html

@@ -2,7 +2,7 @@
 	<div class="bx-chart-growth-controls bx-def-margin-bottom">__controls__</div>
 	<div class="bx-chart-growth-graph bx-def-border">
         <div class="bx-chart-growth-graph-error bx-def-font-align-center"></div>
-		<canvas id="bx_chart_growth_graph" width="100%"></canvas>
+		<canvas class="bx_canvas" id="bx_chart_growth_graph" width="100%"></canvas>
 	</div>
 	<script language="javascript">
         var oBxDolChartGrowth = new BxDolChartGrowth({

template/css/chart.css

@@ -7,7 +7,6 @@
 .bx-chart-growth-graph {
 	position: relative;
 	min-height: 9rem;
-	background-color: #ffffff;
 }
 
 .bx-chart-growth-graph-error {
@@ -48,5 +47,7 @@ div.bx-chart-stats-graph {
 	width: 100%;
 	min-width: 18rem;
 	max-width: 28rem;
-    background-color: #ffffff;
+}
+ .bx-canvas {
+    filter: invert(1) hue-rotate(180deg);
 }