Skip to content

Commit

Permalink
Fix the "paste in root" icon position and update the import/export icons
Browse files Browse the repository at this point in the history
  • Loading branch information
leofeyer committed Jun 17, 2024
1 parent 4bb50c2 commit 408a154
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion core-bundle/contao/drivers/DC_Folder.php
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ public function showAll()
<label for="tl_select_trigger" class="tl_select_label">' . $GLOBALS['TL_LANG']['MSC']['selectAll'] . '</label> <input type="checkbox" id="tl_select_trigger" onclick="Backend.toggleCheckboxes(this)" class="tl_tree_checkbox">
</div>' : '') . '
<ul class="tl_listing tl_file_manager' . ($this->strPickerFieldType ? ' picker unselectable' : '') . '">
<li class="tl_folder_top cf"><div class="tl_right">' . (($blnClipboard && empty($this->arrFilemounts) && !\is_array($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['root'] ?? null) && ($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['root'] ?? null) !== false && $security->isGranted(ContaoCorePermissions::DC_PREFIX . $this->strTable, new CreateAction($this->strTable))) ? '<a href="' . $this->addToUrl('&amp;act=' . $arrClipboard['mode'] . '&amp;mode=2&amp;pid=' . $this->strUploadPath . (!\is_array($arrClipboard['id'] ?? null) ? '&amp;id=' . $arrClipboard['id'] : '')) . '" title="' . StringUtil::specialchars($labelPasteInto[0]) . '" data-action="contao--scroll-offset#store">' . $imagePasteInto . '</a>' : '&nbsp;') . '</div></li>' . $return . '
<li class="tl_folder_top cf"><div class="tl_left"></div> <div class="tl_right">' . (($blnClipboard && empty($this->arrFilemounts) && !\is_array($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['root'] ?? null) && ($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['root'] ?? null) !== false && $security->isGranted(ContaoCorePermissions::DC_PREFIX . $this->strTable, new CreateAction($this->strTable))) ? '<a href="' . $this->addToUrl('&amp;act=' . $arrClipboard['mode'] . '&amp;mode=2&amp;pid=' . $this->strUploadPath . (!\is_array($arrClipboard['id'] ?? null) ? '&amp;id=' . $arrClipboard['id'] : '')) . '" title="' . StringUtil::specialchars($labelPasteInto[0]) . '" data-action="contao--scroll-offset#store">' . $imagePasteInto . '</a>' : '&nbsp;') . '</div></li>' . $return . '
</ul>' . ($this->strPickerFieldType == 'radio' ? '
<div class="tl_radio_reset">
<label for="tl_radio_reset" class="tl_radio_label">' . $GLOBALS['TL_LANG']['MSC']['resetSelected'] . '</label> <input type="radio" name="picker" id="tl_radio_reset" value="" class="tl_tree_radio">
Expand Down
2 changes: 1 addition & 1 deletion core-bundle/contao/drivers/DC_Table.php
Original file line number Diff line number Diff line change
Expand Up @@ -3977,7 +3977,7 @@ protected function treeView()
<label for="tl_select_trigger" class="tl_select_label">' . $GLOBALS['TL_LANG']['MSC']['selectAll'] . '</label> <input type="checkbox" id="tl_select_trigger" onclick="Backend.toggleCheckboxes(this)" class="tl_tree_checkbox">
</div>' : '') . '
<ul class="tl_listing ' . $treeClass . ($this->strPickerFieldType ? ' picker unselectable' : '') . '">
<li class="tl_folder_top cf"><div class="tl_right">';
<li class="tl_folder_top cf"><div class="tl_left"></div> <div class="tl_right">';

$_buttons = '&nbsp;';

Expand Down
2 changes: 1 addition & 1 deletion core-bundle/contao/themes/flexible/icons/cssimport.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions core-bundle/contao/themes/flexible/icons/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,11 @@
"pagemounts.svg": "/system/themes/flexible/icons/pagemounts.svg",
"su--disabled--dark.svg": "/system/themes/flexible/icons/su--disabled--dark.svg",
"su--disabled.svg": "/system/themes/flexible/icons/su--disabled.svg",
"cssimport.svg": "/system/themes/flexible/icons/cssimport.svg",
"theme_export--disabled--dark.svg": "/system/themes/flexible/icons/theme_export--disabled--dark.svg",
"theme_export--disabled.svg": "/system/themes/flexible/icons/theme_export--disabled.svg",
"theme_export.svg": "/system/themes/flexible/icons/theme_export.svg",
"theme_import.svg": "/system/themes/flexible/icons/theme_import.svg",
"protected.svg": "/system/themes/flexible/icons/protected.svg",
"delete--disabled--dark.svg": "/system/themes/flexible/icons/delete--disabled--dark.svg",
"delete--disabled.svg": "/system/themes/flexible/icons/delete--disabled.svg",
Expand All @@ -228,11 +233,6 @@
"featured--disabled.svg": "/system/themes/flexible/icons/featured--disabled.svg",
"featured.svg": "/system/themes/flexible/icons/featured.svg",
"tablewizard.svg": "/system/themes/flexible/icons/tablewizard.svg",
"cssimport.svg": "/system/themes/flexible/icons/cssimport.svg",
"theme_export--disabled--dark.svg": "/system/themes/flexible/icons/theme_export--disabled--dark.svg",
"theme_export--disabled.svg": "/system/themes/flexible/icons/theme_export--disabled.svg",
"theme_export.svg": "/system/themes/flexible/icons/theme_export.svg",
"theme_import.svg": "/system/themes/flexible/icons/theme_import.svg",
"favorite--dark.svg": "/system/themes/flexible/icons/favorite--dark.svg",
"favorite.svg": "/system/themes/flexible/icons/favorite.svg",
"favorite_active--dark.svg": "/system/themes/flexible/icons/favorite_active--dark.svg",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion core-bundle/contao/themes/flexible/icons/theme_export.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion core-bundle/contao/themes/flexible/icons/theme_import.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 408a154

Please sign in to comment.