From 4629df17b40deedda37ce8333173045d836e6df5 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Sun, 19 Apr 2020 08:51:02 -0400 Subject: [PATCH] Cosmetic Update (#753) * UI changes * New (header) style was missing on some pages * Added/changed new localization strings * Unify page titles / apply .title class everywhere * Reduce spacing below page title Co-authored-by: Bernd Bestel --- localization/strings.pot | 4 +- public/css/grocy.css | 68 ++++++++++ public/viewjs/batteriesoverview.js | 2 +- public/viewjs/choresoverview.js | 4 +- public/viewjs/shoppinglist.js | 2 +- public/viewjs/stockoverview.js | 2 +- public/viewjs/tasks.js | 2 +- views/about.blade.php | 4 +- views/barcodescannertesting.blade.php | 7 +- views/batteries.blade.php | 34 +++-- views/batteriesjournal.blade.php | 23 ++-- views/batteriesoverview.blade.php | 42 ++++--- views/batteriessettings.blade.php | 8 +- views/batteryform.blade.php | 7 +- views/batterytracking.blade.php | 4 +- views/calendar.blade.php | 15 ++- views/choreform.blade.php | 8 +- views/chores.blade.php | 34 +++-- views/choresjournal.blade.php | 29 +++-- views/choresoverview.blade.php | 66 ++++++---- views/choressettings.blade.php | 8 +- views/choretracking.blade.php | 4 +- views/consume.blade.php | 25 ++-- views/equipment.blade.php | 23 ++-- views/equipmentform.blade.php | 8 +- views/inventory.blade.php | 4 +- views/locationform.blade.php | 8 +- views/locations.blade.php | 34 +++-- views/login.blade.php | 4 +- views/manageapikeys.blade.php | 24 ++-- views/mealplan.blade.php | 5 +- views/productform.blade.php | 9 +- views/productgroupform.blade.php | 8 +- views/productgroups.blade.php | 34 +++-- views/products.blade.php | 57 +++++---- views/purchase.blade.php | 25 ++-- views/quantityunitconversionform.blade.php | 9 +- views/quantityunitform.blade.php | 8 +- views/quantityunitpluraltesting.blade.php | 8 +- views/quantityunits.blade.php | 34 +++-- views/recipeform.blade.php | 4 +- views/recipeposform.blade.php | 7 +- views/recipes.blade.php | 47 ++++--- views/recipessettings.blade.php | 8 +- views/shoppinglist.blade.php | 139 +++++++++++---------- views/shoppinglistform.blade.php | 8 +- views/shoppinglistitemform.blade.php | 8 +- views/shoppinglistsettings.blade.php | 8 +- views/shoppinglocationform.blade.php | 8 +- views/shoppinglocations.blade.php | 33 +++-- views/stockentries.blade.php | 4 +- views/stockentryform.blade.php | 7 +- views/stockjournal.blade.php | 29 +++-- views/stockoverview.blade.php | 110 +++++++++------- views/stocksettings.blade.php | 8 +- views/taskcategories.blade.php | 34 +++-- views/taskcategoryform.blade.php | 8 +- views/taskform.blade.php | 8 +- views/tasks.blade.php | 51 +++++--- views/taskssettings.blade.php | 7 +- views/transfer.blade.php | 3 +- views/userentities.blade.php | 24 ++-- views/userentityform.blade.php | 8 +- views/userfieldform.blade.php | 8 +- views/userfields.blade.php | 41 +++--- views/userform.blade.php | 8 +- views/userobjectform.blade.php | 8 +- views/userobjects.blade.php | 36 ++++-- views/users.blade.php | 24 ++-- 69 files changed, 915 insertions(+), 485 deletions(-) diff --git a/localization/strings.pot b/localization/strings.pot index d06db14f..3292c1bd 100644 --- a/localization/strings.pot +++ b/localization/strings.pot @@ -737,7 +737,7 @@ msgstr "" msgid "When not set, you will get logged out at latest after 30 days" msgstr "" -msgid "Filter by status" +msgid "Status" msgstr "" msgid "Below min. stock amount" @@ -1430,7 +1430,7 @@ msgstr "" msgid "assigned to %s" msgstr "" -msgid "Filter by assignment" +msgid "Assignment" msgstr "" msgid "Consume product on chore execution" diff --git a/public/css/grocy.css b/public/css/grocy.css index 90c05ee6..937d1586 100644 --- a/public/css/grocy.css +++ b/public/css/grocy.css @@ -430,3 +430,71 @@ canvas.drawingBuffer { left: 0; top: 0; } + + +.warning-message, +.error-message, +.normal-message { + padding: 12px; + font-weight: bold; + width: fit-content; + border-top: 6px solid; +} + +.warning-message { + background-color: #fffaeb; + color: #7c5e10; + border-top-color: #e9b949; +} + +.error-message { + background-color: #ffeeee; + color: #780a0a; + border-top-color: #ba2525; +} + +.normal-message { + background-color: #e0e8f9; + color: #2d3a8c; + border-top-color: #4c63b6; +} + +.status-filter-message, +.user-filter-message { + display: inline-block; + cursor: pointer; +} + +#info-current-stock { + font-size: 1.5em; + font-weight: 500; + line-height: 1.2; +} + +.related-links .btn { + font-size: 14px; +} + +.title { + display: inline-block; + margin-bottom: 0 !important; +} + +.title-related-links { + display: flex; + align-items: center; + justify-content: space-between; + flex-wrap: wrap; +} + +.custom-control-label { + padding-top: 7px; + padding-left: 10px; +} + +.custom-control-label::before, +.custom-control-label::after { + top: 0.8rem; + width: 1.25rem; + height: 1.25rem; +} diff --git a/public/viewjs/batteriesoverview.js b/public/viewjs/batteriesoverview.js index 32a02cb4..4d5326d3 100644 --- a/public/viewjs/batteriesoverview.js +++ b/public/viewjs/batteriesoverview.js @@ -33,7 +33,7 @@ $("#status-filter").on("change", function() batteriesOverviewTable.column(4).search(value).draw(); }); -$(".status-filter-button").on("click", function() +$(".status-filter-message").on("click", function() { var value = $(this).data("status-filter"); $("#status-filter").val(value); diff --git a/public/viewjs/choresoverview.js b/public/viewjs/choresoverview.js index b08a2e1f..8fed886a 100644 --- a/public/viewjs/choresoverview.js +++ b/public/viewjs/choresoverview.js @@ -52,14 +52,14 @@ $("#user-filter").on("change", function() } }); -$(".status-filter-button").on("click", function() +$(".status-filter-message").on("click", function() { var value = $(this).data("status-filter"); $("#status-filter").val(value); $("#status-filter").trigger("change"); }); -$(".user-filter-button").on("click", function() +$(".user-filter-message").on("click", function() { var value = $(this).data("user-filter"); $("#user-filter").val(value); diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js index 243de784..65ca7649 100644 --- a/public/viewjs/shoppinglist.js +++ b/public/viewjs/shoppinglist.js @@ -68,7 +68,7 @@ $("#selected-shopping-list").on("change", function() window.location.href = U('/shoppinglist?list=' + value); }); -$(".status-filter-button").on("click", function() +$(".status-filter-message").on("click", function() { var value = $(this).data("status-filter"); $("#status-filter").val(value); diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js index 8d90abf1..4cb6e205 100644 --- a/public/viewjs/stockoverview.js +++ b/public/viewjs/stockoverview.js @@ -47,7 +47,7 @@ $("#status-filter").on("change", function() stockOverviewTable.column(5).search(value).draw(); }); -$(".status-filter-button").on("click", function() +$(".status-filter-message").on("click", function() { var value = $(this).data("status-filter"); $("#status-filter").val(value); diff --git a/public/viewjs/tasks.js b/public/viewjs/tasks.js index de0d0fb7..b01ff5d2 100644 --- a/public/viewjs/tasks.js +++ b/public/viewjs/tasks.js @@ -37,7 +37,7 @@ $("#status-filter").on("change", function() tasksTable.column(5).search(value).draw(); }); -$(".status-filter-button").on("click", function() +$(".status-filter-message").on("click", function() { var value = $(this).data("status-filter"); $("#status-filter").val(value); diff --git a/views/about.blade.php b/views/about.blade.php index 78de67ce..70142e69 100644 --- a/views/about.blade.php +++ b/views/about.blade.php @@ -6,8 +6,8 @@ @section('content')
-

@yield('title')

- +

@yield('title')

+
  • {{ $__t('System info') }} diff --git a/views/barcodescannertesting.blade.php b/views/barcodescannertesting.blade.php index c3d6725b..988b1f3f 100644 --- a/views/barcodescannertesting.blade.php +++ b/views/barcodescannertesting.blade.php @@ -9,9 +9,14 @@ @endpush @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    diff --git a/views/batteries.blade.php b/views/batteries.blade.php index 11ef10ac..9926c37d 100644 --- a/views/batteries.blade.php +++ b/views/batteries.blade.php @@ -7,22 +7,32 @@ @section('content')
    -

    - @yield('title') - -  {{ $__t('Add') }} - - -  {{ $__t('Configure userfields') }} - -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Configure userfields') }} + +
    +
    - +
    +
    + + {{ $__t('Add') }} + +
    +
    +
    - - +
    +
    + +
    + +
    diff --git a/views/batteriesjournal.blade.php b/views/batteriesjournal.blade.php index f3bb0e28..a4d3e479 100644 --- a/views/batteriesjournal.blade.php +++ b/views/batteriesjournal.blade.php @@ -7,23 +7,32 @@ @section('content')
    -

    @yield('title')

    +

    @yield('title')

    +
    - - +
    +
    + +
    + +
    - - + @foreach($batteries as $battery) @endforeach - + +
    diff --git a/views/batteriesoverview.blade.php b/views/batteriesoverview.blade.php index 05bb46b1..5da87a25 100644 --- a/views/batteriesoverview.blade.php +++ b/views/batteriesoverview.blade.php @@ -11,28 +11,40 @@ @section('content')
    -

    @yield('title') - - {{ $__t('Journal') }} - -

    -

    -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Journal') }} + +
    +
    +
    +

    +

    - - +
    +
    + +
    + +
    - - +
    +
    + +
    + +
    diff --git a/views/batteriessettings.blade.php b/views/batteriessettings.blade.php index e1dd1dc1..165c8b25 100644 --- a/views/batteriessettings.blade.php +++ b/views/batteriessettings.blade.php @@ -5,10 +5,14 @@ @section('viewJsName', 'batteriessettings') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    -

    {{ $__t('Batteries overview') }}

    @include('components.numberpicker', array( 'id' => 'batteries_due_soon_days', diff --git a/views/batteryform.blade.php b/views/batteryform.blade.php index 4ec4fca3..ad5c8c86 100644 --- a/views/batteryform.blade.php +++ b/views/batteryform.blade.php @@ -9,9 +9,14 @@ @section('viewJsName', 'batteryform') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    diff --git a/views/batterytracking.blade.php b/views/batterytracking.blade.php index efd87416..17b7e4a0 100644 --- a/views/batterytracking.blade.php +++ b/views/batterytracking.blade.php @@ -7,8 +7,8 @@ @section('content')
    -

    @yield('title')

    - +

    @yield('title')

    +
    diff --git a/views/calendar.blade.php b/views/calendar.blade.php index 622a86a1..9e65924d 100644 --- a/views/calendar.blade.php +++ b/views/calendar.blade.php @@ -16,14 +16,17 @@ @section('content')
    -

    - @yield('title') - -  {{ $__t('Share/Integrate calendar (iCal)') }} - -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Share/Integrate calendar (iCal)') }} + +
    +
    +
    @if($mode == 'edit') diff --git a/views/chores.blade.php b/views/chores.blade.php index b21d3b53..4bd18e81 100644 --- a/views/chores.blade.php +++ b/views/chores.blade.php @@ -7,22 +7,32 @@ @section('content')
    -

    - @yield('title') - -  {{ $__t('Add') }} - - -  {{ $__t('Configure userfields') }} - -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Configure userfields') }} + +
    +
    - +
    +
    + + {{ $__t('Add') }} + +
    +
    +
    - - +
    +
    + +
    + +
    diff --git a/views/choresjournal.blade.php b/views/choresjournal.blade.php index b1bd30ee..70243079 100644 --- a/views/choresjournal.blade.php +++ b/views/choresjournal.blade.php @@ -7,23 +7,32 @@ @section('content')
    -

    @yield('title')

    +

    @yield('title')

    +
    - - +
    +
    + +
    + +
    - - +
    +
    + +
    + +
    diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php index 79763f7a..0edb7679 100644 --- a/views/choresoverview.blade.php +++ b/views/choresoverview.blade.php @@ -11,41 +11,59 @@ @section('content')
    -

    @yield('title') - - {{ $__t('Journal') }} - -

    -

    -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Journal') }} + +
    +
    +
    +

    +

    @if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) -

    +

    @endif
    -
    - - +
    +
    +
    + +
    + +
    - - + +
    +
    + +
    + +
    @if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS)
    - - + +
    +
    + +
    + +
    @endif
    diff --git a/views/choressettings.blade.php b/views/choressettings.blade.php index 4105095b..4c3d8aac 100644 --- a/views/choressettings.blade.php +++ b/views/choressettings.blade.php @@ -5,10 +5,14 @@ @section('viewJsName', 'choressettings') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    -

    {{ $__t('Chores overview') }}

    @include('components.numberpicker', array( 'id' => 'chores_due_soon_days', diff --git a/views/choretracking.blade.php b/views/choretracking.blade.php index 53f578f7..793c55a4 100644 --- a/views/choretracking.blade.php +++ b/views/choretracking.blade.php @@ -7,8 +7,8 @@ @section('content')
    -

    @yield('title')

    - +

    @yield('title')

    +
    diff --git a/views/consume.blade.php b/views/consume.blade.php index a7fd0da5..c5234717 100644 --- a/views/consume.blade.php +++ b/views/consume.blade.php @@ -11,17 +11,20 @@ @section('content')
    -

    - @yield('title') - @if(!$embedded) - - - @else - - @endif -

    +
    +

    @yield('title')

    +
    + @if(!$embedded) + + + @else + + @endif +
    +
    +
    diff --git a/views/equipment.blade.php b/views/equipment.blade.php index 04394f72..b2150ecd 100644 --- a/views/equipment.blade.php +++ b/views/equipment.blade.php @@ -8,15 +8,22 @@
    -

    - @yield('title') - -  {{ $__t('Add') }} - -

    +

    @yield('title')

    +
    - - +
    +
    + + {{ $__t('Add') }} + +
    +
    +
    +
    + +
    + +
    diff --git a/views/equipmentform.blade.php b/views/equipmentform.blade.php index b9ae01f1..15bf4c8d 100644 --- a/views/equipmentform.blade.php +++ b/views/equipmentform.blade.php @@ -9,11 +9,15 @@ @section('viewJsName', 'equipmentform') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    - @if($mode == 'edit') diff --git a/views/inventory.blade.php b/views/inventory.blade.php index a7893982..ea1f885e 100644 --- a/views/inventory.blade.php +++ b/views/inventory.blade.php @@ -7,8 +7,8 @@ @section('content')
    -

    @yield('title')

    - +

    @yield('title')

    +
    @include('components.productpicker', array( diff --git a/views/locationform.blade.php b/views/locationform.blade.php index abdf1e11..0e8d19b9 100644 --- a/views/locationform.blade.php +++ b/views/locationform.blade.php @@ -9,10 +9,14 @@ @section('viewJsName', 'locationform') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    - @if($mode == 'edit') diff --git a/views/locations.blade.php b/views/locations.blade.php index ea151573..02fea37d 100644 --- a/views/locations.blade.php +++ b/views/locations.blade.php @@ -7,22 +7,32 @@ @section('content')
    -

    - @yield('title') - -  {{ $__t('Add') }} - - -  {{ $__t('Configure userfields') }} - -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Configure userfields') }} + +
    +
    - +
    +
    + + {{ $__t('Add') }} + +
    +
    +
    - - +
    +
    + +
    + +
    diff --git a/views/login.blade.php b/views/login.blade.php index f7830764..608b9d96 100644 --- a/views/login.blade.php +++ b/views/login.blade.php @@ -6,8 +6,8 @@ @section('content')
    -

    @yield('title')

    - +

    @yield('title')

    +
    diff --git a/views/manageapikeys.blade.php b/views/manageapikeys.blade.php index 28e6bd72..b1aa3667 100644 --- a/views/manageapikeys.blade.php +++ b/views/manageapikeys.blade.php @@ -11,19 +11,25 @@ @section('content')
    -

    - @yield('title') - -  {{ $__t('Add') }} - -

    +

    @yield('title')

    - +
    +
    + + {{ $__t('Add') }} + +
    +
    +
    - - +
    +
    + +
    + +
    diff --git a/views/mealplan.blade.php b/views/mealplan.blade.php index cc2385cf..28155463 100644 --- a/views/mealplan.blade.php +++ b/views/mealplan.blade.php @@ -27,11 +27,10 @@
    -

    - @yield('title') -

    +

    @yield('title')

    +
    diff --git a/views/productform.blade.php b/views/productform.blade.php index b30cf333..a55a8a07 100644 --- a/views/productform.blade.php +++ b/views/productform.blade.php @@ -21,10 +21,13 @@ @section('content')
    - +
    +

    @yield('title')

    +
    +
    +
    +
    -

    @yield('title')

    - @if($mode == 'edit') diff --git a/views/productgroupform.blade.php b/views/productgroupform.blade.php index 4742a080..caa20184 100644 --- a/views/productgroupform.blade.php +++ b/views/productgroupform.blade.php @@ -9,10 +9,14 @@ @section('viewJsName', 'productgroupform') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    - @if($mode == 'edit') diff --git a/views/productgroups.blade.php b/views/productgroups.blade.php index 44d2c594..cb151700 100644 --- a/views/productgroups.blade.php +++ b/views/productgroups.blade.php @@ -7,22 +7,32 @@ @section('content')
    -

    - @yield('title') - -  {{ $__t('Add') }} - - -  {{ $__t('Configure userfields') }} - -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Configure userfields') }} + +
    +
    - +
    +
    + + {{ $__t('Add') }} + +
    +
    +
    - - +
    +
    + +
    + +
    diff --git a/views/products.blade.php b/views/products.blade.php index 10f6823f..42477567 100644 --- a/views/products.blade.php +++ b/views/products.blade.php @@ -7,34 +7,49 @@ @section('content')
    -

    - @yield('title') - -  {{ $__t('Add') }} - - -  {{ $__t('Configure userfields') }} - - -  {{ $__t('Presets for new products') }} - -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Configure userfields') }} + + + {{ $__t('Presets for new products') }} + +
    +
    +
    +
    + + {{ $__t('Add') }} + +
    +
    +
    - - +
    +
    + +
    + +
    - - +
    +
    + +
    + +
    diff --git a/views/purchase.blade.php b/views/purchase.blade.php index aa753772..10d72bff 100644 --- a/views/purchase.blade.php +++ b/views/purchase.blade.php @@ -11,17 +11,20 @@ @section('content')
    -

    - @yield('title') - @if(!$embedded) - - - @else - - @endif -

    +
    +

    @yield('title')

    +
    + @if(!$embedded) + + + @else + + @endif +
    +
    +
    diff --git a/views/quantityunitconversionform.blade.php b/views/quantityunitconversionform.blade.php index 989d4966..4d56f414 100644 --- a/views/quantityunitconversionform.blade.php +++ b/views/quantityunitconversionform.blade.php @@ -9,10 +9,15 @@ @section('viewJsName', 'quantityunitconversionform') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    - + @if($product != null)

    {{ $__t('Override for product') }} {{ $product->name }}

    @else diff --git a/views/quantityunitform.blade.php b/views/quantityunitform.blade.php index 9083298d..90f6624f 100644 --- a/views/quantityunitform.blade.php +++ b/views/quantityunitform.blade.php @@ -9,10 +9,14 @@ @section('viewJsName', 'quantityunitform') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    - @if($mode == 'edit') diff --git a/views/quantityunitpluraltesting.blade.php b/views/quantityunitpluraltesting.blade.php index 645c5f6f..e59eae11 100644 --- a/views/quantityunitpluraltesting.blade.php +++ b/views/quantityunitpluraltesting.blade.php @@ -9,10 +9,14 @@ @endpush @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    -
    diff --git a/views/quantityunits.blade.php b/views/quantityunits.blade.php index 57510076..d54b81ac 100644 --- a/views/quantityunits.blade.php +++ b/views/quantityunits.blade.php @@ -7,22 +7,32 @@ @section('content')
    -

    - @yield('title') - -  {{ $__t('Add') }} - - -  {{ $__t('Configure userfields') }} - -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Configure userfields') }} + +
    +
    - +
    +
    + + {{ $__t('Add') }} + +
    +
    +
    - - +
    +
    + +
    + +
    diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php index 577c7d07..3a71ac30 100644 --- a/views/recipeform.blade.php +++ b/views/recipeform.blade.php @@ -20,8 +20,8 @@ @section('content')
    -

    @yield('title')

    - +

    @yield('title')

    +
    @if($mode == 'edit') diff --git a/views/shoppinglistitemform.blade.php b/views/shoppinglistitemform.blade.php index 12a060a4..e6254f76 100644 --- a/views/shoppinglistitemform.blade.php +++ b/views/shoppinglistitemform.blade.php @@ -9,10 +9,14 @@ @section('viewJsName', 'shoppinglistitemform') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    - @if($mode == 'edit') diff --git a/views/shoppinglistsettings.blade.php b/views/shoppinglistsettings.blade.php index 0fd74846..75d58f81 100644 --- a/views/shoppinglistsettings.blade.php +++ b/views/shoppinglistsettings.blade.php @@ -5,10 +5,14 @@ @section('viewJsName', 'shoppinglistsettings') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    -

    {{ $__t('Shopping list') }}

    diff --git a/views/shoppinglocationform.blade.php b/views/shoppinglocationform.blade.php index bbe1a35f..81878c35 100644 --- a/views/shoppinglocationform.blade.php +++ b/views/shoppinglocationform.blade.php @@ -9,10 +9,14 @@ @section('viewJsName', 'shoppinglocationform') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    - @if($mode == 'edit') diff --git a/views/shoppinglocations.blade.php b/views/shoppinglocations.blade.php index ed49f777..3f82dd68 100644 --- a/views/shoppinglocations.blade.php +++ b/views/shoppinglocations.blade.php @@ -7,22 +7,33 @@ @section('content')
    -

    - @yield('title') - -  {{ $__t('Add') }} - - -  {{ $__t('Configure userfields') }} - -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Configure userfields') }} + +
    +
    +
    +
    + + {{ $__t('Add') }} + +
    +
    +
    - - +
    +
    + +
    + +
    diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php index f9693289..f31142d9 100644 --- a/views/stockentries.blade.php +++ b/views/stockentries.blade.php @@ -14,7 +14,7 @@ @section('content')
    -

    @yield('title')

    +

    @yield('title')

    @include('components.productpicker', array( @@ -23,7 +23,7 @@ ))
    - +
    diff --git a/views/stockentryform.blade.php b/views/stockentryform.blade.php index 9b6035f3..b9a6d2ee 100644 --- a/views/stockentryform.blade.php +++ b/views/stockentryform.blade.php @@ -9,9 +9,14 @@ Grocy.EditObjectProductId = {{ $stockEntry->product_id }}; +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    @php diff --git a/views/stockjournal.blade.php b/views/stockjournal.blade.php index ea30857a..d7aa3dd9 100644 --- a/views/stockjournal.blade.php +++ b/views/stockjournal.blade.php @@ -7,23 +7,32 @@ @section('content')
    -

    @yield('title')

    +

    @yield('title')

    +
    - - +
    +
    + +
    + +
    - - +
    +
    + +
    + +
    diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php index ac000d64..f479c670 100644 --- a/views/stockoverview.blade.php +++ b/views/stockoverview.blade.php @@ -15,63 +15,85 @@ @section('content')
    -

    @yield('title') - - - {{ $__t('Journal') }} - - - {{ $__t('Stock entries') }} - - @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) - - {{ $__t('Location Content Sheet') }} - - @endif -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Journal') }} + + + {{ $__t('Stock entries') }} + + @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) + + {{ $__t('Location Content Sheet') }} + + @endif +
    +
    +
    +
    @if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) -

    -

    +

    +

    @endif -

    +

    -
    -
    - - +
    +
    +
    + +
    + +
    @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
    - - + +
    +
    + +
    + +
    @endif
    - - + +
    +
    + +
    + +
    - - + +
    +
    + +
    + +
    diff --git a/views/stocksettings.blade.php b/views/stocksettings.blade.php index b5444045..a0b3045b 100644 --- a/views/stocksettings.blade.php +++ b/views/stocksettings.blade.php @@ -5,10 +5,14 @@ @section('viewJsName', 'stocksettings') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    -

    {{ $__t('Presets for new products') }}

    diff --git a/views/taskcategories.blade.php b/views/taskcategories.blade.php index ac356043..6ab7a8b6 100644 --- a/views/taskcategories.blade.php +++ b/views/taskcategories.blade.php @@ -7,22 +7,32 @@ @section('content')
    -

    - @yield('title') - -  {{ $__t('Add') }} - - -  {{ $__t('Configure userfields') }} - -

    +
    +

    @yield('title')

    +
    + + {{ $__t('Configure userfields') }} + +
    +
    - +
    +
    + + {{ $__t('Add') }} + +
    +
    +
    - - +
    +
    + +
    + +
    diff --git a/views/taskcategoryform.blade.php b/views/taskcategoryform.blade.php index 3edb39e2..c14fe59a 100644 --- a/views/taskcategoryform.blade.php +++ b/views/taskcategoryform.blade.php @@ -9,10 +9,14 @@ @section('viewJsName', 'taskcategoryform') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    - @if($mode == 'edit') diff --git a/views/taskform.blade.php b/views/taskform.blade.php index 847da597..0aa12d76 100644 --- a/views/taskform.blade.php +++ b/views/taskform.blade.php @@ -9,10 +9,14 @@ @section('viewJsName', 'taskform') @section('content') +
    +
    +

    @yield('title')

    +
    +
    +
    -

    @yield('title')

    - @if($mode == 'edit') diff --git a/views/tasks.blade.php b/views/tasks.blade.php index 4f712312..592339d2 100644 --- a/views/tasks.blade.php +++ b/views/tasks.blade.php @@ -17,34 +17,45 @@ @section('content')
    -

    - @yield('title') - - {{ $__t('Add') }} - -

    -

    -

    +

    @yield('title')

    +
    +

    +

    +
    + + {{ $__t('Add') }} + +
    +
    +
    - - +
    +
    + +
    + +
    - - +
    +
    + +
    + +
    -
    -
    - -