From 69a011bc864a31408144ceff9f38b13776b3c1ad Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sat, 22 Apr 2017 15:47:55 +0200 Subject: [PATCH] Little wording changes --- grocy.phpproj | 4 ++-- index.php | 6 +++--- views/{consumption.js => consume.js} | 16 ++++++++-------- views/{consumption.php => consume.php} | 6 +++--- views/layout.php | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) rename views/{consumption.js => consume.js} (89%) rename views/{consumption.php => consume.php} (91%) diff --git a/grocy.phpproj b/grocy.phpproj index 005bafd5..f59648ee 100644 --- a/grocy.phpproj +++ b/grocy.phpproj @@ -29,7 +29,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/index.php b/index.php index c55f6e81..db99d49d 100644 --- a/index.php +++ b/index.php @@ -57,11 +57,11 @@ $app->get('/purchase', function(Request $request, Response $response) use($db) ]); }); -$app->get('/consumption', function(Request $request, Response $response) use($db) +$app->get('/consume', function(Request $request, Response $response) use($db) { return $this->renderer->render($response, '/layout.php', [ - 'title' => 'Consumption', - 'contentPage' => 'consumption.php', + 'title' => 'Consume', + 'contentPage' => 'consume.php', 'products' => $db->products() ]); }); diff --git a/views/consumption.js b/views/consume.js similarity index 89% rename from views/consumption.js rename to views/consume.js index 25a2dbbf..10616a74 100644 --- a/views/consumption.js +++ b/views/consume.js @@ -1,8 +1,8 @@ -$('#save-consumption-button').on('click', function(e) +$('#save-consume-button').on('click', function(e) { e.preventDefault(); - var jsonForm = $('#consumption-form').serializeJSON(); + var jsonForm = $('#consume-form').serializeJSON(); var spoiled = 0; if ($('#spoiled').is(':checked')) @@ -23,7 +23,7 @@ $('#product_id_text_input').focus(); $('#product_id_text_input').val(''); $('#product_id_text_input').trigger('change'); - $('#consumption-form').validator('validate'); + $('#consume-form').validator('validate'); }, function(xhr) { @@ -56,7 +56,7 @@ $('#product_id').on('change', function(e) $('#selected-product-last-used').text((productDetails.last_used || 'never').substring(0, 10)); $('#selected-product-last-used-timeago').text($.timeago(productDetails.last_used || '')); $('#amount').attr('max', productDetails.stock_amount); - $('#consumption-form').validator('update'); + $('#consume-form').validator('update'); $('#amount_qu_unit').text(productDetails.quantity_unit_stock.name); Grocy.EmptyElementWhenMatches('#selected-product-last-purchased-timeago', 'NaN years ago'); @@ -114,8 +114,8 @@ $(function() $('#product_id_text_input').val(''); $('#product_id_text_input').trigger('change'); - $('#consumption-form').validator(); - $('#consumption-form').validator('validate'); + $('#consume-form').validator(); + $('#consume-form').validator('validate'); $('#amount').on('focus', function(e) { @@ -125,11 +125,11 @@ $(function() } }); - $('#consumption-form input').keydown(function(event) + $('#consume-form input').keydown(function(event) { if (event.keyCode === 13) //Enter { - if ($('#consumption-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error + if ($('#consume-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error { event.preventDefault(); return false; diff --git a/views/consumption.php b/views/consume.php similarity index 91% rename from views/consumption.php rename to views/consume.php index c65c55c7..29f199a3 100644 --- a/views/consumption.php +++ b/views/consume.php @@ -1,8 +1,8 @@
-

Consumption

+

Consume

-
+
@@ -27,7 +27,7 @@
- +
diff --git a/views/layout.php b/views/layout.php index 276a0952..4cc4f6d1 100644 --- a/views/layout.php +++ b/views/layout.php @@ -47,8 +47,8 @@
  •  Purchase
    • -
  • -  Consumption +
  • +  Consume
  •  Inventory @@ -87,8 +87,8 @@
  •  Purchase
    • -
  • -  Consumption +
  • +  Consume
  •  Inventory