[TASK] Remove unused icons in Table and Form wizard controller 36/40736/5
authorWouter Wolters <typo3@wouterwolters.nl>
Mon, 29 Jun 2015 22:14:49 +0000 (00:14 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 7 Jul 2015 07:39:34 +0000 (09:39 +0200)
Resolves: #67828
Releases: master
Change-Id: Id9f0884fdfb9d572e5e1624e5cbb738fdcf0f614
Reviewed-on: http://review.typo3.org/40736
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
13 files changed:
typo3/gfx/garbage.gif [deleted file]
typo3/gfx/information.png [deleted file]
typo3/gfx/pil2down.gif [deleted file]
typo3/gfx/pil2right.gif [deleted file]
typo3/gfx/pil2up.gif [deleted file]
typo3/gfx/saveandclosedok.gif [deleted file]
typo3/gfx/savedok.gif [deleted file]
typo3/gfx/turn_down.gif [deleted file]
typo3/gfx/turn_left.gif [deleted file]
typo3/gfx/turn_right.gif [deleted file]
typo3/gfx/turn_up.gif [deleted file]
typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
typo3/sysext/compatibility6/Classes/Controller/Wizard/FormsController.php

diff --git a/typo3/gfx/garbage.gif b/typo3/gfx/garbage.gif
deleted file mode 100644 (file)
index 325586f..0000000
Binary files a/typo3/gfx/garbage.gif and /dev/null differ
diff --git a/typo3/gfx/information.png b/typo3/gfx/information.png
deleted file mode 100644 (file)
index f61dc86..0000000
Binary files a/typo3/gfx/information.png and /dev/null differ
diff --git a/typo3/gfx/pil2down.gif b/typo3/gfx/pil2down.gif
deleted file mode 100644 (file)
index 34cb585..0000000
Binary files a/typo3/gfx/pil2down.gif and /dev/null differ
diff --git a/typo3/gfx/pil2right.gif b/typo3/gfx/pil2right.gif
deleted file mode 100644 (file)
index fc0c14c..0000000
Binary files a/typo3/gfx/pil2right.gif and /dev/null differ
diff --git a/typo3/gfx/pil2up.gif b/typo3/gfx/pil2up.gif
deleted file mode 100644 (file)
index 256621f..0000000
Binary files a/typo3/gfx/pil2up.gif and /dev/null differ
diff --git a/typo3/gfx/saveandclosedok.gif b/typo3/gfx/saveandclosedok.gif
deleted file mode 100644 (file)
index f80f504..0000000
Binary files a/typo3/gfx/saveandclosedok.gif and /dev/null differ
diff --git a/typo3/gfx/savedok.gif b/typo3/gfx/savedok.gif
deleted file mode 100644 (file)
index 5379d31..0000000
Binary files a/typo3/gfx/savedok.gif and /dev/null differ
diff --git a/typo3/gfx/turn_down.gif b/typo3/gfx/turn_down.gif
deleted file mode 100644 (file)
index 87edbfb..0000000
Binary files a/typo3/gfx/turn_down.gif and /dev/null differ
diff --git a/typo3/gfx/turn_left.gif b/typo3/gfx/turn_left.gif
deleted file mode 100644 (file)
index 4670e86..0000000
Binary files a/typo3/gfx/turn_left.gif and /dev/null differ
diff --git a/typo3/gfx/turn_right.gif b/typo3/gfx/turn_right.gif
deleted file mode 100644 (file)
index 4866ad0..0000000
Binary files a/typo3/gfx/turn_right.gif and /dev/null differ
diff --git a/typo3/gfx/turn_up.gif b/typo3/gfx/turn_up.gif
deleted file mode 100644 (file)
index d212bb6..0000000
Binary files a/typo3/gfx/turn_up.gif and /dev/null differ
index 7d970ca..1ca1d77 100644 (file)
@@ -192,9 +192,9 @@ class TableController extends AbstractWizardController {
                        // Close
                        $buttons['close'] = '<a href="#" onclick="' . htmlspecialchars(('jumpToUrl(' . GeneralUtility::quoteJSvalue(GeneralUtility::sanitizeLocalUrl($this->P['returnUrl'])) . '); return false;')) . '">' . IconUtility::getSpriteIcon('actions-document-close', array('title' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc', TRUE))) . '</a>';
                        // Save
-                       $buttons['save'] = '<input type="image" class="c-inputButton" name="savedok"' . IconUtility::skinImg($this->doc->backPath, 'gfx/savedok.gif') . ' title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc', TRUE) . '" />';
+                       $buttons['save'] = '<button class="c-inputButton" name="savedok">' . IconUtility::getSpriteIcon('actions-document-save', array('title' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc', TRUE))) . '</button>';
                        // Save & Close
-                       $buttons['save_close'] = '<input type="image" class="c-inputButton" name="saveandclosedok"' . IconUtility::skinImg($this->doc->backPath, 'gfx/saveandclosedok.gif') . ' title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc', TRUE) . '" />';
+                       $buttons['save_close'] = '<button class="c-inputButton" name="saveandclosedok">' . IconUtility::getSpriteIcon('actions-document-save-close', array('title' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc', TRUE))) . '</button>';
                        // Reload
                        $buttons['reload'] = '<button class="c-inputButton" name="_refresh">' . IconUtility::getSpriteIcon('actions-system-refresh', array('title' => $this->getLanguageService()->getLL('forms_refresh', TRUE))) . '</button>';
                }
index aff3436..9adef6a 100644 (file)
@@ -244,9 +244,9 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
                        // Close
                        $buttons['close'] = '<a href="#" onclick="' . htmlspecialchars(('jumpToUrl(unescape(\'' . rawurlencode(GeneralUtility::sanitizeLocalUrl($this->P['returnUrl'])) . '\')); return false;')) . '">' . IconUtility::getSpriteIcon('actions-document-close', array('title' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc', TRUE))) . '</a>';
                        // Save
-                       $buttons['save'] = '<input type="image" class="c-inputButton" name="savedok"' . IconUtility::skinImg($this->doc->backPath, 'gfx/savedok.gif') . ' title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc', TRUE) . '" />';
+                       $buttons['save'] = '<button class="c-inputButton" name="savedok">' . IconUtility::getSpriteIcon('actions-document-save', array('title' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc', TRUE))) . '</button>';
                        // Save & Close
-                       $buttons['save_close'] = '<input type="image" class="c-inputButton" name="saveandclosedok"' . IconUtility::skinImg($this->doc->backPath, 'gfx/saveandclosedok.gif') . ' title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc', TRUE) . '" />';
+                       $buttons['save_close'] = '<button class="c-inputButton" name="saveandclosedok">' . IconUtility::getSpriteIcon('actions-document-save-close', array('title' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc', TRUE))) . '</button>';
                        // Reload
                        $buttons['reload'] = '<button class="c-inputButton" name="_refresh">' . IconUtility::getSpriteIcon('actions-system-refresh', array('title' => $this->getLanguageService()->getLL('forms_refresh', TRUE))) . '</button>';
                }
@@ -463,18 +463,17 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
                                        $onClick = ' onclick="' . htmlspecialchars($onClick) . '"';
                                        // @todo $inputStyle undefined
                                        $brTag = $inputStyle ? '' : '<br />';
-                                       if ($k != 0) {
-                                               $ctrl .= '<input type="image" name="FORMCFG[row_up][' . ($k + 1) * 2 . ']"' . IconUtility::skinImg($this->doc->backPath, 'gfx/pil2up.gif', '') . $onClick . ' title="' . $this->getLanguageService()->getLL('table_up', TRUE) . '" />' . $brTag;
-                                       } else {
-                                               $ctrl .= '<input type="image" name="FORMCFG[row_bottom][' . ($k + 1) * 2 . ']"' . IconUtility::skinImg($this->doc->backPath, 'gfx/turn_up.gif', '') . $onClick . ' title="' . $this->getLanguageService()->getLL('table_bottom', TRUE) . '" />' . $brTag;
+                                       if ($k != 1) {
+                                               $ctrl .= '<button name="FORMCFG[row_top][' . ($k + 1) * 2 . ']"' . $onClick . '>' . IconUtility::getSpriteIcon('actions-move-to-top', array('title' => $this->getLanguageService()->getLL('table_top', TRUE))) . '</button>' . $brTag;
+                                               $ctrl .= '<button name="FORMCFG[row_up][' . ($k + 1) * 2 . ']"' . $onClick . '>' . IconUtility::getSpriteIcon('actions-move-up', array('title' => $this->getLanguageService()->getLL('table_up', TRUE))) . '</button>' . $brTag;
                                        }
-                                       $ctrl .= '<input type="image" name="FORMCFG[row_remove][' . ($k + 1) * 2 . ']"' . IconUtility::skinImg($this->doc->backPath, 'gfx/garbage.gif', '') . $onClick . ' title="' . $this->getLanguageService()->getLL('table_removeRow', TRUE) . '" />' . $brTag;
-                                       // @todo $tLines undefined
-                                       if ($k + 1 != count($tLines)) {
-                                               $ctrl .= '<input type="image" name="FORMCFG[row_down][' . ($k + 1) * 2 . ']"' . IconUtility::skinImg($this->doc->backPath, 'gfx/pil2down.gif', '') . $onClick . ' title="' . $this->getLanguageService()->getLL('table_down', TRUE) . '" />' . $brTag;
-                                       } else {
-                                               $ctrl .= '<input type="image" name="FORMCFG[row_top][' . ($k + 1) * 2 . ']"' . IconUtility::skinImg($this->doc->backPath, 'gfx/turn_down.gif', '') . $onClick . ' title="' . $this->getLanguageService()->getLL('table_top', TRUE) . '" />' . $brTag;
+                                       $ctrl .= '<button name="FORMCFG[row_remove][' . ($k + 1) * 2 . ']" ' . $onClick . '>' . IconUtility::getSpriteIcon('actions-edit-delete', array('title' => $this->getLanguageService()->getLL('table_removeRow', TRUE))) . '</button>' . $brTag;
+
+                                       if ($k != (count($formCfgArray)/2)) {
+                                               $ctrl .= '<button name="FORMCFG[row_down][' . ($k + 1) * 2 . ']"' . $onClick . '>' . IconUtility::getSpriteIcon('actions-move-down', array('title' => $this->getLanguageService()->getLL('table_down', TRUE))) . '</button>' . $brTag;
+                                               $ctrl .= '<button name="FORMCFG[row_bottom][' . ($k + 1) * 2 . ']"' . $onClick . '>' . IconUtility::getSpriteIcon('actions-move-to-bottom', array('title' => $this->getLanguageService()->getLL('table_bottom', TRUE))) . '</button>' . $brTag;
                                        }
+
                                        $ctrl .= '<button name="FORMCFG[row_add][' . ($k + 1) * 2 . ']"' . $onClick . ' title="' . $this->getLanguageService()->getLL('table_addRow', TRUE) . '">' . IconUtility::getSpriteIcon('actions-template-new') . '</button>' . $brTag;
                                        $ctrl = '<span class="c-wizButtonsV">' . $ctrl . '</span>';
                                        // Finally, put together the full row from the generated content above: