[TASK] Restructure position of help icons in 'Pagetree overview' 24/53124/2
authorJasmina Liessmann <code@frauliessmann.de>
Sat, 3 Jun 2017 12:30:01 +0000 (14:30 +0200)
committerFrank Naegler <frank.naegler@typo3.org>
Mon, 5 Jun 2017 15:58:58 +0000 (17:58 +0200)
Move general CSH for 'Pagetree overview' next to form fields.

Resolves: #81453
Releases: master, 8.7
Change-Id: I8e5c3a4257d569277f837bee2c641cd1a95dd9a5
Reviewed-on: https://review.typo3.org/53124
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
typo3/sysext/backend/Classes/View/PageLayoutView.php
typo3/sysext/frontend/Classes/Controller/PageInformationController.php
typo3/sysext/frontend/Resources/Private/Language/locallang_csh_webinfo.xlf
typo3/sysext/info/Classes/Controller/InfoModuleController.php
typo3/sysext/lang/Resources/Private/Language/locallang_csh_corebe.xlf

index ce4a95c..bb7ee7d 100644 (file)
@@ -410,19 +410,16 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                         }
                 }
             }
-            // CSH:
-            $optionKey = $this->getPageLayoutController()->MOD_SETTINGS['pages'];
-            $out = BackendUtility::cshItem($this->descrTable, ('func_' . $optionKey), null, '<span class="btn btn-default btn-sm">|</span>') . '
-                <div class="table-fit">
-                                       <table class="table table-striped table-hover typo3-page-pages">' .
-                        '<thead>' .
-                            $this->addElement(1, '', $theData) .
-                        '</thead>' .
-                        '<tbody>' .
-                            $out .
-                        '</tbody>' .
-                    '</table>
-                               </div>';
+            $out = '<div class="table-fit">'
+                . '<table class="table table-striped table-hover typo3-page-pages">'
+                    . '<thead>'
+                            . $this->addElement(1, '', $theData)
+                    . '</thead>'
+                    . '<tbody>'
+                        . $out
+                    . '</tbody>'
+                . '</table>'
+                . '</div>';
         }
         return $out;
     }
index 7a0232e..4979566 100644 (file)
@@ -106,13 +106,15 @@ class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFuncti
         $dblist->start($this->pObj->id, 'pages', 0);
         $dblist->generateList();
         // CSH
-        $theOutput .= '<div>';
-        $theOutput .= BackendUtility::cshItem($dblist->descrTable, 'pagetree_overview', null, '<span class="btn btn-default btn-sm">|</span><br />')
-            . '<div class="form-inline form-inline-spaced">'
+        $optionKey = $this->pObj->MOD_SETTINGS['pages'];
+        $cshPagetreeOverview = BackendUtility::cshItem($dblist->descrTable, 'func_' . $optionKey, null, '<span class="btn btn-default btn-sm">|</span>');
+
+        $theOutput .= '<div class="form-inline form-inline-spaced">'
             . $h_func
+            . '<div class="form-group">' . $cshPagetreeOverview . '</div>'
             . '</div>'
             . $dblist->HTMLcode;
-        $theOutput .= '</div>';
+
         // Additional footer content
         $footerContentHook = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/web_info/class.tx_cms_webinfo.php']['drawFooterHook'];
         if (is_array($footerContentHook)) {
index 7e1da16..a3963b9 100644 (file)
@@ -3,26 +3,6 @@
        <file t3:id="1415814788" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="cms">
                <header/>
                <body>
-                       <trans-unit id="pagetree_overview.alttitle">
-                               <source>Pagetree Overview</source>
-                       </trans-unit>
-                       <trans-unit id="pagetree_overview.description">
-                               <source>The Pagetree Overview shows information related to pages for a branch of the page tree. This includes start- and stop-times, cache settings etc.</source>
-                       </trans-unit>
-                       <trans-unit id="_pagetree_overview.seeAlso" xml:space="preserve">
-                               <source>_MOD_web_info:func_0,
-_MOD_web_info:func_1,
-_MOD_web_info:func_2,
-_MOD_web_info:stat</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="_pagetree_overview.image">
-                               <source>EXT:frontend/Resources/Public/Images/cshimages/pagetree_overview_1.png</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="pagetree_overview.image_descr">
-                               <source>One of the features of the Pagetree Overview module is that you can see what types of records are found on pages in a branch. Here record counts are shown for a page tree branch 2 levels down.</source>
-                       </trans-unit>
                        <trans-unit id="func_0.alttitle">
                                <source>Basic Settings</source>
                        </trans-unit>
index 24d2bc1..08ab8bf 100644 (file)
@@ -184,6 +184,12 @@ class InfoModuleController extends BaseScriptClass
             ])
             ->setSetVariables(array_keys($this->MOD_MENU));
         $buttonBar->addButton($shortCutButton, ButtonBar::BUTTON_POSITION_RIGHT);
+
+        // CSH
+        $cshButton = $buttonBar->makeHelpButton()
+          ->setModuleName('xMOD_csh_corebe')
+          ->setFieldName('pagetree_overview');
+        $buttonBar->addButton($cshButton);
     }
 
     /**
index e67dec6..1e66812 100644 (file)
@@ -292,6 +292,26 @@ EXT:lang/Resources/Public/Images/cshimages/core_19.png,</source>
                                <source>The options checkboxes.
 Selecting "Extended view" will enable the control buttons in the record lists.</source>
                        </trans-unit>
+                       <trans-unit id="pagetree_overview.alttitle">
+                               <source>Pagetree Overview</source>
+                       </trans-unit>
+                       <trans-unit id="pagetree_overview.description">
+                               <source>The Pagetree Overview shows information related to pages for a branch of the page tree. This includes start- and stop-times, cache settings etc.</source>
+                       </trans-unit>
+                       <trans-unit id="_pagetree_overview.seeAlso" xml:space="preserve">
+                               <source>_MOD_web_info:func_0,
+_MOD_web_info:func_1,
+_MOD_web_info:func_2,
+_MOD_web_info:stat</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="_pagetree_overview.image">
+                               <source>EXT:frontend/Resources/Public/Images/cshimages/pagetree_overview_1.png</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="pagetree_overview.image_descr">
+                               <source>One of the features of the Pagetree Overview module is that you can see what types of records are found on pages in a branch. Here record counts are shown for a page tree branch 2 levels down.</source>
+                       </trans-unit>
                        <trans-unit id="new_regular.alttitle">
                                <source>Create new record</source>
                        </trans-unit>