Index: t3lib/class.t3lib_tceforms.php =================================================================== --- t3lib/class.t3lib_tceforms.php (Revision 7946) +++ t3lib/class.t3lib_tceforms.php (Arbeitskopie) @@ -658,7 +658,7 @@ $content = implode('', $sheetContent); if ($content) { // Wrap content (row) with table-tag, otherwise tab/sheet will be disabled (see getdynTabMenu() ) - $content = '
' . $content . '
'; + $content = ''.$content.'
'; } $parts[$idx] = array( 'label' => $out_array_meta[$idx]['title'], @@ -679,9 +679,11 @@ } $output = ' -
+ + '.$output.' -
'; + + '; } else { // Only one, so just implode: @@ -1805,8 +1807,8 @@ $hasHelp = ($p[3] !=''); $label = t3lib_div::deHSCentities(htmlspecialchars($p[0])); - $help = $hasHelp ? '

' . $label . '

' . - '

' . $GLOBALS['LANG']->hscAndCharConv(nl2br(trim(htmlspecialchars($p[3]))), false) . '

' : ''; + $help = $hasHelp ? '' . $label . '' . + '' . $GLOBALS['LANG']->hscAndCharConv(nl2br(trim(htmlspecialchars($p[3]))), false) . '' : ''; if ($hasHelp && $this->edit_showFieldHelp == 'icon') { $helpIcon = ''; @@ -4783,36 +4785,48 @@ // Wrapping all table rows for a particular record being edited: $this->totalWrap=' -

###PAGE_TITLE###

+

###PAGE_TITLE###

-
- | -
- ###RECORD_ICON### ###TABLE_TITLE### ###ID_NEW_INDICATOR### -
-
'; + '. + ' + + '. + '|'. + ' + + + +
###RECORD_ICON### ###TABLE_TITLE### ###ID_NEW_INDICATOR### - ###RECORD_LABEL###
'; // Wrapping a single field: $this->fieldTemplate=' -
- ###FIELD_HELP_ICON### ###FIELD_HELP_TEXT### - - ###FIELD_ITEM######FIELD_PAL_LINK_ICON### -
'; + + ###FIELD_HELP_ICON### + ###FIELD_NAME######FIELD_HELP_TEXT### + + + + ###FIELD_ITEM######FIELD_PAL_LINK_ICON### + '; $this->palFieldTemplate=' -
- ###FIELD_PALETTE### -
'; + + + ###FIELD_PALETTE### + '; $this->palFieldTemplateHeader=' -
- ###FIELD_HEADER### -
'; + + + ###FIELD_HEADER### + '; $this->sectionWrap=' -
- ###CONTENT### -
+ + + + + ###CONTENT###
+ '; } @@ -4892,6 +4906,8 @@ $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.new',1). ''; + // Kasper: Should not be used here because NEW records are not offline workspace versions... + #t3lib_BEfunc::fixVersioningPid($table,$rec); $truePid = t3lib_BEfunc::getTSconfig_pidValue($table, $rec['uid'], $rec['pid']); $prec = t3lib_BEfunc::getRecordWSOL('pages', $truePid, 'title'); $pageTitle = t3lib_BEfunc::getRecordTitle('pages', $prec, TRUE, FALSE); @@ -4949,6 +4965,7 @@ // Make substitutions: $arr[$k] = str_replace('###PAGE_TITLE###', $pageTitle, $arr[$k]); $arr[$k] = str_replace('###ID_NEW_INDICATOR###', $newLabel, $arr[$k]); + $arr[$k] = str_replace('###RECORD_LABEL###', $rLabel, $arr[$k]); $arr[$k] = str_replace('###TABLE_TITLE###',htmlspecialchars($this->sL($TCA[$table]['ctrl']['title'])),$arr[$k]); $titleA=t3lib_BEfunc::titleAltAttrib($this->getRecordPath($table,$rec)); @@ -4992,6 +5009,11 @@ $inTemplate = str_replace('###BGCOLOR_HEAD###',$this->colorScheme[1]?' bgcolor="'.$this->colorScheme[1].'"':'',$inTemplate); $inTemplate = str_replace('###FONTCOLOR_HEAD###',$this->colorScheme[3],$inTemplate); + // Classes: + $inTemplate = str_replace('###CLASSATTR_1###',$this->classScheme[0]?' class="'.$this->classScheme[0].'"':'',$inTemplate); + $inTemplate = str_replace('###CLASSATTR_2###',$this->classScheme[1]?' class="'.$this->classScheme[1].'"':'',$inTemplate); + $inTemplate = str_replace('###CLASSATTR_4###',$this->classScheme[3]?' class="'.$this->classScheme[3].'"':'',$inTemplate); + return $inTemplate; } @@ -5012,6 +5034,27 @@ * @return string HTML output */ function printPalette($palArr) { + $fieldAttributes = $labelAttributes = ''; + + // Init color/class attributes: + if ($this->colorScheme[2]) { + $labelAttributes .= ' bgcolor="' . $this->colorScheme[2] . '"'; + } + + if ($this->classScheme[2]) { + $labelAttributes .= ' class="t3-form-palette-field-label ' . $this->classScheme[2] . '"'; + } else { + $labelAttributes .= ' class="t3-form-palette-field-label"'; + } + + if ($this->colorScheme[4]) { + $fieldAttributes .= ' style="color: ' . $this->colorScheme[4] . '"'; + } + + if ($this->classScheme[4]) { + $fieldAttributes .= ' class="t3-form-palette-field' . $this->classScheme[4] . '"'; + } + $row = 0; $hRow = $iRow = array(); $lastLineWasLinebreak = FALSE; @@ -5027,14 +5070,14 @@ $lastLineWasLinebreak = FALSE; $fieldIdentifierForJs = $content['TABLE'] . '_' . $content['ID'] . '_' . $content['FIELD']; $iRow[$row][] = '' . - $content['HELP_ICON'] . - '' . - '' . + '' . $content['ITEM'] . + $content['HELP_ICON'] . '' . ''; } @@ -5063,7 +5106,7 @@ return t3lib_BEfunc::helpTextIcon($table, $field, $this->backPath, $force); } else { // Detects fields with no CSH and outputs dummy line to insert into CSH locallang file: - return ' '; + return ' '; } } Index: typo3/sysext/t3skin/stylesheets/structure/element_tceforms.css =================================================================== --- typo3/sysext/t3skin/stylesheets/structure/element_tceforms.css (Revision 7946) +++ typo3/sysext/t3skin/stylesheets/structure/element_tceforms.css (Arbeitskopie) @@ -3,101 +3,253 @@ $Id$ - - - - - - - - - - - - - - - - - - - - - */ +img.t3-TCEforms-reqImg { + display: inline-block; + height: 16px; + margin-left: 3px; + margin-right: 3px; + margin-top: 4px; + width: 16px; +} -.t3-form-sheet { - padding: 10px 0; +img.t3-TCEforms-reqTabImg { + height: 16px; + margin-left: 4px; + margin-bottom: -3px; + width: 16px; } -.t3-form-field { - margin: 0 10px; - padding: 9px 0; +img.t3-TCEforms-contentchangedImg { + display: inline-block; + margin-bottom: 2px; + width: 7px; } -.t3-form-palField .t3-form-palette-fieldset { - margin: 0px 10px 10px; +.t3-form-palette-icon-required { + display: inline-block; + height: 16px; + margin-right: 2px; + width: 16px; } +/* renamed to .t3-form-palette-icon-required, lines below kept for backwards-compatibility */ +img.t3-TCEforms-reqPaletteImg { + display: inline-block; + height: 16px; + margin-right: 2px; + width: 16px; +} -.t3-form-palFieldHeader { - margin: 15px 12px 5px; +.t3-form-palette-icon-contentchanged { + width: 7px; } +/* renamed to .t3-form-palette-icon-contentchanged, lines below kept for backwards-compatibility */ +img.t3-TCEforms-contentchangedPaletteImg { + width: 7px; +} -.t3-form-palFieldHeader strong { - font-weight: bold; +table.typo3-TCEforms { + width: 93%; } -.t3-form-field-label { - display: inline-block; - width: 80px; +table.typo3-TCEforms .bgColor2, +table.typo3-TCEforms tr.bgColor2 td { + padding-bottom: 5px; } -.t3-icon-system-options-view, -.t3-form-field img, -.t3-form-palette-field img { - margin-left: 4px; +table.typo3-TCEforms optgroup.c-divider, +select option.c-divider { + margin-top: 10px; + padding: 0px; } -.typo3-TCEforms-selectIcons img { - margin-left: 0; +table.typo3-TCEforms optgroup option { + margin: 0px; + padding: 2px; } -.t3-form-field textarea, -.t3-form-field table { - vertical-align: top; - display: inline; + +table.typo3-TCEforms select.icon-select option { + padding-left: 22px; } -.t3-form-recHeaderRow { +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox { + margin-bottom: 10px; + width: 98%; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr td { + padding: 1px 3px 1px 3px; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr td.c-labelCell { + padding-right: 30px; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr td.c-labelCell P.c-descr { + margin-left: 30px; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr.c-header td { + padding-left: 4px; + padding-top: 10px; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr.c-header-checkbox-controls td { + padding-right: 16px; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr.c-header-checkbox-controls td a { + padding-left: 16px; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox td.c-descr img { float: right; - margin-top: 15px; } -.t3-form-palette-field-container { - display: inline-block; - width: 300px; - margin: 3px 20px 3px 0; +table.typo3-TCEforms table.typo3-TCEforms-select-singlebox { + margin-bottom: 10px; + margin-top: 4px; } -.t3-form-palette-field-label { - display: inline-block; - margin-left: 4px; - width: 98px; +table.typo3-TCEforms div.typo3-dyntabmenu-tabs { + margin-top: 10px; } -.t3-form-palette-field select { - width: 125px; +.checkbox, +.checkbox:hover { + margin: 4px 0 4px 2px; } -.t3-form-palette-field .tceforms-textfield { - width: 101px !important; +table.typo3-TCEforms .class-main1 td, +table.typo3-TCEforms .class-main11 td, +table.typo3-TCEforms .class-main21 td, +table.typo3-TCEforms .class-main31 td, +table.typo3-TCEforms .class-main41 td, +table.typo3-TCEforms .class-main51 td { + padding: 2px 0px 2px 0px; } -.t3-form-palette-field table { - display: inline; +table.typo3-TCEforms .class-main2 td, +table.typo3-TCEforms .class-main12 td, +table.typo3-TCEforms .class-main22 td, +table.typo3-TCEforms .class-main32 td, +table.typo3-TCEforms .class-main42 td, +table.typo3-TCEforms .class-main52 td { + padding: 2px 0px 2px 0px; +} + +table.typo3-TCEforms .class-main3, +table.typo3-TCEforms .class-main13, +table.typo3-TCEforms .class-main23, +table.typo3-TCEforms .class-main33, +table.typo3-TCEforms .class-main43, +table.typo3-TCEforms .class-main53 { + padding: 2px 0px 2px 0px; +} + +table.typo3-TCEforms .formField, +table.typo3-TCEforms .formField1, +table.typo3-TCEforms .formField2, +table.typo3-TCEforms .formField3, +table.typo3-TCEforms .formField4, +table.typo3-TCEforms .formField5 { + margin: 4px 2px; + padding: 1px; vertical-align: middle; } -.t3-form .t3-csh-not-available { - display: inline-block; - width: 18px; +table.typo3-TCEforms .wrapperTable, +table.typo3-TCEforms .wrapperTable1, +table.typo3-TCEforms .wrapperTable2, +table.typo3-TCEforms .wrapperTable3, +table.typo3-TCEforms .wrapperTable4, +table.typo3-TCEforms .wrapperTable5 { + margin: 0 0 5px 0; } -.formField5 { - width: 300px !important; +table.typo3-TCEforms td.icons { + padding: 6px 2px; } -.formField5.tceforms-multiselect { - width: 300px !important; +table.typo3-TCEforms td.thumbnails { + padding-top: 6px; } -.typo3-TCEforms-flexForm .bgColor5 { - width: 200px; +.typo3-TCEforms-palette .typo3-csh-link img { + padding-top: 3px; + vertical-align: top; } -.typo3-TCEforms-flexForm { - padding: 10px 0; +.typo3-TCEforms-palette selct.select { + margin-top: 2px; } -.typo3-TCEforms-flexForm > div { - margin: 0 10px; - padding: 9px 0; +.t3-form-palette-field-container { + display:inline-block; + margin-left:20px; + vertical-align:top; } + +.t3-form-palette-field-container .t3-form-palette-field-label, .t3-form-palette-field-container .t3-form-palette-field { + display:block; +} + +/* - - - - - - - - - - - - - - - - - - - - - +TCEforms suggest +- - - - - - - - - - - - - - - - - - - - - */ +div.typo3-TCEforms-suggest-position-right { + margin-left: 10px; + margin-top: 5px; +} + +div.typo3-TCEforms-suggest label { + margin-right: 5px; +} + +div.typo3-TCEforms-suggest-indicator { + left: 230px; + position: relative; + top: -18px; +} + +div.typo3-TCEforms-suggest-choices { + position: absolute; + width: 250px; +} + +div.typo3-TCEforms-suggest-choices ul { + margin: 0; + padding: 0; +} + +div.typo3-TCEforms-suggest-choices li { + display: block; + margin: 0; + padding: 4px 2px 4px 24px; +} + +div.typo3-TCEforms-suggest-choices li.suggest-noresults { + height: auto; +} + +div.typo3-TCEforms-suggest-choices span.suggest-uid { + margin-left: 0.3em; +} + +div.typo3-TCEforms-suggest-choices span.suggest-path { + margin-top: 0.3em; +} + +input.typo3-TCEforms-suggest-search { + width: 200px; + padding-left: 20px; + vertical-align: middle; +} + +/* - - - - - - - - - - - - - - - - - - - - - +TCEforms Inline-Relational-Record-Editing +- - - - - - - - - - - - - - - - - - - - - */ + +.typo3-TCEforms div.inlineDivMSIE { + display: inline-block; +} \ No newline at end of file Index: typo3/sysext/t3skin/stylesheets/visual/element_tceforms.css =================================================================== --- typo3/sysext/t3skin/stylesheets/visual/element_tceforms.css (Revision 7946) +++ typo3/sysext/t3skin/stylesheets/visual/element_tceforms.css (Arbeitskopie) @@ -4,20 +4,258 @@ $Id$ - - - - - - - - - - - - - - - - - - - - - */ -.t3-form-field { - border-top: 1px solid #cdcdcd; +table.typo3-TCEforms { + border-collapse: collapse; } -.t3-form-section:first-child > .t3-form-field:first-child { - border-top: 0; +table.typo3-TCEforms tr.bgColor2 td { + color: #212424; } -.t3-form-palField .t3-form-palette-fieldset { - border: 0; +table.typo3-TCEforms tr.bgColor2 { + background-image: none; } -.typo3-TCEforms-flexForm .bgColor4, -.typo3-TCEforms-flexForm .bgColor5 { - background: none; - display: inline-block; +table#typo3-altdoc-header input, +.c-inputButton { + background: none; + border: 0; } + +.checkbox, +.checkbox:hover { + background: #efeff4; + border: 0; +} + +table.typo3-TCEforms table#typo3-altdoc-header input:hover, +.c-inputButton:hover { + background: none; + border: 0; +} + +table.typo3-TCEforms span.typo3-TCEforms-recHeader { + color: #333366; + font-weight: bold; +} + +table.typo3-TCEforms tr.typo3-TCEforms-recHeaderRow td { + text-align: right; +} + +table.typo3-TCEforms span.typo3-TCEforms-newToken { + color: #990000; + font-weight: bold; +} + +table.typo3-TCEforms span.typo3-TCEforms-helpText { + background: transparent; + color: #fff; +} + +table.typo3-TCEforms-select-checkbox { + background-color: #efeff4; + border: 1px solid #aaa; +} + +table.typo3-TCEforms-select-checkbox tr { + background-color: #efeff4; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr.c-selectedItem { + background-color: #d7dbe2; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr.c-unselectedItem { + background-color: #efeff4; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr.c-invalidItem { + background-color: #ff6600; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr.c-header-checkbox-controls td { + background-color: #b8bec9; + text-align: right; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr.c-header-checkbox-controls td a { + color: white; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr.c-header td { + background-color: #fff; + border-bottom: 1px solid #999999; + font-weight: bold; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr td { + border-bottom: 1px #999 dashed; +} + +table.typo3-TCEforms table.typo3-TCEforms-select-checkbox tr td.c-labelCell p.c-descr { + font-style: italic; +} + +table.typo3-TCEforms optgroup.c-divider, +select option.c-divider { + background-color: #eee; + border-top: 1px solid #666; + color: #666; + font-style: italic; + text-transform: uppercase; +} + +table.typo3-TCEforms optgroup option { + background-color: white; + border-bottom: none; + color: black; + font-style: normal; + text-indent: 0px; + text-transform: none; +} + +table.typo3-TCEforms div.typo3-TCEforms-originalLanguageValue { + background-color: #bbccbb; +} + +table.typo3-TCEforms div.typo3-TCEforms-diffBox { + background-color: white; + border: 1px solid black; +} + +table.typo3-TCEforms div.typo3-TCEforms-diffBox-header { + background-color: red; + font-weight: bold; +} + +/* Default. Always used on main-palettes in the bottom of the forms */ +table.typo3-TCEforms .class-main1, +table.typo3-TCEforms .class-main11, +table.typo3-TCEforms .class-main21, +table.typo3-TCEforms .class-main31, +table.typo3-TCEforms .class-main41, +table.typo3-TCEforms .class-main51 { + background: #efeff4; +} + +table.typo3-TCEforms .class-main2 td, +table.typo3-TCEforms .class-main12 td, +table.typo3-TCEforms .class-main22 td, +table.typo3-TCEforms .class-main32 td, +table.typo3-TCEforms .class-main42 td, +table.typo3-TCEforms .class-main52 td { + color: #fff; +} + +table.typo3-TCEforms .class-main2, +table.typo3-TCEforms .class-main12, +table.typo3-TCEforms .class-main22, +table.typo3-TCEforms .class-main32, +table.typo3-TCEforms .class-main42, +table.typo3-TCEforms .class-main52 { + background-color: #b8bec9; + background-image: url('../../icons/gfx/alt_menu_mainitem_bg.gif'); + background-position: top left; + background-repeat: repeat-x; +} + +table.typo3-TCEforms table.wrapperAttention .class-main2, +table.typo3-TCEforms table.wrapperAttention .class-main12, +table.typo3-TCEforms table.wrapperAttention .class-main22, +table.typo3-TCEforms table.wrapperAttention .class-main32, +table.typo3-TCEforms table.wrapperAttention .class-main42, +table.typo3-TCEforms table.wrapperAttention .class-main52 { + background-color: #a30904; + background-image: none; + background-position: top left; + background-repeat: repeat-x; +} + + +table.typo3-TCEforms .class-main4, +table.typo3-TCEforms .class-main14, +table.typo3-TCEforms .class-main24, +table.typo3-TCEforms .class-main34, +table.typo3-TCEforms .class-main44, +table.typo3-TCEforms .class-main54 { + color: #fff; +} + +table.typo3-TCEforms .class-main5, +table.typo3-TCEforms .class-main15, +table.typo3-TCEforms .class-main25, +table.typo3-TCEforms .class-main35, +table.typo3-TCEforms .class-main45, +table.typo3-TCEforms .class-main55 { + color: #3c3c44; +} + +table.typo3-TCEforms .wrapperTable, +table.typo3-TCEforms .wrapperTable1, +table.typo3-TCEforms .wrapperTable2, +table.typo3-TCEforms .wrapperTable3, +table.typo3-TCEforms .wrapperTable4, +table.typo3-TCEforms .wrapperTable5 { + border: 1px solid #a2aab8; +} + +table.typo3-TCEforms table.wrapperAttention .wrapperTable, +table.typo3-TCEforms table.wrapperAttention .wrapperTable1, +table.typo3-TCEforms table.wrapperAttention .wrapperTable2, +table.typo3-TCEforms table.wrapperAttention .wrapperTable3, +table.typo3-TCEforms table.wrapperAttention .wrapperTable4, +table.typo3-TCEforms table.wrapperAttention .wrapperTable5 { + border: 1px solid #a30904; +} + +.t3-form-palette-fieldset { + border:none; +} + +input.typo3-TCEforms-suggest-search { + background-image: url('../../icons/gfx/zoom.gif'); + background-position: 2px center; + background-repeat: no-repeat; +} + +div.typo3-TCEforms-suggest-choices { + background-color: white; + border: 1px solid #888; +} + +div.typo3-TCEforms-suggest-choices ul { + list-style-type: none; +} + +div.typo3-TCEforms-suggest-choices li.selected { + background-color: #ffb !important; +} + +div.typo3-TCEforms-suggest-choices li { + cursor: pointer; + background-color: #efeff4; + background-repeat: no-repeat; + background-position: 4px center; + list-style-type: none; +} + +div.typo3-TCEforms-suggest-choices li.pages { + background-color: #fcc; +} + +div.typo3-TCEforms-suggest-choices span.suggest-uid { + font-size: 0.9em; +} + +div.typo3-TCEforms-suggest-choices span.suggest-path { + font-size: 0.9em; +} + +div.typo3-TCEforms-suggest-choices span.suggest-path abbr { + border-bottom: none; +} + +div.typo3-TCEforms-suggest-choises a { + cursor: pointer; +} \ No newline at end of file