Fix the backend module styling

Digi92 · Mar 4, 2018 · 6788242 · 6788242
1 parent f119b3c
commit 6788242
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 25 deletions.
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
@@ -27,7 +27,9 @@
  ***************************************************************/
 
 use Denkwerk\DwContentElements\Service\FileService;
+use Denkwerk\DwContentElements\Service\IniProviderService;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
 /**
@@ -46,8 +48,16 @@ class BackendController extends ActionController
      */
     public function indexAction()
     {
+        /** @var IniProviderService $iniProviderService */
+        $iniProviderService = GeneralUtility::makeInstance(IniProviderService::class);
+
+        // Load all provider configurations as array
+        $providers = $iniProviderService->loadProvider();
+
         // Check if source extension is enabled
-        if (ExtensionManagementUtility::isLoaded('dw_content_elements_source') === false) {
+        if (is_array($providers) &&
+            count($providers) === 0
+        ) {
             // Check if source extension exists
             if (!is_dir(PATH_typo3conf . 'ext/dw_content_elements_source')) {
                 $this->forward('createSourceExt');

diff --git a/Resources/Private/Layouts/BackendDefault.html b/Resources/Private/Layouts/BackendDefault.html
@@ -1,29 +1,32 @@
 <f:be.container>
-
     <div class="typo3-fullDoc">
         <div id="typo3-docheader">
-            <div id="typo3-docheader-row1">
-                <div class="buttonsleft">
-                </div>
-                <div class="buttonsright">
-                    <f:be.buttons.shortcut />
-                </div>
-            </div>
-            <div id="typo3-docheader-row2">
-                <div class="docheader-row2-left">
+            <div class="typo3-docheader-functions">
+                <div class="left">
+                    <f:be.buttons.csh />
+
                 </div>
-                <div class="docheader-row2-right">
+
+                <div class="right">
                     <f:be.pagePath />
+                    <f:be.pageInfo />
                 </div>
             </div>
+
+            <f:comment>
+                <div class="typo3-docheader-buttons">
+                    <div class="left">
+                    </div>
+                    <div class="right">
+                        <f:be.buttons.shortcut />
+                    </div>
+                </div>
+            </f:comment>
         </div>
         <div id="typo3-docbody">
-            <div id="typo3-inner-docbody">
-
+            <div id="typo3-inner-docbody" class="realurl-backend">
                 <f:render section="Content" />
-
             </div>
         </div>
     </div>
-
-</f:be.container>
+</f:be.container>
diff --git a/Resources/Private/Templates/Backend/CreateSourceExt.html b/Resources/Private/Templates/Backend/CreateSourceExt.html
@@ -10,7 +10,7 @@ <h3><f:translate key="backend.createSourceExt.error" /></h3>
     <h1><f:translate key="backend.createSourceExt.headline" /></h1>
 
     <h3><f:translate key="backend.createSourceExt.question.headline" /></h3>
-    <p><f:translate key="backend.createSourceExt.question.text" /></p>
+    <p><f:format.raw><f:translate key="backend.createSourceExt.question.text" /></f:format.raw></p>
 
     <f:form action="createSourceExt" controller="Backend" method="post" name="createSourceExt">
         <f:form.submit value="{f:translate(key:'backend.createSourceExt.create')}" name="createSourceExt" />

diff --git a/Resources/Private/Templates/Backend/Index.html b/Resources/Private/Templates/Backend/Index.html
@@ -8,22 +8,22 @@ <h1><f:translate key="backend.index.headline" /></h1>
 
     <h2><f:translate key="backend.index.subheadline" /></h2>
 
-    <p><f:translate key="backend.index.documentation.introduction" /></p>
+    <p><f:format.raw><f:translate key="backend.index.documentation.introduction" /></f:format.raw></p>
 
 
     <h3><f:translate key="backend.index.documentation.config.headline" /></h3>
-    <f:translate key="backend.index.documentation.config.list" />
+    <f:format.raw><f:translate key="backend.index.documentation.config.list" /></f:format.raw>
 
     <h3><f:translate key="backend.index.documentation.template.headline" /></h3>
-    <f:translate key="backend.index.documentation.template.list"
+    <f:format.raw><f:translate key="backend.index.documentation.template.list"
                  arguments="{0: '{f:image(src: \'EXT:dw_content_elements/Resources/Public/Backend/Images/Documentation/example_element_template.png\', alt:\'Example element template\')}'}"
-    />
+    /></f:format.raw>
 
     <h3><f:translate key="backend.index.documentation.irre.headline" /></h3>
-    <f:translate key="backend.index.documentation.irre.list" />
+    <f:format.raw><f:translate key="backend.index.documentation.irre.list" /></f:format.raw>
 
     <h3><f:translate key="backend.index.documentation.ts.headline" /></h3>
-    <f:translate key="backend.index.documentation.ts.list" />
+    <f:format.raw><f:translate key="backend.index.documentation.ts.list" /></f:format.raw>
 
     <f:comment>
         <h2>ToDos</h2>

diff --git a/Resources/Private/Templates/Backend/LoadSourceExt.html b/Resources/Private/Templates/Backend/LoadSourceExt.html
@@ -19,7 +19,7 @@ <h3><f:translate key="backend.loadSourceExt.install.headline" /></h3>
     </ul>
 
     <h3><f:translate key="backend.loadSourceExt.install.composermode.headline" /></h3>
-    <f:translate key="backend.loadSourceExt.install.composermode.list" />
+    <f:format.raw><f:translate key="backend.loadSourceExt.install.composermode.list" /></f:format.raw>
 
 </f:section>
 </html>