Skip to content

Commit

Permalink
minor html formatting beautifer
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobinDev
RobinDev committed Jan 28, 2024
1 parent 0a7c7fa commit 27fb6bd
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 62 deletions.
106 changes: 49 additions & 57 deletions packages/core/src/templates/page/page_default.html.twig
View file
Expand Up @@ -3,10 +3,7 @@
{# ----------- #}

{% block html_opener %}
<html
lang="{{ page.locale|default(apps.get().defaultLocale) }}"
{{ mergeAttr({'class': 'leading-tight text-gray-900'}, page.htmlOpenerAttr|default({})) }}
>
<html lang="{{ page.locale|default(apps.get().defaultLocale) }}" {{ mergeAttr({'class': 'leading-tight text-gray-900'}, page.htmlOpenerAttr|default({})) }}>
{% endblock %}

{% block title %}
Expand Down Expand Up @@ -57,63 +54,58 @@

{% block feed %}
{# TODO #}
{{ parent() }}
{% if page.feeds is defined and page.feeds is not null %}
{% for feed in page.feeds %}
<link
rel="alternate"
type="{{ feed.type|default('application/rss+xml') }}"
href="{{ apps.get().baseUrl|default('') }}{{ feed.uri }}"
title="{{ app_name|default('') }} &raquo; {{ feed.title }}"
/>
{% endfor %}
{% endif %}
{{ parent() }}
{% if page.feeds is defined and page.feeds is not null %}
{% for feed in page.feeds %}
<link rel="alternate" type="{{ feed.type|default('application/rss+xml') }}" href="{{ apps.get().baseUrl|default('') }}{{ feed.uri }}" title="{{ app_name|default('') }} &raquo; {{ feed.title }}" />
{% endfor %}
{% endif %}
{% endblock %}


{% block body %}
<div class="flex flex-col min-h-screen">

{% set pageContent = include(view('/page/_content.html.twig')) %}
{% block content %}
{{ pageContent|raw }}
{% endblock %}

{% set pageBreadcrumb = include(view('/page/_breadcrumb.html.twig')) %}
{% block breadcrumb %}
{{ pageBreadcrumb|raw }}
{% endblock %}

{% block footer %}
{% include view('/page/_footer.html.twig') with {'content': '"/'~page.slug ~ '" ' ~pageContent ~ pageBreadcrumb} %}
{% endblock %}

{% block navbar %}
{% include view('/page/_navbar.html.twig') %}
{% endblock %}

{% block admin_buttons %}
{% if class_exists('\\Pushword\\Admin\\PushwordAdminBundle')
and class_exists('\\Pushword\\Svg\\PushwordSvgBundle')
and is_granted('IS_AUTHENTICATED_REMEMBERED') %}
<div class="hidden md:block fixed top-1/2 right-2 mx-1 w-10 z-10 bg-gray-500 rounded-lg opacity-50">
<a href="{{ path('admin_page_edit', {id: page.id}) }}" class="inline-block p-1 text-gray-50 rounded-t-lg hover:bg-gray-800">
{{ svg('edit', {class: 'w-full p-2 fill-current'}) }}
</a>
<a href="{{ path('admin_page_list') }}?filter%5Bhost%5D%5Bvalue%5D%5B%5D={{ page.host }}" class="inline-block p-1 text-gray-50 bg-gray-500 hover:bg-gray-800">
{{ svg('list', {class: 'w-full p-2 fill-current'}) }}
</a>
<a href="{{ path('admin_page_create') }}?host={{ page.host }}" class="inline-block p-1 text-gray-50 bg-gray-500 hover:bg-gray-800">
{{ svg('file', {class: 'w-full p-2 fill-current'}) }}
</a>
</a>
<a href="{{ path('piedweb_static_generate', {'host': page.host}) }}" class="inline-block p-1 text-gray-50 bg-gray-500 rounded-b-lg hover:bg-gray-800">
{{ svg('upload', {class: 'w-full p-2 fill-current'}) }}
</a>
</div>
{% endif %}
{% endblock %}
</div>
<div class="flex flex-col min-h-screen">

{% set pageContent = include(view('/page/_content.html.twig')) %}
{% block content %}
{{ pageContent|raw }}
{% endblock %}

{% set pageBreadcrumb = include(view('/page/_breadcrumb.html.twig')) %}
{% block breadcrumb %}
{{ pageBreadcrumb|raw }}
{% endblock %}

{% block footer %}
{% include view('/page/_footer.html.twig') with {'content': '"/'~page.slug ~ '" ' ~pageContent ~ pageBreadcrumb} %}
{% endblock %}

{% block navbar %}
{% include view('/page/_navbar.html.twig') %}
{% endblock %}

{% block admin_buttons %}
{% if class_exists('\\Pushword\\Admin\\PushwordAdminBundle')
and class_exists('\\Pushword\\Svg\\PushwordSvgBundle')
and is_granted('IS_AUTHENTICATED_REMEMBERED') %}
<div class="hidden md:block fixed top-1/2 right-2 mx-1 w-10 z-10 bg-gray-500 rounded-lg opacity-50">
<a href="{{ path('admin_page_edit', {id: page.id}) }}" class="inline-block p-1 text-gray-50 rounded-t-lg hover:bg-gray-800">
{{ svg('edit', {class: 'w-full p-2 fill-current'}) }}
</a>
<a href="{{ path('admin_page_list') }}?filter%5Bhost%5D%5Bvalue%5D%5B%5D={{ page.host }}" class="inline-block p-1 text-gray-50 bg-gray-500 hover:bg-gray-800">
{{ svg('list', {class: 'w-full p-2 fill-current'}) }}
</a>
<a href="{{ path('admin_page_create') }}?host={{ page.host }}" class="inline-block p-1 text-gray-50 bg-gray-500 hover:bg-gray-800">
{{ svg('file', {class: 'w-full p-2 fill-current'}) }}
</a>
</a>
<a href="{{ path('piedweb_static_generate', {'host': page.host}) }}" class="inline-block p-1 text-gray-50 bg-gray-500 rounded-b-lg hover:bg-gray-800">
{{ svg('upload', {class: 'w-full p-2 fill-current'}) }}
</a>
</div>
{% endif %}
{% endblock %}
</div>
{% endblock %}


Expand Down
5 changes: 1 addition & 4 deletions packages/skeleton/templates/pushword.piedweb.com/page/page_default.html.twig
View file
Expand Up @@ -25,10 +25,7 @@
{% set breadcrumb_class = 'p-3 text-sm font-light text-gray-700 dark:text-gray-300' %}

{% block html_opener %}
<html
lang="{{ page.locale|default(apps.get().defaultLocale) }}"
{{ mergeAttr({'class': 'leading-tight text-gray-900 bg-white dark:bg-gray-900 dark:text-gray-100 overflow-x-hidden'}, page.htmlOpenerAttr|default({})) }}
>
<html lang="{{ page.locale|default(apps.get().defaultLocale) }}" {{ mergeAttr({'class': 'leading-tight text-gray-900 bg-white dark:bg-gray-900 dark:text-gray-100 overflow-x-hidden'}, page.htmlOpenerAttr|default({})) }}>
{% endblock %}


Expand Down
3 changes: 2 additions & 1 deletion packages/static-generator/src/Generator/HtmlCompressor.php
View file
Expand Up @@ -2,6 +2,7 @@

namespace Pushword\StaticGenerator\Generator;

use Exception;
use WyriHaximus\HtmlCompress\Factory as HtmlCompressorFactory;

class HtmlCompressor
Expand All @@ -10,7 +11,7 @@ public static function compress(string $html): string
{
// TODO wait for https://github.com/voku/simple_html_dom/pull/106 be merged to restor html compressor with PHP 8.3
// and remove package https://github.com/devteam-emroc/simple_html_dom in base and core
$html = preg_replace('/<!--(.*?)-->/s', '', $html);
$html = preg_replace('/<!--(.*?)-->/s', '', $html) ?? throw new Exception();

return $html; // return HtmlCompressorFactory::construct()->compress($html);
}
Expand Down

0 comments on commit 27fb6bd

Please sign in to comment.