From 6bb5c271c6b9b23c09c77c974436964319705316 Mon Sep 17 00:00:00 2001 From: uli Date: Wed, 15 Feb 2017 15:36:15 +0000 Subject: [PATCH] =?UTF-8?q?*=20Navigation=20in=20Sidebar=20*=20Seitenbaum:?= =?UTF-8?q?=20Jugendreisen=20und=20Reisemagazin=20mit=20einbeziehen;=20Urs?= =?UTF-8?q?pr=C3=BCngliche=20Sortierung=20ber=C3=BCcksichtigen=20*=20Neue?= =?UTF-8?q?=20Datenbank-Spalten=20f=C3=BCr=20automatisch=20generierte=20Se?= =?UTF-8?q?iten=C3=BCbersichtsboxen=20und=20Datenbank=20*=20Unterst=C3=BCt?= =?UTF-8?q?zung=20statisch=20festgelegter=20URLs=20(page.real=5Furl=5Fpath?= =?UTF-8?q?)=20-=20wird=20aus=20SEO-technischen=20Gr=C3=BCnden=20ben=C3=B6?= =?UTF-8?q?tigt,=20um=20vorerst=20die=20alten=20URLs=20zu=20behalten=20*?= =?UTF-8?q?=20Redirect-Tabelle:=20Hier=20k=C3=B6nnen=20alte=20URLs=20mit?= =?UTF-8?q?=20page-Eintr=C3=A4ge=20verkn=C3=BCpft=20werden.=20Bei=20Aufruf?= =?UTF-8?q?=20so=20einer=20URL=20wird=20auf=20die=20URL=20der=20verkn?= =?UTF-8?q?=C3=BCpften=20page=20umgeleitet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SQL: UPDATE page SET template = 'overview' WHERE slug IN ('iran-reisen', 'marokko-urlaub'); UPDATE page SET `order` = 0 WHERE slug = 'aegypten-reisen'; UPDATE page SET `order` = 1 WHERE slug = 'israel-reisen'; UPDATE page SET `order` = 2 WHERE slug = 'jordanien-reisen'; UPDATE page SET `order` = 3 WHERE slug = 'iran-reisen'; UPDATE page SET `order` = 4 WHERE slug = 'marokko-urlaub'; UPDATE page SET `order` = 5 WHERE slug = 'oman-reisen'; UPDATE page SET `order` = 6 WHERE slug = 'tuerkei-urlaub'; UPDATE page SET template = 'overview' WHERE (slug IN ('jugendreisen', 'reisemagazin') AND lvl = 0) OR (catalog_id IN (6, 14) AND owner = 0); -- Request URL /create-tree in browser to re-create the page tree ALTER TABLE page ADD COLUMN real_url_path VARCHAR(200) DEFAULT NULL; CREATE UNIQUE INDEX UNIQ_140AB620E2652A2A ON page (real_url_path); UPDATE page p INNER JOIN catalog c ON c.id = p.catalog_id SET p.real_url_path = CONCAT('/', c.slug, '/', p.slug, '.html'); ALTER TABLE page ADD COLUMN box_body TEXT DEFAULT NULL; ALTER TABLE page ADD COLUMN box_image_url VARCHAR(200) DEFAULT NULL; ALTER TABLE page ADD COLUMN box_star VARCHAR(255) DEFAULT NULL; ALTER TABLE page ADD COLUMN box_discount VARCHAR(255) DEFAULT NULL; ALTER TABLE page ADD COLUMN content_new TEXT DEFAULT NULL AFTER content; ALTER TABLE page DROP COLUMN preview_image_url; CREATE TABLE redirect (id INT AUTO_INCREMENT NOT NULL, page_id INT DEFAULT NULL, source_url_path VARCHAR(200) NOT NULL, UNIQUE INDEX UNIQ_C30C9E2B56207465 (source_url_path), INDEX IDX_C30C9E2BC4663E4 (page_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB; ALTER TABLE redirect ADD CONSTRAINT FK_C30C9E2BC4663E4 FOREIGN KEY (page_id) REFERENCES page (id); ALTER TABLE redirect MODIFY COLUMN page_id INT NOT NULL; git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3293 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- trunk/app/Resources/views/base.html.twig | 4 +- .../views/default/components/header.html.twig | 69 ++++-- .../default/components/pageBox.html.twig | 36 ++++ .../default/components/sidebar.html.twig | 8 + .../sidebar/navSidebarWidget.html.twig | 36 ++++ .../views/default/pages/overview.html.twig | 23 +- .../pages/travelProgramOverview.html.twig | 31 +-- .../Controller/BookingController.php | 7 +- .../Controller/DefaultController.php | 62 +++++- trunk/src/AppBundle/Entity/Page.php | 201 +++++++++++++++--- trunk/src/AppBundle/Entity/PageRepository.php | 21 ++ trunk/src/AppBundle/Entity/Redirect.php | 96 +++++++++ .../AppBundle/Entity/RedirectRepository.php | 13 ++ .../Listener/KernelControllerListener.php | 108 +++++++--- trunk/src/AppBundle/Util.php | 6 +- 15 files changed, 596 insertions(+), 125 deletions(-) create mode 100644 trunk/app/Resources/views/default/components/pageBox.html.twig create mode 100644 trunk/app/Resources/views/default/components/sidebar/navSidebarWidget.html.twig create mode 100644 trunk/src/AppBundle/Entity/Redirect.php create mode 100644 trunk/src/AppBundle/Entity/RedirectRepository.php diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig index 1821083b..91b75722 100644 --- a/trunk/app/Resources/views/base.html.twig +++ b/trunk/app/Resources/views/base.html.twig @@ -78,7 +78,9 @@
- {% include 'default/components/sidebar.html.twig' %} + {% include 'default/components/sidebar.html.twig' with { + nav_sidebar_widget_block: block('nav_sidebar_widget') + } %}
{% block body %}{% endblock %} diff --git a/trunk/app/Resources/views/default/components/header.html.twig b/trunk/app/Resources/views/default/components/header.html.twig index 9d4141eb..62e97195 100644 --- a/trunk/app/Resources/views/default/components/header.html.twig +++ b/trunk/app/Resources/views/default/components/header.html.twig @@ -19,23 +19,60 @@