mirror of
https://github.com/grocy/grocy.git
synced 2025-08-20 04:12:59 +00:00
New logo
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
@extends('layout.default')
|
||||
|
||||
@section('title', $__t('About grocy'))
|
||||
@section('title', $__t('About Grocy'))
|
||||
@section('viewJsName', 'about')
|
||||
|
||||
@section('content')
|
||||
@@ -41,7 +41,7 @@
|
||||
</p>
|
||||
|
||||
<p>
|
||||
{{ $__t('Do you find grocy useful?') }}<br>
|
||||
{{ $__t('Do you find Grocy useful?') }}<br>
|
||||
<a class="btn btn-sm btn-primary text-white mt-1"
|
||||
href="https://grocy.info/#say-thanks"
|
||||
target="_blank">{{ $__t('Say thanks') }} <i class="fa-solid fa-heart"></i></a>
|
||||
@@ -75,7 +75,7 @@
|
||||
</div>
|
||||
|
||||
<p class="small text-muted">
|
||||
grocy is a project by
|
||||
Grocy is a project by
|
||||
<a href="https://berrnd.de"
|
||||
class="text-dark"
|
||||
target="_blank">Bernd Bestel</a><br>
|
||||
|
@@ -154,14 +154,14 @@
|
||||
<a class="dropdown-item"
|
||||
type="button"
|
||||
href="{{ $U('/battery/' . $currentBatteryEntry->battery_id . '/grocycode?download=true') }}">
|
||||
{!! str_replace('grocycode', '<span class="ls-n1">grocycode</span>', $__t('Download %s grocycode', $__t('Battery'))) !!}
|
||||
{!! str_replace('grocycode', '<span class="ls-n1">Grocycode</span>', $__t('Download %s Grocycode', $__t('Battery'))) !!}
|
||||
</a>
|
||||
@if(GROCY_FEATURE_FLAG_LABEL_PRINTER)
|
||||
<a class="dropdown-item battery-grocycode-label-print"
|
||||
data-battery-id="{{ $currentBatteryEntry->battery_id }}"
|
||||
type="button"
|
||||
href="#">
|
||||
{!! str_replace('grocycode', '<span class="ls-n1">grocycode</span>', $__t('Print %s grocycode on label printer', $__t('Battery'))) !!}
|
||||
{!! str_replace('Grocycode', '<span class="ls-n1">Grocycode</span>', $__t('Print %s Grocycode on label printer', $__t('Battery'))) !!}
|
||||
</a>
|
||||
@endif
|
||||
</div>
|
||||
|
@@ -101,11 +101,11 @@
|
||||
<div class="col clearfix mt-2">
|
||||
<div class="title-related-links">
|
||||
<h4>
|
||||
<span class="ls-n1">{{ $__t('grocycode') }}</span>
|
||||
<span class="ls-n1">{{ $__t('Grocycode') }}</span>
|
||||
<i class="fa-solid fa-question-circle text-muted"
|
||||
data-toggle="tooltip"
|
||||
data-trigger="hover click"
|
||||
title="{{ $__t('grocycode is a unique referer to this %s in your grocy instance - print it onto a label and scan it like any other barcode', $__t('Battery')) }}"></i>
|
||||
title="{{ $__t('Grocycode is a unique referer to this %s in your Grocy instance - print it onto a label and scan it like any other barcode', $__t('Battery')) }}"></i>
|
||||
</h4>
|
||||
<p>
|
||||
@if($mode == 'edit')
|
||||
|
@@ -314,11 +314,11 @@
|
||||
<div class="col clearfix">
|
||||
<div class="title-related-links pb-4">
|
||||
<h4>
|
||||
<span class="ls-n1">{{ $__t('grocycode') }}</span>
|
||||
<span class="ls-n1">{{ $__t('Grocycode') }}</span>
|
||||
<i class="fa-solid fa-question-circle text-muted"
|
||||
data-toggle="tooltip"
|
||||
data-trigger="hover click"
|
||||
title="{{ $__t('grocycode is a unique referer to this %s in your grocy instance - print it onto a label and scan it like any other barcode', $__t('Chore')) }}"></i>
|
||||
title="{{ $__t('Grocycode is a unique referer to this %s in your Grocy instance - print it onto a label and scan it like any other barcode', $__t('Chore')) }}"></i>
|
||||
</h4>
|
||||
<p>
|
||||
@if($mode == 'edit')
|
||||
|
@@ -199,14 +199,14 @@
|
||||
<a class="dropdown-item"
|
||||
type="button"
|
||||
href="{{ $U('/chore/' . $curentChoreEntry->chore_id . '/grocycode?download=true') }}">
|
||||
{!! str_replace('grocycode', '<span class="ls-n1">grocycode</span>', $__t('Download %s grocycode', $__t('Chore'))) !!}
|
||||
{!! str_replace('Grocycode', '<span class="ls-n1">Grocycode</span>', $__t('Download %s Grocycode', $__t('Chore'))) !!}
|
||||
</a>
|
||||
@if(GROCY_FEATURE_FLAG_LABEL_PRINTER)
|
||||
<a class="dropdown-item chore-grocycode-label-print"
|
||||
data-chore-id="{{ $curentChoreEntry->chore_id }}"
|
||||
type="button"
|
||||
href="#">
|
||||
{!! str_replace('grocycode', '<span class="ls-n1">grocycode</span>', $__t('Print %s grocycode on label printer', $__t('Chore'))) !!}
|
||||
{!! str_replace('Grocycode', '<span class="ls-n1">Grocycode</span>', $__t('Print %s Grocycode on label printer', $__t('Chore'))) !!}
|
||||
</a>
|
||||
@endif
|
||||
</div>
|
||||
|
@@ -10,36 +10,15 @@
|
||||
<meta name="robots"
|
||||
content="noindex,nofollow">
|
||||
|
||||
<link rel="apple-touch-icon"
|
||||
sizes="180x180"
|
||||
href="{{ $U('/img/appicons/apple-touch-icon.png?v=', true) }}{{ $version }}">
|
||||
<link rel="icon"
|
||||
type="image/png"
|
||||
sizes="32x32"
|
||||
href="{{ $U('/img/appicons/favicon-32x32.png?v=', true) }}{{ $version }}">
|
||||
<link rel="icon"
|
||||
type="image/png"
|
||||
sizes="16x16"
|
||||
href="{{ $U('/img/appicons/favicon-16x16.png?v=', true) }}{{ $version }}">
|
||||
href="{{ $U('/img/icon-32.png?v=', true) }}{{ $version }}">
|
||||
<link rel="manifest"
|
||||
href="{{ $U('/img/appicons/site.webmanifest?v=', true) }}{{ $version }}">
|
||||
<link rel="mask-icon"
|
||||
href="{{ $U('/img/appicons/safari-pinned-tab.svg?v=', true) }}{{ $version }}"
|
||||
color="#0b024c">
|
||||
<link rel="shortcut icon"
|
||||
href="{{ $U('/img/appicons/favicon.ico?v=', true) }}{{ $version }}">
|
||||
<meta name="apple-mobile-web-app-title"
|
||||
content="grocy">
|
||||
<meta name="application-name"
|
||||
content="grocy">
|
||||
<meta name="msapplication-TileColor"
|
||||
content="#e5e5e5">
|
||||
<meta name="msapplication-config"
|
||||
content="{{ $U('/img/appicons/browserconfig.xml?v=', true) }}{{ $version }}">
|
||||
<meta name="theme-color"
|
||||
content="#ffffff">
|
||||
href="{{ $U('/manifest.json?v=', true) }}{{ $version }}">
|
||||
|
||||
<title>@yield('title') | Grocy</title>
|
||||
|
||||
<title>@yield('title') | grocy</title>
|
||||
<link href="{{ $U('/node_modules/bootstrap/dist/css/bootstrap.min.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
<link href="{{ $U('/node_modules/@fortawesome/fontawesome-free/css/all.min.css?v=', true) }}{{ $version }}"
|
||||
@@ -120,7 +99,7 @@
|
||||
<nav id="mainNav"
|
||||
class="navbar navbar-expand-lg navbar-light fixed-top">
|
||||
<a class="navbar-brand py-0"
|
||||
href="{{ $U('/') }}"><img src="{{ $U('/img/grocy_logo.svg?v=', true) }}{{ $version }}"
|
||||
href="{{ $U('/') }}"><img src="{{ $U('/img/logo.svg?v=', true) }}{{ $version }}"
|
||||
height="30"></a>
|
||||
<span id="clock-container"
|
||||
class="text-muted font-italic d-none">
|
||||
@@ -680,7 +659,7 @@
|
||||
<div class="dropdown-divider"></div>
|
||||
<a id="about-dialog-link"
|
||||
class="dropdown-item discrete-link"
|
||||
href="#"><i class="fa-solid fa-info fa-fw"></i> {{ $__t('About grocy') }} (Version {{ $version }})</a>
|
||||
href="#"><i class="fa-solid fa-info fa-fw"></i> {{ $__t('About Grocy') }} (Version {{ $version }})</a>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
|
@@ -23,7 +23,6 @@
|
||||
display: inline !important;
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
@endpush
|
||||
|
||||
@@ -75,7 +74,7 @@
|
||||
@endif
|
||||
<div class="page">
|
||||
<h1 class="pt-4 text-center">
|
||||
<img src="{{ $U('/img/grocy_logo.svg?v=', true) }}{{ $version }}"
|
||||
<img src="{{ $U('/img/logo.svg?v=', true) }}{{ $version }}"
|
||||
height="30"
|
||||
class="d-none d-print-flex mx-auto">
|
||||
{{ $location->name }}
|
||||
|
@@ -3,22 +3,18 @@
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="x-ua-compatible"
|
||||
content="ie=edge">
|
||||
<meta name="viewport"
|
||||
content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
content="width=device-width, initial-scale=1">
|
||||
|
||||
<meta name="robots"
|
||||
content="noindex,nofollow">
|
||||
<meta name="format-detection"
|
||||
content="telephone=no">
|
||||
|
||||
<meta name="author"
|
||||
content="Bernd Bestel (bernd@berrnd.de)">
|
||||
<link rel="icon"
|
||||
href="{{ $U('/img/grocy_icon.svg?v=', true) }}{{ $version }}">
|
||||
type="image/png"
|
||||
sizes="32x32"
|
||||
href="{{ $U('/img/icon-32.png?v=', true) }}{{ $version }}">
|
||||
|
||||
<title>{{ $__t('REST API browser') }} | grocy</title>
|
||||
<title>{{ $__t('REST API browser') }} | Grocy</title>
|
||||
|
||||
<link href="{{ $U('/node_modules/swagger-ui-dist/swagger-ui.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
@@ -53,7 +49,6 @@
|
||||
-webkit-box-shadow: none !important;
|
||||
border-bottom: 1px solid rgba(59, 65, 81, 0.3) !important;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
|
||||
|
@@ -403,7 +403,7 @@
|
||||
</select>
|
||||
<div class="invalid-feedback">{{ $__t('A quantity unit is required') }}</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<label for="qu_id_consume">{{ $__t('Default quantity unit consume') }}</label>
|
||||
<i class="fa-solid fa-question-circle text-muted"
|
||||
@@ -729,11 +729,11 @@
|
||||
<div class="col clearfix">
|
||||
<div class="title-related-links">
|
||||
<h4>
|
||||
<span class="ls-n1">{{ $__t('grocycode') }}</span>
|
||||
<span class="ls-n1">{{ $__t('Grocycode') }}</span>
|
||||
<i class="fa-solid fa-question-circle text-muted"
|
||||
data-toggle="tooltip"
|
||||
data-trigger="hover click"
|
||||
title="{{ $__t('grocycode is a unique referer to this %s in your grocy instance - print it onto a label and scan it like any other barcode', $__t('Product')) }}"></i>
|
||||
title="{{ $__t('Grocycode is a unique referer to this %s in your Grocy instance - print it onto a label and scan it like any other barcode', $__t('Product')) }}"></i>
|
||||
</h4>
|
||||
<p>
|
||||
@if($mode == 'edit')
|
||||
|
@@ -127,7 +127,7 @@
|
||||
<th class="allow-grouping">{{ $__t('Quantity unit stock') }}</th>
|
||||
<th class="">{{ $__t('Product group') }}</th>
|
||||
<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif allow-grouping">{{ $__t('Default store') }}</th>
|
||||
<th class="">{{ $__t('grocycode') }}</th>
|
||||
<th class="">{{ $__t('Grocycode') }}</th>
|
||||
|
||||
@include('components.userfields_thead', array(
|
||||
'userfields' => $userfields
|
||||
|
@@ -341,11 +341,11 @@
|
||||
<div class="col">
|
||||
<div class="title-related-links">
|
||||
<h4>
|
||||
<span class="ls-n1">{{ $__t('grocycode') }}</span>
|
||||
<span class="ls-n1">{{ $__t('Grocycode') }}</span>
|
||||
<i class="fa-solid fa-question-circle text-muted"
|
||||
data-toggle="tooltip"
|
||||
data-trigger="hover click"
|
||||
title="{{ $__t('grocycode is a unique referer to this %s in your grocy instance - print it onto a label and scan it like any other barcode', $__t('Recipe')) }}"></i>
|
||||
title="{{ $__t('Grocycode is a unique referer to this %s in your Grocy instance - print it onto a label and scan it like any other barcode', $__t('Recipe')) }}"></i>
|
||||
</h4>
|
||||
<p>
|
||||
@if($mode == 'edit')
|
||||
|
@@ -197,14 +197,14 @@
|
||||
<a class="dropdown-item"
|
||||
type="button"
|
||||
href="{{ $U('/recipe/' . $recipe->id . '/grocycode?download=true') }}">
|
||||
<span class="dropdown-item-text">{!! str_replace('grocycode', '<span class="ls-n1">grocycode</span>', $__t('Download %s grocycode', $__t('Recipe'))) !!}</span>
|
||||
<span class="dropdown-item-text">{!! str_replace('Grocycode', '<span class="ls-n1">Grocycode</span>', $__t('Download %s Grocycode', $__t('Recipe'))) !!}</span>
|
||||
</a>
|
||||
@if(GROCY_FEATURE_FLAG_LABEL_PRINTER)
|
||||
<a class="dropdown-item recipe-grocycode-label-print"
|
||||
data-recipe-id="{{ $recipe->id }}"
|
||||
type="button"
|
||||
href="#">
|
||||
<span class="dropdown-item-text">{!! str_replace('grocycode', '<span class="ls-n1">grocycode</span>', $__t('Print %s grocycode on label printer', $__t('Recipe'))) !!}</span>
|
||||
<span class="dropdown-item-text">{!! str_replace('Grocycode', '<span class="ls-n1">Grocycode</span>', $__t('Print %s Grocycode on label printer', $__t('Recipe'))) !!}</span>
|
||||
</a>
|
||||
@endif
|
||||
</div>
|
||||
|
@@ -345,7 +345,7 @@
|
||||
<div class="d-none d-print-block">
|
||||
<div id="print-header">
|
||||
<h1 class="text-center">
|
||||
<img src="{{ $U('/img/grocy_logo.svg?v=', true) }}{{ $version }}"
|
||||
<img src="{{ $U('/img/logo.svg?v=', true) }}{{ $version }}"
|
||||
height="30"
|
||||
class="d-print-flex mx-auto">
|
||||
{{ $__t("Shopping list") }}
|
||||
|
@@ -228,14 +228,14 @@
|
||||
<a class="dropdown-item"
|
||||
type="button"
|
||||
href="{{ $U('/stockentry/' . $stockEntry->id . '/grocycode?download=true') }}">
|
||||
{!! str_replace('grocycode', '<span class="ls-n1">grocycode</span>', $__t('Download %s grocycode', $__t('Stock entry'))) !!}
|
||||
{!! str_replace('Grocycode', '<span class="ls-n1">Grocycode</span>', $__t('Download %s Grocycode', $__t('Stock entry'))) !!}
|
||||
</a>
|
||||
@if(GROCY_FEATURE_FLAG_LABEL_PRINTER)
|
||||
<a class="dropdown-item stockentry-grocycode-label-print"
|
||||
data-stock-id="{{ $stockEntry->id }}"
|
||||
type="button"
|
||||
href="#">
|
||||
{!! str_replace('grocycode', '<span class="ls-n1">grocycode</span>', $__t('Print %s grocycode on label printer', $__t('Stock entry'))) !!}
|
||||
{!! str_replace('Grocycode', '<span class="ls-n1">Grocycode</span>', $__t('Print %s Grocycode on label printer', $__t('Stock entry'))) !!}
|
||||
</a>
|
||||
@endif
|
||||
<a class="dropdown-item stockentry-label-link"
|
||||
|
@@ -314,14 +314,14 @@
|
||||
<a class="dropdown-item"
|
||||
type="button"
|
||||
href="{{ $U('/product/' . $currentStockEntry->product_id . '/grocycode?download=true') }}">
|
||||
{!! str_replace('grocycode', '<span class="ls-n1">grocycode</span>', $__t('Download %s grocycode', $__t('Product'))) !!}
|
||||
{!! str_replace('Grocycode', '<span class="ls-n1">Grocycode</span>', $__t('Download %s Grocycode', $__t('Product'))) !!}
|
||||
</a>
|
||||
@if(GROCY_FEATURE_FLAG_LABEL_PRINTER)
|
||||
<a class="dropdown-item product-grocycode-label-print"
|
||||
data-product-id="{{ $currentStockEntry->product_id }}"
|
||||
type="button"
|
||||
href="#">
|
||||
{!! str_replace('grocycode', '<span class="ls-n1">grocycode</span>', $__t('Print %s grocycode on label printer', $__t('Product'))) !!}
|
||||
{!! str_replace('Grocycode', '<span class="ls-n1">Grocycode</span>', $__t('Print %s Grocycode on label printer', $__t('Product'))) !!}
|
||||
</a>
|
||||
@endif
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user