Fixed bug 14523: Missing icons in workspace modules
authorSteffen Kamper <info@sk-typo3.de>
Sat, 29 May 2010 15:45:23 +0000 (15:45 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Sat, 29 May 2010 15:45:23 +0000 (15:45 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7741 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/alt_db_navframe.php
typo3/mod/user/ws/class.wslib_gui.php
typo3/mod/user/ws/index.php
typo3/sysext/version/cm1/index.php

index 24a48ef..da46670 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-29  Steffen Kamper  <info@sk-typo3.de>
+
+       * Fixed bug 14523: Missing icons in workspace modules
+
 2010-05-29  Oliver Hader  <oliver@typo3.org>
 
        * Fixed bug #14488: prioriCalc no longer working correctly (thanks to Franz Koch)
index 946e710..11a9b80 100644 (file)
@@ -336,7 +336,7 @@ class SC_alt_db_navframe {
                        $workspaceInfo = '
                                <div class="bgColor4 workspace-info">
                                        <a href="'.htmlspecialchars('mod/user/ws/index.php').'" target="content">'.
-                                         t3lib_iconWorks::getSpriteIcon('status-workspace-draft') .
+                                         t3lib_iconWorks::getSpriteIcon('apps-toolbar-menu-workspace') .
                                        '</a>'.$wsTitle.'
                                </div>
                        ';
index 2eafe86..2cf6867 100644 (file)
@@ -874,7 +874,7 @@ class wslib_gui {
                                '&cmd['.$table.']['.$rec_on['uid'].'][version][action]=swap'.
                                '&cmd['.$table.']['.$rec_on['uid'].'][version][swapWith]='.$rec_off['uid']
                                )).' " title="' . $LANG->getLL('img_title_publish') . '">'.
-                                 t3lib_iconWorks::getSpriteIcon('apps-version-swap-versions') . 
+                                 t3lib_iconWorks::getSpriteIcon('actions-version-swap-version') .
                                '</a>';
                        if ($GLOBALS['BE_USER']->workspaceSwapAccess()) {
                                $actionLinks.=
@@ -883,7 +883,7 @@ class wslib_gui {
                                        '&cmd['.$table.']['.$rec_on['uid'].'][version][swapWith]='.$rec_off['uid'].
                                        '&cmd['.$table.']['.$rec_on['uid'].'][version][swapIntoWS]=1'
                                                                )).'" title="' . $LANG->getLL('img_title_swap') . '">'.
-                                         t3lib_iconWorks::getSpriteIcon('apps-version-swap-workspace') . 
+                                         t3lib_iconWorks::getSpriteIcon('actions-version-swap-workspace') .
                                        '</a>';
                        }
                }
@@ -894,7 +894,7 @@ class wslib_gui {
                                $confirm = $LANG->JScharCode($LANG->getLL('remove_from_ws_confirmation'));
                                $actionLinks.=
                                '<a href="'.htmlspecialchars($this->doc->issueCommand('&cmd['.$table.']['.$rec_off['uid'].'][version][action]=clearWSID')).'" onclick="return confirm(' . $confirm . ');" title="' . $LANG->getLL('img_title_remove_from_ws') . '">'.
-                                 t3lib_iconWorks::getSpriteIcon('apps-version-document-remove') . 
+                                 t3lib_iconWorks::getSpriteIcon('actions-version-document-remove') .
                                '</a>';
                        }
 
@@ -903,21 +903,21 @@ class wslib_gui {
                                $tempUid = ($vType==='branch' || $GLOBALS['BE_USER']->workspace===0 ? $rec_off['uid'] : $rec_on['uid']);
                                $actionLinks.=
                                        '<a href="#" onclick="top.loadEditId('.$tempUid.');top.goToModule(\''.$this->pageModule.'\'); return false;" title="' . $LANG->getLL('img_title_edit_page') . '">'.
-                                         t3lib_iconWorks::getSpriteIcon('apps-version-page-open') . 
+                                         t3lib_iconWorks::getSpriteIcon('actions-page-open') .
                                        '</a>';
                        } else {
                                $params = '&edit['.$table.']['.$rec_off['uid'].']=edit';
                                $actionLinks.=
                                        '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->doc->backPath)).'" title="' . $LANG->getLL('img_title_edit_element') . '">'.
-                                         t3lib_iconWorks::getSpriteIcon('actions-document-open') . 
+                                         t3lib_iconWorks::getSpriteIcon('actions-document-open') .
                                        '</a>';
                        }
                }
 
                // History/Log
                $actionLinks.=
-                       '<a href="'.htmlspecialchars($this->doc->backPath.'show_rechis.php?element='.rawurlencode($table.':'.$rec_off['uid']).'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'" title="' . $LANG->getLL('img_title_show_log') . '">' . 
-                         t3lib_iconWorks::getSpriteIcon('actions-document-history-open') . 
+                       '<a href="'.htmlspecialchars($this->doc->backPath.'show_rechis.php?element='.rawurlencode($table.':'.$rec_off['uid']).'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'" title="' . $LANG->getLL('img_title_show_log') . '">' .
+                         t3lib_iconWorks::getSpriteIcon('actions-document-history-open') .
                        '</a>';
 
                // View
@@ -925,7 +925,7 @@ class wslib_gui {
                        $tempUid = ($vType==='branch' || $GLOBALS['BE_USER']->workspace===0 ? $rec_off['uid'] : $rec_on['uid']);
                        $actionLinks.=
                                '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::viewOnClick($tempUid,$this->doc->backPath,t3lib_BEfunc::BEgetRootLine($tempUid))).'">'.
-                                 t3lib_iconWorks::getSpriteIcon('actions-document-view') . 
+                                 t3lib_iconWorks::getSpriteIcon('actions-document-view') .
                                '</a>';
                }
 
@@ -1184,13 +1184,13 @@ class wslib_gui {
                                if ($table==='pages')   {
                                        $actionLinks.=
                                                '<a href="#" onclick="top.loadEditId('.$uid.');top.goToModule(\''.$this->pageModule.'\'); return false;" title="' . $LANG->getLL('img_title_edit_page') . '">'.
-                                                 t3lib_iconWorks::getSpriteIcon('apps-version-page-open') . 
+                                                 t3lib_iconWorks::getSpriteIcon('apps-version-page-open') .
                                                '</a>';
                                } else {
                                        $params = '&edit['.$table.']['.$uid.']=edit';
                                        $actionLinks.=
                                                '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->doc->backPath)).'" title="' . $LANG->getLL('img_title_edit_element') . '">'.
-                                                 t3lib_iconWorks::getSpriteIcon('actions-document-open') . 
+                                                 t3lib_iconWorks::getSpriteIcon('actions-document-open') .
                                                '</a>';
                                }
                        }
@@ -1198,7 +1198,7 @@ class wslib_gui {
                        // History/Log
                        $actionLinks.=
                                '<a href="'.htmlspecialchars($this->doc->backPath.'show_rechis.php?element='.rawurlencode($table.':'.$uid).'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'" title="' . $LANG->getLL('img_title_show_log') . '">'.
-                                 t3lib_iconWorks::getSpriteIcon('actions-document-history-open') . 
+                                 t3lib_iconWorks::getSpriteIcon('actions-document-history-open') .
                                '</a>';
                }
 
@@ -1206,7 +1206,7 @@ class wslib_gui {
                if ($table==='pages')   {
                        $actionLinks.=
                                '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::viewOnClick($uid,$this->doc->backPath,t3lib_BEfunc::BEgetRootLine($uid))).'">'.
-                                 t3lib_iconWorks::getSpriteIcon('actions-document-view') . 
+                                 t3lib_iconWorks::getSpriteIcon('actions-document-view') .
                                '</a>';
                }
 
@@ -1270,7 +1270,7 @@ class wslib_gui {
                        // Reject:
                        $actionLinks.=
                        '<a href="#" onclick="'.htmlspecialchars($onClick).'"title="'.$LANG->getLL('label_reject').'"> '.
-                         t3lib_iconWorks::getSpriteIcon('actions-move-down') . 
+                         t3lib_iconWorks::getSpriteIcon('actions-move-down') .
                        '</a>';
                } else {
                        // Reject:
@@ -1292,7 +1292,7 @@ class wslib_gui {
                        if ($rec_off['t3ver_stage']!=10)        {
                                $actionLinks.=
                                '<a href="#" onclick="'.htmlspecialchars($onClick).'" title="'.htmlspecialchars($titleAttrib).'">'.
-                                 t3lib_iconWorks::getSpriteIcon('actions-move-up') . 
+                                 t3lib_iconWorks::getSpriteIcon('actions-move-up') .
                                '</a>';
 
                                $this->stageIndex[$sId][$table][] = $rec_off['uid'];
index cf925cc..0270f75 100755 (executable)
@@ -251,25 +251,23 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
                $this->doc->setModuleTemplate('templates/ws.html');
 
                        // JavaScript
-               $plusIcon = t3lib_iconWorks::getSpriteIcon('actions-view-table-expand');
-               $minusIcon = t3lib_iconWorks::getSpriteIcon('actions-view-table-collapse');
                $this->doc->JScode = $this->doc->wrapScriptTags('
                        script_ended = 0;
                        function jumpToUrl(URL) {       //
                                window.location.href = URL;
                        }
 
-                       function expandCollapse(rowNumber)      {       //
-                               elementId = \'wl_\' + rowNumber;
+                       function expandCollapse(rowNumber) {
+                               elementId = "wl_" + rowNumber;
                                element = document.getElementById(elementId);
-                               image = document.getElementById(elementId + \'i\');
+                               image = document.getElementById("spanw1_" + rowNumber);
                                if (element.style)      {
-                                       if (element.style.display == \'none\')  {
-                                               element.style.display = \'\';
-                                               image.src = \'' . $minusIcon . '\';
+                                       if (element.style.display == "none")    {
+                                               element.style.display = "block";
+                                               image.className = "t3-icon t3-icon-actions t3-icon-actions-view t3-icon-view-table-collapse";
                                        } else {
-                                               element.style.display = \'none\';
-                                               image.src = \'' . $plusIcon . '\';
+                                               element.style.display = "none";
+                                               image.className = "t3-icon t3-icon-actions t3-icon-actions-view t3-icon-view-table-expand";
                                        }
                                }
                        }
@@ -599,7 +597,10 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
                                // row #1, column #1: expand icon
                        $content .= '<td>' .
                                                '<a href="javascript:expandCollapse(' . $rowNum . ')">' .
-                                               t3lib_iconWorks::getSpriteIcon('actions-view-tables-expand', array('title' => $LANG->getLL('img_title_show_more'))) .
+                                               t3lib_iconWorks::getSpriteIcon('actions-view-table-expand', array(
+                                                       'title' => $LANG->getLL('img_title_show_more'),
+                                                       'id' => 'spanw1_' . $rowNum
+                                               )) .
                                                '</a></td>';
 
                                // row #1, column #2: icon panel
@@ -996,7 +997,7 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
                        $content .= '<a href="' .
                                        t3lib_div::getIndpEnv('SCRIPT_NAME') .
                                        '?changeWorkspace=' . $wksp['uid'] . '" title="'. $LANG->getLL('workspace_list_icon_title_switch_workspace') . '"/>' .
-                                       t3lib_iconWorks::getSpriteIcon('actions-version-swap-workspace') . 
+                                       t3lib_iconWorks::getSpriteIcon('actions-version-swap-workspace') .
                                        '</a>';
                } else {
                                // Current workspace: empty space instead of workspace switching button
index ac046fe..9d992ef 100755 (executable)
@@ -336,7 +336,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                if ($this->recordFound && $TCA[$this->table]['ctrl']['versioningWS']) {
                                // View page
                        $buttons['view'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::viewOnClick($this->pageinfo['uid'], $BACK_PATH, t3lib_BEfunc::BEgetRootLine($this->pageinfo['uid']))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', TRUE) . '">' .
-                                               t3lib_iconWorks::getSpriteIcon('actions-document-view') . 
+                                               t3lib_iconWorks::getSpriteIcon('actions-document-view') .
                                        '</a>';
 
                                // Shortcut
@@ -348,7 +348,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                        if ($BE_USER->check('modules','web_list'))      {
                                $href = $BACK_PATH . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'));
                                $buttons['record_list'] = '<a href="' . htmlspecialchars($href) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList', TRUE) . '">' .
-                                                       t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . 
+                                                       t3lib_iconWorks::getSpriteIcon('actions-system-list-open') .
                                                '</a>';
                        }
                }
@@ -461,7 +461,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                        $content.='
                                <tr class="' . ($row['uid'] != $this->uid ? 'bgColor4' : 'bgColor2 tableheader') . '">
                                        <td>'.($row['uid']!=$this->uid ? '<a href="'.$this->doc->issueCommand('&cmd['.$this->table.']['.$this->uid.'][version][swapWith]='.$row['uid'].'&cmd['.$this->table.']['.$this->uid.'][version][action]=swap').'" title="' . $GLOBALS['LANG']->getLL('swapWithCurrent', TRUE) . '">'.
-                                               t3lib_iconWorks::getSpriteIcon('apps-version-swap-versions') .
+                                               t3lib_iconWorks::getSpriteIcon('actions-version-swap-version') .
                                                '</a>' /* (
                                                        $this->table == 'pages' ?
                                                        '<a href="'.$this->doc->issueCommand('&cmd['.$this->table.']['.$this->uid.'][version][action]=swap&cmd['.$this->table.']['.$this->uid.'][version][swapWith]='.$row['uid'].'&cmd['.$this->table.']['.$this->uid.'][version][swapContent]=1').'">'.
@@ -614,12 +614,12 @@ class tx_version_cm1 extends t3lib_SCbase {
 
                        // Edit link:
                $adminLink = '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick('&edit['.$table.']['.$row['uid'].']=edit',$this->doc->backPath)).'" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.edit', TRUE) . '">'.
-                                                       t3lib_iconWorks::getSpriteIcon('actions-document-open') . 
+                                                       t3lib_iconWorks::getSpriteIcon('actions-document-open') .
                                                '</a>';
 
                        // Delete link:
                $adminLink.= '<a href="'.htmlspecialchars($this->doc->issueCommand('&cmd['.$table.']['.$row['uid'].'][delete]=1')).'" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:cm.delete', TRUE) . '">' .
-                                                       t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . 
+                                                       t3lib_iconWorks::getSpriteIcon('actions-edit-delete') .
                                                '</a>';
 
 
@@ -635,15 +635,15 @@ class tx_version_cm1 extends t3lib_SCbase {
                        $a_wp = t3lib_extMgm::isLoaded('cms') && $BE_USER->check('modules',$pageModule);
 
                        $adminLink.='<a href="#" onclick="top.loadEditId('.$row['uid'].');top.goToModule(\''.$pageModule.'\'); return false;">'.
-                                                       t3lib_iconWorks::getSpriteIcon('apps-version-page-open') .
+                                                       t3lib_iconWorks::getSpriteIcon('actions-page-open') .
                                                '</a>';
                        $adminLink.='<a href="#" onclick="top.loadEditId('.$row['uid'].');top.goToModule(\'web_list\'); return false;">'.
-                                                       t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . 
+                                                       t3lib_iconWorks::getSpriteIcon('actions-system-list-open') .
                                                '</a>';
 
                                // "View page" icon is added:
                        $adminLink.='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::viewOnClick($row['uid'],$this->doc->backPath,t3lib_BEfunc::BEgetRootLine($row['uid']))).'">'.
-                                       t3lib_iconWorks::getSpriteIcon('actions-document-view') . 
+                                       t3lib_iconWorks::getSpriteIcon('actions-document-view') .
                                '</a>';
                } else {
                        if ($row['pid']==-1)    {
@@ -651,7 +651,7 @@ class tx_version_cm1 extends t3lib_SCbase {
 
                                        // "View page" icon is added:
                                $adminLink.='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::viewOnClick($row['_REAL_PID'],$this->doc->backPath,t3lib_BEfunc::BEgetRootLine($row['_REAL_PID']),'','',$getVars)).'">'.
-                                               t3lib_iconWorks::getSpriteIcon('actions-document-view') . 
+                                               t3lib_iconWorks::getSpriteIcon('actions-document-view') .
                                        '</a>';
                        }
                }
@@ -809,7 +809,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                } else $table = '';
 
                $linkBack = t3lib_div::_GP('returnUrl') ? '<a href="' . htmlspecialchars(t3lib_div::_GP('returnUrl')) . '" class="typo3-goBack">' .
-                               t3lib_iconWorks::getSpriteIcon('actions-go-back') . $GLOBALS['LANG']->getLL('goBack', TRUE) . 
+                               t3lib_iconWorks::getSpriteIcon('actions-go-back') . $GLOBALS['LANG']->getLL('goBack', TRUE) .
                        '</a><br /><br />' : '';
                $resetDiffOnly = $this->diffOnly ? '<a href="index.php?id=' . intval($this->id) . '" class="typo3-goBack">' . $GLOBALS['LANG']->getLL('showAllInformation') . '</a><br /><br />' : '';
 
@@ -1680,7 +1680,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                                                '&cmd['.$table.']['.$rec_on['uid'].'][version][action]=swap'.
                                                '&cmd['.$table.']['.$rec_on['uid'].'][version][swapWith]='.$rec_off['uid']
                                                )).'" title="' . $GLOBALS['LANG']->getLL('publish', TRUE) . '">'.
-                                       t3lib_iconWorks::getSpriteIcon('apps-version-swap-versions') .
+                                       t3lib_iconWorks::getSpriteIcon('actions-version-swap-versions') .
                                '</a>';
                        if ($GLOBALS['BE_USER']->workspaceSwapAccess()) {
                                $actionLinks.=
@@ -1689,7 +1689,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                                                        '&cmd['.$table.']['.$rec_on['uid'].'][version][swapWith]='.$rec_off['uid'].
                                                        '&cmd['.$table.']['.$rec_on['uid'].'][version][swapIntoWS]=1'
                                                        )).'" title="' . $GLOBALS['LANG']->getLL('swap', TRUE) . '">'.
-                                               t3lib_iconWorks::getSpriteIcon('apps-version-swap-workspace') .
+                                               t3lib_iconWorks::getSpriteIcon('actions-version-swap-workspace') .
                                        '</a>';
                        }
                }
@@ -1698,7 +1698,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                                // Release
                        $actionLinks.=
                                '<a href="'.htmlspecialchars($this->doc->issueCommand('&cmd['.$table.']['.$rec_off['uid'].'][version][action]=clearWSID')).'" onclick="return confirm(\'' . $GLOBALS['LANG']->getLL('removeFromWorkspace', TRUE) . '?\');" title="' . $GLOBALS['LANG']->getLL('removeFromWorkspace', TRUE) . '">'.
-                                       t3lib_iconWorks::getSpriteIcon('apps-version-document-remove') .
+                                       t3lib_iconWorks::getSpriteIcon('actions-version-document-remove') .
                                '</a>';
 
                                // Edit
@@ -1706,13 +1706,13 @@ class tx_version_cm1 extends t3lib_SCbase {
                                $tempUid = ($vType==='branch' || $GLOBALS['BE_USER']->workspace===0 ? $rec_off['uid'] : $rec_on['uid']);
                                $actionLinks.=
                                        '<a href="#" onclick="top.loadEditId('.$tempUid.');top.goToModule(\''.$this->pageModule.'\'); return false;" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xml:img_title_edit_page', TRUE) . '">'.
-                                               t3lib_iconWorks::getSpriteIcon('apps-version-page-open') .
+                                               t3lib_iconWorks::getSpriteIcon('actions-version-page-open') .
                                        '</a>';
                        } else {
                                $params = '&edit['.$table.']['.$rec_off['uid'].']=edit';
                                $actionLinks.=
                                        '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->doc->backPath)).'" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xml:img_title_edit_element', TRUE). '">'.
-                                               t3lib_iconWorks::getSpriteIcon('actions-document-open') . 
+                                               t3lib_iconWorks::getSpriteIcon('actions-document-open') .
                                        '</a>';
                        }
                }