Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI Cleanup & UI Buys #7274

Merged
merged 2 commits into from
Feb 23, 2025
+8 −12
Merged

UI Cleanup & UI Buys #7274

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daa75aa
depositChartRow had extra card
DawoudIO Feb 23, 2025
1f3838f
Merge branch 'master' into UI-Cleanup-Feb-2025
DawoudIO Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions src/v2/templates/root/dashboard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,19 +130,15 @@
<?php
if ($depositEnabled) { // If the user has Finance permissions, then let's display the deposit line chart
?>
<div class="card" id="depositChartRow">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card card-info">
<div class="card-header">
<h3 class="card-title"><i class="fa fa-circle-dollar-to-slot"></i> <?= gettext('Deposit Tracking') ?></h3>
<div class="card-tools pull-right">
<div id="deposit-graph" class="chart-legend"></div>
</div>
</div><!-- /.box-header -->
<div class="card-body" style="height: 200px">
<canvas id="deposit-lineGraph" style="height:125px; width:100%"></canvas>
</div>
<div class="card card-info" id="depositChartRow">
<div class="card-header">
<h3 class="card-title"><i class="fa fa-circle-dollar-to-slot"></i> <?= gettext('Deposit Tracking') ?></h3>
<div class="card-tools pull-right">
<div id="deposit-graph" class="chart-legend"></div>
</div>
</div><!-- /.box-header -->
<div class="card-body" style="height: 200px">
<canvas id="deposit-lineGraph" style="height:125px; width:100%"></canvas>
</div>
</div>
<?php
Expand Down
Loading