This is 1.6

This commit is contained in:
Bernd Bestel
2017-11-05 14:48:43 +01:00
parent 2d5ed67ae1
commit 9114dec695
8 changed files with 15 additions and 13 deletions

View File

@@ -1,6 +1,6 @@
$(function()
{
$('#habits-overview-table').DataTable({
$('#batteries-overview-table').DataTable({
'pageLength': 50,
'order': [[1, 'desc']]
});

View File

@@ -26,7 +26,7 @@
<?php echo GrocyLogicBatteries::GetNextChargeTime($curentBatteryEntry->battery_id); ?>
<time class="timeago timeago-contextual" datetime="<?php echo GrocyLogicBatteries::GetNextChargeTime($curentBatteryEntry->battery_id); ?>"></time>
<?php else: ?>
Whenever you want...
...
<?php endif; ?>
</td>
</tr>

View File

@@ -22,7 +22,7 @@
<?php echo GrocyLogicHabits::GetNextHabitTime($curentHabitEntry->habit_id); ?>
<time class="timeago timeago-contextual" datetime="<?php echo GrocyLogicHabits::GetNextHabitTime($curentHabitEntry->habit_id); ?>"></time>
<?php else: ?>
Whenever you want...
...
<?php endif; ?>
</td>
<td>

View File

@@ -64,6 +64,7 @@
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="disabled"><a href="#"><strong>Record data</strong></a></li>
<li data-nav-for-page="purchase.php">
<a class="discrete-link" href="/purchase"><i class="fa fa-shopping-cart fa-fw"></i>&nbsp;Purchase</a>
</li>
@@ -131,6 +132,7 @@
</ul>
<ul class="nav nav-sidebar">
<li class="disabled"><a href="#"><strong>Record data</strong></a></li>
<li data-nav-for-page="purchase.php">
<a class="discrete-link" href="/purchase"><i class="fa fa-shopping-cart fa-fw"></i>&nbsp;Purchase</a>
</li>