678 - make footer visible

FriendsOfTYPO3 · Dec 28, 2023 · 1f0fb57 · 1f0fb57
1 parent d91a78b
commit 1f0fb57
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 29 deletions.
diff --git a/Build/Sources/components/ReactFlow/ReactFlowComponent.jsx b/Build/Sources/components/ReactFlow/ReactFlowComponent.jsx
@@ -121,7 +121,7 @@ export const ReactFlowComponent = (props) => {
     );
 
     return (
-        <div style={{ width: '100%', height: '93vh' }} className="dndflow">
+        <div style={{ width: '100%', height: 'calc(100vh - 45px)' }} className="dndflow">
             <ReactFlowProvider>
                 <div className="reactflow-wrapper" ref={reactFlowWrapper}>
                     <ReactFlow

diff --git a/Classes/Controller/BuilderModuleController.php b/Classes/Controller/BuilderModuleController.php
@@ -142,13 +142,14 @@ public function domainmodellingAction(): ResponseInterface
     {
         $this->moduleTemplate = $this->moduleTemplateFactory->create($this->request);
         $this->moduleTemplate->setTitle('Extension Builder');
+        $this->moduleTemplate->getDocHeaderComponent()->disable();
 
         // $this->addMainMenu('domainmodelling');
         // $this->addMainMenu('testaction');
         $this->addCurrentExtensionPath();
 
-        $this->addLeftButtons();
-        $this->addRightButtons();
+        // $this->addLeftButtons();
+        // $this->addRightButtons();
 
         $this->addAssets();
 
@@ -190,13 +191,8 @@ public function helpAction() {
         $this->moduleTemplate = $this->moduleTemplateFactory->create($this->request);
         $this->moduleTemplate->setTitle('Extension Builder');
 
-        // $this->addMainMenu('domainmodelling');
-        // $this->addMainMenu('testaction');
         $this->addCurrentExtensionPath();
 
-        $this->addLeftButtons('help');
-        // $this->addRightButtons();
-
         $this->addAssets();
 
         $this->pageRenderer->addInlineSettingArray(
@@ -250,7 +246,7 @@ protected function addCurrentExtensionPath(): void
         // TODO
     }
 
-    protected function addLeftButtons(string $action = 'domainmodelling'): void
+    protected function addLeftButtons(): void
     {
         $buttonBar = $this->moduleTemplate->getDocHeaderComponent()->getButtonBar();
 
@@ -287,16 +283,7 @@ protected function addLeftButtons(string $action = 'domainmodelling'): void
                 ->setId('sponsor-button')
                 ->setHref('#');
             $buttonBar->addButton($sponsorButton, ButtonBar::BUTTON_POSITION_LEFT, 1);
-        } else if ($action === 'help') {
-            // Add buttons for help page
-            $slackButton = GeneralUtility::makeInstance(LinkButtonWithId::class)
-                ->setIcon($this->iconFactory->getIcon('actions-view-go-back', Icon::SIZE_SMALL))
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.goBack'))
-                ->setShowLabelText(true)
-                ->setHref($this->uriBuilder->uriFor('domainmodelling'));
-            $buttonBar->addButton($slackButton, ButtonBar::BUTTON_POSITION_LEFT, 3);
         }
-
     }
 
     protected function addRightButtons(): void

diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
@@ -549,16 +549,16 @@ This page is intended to give you some overview about the workflow we suggest.
 				<source>Do you really want to clear the current working board and load the selected pipe? Unsaved changes will get lost!</source>
 			</trans-unit>
 			<trans-unit id="helpSlack" resname="helpSlack">
-				<source>Get help on Slack (#extension-builder)</source>
+				<source>Slack (#extension-builder)</source>
 			</trans-unit>
 			<trans-unit id="becomeSponsor" resname="becomeSponsor">
-				<source>Become a sponsor</source>
+				<source>Sponsoring</source>
 			</trans-unit>
 			<trans-unit id="reportBug" resname="reportBug">
 				<source>Report a bug</source>
 			</trans-unit>
 			<trans-unit id="showDocumentation" resname="showDocumentation">
-				<source>Show Documentation</source>
+				<source>Documentation</source>
 			</trans-unit>
 		</body>
 	</file>

diff --git a/Resources/Private/Templates/BuilderModule/Domainmodelling.html b/Resources/Private/Templates/BuilderModule/Domainmodelling.html
@@ -6,7 +6,7 @@
 <f:section name="Content">
 	<div id="domainModelEditor">
 		<div id="root"></div>
-		<div class="footer">
+		<div class="footer d-flex justify-content-center position-fixed bottom-0 z-3 py-3 w-100">
 			<f:render partial="Moduler/Footer" arguments="{_all}" />
 		</div>
 	</div>

diff --git a/Resources/Public/Css/extensionbuilder.css b/Resources/Public/Css/extensionbuilder.css
@@ -1,20 +1,26 @@
-footer {
-    padding-bottom: 10px;
-    padding-top: 10px;
+#domainModelEditor {
+    height: calc(100vh - 45px); /* 45px = top header, 54px = doc header */
+    overflow-y: scroll;
 }
 
-footer ul {
+.footer {
+    box-shadow: 0px -5px 11px 0px rgba(204,204,204,0.7);
+    border-top: 1px solid #ccc;
+    height: 30px;
+}
+
+.footer ul {
     margin-bottom: 0;
 }
 
-footer ul li {
+.footer ul li {
     margin-right: 20px;
     list-style-type: none;
     display: flex;
     align-items: center;
 }
 
-footer ul li:last-child {
+.footer ul li:last-child {
     margin-right: 0;
 }
 
@@ -34,3 +40,7 @@ footer ul li:last-child {
     list-style: none;
     margin-right: 10px;
 }
+
+.footer ul {
+    margin: 0;
+}
diff --git a/Resources/Public/JavaScript/main.js b/Resources/Public/JavaScript/main.js