Index: class.tx_templavoila_api.php =================================================================== --- class.tx_templavoila_api.php (revision 27850) +++ class.tx_templavoila_api.php (working copy) @@ -1393,6 +1393,7 @@ 'sys_language_uid' => $row['sys_language_uid'], 'l18n_parent' => $row['l18n_parent'], 'CType' => $row['CType'], + 'TO' => $row['tx_templavoila_to'], ); if ($this->includePreviewData) { @@ -1421,6 +1422,7 @@ if (is_array ($currentTemplateObject)) $templateMappingArr = unserialize($currentTemplateObject['templatemapping']); $tree['ds_is_found'] = is_array($rawDataStructureArr); $tree['ds_meta'] = $rawDataStructureArr['meta']; + $flexformContentArr = t3lib_div::xml2array($row['tx_templavoila_flex']); if (!is_array($flexformContentArr)) $flexformContentArr = array(); Index: mod1/class.tx_templavoila_mod1_clipboard.php =================================================================== --- mod1/class.tx_templavoila_mod1_clipboard.php (revision 27850) +++ mod1/class.tx_templavoila_mod1_clipboard.php (working copy) @@ -153,7 +153,7 @@ $copyIcon = 'pObj->doc->backPath,'gfx/clip_copy'.($clipActive_copy ? '_h':'').'.gif','').' title="'.$LANG->getLL ('copyrecord').'" border="0" alt="" />'; $cutIcon = 'pObj->doc->backPath,'gfx/clip_cut'.($clipActive_cut ? '_h':'').'.gif','').' title="'.$LANG->getLL ('cutrecord').'" border="0" alt="" />'; - $refIcon = 'pObj->doc->backPath,t3lib_extMgm::extRelPath('templavoila').'mod1/clip_ref'.($clipActive_ref ? '_h':'').'.gif','').' title="'.$LANG->getLL ('createreference').'" border="0" alt="" />'; + $refIcon = 'pObj->doc->backPath,t3lib_extMgm::extRelPath('templavoila').'mod1/clip_ref'.($clipActive_ref ? '_h':'').'.gif','').' title="'.$LANG->getLL ('createreference').'" vspace="2" hspace="2" alt="" />'; $removeElement = '&CB[removeAll]=normal'; $setElement = '&CB[el]['.rawurlencode('tt_content|'.$elementRecord['uid']).']=1'; @@ -223,8 +223,8 @@ // Prepare the ingredients for the different buttons: $pasteMode = isset ($this->t3libClipboardObj->clipData['normal']['flexMode']) ? $this->t3libClipboardObj->clipData['normal']['flexMode'] : ($this->t3libClipboardObj->clipData['normal']['mode'] == 'copy' ? 'copy' : 'cut'); - $pasteAfterIcon = 'pObj->doc->backPath,'gfx/clip_pasteafter.gif','').' style="text-align: center; vertical-align: middle;" hspace="1" vspace="5" border="0" title="'.$LANG->getLL ('pasterecord').'" alt="" />'; - $pasteSubRefIcon = ''; + $pasteAfterIcon = 'pObj->doc->backPath,'gfx/clip_pasteafter.gif','').' title="'.$LANG->getLL ('pasterecord').'" alt="" />'; + $pasteSubRefIcon = ''; $sourcePointerString = $this->pObj->apiObj->flexform_getStringFromPointer ($clipboardElementPointer); $destinationPointerString = $this->pObj->apiObj->flexform_getStringFromPointer ($destinationPointer); @@ -284,15 +284,16 @@ $elementRows[] = ' - - '. - $cutButton. + + ' . + $cutButton . $languageIcon . ' - '.$languageIcon.' - '.$this->renderReferenceCount($row['uid']).' - '.$recordButton. - htmlspecialchars(' '.t3lib_div::fixed_lgd_cs(trim(strip_tags($row['header'].($row['header'] && $row['bodytext'] ? ' - ' : '').$row['bodytext'])),100)).' - + ' . + $this->renderReferenceCount($row['uid']) . + ' + ' . + $recordButton . htmlspecialchars(t3lib_BEfunc::getRecordTitle('tt_content', $row)) . + ' '; } @@ -315,13 +316,13 @@ // Create table and header cell: $output = ' - +
- + - '.implode('',$elementRows).' + ' . implode('', $elementRows) . ' - +
'.$LANG->getLL('inititemno_elementsNotBeingUsed','1').':' . $LANG->getLL('inititemno_elementsNotBeingUsed','1') . ':
'.$deleteAll.'' . $deleteAll . '
'; Index: mod1/index.php =================================================================== --- mod1/index.php (revision 27850) +++ mod1/index.php (working copy) @@ -353,6 +353,13 @@ $this->doc->divClass = ''; $this->doc->form='
'; + // Add custom styles + $styleSheetFile = t3lib_extMgm::extRelPath($this->extKey) . "mod1/pagemodule.css"; + if ($this->modTSconfig['properties']['stylesheet']) { + $styleSheetFile = $this->modTSconfig['properties']['stylesheet']; + } + $this->doc->styleSheetFile2 = $styleSheetFile; + // Adding classic jumpToUrl function, needed for the function menu. Also, the id in the parent frameset is configured. $this->doc->JScode = $this->doc->wrapScriptTags(' function jumpToUrl(URL) { // @@ -434,10 +441,10 @@ //Prototype /Scriptaculous // prototype is loaded before, so no need to include twice. //TODO: switch to $this->doc->JScodeLibArray for preventing double inclusion - #$this->doc->JScode .= ''; $this->doc->JScode .= ''; $this->doc->JScode .= ''; + // Set up JS for dynamic tab menu and side bar $this->doc->JScode .= $this->doc->getDynTabMenuJScode(); $this->doc->JScode .= $this->modTSconfig['properties']['sideBarEnable'] ? $this->sideBarObj->getJScode() : ''; @@ -449,10 +456,6 @@ $this->doc->postCode.= $CMparts[2]; // CSS for drag and drop - $this->doc->inDocStyles .= ' - table {position:relative;} - .sortableItem .sortable_handle {cursor:move;} - '; if (t3lib_extMgm::isLoaded('t3skin')) { // Fix padding for t3skin in disabled tabs @@ -489,7 +492,7 @@ $this->content .= $result; if ($GLOBALS['BE_USER']->isPSet($this->calcPerms, 'pages', 'edit')) { // Edit icon only if page can be modified by user - $this->content .= '

'.$this->link_edit('doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" style="border: none; vertical-align: middle" /> '.$LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage'),'pages',$this->id).''; + $this->content .= '

'.$this->link_edit('doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" /> '.$LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage'),'pages',$this->id).''; } $render_editPageScreen = false; // Do not output editing code for special doctypes! } @@ -724,8 +727,10 @@ $canEditPage = $GLOBALS['BE_USER']->isPSet($this->calcPerms, 'pages', 'edit'); $canEditContent = $GLOBALS['BE_USER']->isPSet($this->calcPerms, 'pages', 'editcontent'); + $elementClass = 'tpm-container-element'; + // Prepare the record icon including a content sensitive menu link wrapped around it: - $recordIcon = 'doc->backPath,$contentTreeArr['el']['icon'],'').' style="text-align: center; vertical-align: middle;" width="18" height="16" border="0" title="'.htmlspecialchars('['.$contentTreeArr['el']['table'].':'.$contentTreeArr['el']['uid'].']').'" alt="" />'; + $recordIcon = 'doc->backPath,$contentTreeArr['el']['icon'],'').' width="18" height="16" border="0" title="'.htmlspecialchars('['.$contentTreeArr['el']['table'].':'.$contentTreeArr['el']['uid'].']').'" alt="" />'; $menuCommands = array(); if ($GLOBALS['BE_USER']->isPSet($this->calcPerms, 'pages', 'new')) { $menuCommands[] = 'new'; @@ -745,27 +750,35 @@ switch ($contentTreeArr['el']['table']) { case 'pages' : - - $titleBarLeftButtons .= $this->translatorMode || !$canEditPage ? '' : $this->link_edit('doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" style="text-align: center; vertical-align: middle; border:0;" />',$contentTreeArr['el']['table'],$contentTreeArr['el']['uid']); + $elementTitlebarClass = 'tpm-titlebar-page'; + $elementClass .= ' pagecontainer'; + $titleBarLeftButtons .= $this->translatorMode || !$canEditPage ? '' : $this->link_edit('doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" />',$contentTreeArr['el']['table'],$contentTreeArr['el']['uid']); $titleBarRightButtons = ''; $addGetVars = ($this->currentLanguageUid?'&L='.$this->currentLanguageUid:''); $viewPageOnClick = 'onclick= "'.htmlspecialchars(t3lib_BEfunc::viewOnClick($contentTreeArr['el']['uid'], $this->doc->backPath, t3lib_BEfunc::BEgetRootLine($contentTreeArr['el']['uid']),'','',$addGetVars)).'"'; - $viewPageIcon = 'doc->backPath,'gfx/zoom.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.showPage',1).'" hspace="3" alt="" style="text-align: center; vertical-align: middle;" />'; + $viewPageIcon = 'doc->backPath,'gfx/zoom.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.showPage',1).'" hspace="3" alt="" />'; $titleBarLeftButtons .= ''.$viewPageIcon.''; break; case 'tt_content' : - $elementTitlebarColor = ($elementBelongsToCurrentPage ? $this->doc->bgColor5 : $this->doc->bgColor6); - $elementTitlebarStyle = 'background-color: '.$elementTitlebarColor; + $elementTitlebarClass = $elementBelongsToCurrentPage ? 'tpm-titlebar' : 'tpm-titlebar-fromOtherPage'; + $elementClass .= ' tpm-content-element tpm-ctype-' . $contentTreeArr['el']['CType']; + if ($contentTreeArr['el']['isHidden']) { + $elementClass .= ' tpm-hidden'; + } + if ($contentTreeArr['el']['CType'] == 'templavoila_pi1') { + //fce + $elementClass .= ' tpm-fce tpm-fce_' . intval($contentTreeArr['el']['TO']); + } $languageUid = $contentTreeArr['el']['sys_language_uid']; $elementPointer = 'tt_content:' . $contentTreeArr['el']['uid']; if (!$this->translatorMode && $canEditContent) { // Create CE specific buttons: - $linkMakeLocal = !$elementBelongsToCurrentPage && !in_array('makeLocal', $this->blindIcons) ? $this->link_makeLocal('doc->backPath,t3lib_extMgm::extRelPath('templavoila').'mod1/makelocalcopy.gif','').' title="'.$LANG->getLL('makeLocal').'" border="0" alt="" />', $parentPointer) : ''; + $linkMakeLocal = !$elementBelongsToCurrentPage && !in_array('makeLocal', $this->blindIcons) ? $this->link_makeLocal('doc->backPath,t3lib_extMgm::extRelPath('templavoila') . 'mod1/makelocalcopy.gif','').' title="'.$LANG->getLL('makeLocal').'" alt="" vspace="2" hspace="2" />', $parentPointer) : ''; if( $this->modTSconfig['properties']['enableDeleteIconForLocalElements'] < 2 || !$elementBelongsToCurrentPage || $this->global_tt_content_elementRegister[$contentTreeArr['el']['uid']] > 1 @@ -798,7 +811,7 @@ // Prepare the language icon: $languageLabel = htmlspecialchars ($this->allAvailableLanguages[$contentTreeArr['el']['sys_language_uid']]['title']); - $languageIcon = $this->allAvailableLanguages[$languageUid]['flagIcon'] ? ''.$languageLabel.'' : ($languageLabel && $languageUid ? '['.$languageLabel.']' : ''); + $languageIcon = $this->allAvailableLanguages[$languageUid]['flagIcon'] ? ''.$languageLabel.'' : ($languageLabel && $languageUid ? '['.$languageLabel.']' : ''); // If there was a language icon and the language was not default or [all] and if that langauge is accessible for the user, then wrap the flag with an edit link (to support the "Click the flag!" principle for translators) if ($languageIcon && $languageUid>0 && $GLOBALS['BE_USER']->checkLanguageAccess($languageUid) && $contentTreeArr['el']['table']==='tt_content') { @@ -833,8 +846,8 @@ // Finally assemble the table: $finalContent = ' - - +
+ - + @@ -937,21 +950,21 @@ $canEditContent = $GLOBALS['BE_USER']->isPSet($this->calcPerms, 'pages', 'editcontent'); if (!$this->translatorMode) { - + $cellContent .= '
'; // "New" icon: if ($canCreateNew && !in_array('new', $this->blindIcons)) { - $newIcon = 'doc->backPath,'gfx/new_el.gif','').' style="text-align: center; vertical-align: middle;" vspace="5" hspace="1" border="0" title="'.$LANG->getLL ('createnewrecord').'" alt="" />'; + $newIcon = 'doc->backPath,'gfx/new_el.gif','').' title="'.$LANG->getLL ('createnewrecord').'" alt="" />'; $cellContent .= $this->link_new($newIcon, $subElementPointer); } // "Browse Record" icon if (!in_array('browse', $this->blindIcons)) { - $newIcon = 'doc->backPath,'gfx/insert3.gif','').' style="text-align: center; vertical-align: middle;" vspace="5" hspace="1" border="0" title="'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.browse_db').'" alt="" />'; + $newIcon = 'doc->backPath,'gfx/insert3.gif','').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.browse_db').'" alt="" />'; $cellContent .= $this->link_browse($newIcon, $subElementPointer); } // "Paste" icon - $cellContent .= '' . $this->clipboardObj->element_getPasteButtons ($subElementPointer) . ''; + $cellContent .= '' . $this->clipboardObj->element_getPasteButtons ($subElementPointer) . '
'; } // Render the list of elements (and possibly call itself recursively if needed): @@ -983,20 +996,21 @@ $cellContent .= $this->render_framework_allSheets($subElementArr, $languageKey, $subElementPointer, $elementContentTreeArr['ds_meta']); if (!$this->translatorMode) { + $cellContent .= '
'; // "New" icon: if ($canCreateNew && !in_array('new', $this->blindIcons)) { - $newIcon = 'doc->backPath,'gfx/new_el.gif','').' style="text-align: center; vertical-align: middle;" vspace="5" hspace="1" border="0" title="'.$LANG->getLL ('createnewrecord').'" alt="" />'; + $newIcon = 'doc->backPath,'gfx/new_el.gif','').' title="'.$LANG->getLL ('createnewrecord').'" alt="" />'; $cellContent .= $this->link_new($newIcon, $subElementPointer); } // "Browse Record" icon if (!in_array('browse', $this->blindIcons)) { - $newIcon = 'doc->backPath,'gfx/insert3.gif','').' style="text-align: center; vertical-align: middle;" vspace="5" hspace="1" border="0" title="'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.browse_db').'" alt="" />'; + $newIcon = 'doc->backPath,'gfx/insert3.gif','').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.browse_db').'" alt="" />'; $cellContent .= $this->link_browse($newIcon, $subElementPointer); } // "Paste" icon - $cellContent .= '' . $this->clipboardObj->element_getPasteButtons ($subElementPointer) . '
'; + $cellContent .= '' . $this->clipboardObj->element_getPasteButtons ($subElementPointer) . ''; } } else { @@ -1051,7 +1065,7 @@ // Compile the content area for the current element (basically what was put together above): if (count ($headerCells) || count ($cells)) { $output = ' -
' . '' . $languageIcon . @@ -847,10 +860,10 @@ $titleBarRightButtons . '
' . $this->render_framework_subElements($contentTreeArr, $languageKey, $sheet) . - $previewContent . + '
' . $previewContent . '
' . $this->render_localizationInfoTable($contentTreeArr, $parentPointer, $parentDsMeta) . '
+
'.(count($headerCells) ? implode('', $headerCells) : '').''.(count($cells) ? implode('', $cells) : '').'
 
 
@@ -1374,7 +1388,7 @@ } $output = count($tRows) ? ' - +
@@ -1476,14 +1490,15 @@ } // Compile table row: - $output.=' + $class = ($entry['isNewVersion']?'bgColor5':'bgColor4') . ' ' . $entry['elementTitlebarClass']; + $output.=''; } - $output = '
'.$LANG->getLL('element_localizations',1).':
'.$indent.$entry['icon'].$entry['flag'].$entry['title'].' '.$entry['controls'].' '.$status.$entry['warnings'].($entry['isNewVersion']?$this->doc->icons(1).'New version!':'').' '.htmlspecialchars($entry['id'] ? $entry['id'] : $entry['table'].':'.$entry['uid']).'
'.$output.'
'; + $output = '' . $output . '
'; // Show link for cleaning all XML structures: if ($xmlCleanCandidates) { @@ -1515,19 +1530,19 @@ $elementBelongsToCurrentPage = $contentTreeArr['el']['table'] == 'pages' || $contentTreeArr['el']['pid'] == $this->rootElementUid_pidForContent; // Prepare the record icon including a context sensitive menu link wrapped around it: - $recordIcon = 'doc->backPath,$contentTreeArr['el']['icon'],'').' style="text-align: center; vertical-align: middle;" width="18" height="16" border="0" title="'.htmlspecialchars('['.$contentTreeArr['el']['table'].':'.$contentTreeArr['el']['uid'].']').'" alt="" />'; + $recordIcon = 'doc->backPath,$contentTreeArr['el']['icon'],'').' width="18" height="16" title="'.htmlspecialchars('['.$contentTreeArr['el']['table'].':'.$contentTreeArr['el']['uid'].']').'" alt="" />'; $titleBarLeftButtons = $this->translatorMode ? $recordIcon : $this->doc->wrapClickMenuOnIcon($recordIcon,$contentTreeArr['el']['table'], $contentTreeArr['el']['uid'], 1,'&callingScriptId='.rawurlencode($this->doc->scriptID), 'new,copy,cut,pasteinto,pasteafter,delete'); $titleBarLeftButtons.= $this->getRecordStatHookValue($contentTreeArr['el']['table'],$contentTreeArr['el']['uid']); // Prepare table specific settings: switch ($contentTreeArr['el']['table']) { case 'pages' : - $titleBarLeftButtons .= $this->translatorMode ? '' : $this->link_edit('doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" style="text-align: center; vertical-align: middle; border:0;" />',$contentTreeArr['el']['table'],$contentTreeArr['el']['uid']); + $titleBarLeftButtons .= $this->translatorMode ? '' : $this->link_edit('doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" />',$contentTreeArr['el']['table'],$contentTreeArr['el']['uid']); $titleBarRightButtons = ''; $addGetVars = ($this->currentLanguageUid?'&L='.$this->currentLanguageUid:''); $viewPageOnClick = 'onclick= "'.htmlspecialchars(t3lib_BEfunc::viewOnClick($contentTreeArr['el']['uid'], $this->doc->backPath, t3lib_BEfunc::BEgetRootLine($contentTreeArr['el']['uid']),'','',$addGetVars)).'"'; - $viewPageIcon = 'doc->backPath,'gfx/zoom.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.showPage',1).'" hspace="3" alt="" style="text-align: center; vertical-align: middle;" />'; + $viewPageIcon = 'doc->backPath,'gfx/zoom.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.showPage',1).'" hspace="3" alt="" />'; $titleBarLeftButtons .= ''.$viewPageIcon.''; break; case 'tt_content' : @@ -1538,7 +1553,7 @@ $titleBarRightButtons = ''; } else { // Create CE specific buttons: - $linkMakeLocal = !$elementBelongsToCurrentPage ? $this->link_makeLocal('doc->backPath,t3lib_extMgm::extRelPath('templavoila').'mod1/makelocalcopy.gif','').' title="'.$LANG->getLL('makeLocal').'" border="0" alt="" />', $parentPointer) : ''; + $linkMakeLocal = !$elementBelongsToCurrentPage ? $this->link_makeLocal('doc->backPath,t3lib_extMgm::extRelPath('templavoila') . 'mod1/makelocalcopy.gif','').' title="'.$LANG->getLL('makeLocal').'" vspace="2" hspace="2" alt="" />', $parentPointer) : ''; if( $this->modTSconfig['properties']['enableDeleteIconForLocalElements'] < 2 || !$elementBelongsToCurrentPage || $this->global_tt_content_elementRegister[$contentTreeArr['el']['uid']] > 1 @@ -1563,7 +1578,7 @@ // Prepare the language icon: $languageLabel = htmlspecialchars ($this->allAvailableLanguages[$contentTreeArr['el']['sys_language_uid']]['title']); - $languageIcon = $this->allAvailableLanguages[$languageUid]['flagIcon'] ? ''.$languageLabel.'' : ($languageLabel && $languageUid ? '['.$languageLabel.']' : ''); + $languageIcon = $this->allAvailableLanguages[$languageUid]['flagIcon'] ? ''.$languageLabel.'' : ($languageLabel && $languageUid ? '['.$languageLabel.']' : ''); // If there was a langauge icon and the language was not default or [all] and if that langauge is accessible for the user, then wrap the flag with an edit link (to support the "Click the flag!" principle for translators) if ($languageIcon && $languageUid>0 && $GLOBALS['BE_USER']->checkLanguageAccess($languageUid) && $contentTreeArr['el']['table']==='tt_content') { @@ -1599,7 +1614,7 @@ 'uid' => $contentTreeArr['el']['uid'], 'flag' => $languageIcon, 'isNewVersion' => $contentTreeArr['el']['_ORIG_uid'] ? TRUE : FALSE, - 'elementTitlebarStyle' => (!$elementBelongsToCurrentPage ? 'background-color: '.$this->doc->bgColor6 : '') + 'elementTitlebarClass' => (!$elementBelongsToCurrentPage ? 'tpm-elementRef' : 'tpm-element') . ' tpm-outline-level' . $indentLevel ); @@ -1659,7 +1674,7 @@ if (!$this->translatorMode) { // "New" and "Paste" icon: - $newIcon = 'doc->backPath,'gfx/new_el.gif','').' style="text-align: center; vertical-align: middle;" vspace="5" hspace="1" border="0" title="'.$LANG->getLL ('createnewrecord').'" alt="" />'; + $newIcon = 'doc->backPath,'gfx/new_el.gif','').' title="'.$LANG->getLL ('createnewrecord').'" alt="" />'; $controls = $this->link_new($newIcon, $subElementPointer); $controls .= $this->clipboardObj->element_getPasteButtons($subElementPointer); } @@ -1671,7 +1686,8 @@ 'icon' => '', 'title' => ''.$LANG->sL($fieldContent['meta']['title'],1).''.($specialPath ? ' '.htmlspecialchars($specialPath).'' : ''), 'id' => '<'.$sheet.'><'.$lKey.'><'.$fieldID.'><'.$vKey.'>', - 'controls' => $controls + 'controls' => $controls, + 'elementTitlebarClass' => 'tpm-container tpm-outline-level' . $indentLevel, ); // Render the list of elements (and possibly call itself recursively if needed): @@ -1685,7 +1701,7 @@ if (!$this->translatorMode) { // "New" and "Paste" icon: - $newIcon = 'doc->backPath,'gfx/new_el.gif','').' style="text-align: center; vertical-align: middle;" vspace="5" hspace="1" border="0" title="'.$LANG->getLL ('createnewrecord').'" alt="" />'; + $newIcon = 'doc->backPath,'gfx/new_el.gif','').' title="'.$LANG->getLL ('createnewrecord').'" alt="" />'; $controls = $this->link_new($newIcon, $subElementPointer); $controls .= $this->clipboardObj->element_getPasteButtons ($subElementPointer); } @@ -1741,7 +1757,7 @@ 'title' => t3lib_BEfunc::getRecordTitle('tt_content', $olrow), 'table' => 'tt_content', 'uid' => $olrow['uid'], - 'flag' => $flagLink_begin.($sLInfo['flagIcon'] ? ''.htmlspecialchars($sLInfo['title']).'' : $sLInfo['title']).$flagLink_end, + 'flag' => $flagLink_begin.($sLInfo['flagIcon'] ? ''.htmlspecialchars($sLInfo['title']).'' : $sLInfo['title']).$flagLink_end, 'isNewVersion' => $olrow['_ORIG_uid'] ? TRUE : FALSE, ); break; @@ -1796,7 +1812,7 @@ $table != 'pages' && ($this->calcPerms & 16)) && (!$this->translatorMode || $forced)) { if($table == "pages" && $this->currentLanguageUid) { - return ''.$label.''; + return ''.$label.''; } else { $onClick = t3lib_BEfunc::editOnClick('&edit['.$table.']['.$uid.']=edit', $this->doc->backPath); return ''.$label.''; @@ -1948,7 +1964,7 @@ function link_makeLocal($label, $makeLocalPointer) { global $LANG; - return ''.$label.''; + return ''.$label.''; } /** Index: mod1/pagemodule.css =================================================================== --- mod1/pagemodule.css (revision 0) +++ mod1/pagemodule.css (revision 0) @@ -0,0 +1,85 @@ +/* PAGEMODULE CSS */ + +/* general */ +table { + position:relative; +} +.sortableItem .sortable_handle { + cursor:move; +} + + +/* link icons */ +.tpm-bottom-controls { + margin-bottom: 5px; +} +.tpm-bottom-controls img { + border: none ; + text-align: center; + vertical-align: middle; + padding: 0 1px; +} + +/* element titlebars */ +.tpm-container-element tr.tpm-titlebar-page { + background-color: #B8BEC9; +} +.tpm-container-element tr.tpm-titlebar { + background-color: #f8f9fb; +} +.tpm-container-element tr.tpm-titlebar-fromOtherPage { + background-color: #e6e9eb; +} +.tpm-container-element tr.tpm-titlebar img, +.tpm-container-element tr.tpm-titlebar-fromOtherPage img, +.tpm-container-element tr.tpm-titlebar-page img { + vertical-align: middle; + padding: 2px 1px; +} +.tpm-container-element tr.tpm-titlebar span img, +.tpm-container-element tr.tpm-titlebar-fromOtherPage span img, +.tpm-container-element tr.tpm-titlebar-page span img { + padding-right: 3px; +} + +/* non-used elements */ +.tpm-nonused-element { + +} +.tpm-nonused-controls { + width: 36px; + padding-left: 4px; +} +.tpm-nonused-ref { + width: 20px; +} +.tpm-nonused-element img, +.tpm-nonused-deleteall img { + vertical-align: middle; + padding: 2px 1px; +} +.tpm-nonused-element .tpm-nonused-preview img { + padding-right: 3px; +} +.tpm-nonused-deleteall { + padding: 5px 0; +} + +/* outline view */ +.tpm-outline-table .tpm-container img, +.tpm-outline-table .tpm-element img, +.tpm-outline-table .tpm-elementRef img { + vertical-align: middle; + padding: 0 1px; +} +.tpm-outline-table .tpm-container td.nobr img, +.tpm-outline-table .tpm-element td.nobr img, +.tpm-outline-table .tpm-elementRef td.nobr img { + padding-right: 3px; +} +.tpm-outline-table .tpm-outline-level0 { + background-color: #b8bec9; +} +.tpm-outline-table .tpm-outline-level1 { + background-color: #f8f9fb; +}