[TASK] Replace clear.gif img-tags with spans 15/41615/3
authorJan Helke <typo3@helke.de>
Fri, 17 Jul 2015 21:06:22 +0000 (23:06 +0200)
committerBenjamin Mack <benni@typo3.org>
Fri, 17 Jul 2015 23:29:57 +0000 (01:29 +0200)
Resolves: #68309
Related: #68025
Releases: master
Change-Id: I871ba198ab80ec00a32e476eed2d09ac0ebbd403
Reviewed-on: http://review.typo3.org/41615
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Patrick Kollodzik <patrick.kollodzik@googlemail.com>
Tested-by: Patrick Kollodzik <patrick.kollodzik@googlemail.com>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
typo3/sysext/backend/Classes/Controller/PageLayoutController.php [changed mode: 0644->0755]
typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html [changed mode: 0644->0755]
typo3/sysext/core/Classes/TimeTracker/TimeTracker.php [changed mode: 0644->0755]
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php [changed mode: 0644->0755]
typo3/sysext/frontend/Classes/View/AdminPanelView.php [changed mode: 0644->0755]
typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php [changed mode: 0644->0755]
typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 0077cff..cb74ce0
@@ -1033,7 +1033,7 @@ class PageLayoutController {
                        // Generate the list of elements here:
                        $dbList->generateList();
                        // Adding the list content to the tableOutput variable:
-                       $tableOutput[$table] = ($h_func ? $h_func . '<br /><img src="clear.gif" width="1" height="4" alt="" /><br />' : '') . $dbList->HTMLcode . ($h_func_b ? '<img src="clear.gif" width="1" height="10" alt="" /><br />' . $h_func_b : '');
+                       $tableOutput[$table] = ($h_func ? $h_func . '<br /><span style="width: 1px; height: 4px; display: inline-block;"></span><br />' : '') . $dbList->HTMLcode . ($h_func_b ? '<span style="width: 1px; height: 10px; display:inline-block;"></span><br />' . $h_func_b : '');
                        // ... and any accumulated JavaScript goes the same way!
                        $tableJSOutput[$table] = $dbList->JScode;
                        // Increase global counter:
@@ -1188,7 +1188,7 @@ class PageLayoutController {
                                // Save record
                                $buttons['savedok'] = IconUtility::getSpriteIcon('actions-document-save', array('html' => '<input type="image" name="_savedok" class="c-inputButton" src="clear.gif" title="' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc', TRUE) . '" />'));
                                // Save and close
-                               $buttons['save_close'] = IconUtility::getSpriteIcon('actions-document-save-close', array('html' => '<input type="image" class="c-inputButton" name="_saveandclosedok" src="clear.gif" title="' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc', TRUE) . '" />'));
+                               $buttons['save_close'] = IconUtility::getSpriteIcon('actions-document-save-close', array('html' => '<input type="image" class="c-inputButton" src="clear.gif" name="_saveandclosedok" title="' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc', TRUE) . '" />'));
                                // Save record and show page
                                $buttons['savedokshow'] = '<a href="#" onclick="' . htmlspecialchars('document.editform.redirect.value+=\'&popView=1\'; TBE_EDITOR.checkAndDoSubmit(1); return false;') . '" title="' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDocShow', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-save-view') . '</a>';
                                // Close record
old mode 100644 (file)
new mode 100755 (executable)
index 551f34d..0f4f4fa
                                                                <f:translate key="chLog_l_error" />
                                                        </strong>
                                                </th>
-                                               <th><span style="width: 10px; height: 1px;" /></th>
+                                               <th><span style="width: 10px; height: 1px; display: inline-block"></span></th>
                                                <th valign="top">
                                                        <strong>
                                                                <f:translate key="chLog_l_time" />
                                                        </strong>
                                                </th>
-                                               <th><span style="width: 10px; height: 1px;" /></th>
+                                               <th><span style="width: 10px; height: 1px; display: inline-block"></span></th>
                                                <th valign="top">
                                                        <strong>
                                                                <f:translate key="chLog_l_user" />
                                                        </strong>
                                                </th>
-                                               <th><span style="width: 10px; height: 1px;" /></th>
+                                               <th><span style="width: 10px; height: 1px; display: inline-block"></span></th>
                                                <th valign="top">
                                                        <strong>
                                                                <f:if condition="{constraint.isInPageContext}">
                                                                </f:if>
                                                        </strong>
                                                </th>
-                                               <th><span style="width: 10px; height: 1px;" /></th>
+                                               <th><span style="width: 10px; height: 1px; display: inline-block"></span></th>
                                                <th valign="top">
                                                        <strong>
                                                                <f:translate key="chLog_l_action" />
                                                        </strong>
                                                </th>
-                                               <th><span style="width: 10px; height: 1px;" /></th>
+                                               <th><span style="width: 10px; height: 1px; display: inline-block"></span></th>
                                                <th valign="top">
                                                        <strong>
                                                                <f:translate key="chLog_l_details" />
                                                        </strong>
                                                </th>
-                                               <th><span style="width: 10px; height: 1px;" /></th>
+                                               <th><span style="width: 10px; height: 1px; display: inline-block"></span></th>
                                        </tr>
                                </thead>
                                <tbody>
                                                        <td valign="top">
                                                                <belog:ErrorIcon errorNumber="{logItem.error}" />
                                                        </td>
-                                                       <td><span style="width: 10px; height: 1px;" /></td>
+                                                       <td><span style="width: 10px; height: 1px; display: inline-block"></span></td>
 
                                                        <td valign="top">
                                                                <f:format.date format="H:i:s">@{logItem.tstamp}</f:format.date>
                                                        </td>
-                                                       <td><span style="width: 10px; height: 1px;" /></td>
+                                                       <td><span style="width: 10px; height: 1px; display: inline-block"></span></td>
 
                                                        <td valign="top">
                                                                <f:if condition="{belog:username(uid:logItem.backendUserUid)}">
                                                                        <f:else>[{logItem.workspaceUid}]</f:else>
                                                                </f:if>
                                                        </td>
-                                                       <td><span style="width: 10px; height: 1px;" /></td>
+                                                       <td><span style="width: 10px; height: 1px; display: inline-block"></span></td>
 
                                                        <td valign="top">
                                                                <f:if condition="{constraint.isInPageContext}">
                                                                        </f:else>
                                                                </f:if>
                                                        </td>
-                                                       <td><span style="width: 10px; height: 1px;" /></td>
+                                                       <td><span style="width: 10px; height: 1px; display: inline-block"></span></td>
 
                                                        <td valign="top">
                                                                <f:if condition="{f:translate(key:'action_{logItem.type}_{logItem.action}')}">
                                                                        </f:else>
                                                                </f:if>
                                                        </td>
-                                                       <td><span style="width: 10px; height: 1px;" /></td>
+                                                       <td><span style="width: 10px; height: 1px; display: inline-block"></span></td>
 
                                                        <td valign="top">
                                                                <belog:formatDetails logEntry="{logItem}" />
                                                                        (msg#{logItem.type}.{logItem.action}.{logItem.detailsNumber})
                                                                </f:if>
                                                        </td>
-                                                       <td><span style="width: 10px; height: 1px;" /></td>
+                                                       <td><span style="width: 10px; height: 1px; display: inline-block"></span></td>
                                                </tr>
                                        </f:for>
                                </tbody>
old mode 100644 (file)
new mode 100755 (executable)
index 4f65c51..4f998b6
@@ -184,9 +184,9 @@ class TimeTracker {
        public function setTSlogMessage($content, $num = 0) {
                end($this->currentHashPointer);
                $k = current($this->currentHashPointer);
-               // Enlarge the "details" column by adding a wide clear.gif
+               // Enlarge the "details" column by adding a span
                if (strlen($content) > 30) {
-                       $placeholder = '<br /><img src="' . TYPO3_mainDir . 'clear.gif" width="300" height="1" alt="" />';
+                       $placeholder = '<br /><span style="width: 300px; height: 1px; display: inline-block;"></span>';
                }
                $this->tsStackLog[$k]['message'][] = IconUtility::getSpriteIcon($this->wrapIcon[$num]) . $this->wrapError[$num][0] . htmlspecialchars($content) . $this->wrapError[$num][1] . $placeholder;
        }
old mode 100644 (file)
new mode 100755 (executable)
index a790952..6d526d8
@@ -6889,14 +6889,14 @@ class ContentObjectRenderer {
                                if ($useDivTag) {
                                        $content = '<div class="content-spacer spacer-before" style="height:' . $wrapBefore . 'px;"></div>' . $content;
                                } else {
-                                       $content = '<img src="' . $GLOBALS['TSFE']->absRefPrefix . 'clear.gif" width="1" height="' . $wrapBefore . '"' . $this->getBorderAttr(' border="0"') . ' class="spacer-gif" alt="" title="" /><br />' . $content;
+                                       $content = '<span style="width: 1px; height: ' . $wrapBefore . 'px; display: inline-block;"></span><br />' . $content;
                                }
                        }
                        if ($wrapAfter) {
                                if ($useDivTag) {
                                        $content .= '<div class="content-spacer spacer-after" style="height:' . $wrapAfter . 'px;"></div>';
                                } else {
-                                       $content .= '<img src="' . $GLOBALS['TSFE']->absRefPrefix . 'clear.gif" width="1" height="' . $wrapAfter . '"' . $this->getBorderAttr(' border="0"') . ' class="spacer-gif" alt="" title="" /><br />';
+                                       $content .= '<span style="width: 1px; height: ' . $wrapAfter . 'px; display: inline-block;"></span><br />';
                                }
                        }
                }
old mode 100644 (file)
new mode 100755 (executable)
index ad5634a..e4840f8
@@ -404,7 +404,7 @@ class AdminPanelView {
                        $GLOBALS['BE_USER']->extPageInTreeInfo[] = array($GLOBALS['TSFE']->page['uid'], htmlspecialchars($GLOBALS['TSFE']->page['title']), $depth + 1);
                        $GLOBALS['BE_USER']->extGetTreeList($GLOBALS['TSFE']->id, $depth, 0, $GLOBALS['BE_USER']->getPagePermsClause(1));
                        foreach ($GLOBALS['BE_USER']->extPageInTreeInfo as $row) {
-                               $outTable .= '<tr>' . '<td><img src="typo3/gfx/clear.gif" width="' . ($depth + 1 - $row[2]) * 18 . '" height="1" alt="" />' . IconUtility::getSpriteIcon('apps-pagetree-page-default') . htmlspecialchars($row[1]) . '</td><td>' . $GLOBALS['BE_USER']->extGetNumberOfCachedPages($row[0]) . '</td></tr>';
+                               $outTable .= '<tr>' . '<td><span style="width: ' . ($depth + 1 - $row[2]) * 18 . 'px; height: 1px; display: inline-block;"></span>' . IconUtility::getSpriteIcon('apps-pagetree-page-default') . htmlspecialchars($row[1]) . '</td><td>' . $GLOBALS['BE_USER']->extGetNumberOfCachedPages($row[0]) . '</td></tr>';
                        }
                        $outTable = '<br /><table>' . $outTable . '</table>';
                        $outTable .= '<input type="submit" name="TSFE_ADMIN_PANEL[action][clearCache]" value="' . $this->extGetLL('cache_doit') . '" />';
old mode 100644 (file)
new mode 100755 (executable)
index 3d74c87..34f0c5d
@@ -2015,7 +2015,7 @@ class ElementBrowser {
                foreach ($folders as $subFolder) {
                        $subFolderIdentifier = $subFolder->getCombinedIdentifier();
                        // Create folder icon:
-                       $icon = '<img src="clear.gif" width="16" height="16" alt="" />';
+                       $icon = '<span style="width: 16px; height: 16px; display: inline-block;"></span>';
                        $icon .= IconUtility::getSpriteIcon('apps-filetree-folder-default', array('title' => htmlspecialchars($subFolder->getName())));
                        // Create links for adding the folder:
                        if ($this->P['itemName'] != '' && $this->P['formName'] != '') {
@@ -2054,7 +2054,7 @@ class ElementBrowser {
                        }
                        $lines[] = '
                                        <tr>
-                                               <td colspan="3"><img src="clear.gif" width="1" height="3" alt="" /></td>
+                                               <td colspan="3"><span style="width: 1px; height: 3px; display: inline-block;"></span></td>
                                        </tr>';
                }
                // Wrap all the rows in table tags:
@@ -2155,7 +2155,7 @@ class ElementBrowser {
                                        </tr>';
                                $lines[] = '
                                        <tr>
-                                               <td colspan="2"><img src="clear.gif" width="1" height="3" alt="" /></td>
+                                               <td colspan="2"><span style="width: 1px; height: 3px; display: inline-block;"></span></td>
                                        </tr>';
                        }
                }
old mode 100644 (file)
new mode 100755 (executable)
index be76173..fbe63d1
@@ -553,14 +553,14 @@ page.10.value = HELLO WORLD!
                        if (MathUtility::canBeInterpretedAsInteger($k)) {
                                if (isset($pArray[$k . '_'])) {
                                        $lines[] = '<tr class="' . ($i++ % 2 == 0 ? 'bgColor4' : 'bgColor6') . '">
-                                               <td nowrap><img src="clear.gif" width="1" height="1" hspace=' . $c * 10 . ' align="top">' . '<a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('id' => $k))) . '">' . IconUtility::getSpriteIconForRecord('pages', BackendUtility::getRecordWSOL('pages', $k), array('title' => ('ID: ' . $k))) . GeneralUtility::fixed_lgd_cs($pArray[$k], 30) . '</a></td>
+                                               <td nowrap><span style="width: 1px; height: 1px; display:inline-block; margin-left: ' . $c * 20 . '"></span>' . '<a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('id' => $k))) . '">' . IconUtility::getSpriteIconForRecord('pages', BackendUtility::getRecordWSOL('pages', $k), array('title' => ('ID: ' . $k))) . GeneralUtility::fixed_lgd_cs($pArray[$k], 30) . '</a></td>
                                                <td>' . $pArray[($k . '_')]['count'] . '</td>
                                                <td>' . ($pArray[$k . '_']['root_max_val'] > 0 ? IconUtility::getSpriteIcon('status-status-checked') : '&nbsp;') . '</td>
                                                <td>' . ($pArray[$k . '_']['root_min_val'] == 0 ? IconUtility::getSpriteIcon('status-status-checked') : '&nbsp;') . '</td>
                                                </tr>';
                                } else {
                                        $lines[] = '<tr class="' . ($i++ % 2 == 0 ? 'bgColor4' : 'bgColor6') . '">
-                                               <td nowrap ><img src="clear.gif" width="1" height="1" hspace=' . $c * 10 . ' align=top>' . IconUtility::getSpriteIconForRecord('pages', BackendUtility::getRecordWSOL('pages', $k)) . GeneralUtility::fixed_lgd_cs($pArray[$k], 30) . '</td>
+                                               <td nowrap >span style="width: 1px; height: 1px; display:inline-block; margin-left: ' . $c * 20 . '"></span>' . IconUtility::getSpriteIconForRecord('pages', BackendUtility::getRecordWSOL('pages', $k)) . GeneralUtility::fixed_lgd_cs($pArray[$k], 30) . '</td>
                                                <td></td>
                                                <td></td>
                                                <td></td>