[TASK] Remove icons from clipboard menu 01/40301/3
authorJan Helke <typo3@helke.de>
Tue, 16 Jun 2015 13:47:38 +0000 (15:47 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 16 Jun 2015 14:25:56 +0000 (16:25 +0200)
This patch removes the scissor + paper icon from the dropdown
menu of the Clipboard in the List module and the File list module.
As they do not fit the style logic anymore and do not describe
the actions "Move" and "Copy" properly, they are removed without
substitution.

Releases: master
Resolves: #67504
Change-Id: I562dac0b6475ac1b1c23976c5c0d612d6ca0e3e3
Reviewed-on: http://review.typo3.org/40301
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>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
typo3/gfx/clip_copy.gif [deleted file]
typo3/gfx/clip_copy_h.gif [deleted file]
typo3/gfx/clip_cut.gif [deleted file]
typo3/gfx/clip_cut_h.gif [deleted file]
typo3/gfx/clip_deselect.gif [deleted file]
typo3/gfx/clip_pasteafter.gif [deleted file]
typo3/gfx/clip_pasteinto.gif [deleted file]
typo3/sysext/backend/Classes/Clipboard/Clipboard.php

diff --git a/typo3/gfx/clip_copy.gif b/typo3/gfx/clip_copy.gif
deleted file mode 100644 (file)
index 8671a71..0000000
Binary files a/typo3/gfx/clip_copy.gif and /dev/null differ
diff --git a/typo3/gfx/clip_copy_h.gif b/typo3/gfx/clip_copy_h.gif
deleted file mode 100644 (file)
index aa090d3..0000000
Binary files a/typo3/gfx/clip_copy_h.gif and /dev/null differ
diff --git a/typo3/gfx/clip_cut.gif b/typo3/gfx/clip_cut.gif
deleted file mode 100644 (file)
index ba7019c..0000000
Binary files a/typo3/gfx/clip_cut.gif and /dev/null differ
diff --git a/typo3/gfx/clip_cut_h.gif b/typo3/gfx/clip_cut_h.gif
deleted file mode 100644 (file)
index 4a8dc27..0000000
Binary files a/typo3/gfx/clip_cut_h.gif and /dev/null differ
diff --git a/typo3/gfx/clip_deselect.gif b/typo3/gfx/clip_deselect.gif
deleted file mode 100644 (file)
index bf5c9ef..0000000
Binary files a/typo3/gfx/clip_deselect.gif and /dev/null differ
diff --git a/typo3/gfx/clip_pasteafter.gif b/typo3/gfx/clip_pasteafter.gif
deleted file mode 100644 (file)
index 6c4cc70..0000000
Binary files a/typo3/gfx/clip_pasteafter.gif and /dev/null differ
diff --git a/typo3/gfx/clip_pasteinto.gif b/typo3/gfx/clip_pasteinto.gif
deleted file mode 100644 (file)
index 44387c1..0000000
Binary files a/typo3/gfx/clip_pasteinto.gif and /dev/null differ
index 8e48bfd..a462cb8 100644 (file)
@@ -252,8 +252,8 @@ class Clipboard {
                $moveLabel = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_misc.xlf:moveElements'));
                $copyLabel = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_misc.xlf:copyElements'));
                $opt = array();
-               $opt[] = '<option style="padding-left: 20px; background-image: url(\'' . IconUtility::skinImg($this->backPath, 'gfx/clip_cut.gif', '', 1) . '\'); background-repeat: no-repeat;" value="" ' . ($this->currentMode() == 'copy' ? '' : 'selected="selected"') . '>' . $moveLabel . '</option>';
-               $opt[] = '<option style="padding-left: 20px; background-image: url(\'' . IconUtility::skinImg($this->backPath, 'gfx/clip_copy.gif', '', 1) . '\'); background-repeat: no-repeat;" value="1" ' . ($this->currentMode() == 'copy' ? 'selected="selected"' : '') . '>' . $copyLabel . '</option>';
+               $opt[] = '<option value="" ' . ($this->currentMode() == 'copy' ? '' : 'selected="selected"') . '>' . $moveLabel . '</option>';
+               $opt[] = '<option value="1" ' . ($this->currentMode() == 'copy' ? 'selected="selected"' : '') . '>' . $copyLabel . '</option>';
                $copymode_selector = ' <select name="CB[setCopyMode]" onchange="this.form.method=\'POST\'; this.form.action=' . htmlspecialchars(GeneralUtility::quoteJSvalue($copymode_url . '&CB[setCopyMode]=')) . '+(this.options[this.selectedIndex].value); this.form.submit(); return true;" >' . implode('', $opt) . '</select>';
                // Selector menu + clear button
                $opt = array();