groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-12-26 12:59:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into turbo

Browse source
This commit is contained in:
Jan Böhmer 2022-07-24 01:26:22 +02:00
commit 79a1715290
55 changed files with 3699 additions and 3329 deletions
Download patch file Download diff file Expand all files Collapse all files

4
templates/_flash.html.twig
View file

@ -17,13 +17,13 @@
{# <img src="..." class="rounded mr-2" alt="...">#}
<i class="fas fa-fw {{ flash_symbol }} mr-2"></i>
<strong class="mr-auto">{{ flash_title|trans }}</strong>
<small class="text-muted">{{ "now" | format_datetime("short", "short") }}</small>
<small class="{% if "text-white" in flash_bg %}text-white{% else %}text-muted{% endif %}">{{ "now" | format_datetime("short", "short") }}</small>
<button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="toast-body {{ flash_bg }}">
{{ message | trans}}
{{ message | trans }}
</div>
</div>
{% endfor %}

12
templates/base.html.twig
View file

@ -10,7 +10,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="application-name" content="Part-DB">
<meta name="apple-mobile-web-app-title" content="Part-DB">
<meta name="msapplication-config" content="{{ asset('icons/browserconfig.xml') }}">
<meta name="msapplication-config" content="{{ asset('icon/browserconfig.xml') }}">
<meta name="theme-color" content="#ffffff">
<meta name="theme-color" content="#ffffff">
<meta name="msapplication-navbutton-color" content="#ffffff">
@ -18,11 +18,11 @@
<meta name="msapplication-starturl" content="/en/">
<link rel="shortcut icon" type="image/x-icon" href="{{ asset('icons/favicon.ico') }}">
<link rel="apple-touch-icon" sizes="180x180" href="{{ asset('icons/apple-touch-icon.png') }}">
<link rel="icon" type="image/png" href="{{ asset('icons/favicon-32x32.png') }}" sizes="32x32">
<link rel="icon" type="image/png" href="{{ asset('icons/favicon-16x16.png') }}" sizes="16x16">
<link rel="mask-icon" href="{{ asset('icons/safari-pinned-tab.svg') }}" color="#5bbad5">
<link rel="shortcut icon" type="image/x-icon" href="{{ asset('icon/favicon.ico') }}">
<link rel="apple-touch-icon" sizes="180x180" href="{{ asset('icon/apple-touch-icon.png') }}">
<link rel="icon" type="image/png" href="{{ asset('icon/favicon-32x32.png') }}" sizes="32x32">
<link rel="icon" type="image/png" href="{{ asset('icon/favicon-16x16.png') }}" sizes="16x16">
<link rel="mask-icon" href="{{ asset('icon/safari-pinned-tab.svg') }}" color="#5bbad5">
<title>{% apply trim %}{% block title %}{{ partdb_title}}{% endblock %}{% endapply %}</title>

5
templates/bundles/TwigBundle/Exception/error500.html.twig
View file

@ -19,9 +19,10 @@
<li>Run <kbd>yarn install</kbd> and <kbd>yarn build</kbd> in Part-DB folder.</li>
<li>Run <kbd>php bin/console cache:clear</kbd></li>
</ul>
{% elseif exception.class == "Doctrine\\DBAL\\Exception\\InvalidFieldNameException" %}
<i>Invalid database schema.</i> Try following things:
{% elseif exception.class == "Doctrine\\DBAL\\Exception\\InvalidFieldNameException" or exception.class == "Doctrine\\DBAL\\Exception\\TableNotFoundException" %}
<i>Invalid or not existing database schema.</i> Try following things:
<ul>
<li>Check if the <code>DATABASE_URL</code> in <code>.env.local</code> is correct</li>
<li>Run <kbd>php bin/console doctrine:migrations:migrate</kbd> to upgrade database schema</li>
<li>Run <kbd>php bin/console cache:clear</kbd></li>
</ul>

2
templates/homepage.html.twig
View file

@ -22,7 +22,7 @@
<h4><i class="fa fa-book fa-fw" aria-hidden="true"></i> {% trans %}homepage.license{% endtrans %}</h4>
</div>
<div class="card-body">
<p>Part-DB, Copyright &copy; 2019 - 2020 of <strong>
<p>Part-DB, Copyright &copy; 2019 - 2022 of <strong>
<a class="link-external" rel="noopener" target="_blank" href="https://github.com/jbtronics/">Jan Böhmer</a>
</strong>. <br> Part-DB is published under the <strong>GNU Affero General Public License v3.0 (or later)</strong>, so it comes with <strong>ABSOLUTELY NO WARRANTY</strong>.
This is free software, and you are welcome to redistribute it under certain conditions.