Version 5.0.0 beta 4
This commit is contained in:
1 parent
e86153356a
commit
2f24f9de48
276 files changed
+8614
-6044
No files matched your search
@@ -1265,7 +1265,7 @@ endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</ul>
|
||||
<ul class='ipsButtons ipsButtons--end i-flex_11 i-basis_100p'>
|
||||
<ul class='ipsButtons ipsButtons--end i-flex_11'>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -1273,19 +1273,19 @@ if ( $chart->showIntervals ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<li data-role="groupingButtons">
|
||||
<ul class="ipsButtonGroup ipsButton--soft ipsButton--small">
|
||||
<ul class="ipsButtonGroup ipsButton--small">
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( $chart->enableHourly ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<li><a class='ipsButtonGroup__button
|
||||
<li><a class='ipsButton
|
||||
IPSCONTENT;
|
||||
|
||||
if ( $chart->timescale == 'hourly' ):
|
||||
$return .= <<<IPSCONTENT
|
||||
ipsButtonGroup__button--active
|
||||
ipsButton--active
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
@@ -1332,12 +1332,12 @@ IPSCONTENT;
|
||||
foreach ( array( 'daily', 'weekly', 'monthly' ) as $k ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<li><a class='ipsButtonGroup__button
|
||||
<li><a class='ipsButton
|
||||
IPSCONTENT;
|
||||
|
||||
if ( $chart->timescale == $k ):
|
||||
$return .= <<<IPSCONTENT
|
||||
ipsButtonGroup__button--active
|
||||
ipsButton--active
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
@@ -1753,19 +1753,13 @@ endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \count( $chart->availableTypes ) > 1 || $chart instanceof \IPS\Helpers\Chart\Dynamic ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<li class=''>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( $chart instanceof \IPS\Helpers\Chart\Dynamic ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<a class='ipsButton ipsButton--soft ipsButton--small' href='
|
||||
<li>
|
||||
<a class='ipsButton ipsButton--soft ipsButton--small' href='
|
||||
IPSCONTENT;
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( $chart->url->setQueryString(array( "download" => 1 ))->csrf() , ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
$return .= <<<IPSCONTENT
|
||||
@@ -1775,31 +1769,33 @@ IPSCONTENT;
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'download_as_csv', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
' data-role='downloadChart'><i class="fa-solid fa-download"></i> CSV</a>
|
||||
|
||||
</li>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \count( $chart->availableTypes ) > 1 ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<span class="ipsButtonGroup ipsButton--soft ipsButton--small">
|
||||
|
||||
<li>
|
||||
<div class="ipsButtonGroup ipsButton--small">
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
foreach ( $chart->availableTypes as $t ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<a class='ipsButtonGroup__button
|
||||
<a class='ipsButton
|
||||
IPSCONTENT;
|
||||
|
||||
if ( $chart->type == $t ):
|
||||
$return .= <<<IPSCONTENT
|
||||
ipsButtonGroup__button--active
|
||||
ipsButton--active
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
@@ -1828,75 +1824,69 @@ IPSCONTENT;
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
>
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( $t === 'Table' ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<i class="fa-solid fa-table"></i>
|
||||
|
||||
<i class="fa-solid fa-table"></i>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
elseif ( $t === 'LineChart' ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<i class="fa-solid fa-chart-line"></i>
|
||||
|
||||
<i class="fa-solid fa-chart-line"></i>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
elseif ( $t == 'AreaChart' ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<i class='fa-solid fa-chart-area'></i>
|
||||
|
||||
<i class='fa-solid fa-chart-area'></i>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
elseif ( $t === 'ColumnChart' ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<i class="fa-solid fa-chart-column"></i>
|
||||
|
||||
<i class="fa-solid fa-chart-column"></i>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
elseif ( $t === 'BarChart' ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<i class="fa-solid fa-chart-column fa-rotate-90"></i>
|
||||
|
||||
<i class="fa-solid fa-chart-column fa-rotate-90"></i>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
elseif ( $t === 'PieChart' ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<i class="fa-solid fa-pie-chart"></i>
|
||||
|
||||
<i class="fa-solid fa-pie-chart"></i>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
elseif ( $t === 'GeoChart' ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<i class="fa-solid fa-earth-americas"></i>
|
||||
|
||||
<i class="fa-solid fa-earth-americas"></i>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</a>
|
||||
|
||||
</a>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endforeach;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</span>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</div>
|
||||
</li>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
Reference in new issue
Block a user