[TASK] Adding parameters for new action, loading initial templates

Classes/Controller/QueueController.php

@@ -24,6 +24,7 @@ namespace SGalinski\SgMail\Controller;
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
+use SGalinski\SgMail\Service\MailTemplateService;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
 /**
@@ -46,6 +47,14 @@ class QueueController extends ActionController {
 	 * @param string $selectedExtension
 	 */
 	public function indexAction($selectedTemplate = NULL, $selectedExtension = NULL) {
+		$registerArray = MailTemplateService::getRegisterArray();
+
+		if ($selectedTemplate === NULL) {
+			$selectedExtension = key($registerArray);
+			$selectedTemplate = key($registerArray[$selectedExtension]);
+		}
+
+		$this->view->assign('templates', $registerArray);
 		$this->view->assign('mode', 'queue');
 	}
 }

Resources/Private/Layouts/Default.html

@@ -12,12 +12,14 @@
 									<sgm:be.menus.actionMenuItem label="MAILQUEUE"
 										controller="Queue"
 										action="index"
+										arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}"
 										additionalAttributes="{selected: 'selected'}" />
 								</f:then>
 								<f:else>
 									<sgm:be.menus.actionMenuItem label="MAILQUEUE"
 										controller="Queue"
-										action="index"/>
+										action="index"
+										arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}" />
 								</f:else>
 							</f:if>
 							<f:if condition="{mode} == 'editor'">
@@ -25,12 +27,14 @@
 									<sgm:be.menus.actionMenuItem label="TEMPLATE EDITOR"
 										controller="Mail"
 										action="index"
+										arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}"
 										additionalAttributes="{selected: 'selected'}" />
 								</f:then>
 								<f:else>
 									<sgm:be.menus.actionMenuItem label="TEMPLATE EDITOR"
 										controller="Mail"
-										action="index"/>
+										action="index"
+										arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}" />
 								</f:else>
 							</f:if>
 						</f:be.menus.actionMenu>
@@ -41,28 +45,30 @@
 									<f:if condition="{mode} == 'queue'">
 										<sgm:be.menus.actionMenuOptionGroup label="{extensionKey}">
 											<f:for each="{template}" as="currentTemplate" key="templateKey">
-													<sgm:extendedIf condition="{selectedTemplateKey} == {templateKey}"
-														and="{selectedExtensionKey} == {extensionKey}">
-														<f:then>
-															<sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}"
-																controller="Queue"
-																action="index"
-																arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}"
-																additionalAttributes="{selected: 'selected'}" />
-														</f:then>
-														<f:else>
-															<sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}"
-																controller="Queue"
-																action="index"
-																arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}" />
-														</f:else>
-													</sgm:extendedIf>
+												<sgm:extendedIf condition="{selectedTemplateKey} == {templateKey}"
+													and="{selectedExtensionKey} == {extensionKey}">
+													<f:then>
+														<sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}"
+															controller="Queue"
+															action="index"
+															arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}"
+															additionalAttributes="{selected: 'selected'}" />
+													</f:then>
+													<f:else>
+														<sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}"
+															controller="Queue"
+															action="index"
+															arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}" />
+													</f:else>
+												</sgm:extendedIf>
 											</f:for>
 										</sgm:be.menus.actionMenuOptionGroup>
 									</f:if>
 									<f:else>
-										<sgm:be.menus.actionMenuOptionGroup label="{extensionKey}">
-											<f:for each="{template}" as="currentTemplate" key="templateKey">
+
+										<f:if condition="{mode} == 'editor'">
+											<sgm:be.menus.actionMenuOptionGroup label="{extensionKey}">
+												<f:for each="{template}" as="currentTemplate" key="templateKey">
 													<sgm:extendedIf condition="{selectedTemplateKey} == {templateKey}"
 														and="{selectedExtensionKey} == {extensionKey}">
 														<f:then>
@@ -79,8 +85,9 @@
 																arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}" />
 														</f:else>
 													</sgm:extendedIf>
-											</f:for>
-										</sgm:be.menus.actionMenuOptionGroup>
+												</f:for>
+											</sgm:be.menus.actionMenuOptionGroup>
+										</f:if>
 									</f:else>
 								</f:for>
 
@@ -89,7 +96,9 @@
 					</div>
 				</div>
 				<div class="module-docheader-bar-column-right">
-					<f:link.action class="reset-btn btn-danger btn form-group" action="reset" arguments="{template: selectedTemplateKey, extensionKey: selectedTemplate.extension}">{f:translate(key:'backend.button_reset')}</f:link.action>
+					<f:if condition="{mode} == 'editor'">
+						<f:link.action class="reset-btn btn-danger btn form-group" action="reset" arguments="{template: selectedTemplateKey, extensionKey: selectedTemplate.extension}">{f:translate(key:'backend.button_reset')}</f:link.action>
+					</f:if>
 				</div>
 			</div>
 			<div class="module-docheader-bar module-docheader-bar-buttons t3js-module-docheader-bar t3js-module-docheader-bar-buttons">