diff --git a/.env b/.env index 4687db0..a55d7be 100644 --- a/.env +++ b/.env @@ -43,7 +43,7 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0 # HLState # Application version, used for API and media cache -APP_VERSION="1.2.0" +APP_VERSION="1.3.0" # Application name APP_NAME="HLState" @@ -58,3 +58,6 @@ APP_THEME="default" # Masters list, server:port comma separated APP_MASTERS="" + +# Links, name|url comma separated +APP_LINKS="Game|https://store.steampowered.com/app/70/HalfLife,Xash3D|https://github.com/FWGS/xash3d-fwgs" \ No newline at end of file diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index c1063b0..aa3f4f1 100644 --- a/config/packages/twig.yaml +++ b/config/packages/twig.yaml @@ -6,6 +6,7 @@ twig: name: '%app.name%' theme: '%app.theme%' masters: '%app.masters%' + links: '%app.links%' meta: title: '%env(APP_META_TITLE)%' description: '%env(APP_META_DESCRIPTION)%' diff --git a/config/services.yaml b/config/services.yaml index b409c5c..31fbbda 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -8,6 +8,7 @@ parameters: app.name: '%env(APP_NAME)%' app.theme: '%env(APP_THEME)%' app.masters: '%env(APP_MASTERS)%' + app.links: '%env(APP_LINKS)%' app.meta.title: '%env(APP_META_TITLE)%' app.meta.description: '%env(APP_META_DESCRIPTION)%' app.meta.keywords: '%env(APP_META_KEYWORDS)%' diff --git a/public/css/default.css b/public/css/default.css index da94ab1..8b0e4e6 100644 --- a/public/css/default.css +++ b/public/css/default.css @@ -75,21 +75,10 @@ header display: block; margin: 16px auto; max-width: var(--container-max-width); + overflow: hidden; position: relative; } -header > h1 -{ - padding-right: 32px; -} - -header > a:first-child -{ - position: absolute; - top: -2px; - right: 4px; -} - main { display: block; diff --git a/templates/default/layout.html.twig b/templates/default/layout.html.twig index b05b9af..9197aaf 100644 --- a/templates/default/layout.html.twig +++ b/templates/default/layout.html.twig @@ -18,15 +18,25 @@ {% block header_container %}
{% block header_content %} - - - - - - -

- {{ app.name }} -

+
+ {% if 'main_index' == request.get('_route') %} + {{ 'Home' | trans }} + {% else %} + {{ 'Home' | trans }} + {% endif %} + {% for link in app.links | split(',') %} + {% set a = link | split('|') %} + {% if a.0 is defined and a.1 is defined %} + • + {{ a.0 }} + {% endif %} + {% endfor %} +
+
+ + {{ app.name }} + +
{% endblock %}
{% endblock %}