+2006-07-17 Michael Stucki <michael@typo3.org>
+
+ * Fix bug #3308: Check for deleted records when displaying language overlays
+ * Removed hardcoded rowSpace value in CSS Styled Content
+ * Minor cleanup in CSS Styled Content constants.txt + setup.txt
+
2006-07-14 Martin Kutschker <martin.t.kutschker@blackbox.net>
* mailto: links were not handled as mailto: links if protocol was present in link
$str = '';
if (is_array($arr)) {
if (!is_array($valueList)) {
- $valueList = $valueList = t3lib_div::trimExplode(',', $valueList, 1);
+ $valueList = t3lib_div::trimExplode(',', $valueList, 1);
}
$valListCnt = count($valueList);
foreach ($arr as $key => $value) {
/**
* Split a string into an array of individual characters
- * The function will look at $this->nativeCharset and if that is set, the input string is expected to be UTF-8 encoded, possibly with entities in it. Otherwise the string is supposed to be a single-byte charset which is just splitted by a for-loop.
+ * The function will look at $this->nativeCharset and if that is set, the input string is expected to be UTF-8 encoded, possibly with entities in it. Otherwise the string is supposed to be a single-byte charset which is just splitted by a for-loop.
*
* @param string The text string to split
* @param boolean Return Unicode numbers instead of chars.
* Copyright notice
*
* (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)
- * (c) 2005-2006 Karsten Dambekalns <karsten@typo3.org>
+* (c) 2005-2006 Karsten Dambekalns <karsten@typo3.org>
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
$this->content.=$this->doc->section('Extensions found only on this server',$content,0,1);
}
}
- } else {
+ } else {
$content.= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import_ter', $GLOBALS['BACK_PATH'],'|<br/>');
$onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;";
$content.= '</form><form action="index.php" method="post" onsubmit="'.htmlspecialchars($onsubmit).'">List or look up extensions<br />
}
if(!strlen($owner)) {
- $this->checkReviewState($this->extensionsXML[$extkey]['versions']); // if showing only own extensions, never hide unreviewed
+ $this->checkReviewState($this->extensionsXML[$extkey]['versions']); // if showing only own extensions, never hide unreviewed
}
$this->removeObsolete($this->extensionsXML[$extkey]['versions']);
* @return void
*/
function checkReviewState(&$extensions) {
- if($this->useUnchecked) return;
+ if ($this->useUnchecked) return;
reset($extensions);
- while (list($version, $data) = each($extensions)) {
- if($data['reviewstate']<1)
- unset($extensions[$version]);
- }
+ while (list($version, $data) = each($extensions)) {
+ if($data['reviewstate']<1)
+ unset($extensions[$version]);
+ }
}
/**
* @return string Return query string.
*/
function exec_languageQuery($id) {
- $exQ = $GLOBALS['BE_USER']->isAdmin() ? '' : ' AND sys_language.hidden=0';
if ($id) {
+ $exQ = t3lib_BEfunc::deleteClause('pages_language_overlay') . ($GLOBALS['BE_USER']->isAdmin()?'':' AND sys_language.hidden=0');
return $GLOBALS['TYPO3_DB']->exec_SELECTquery(
'sys_language.*',
'pages_language_overlay,sys_language',
$cObj->start($this->data);
$this->setup['transparentColor_array'] = explode('|', trim($cObj->stdWrap($this->setup['transparentColor'], $this->setup['transparentColor.'])));
}
-
+
// Transparency does not properly work when, GIFs or 8-bit PNGs are generated or reduceColors is set -- disable truecolor flag so they get generated "natively" in 8-bit.
// not working with reduceColors and truecolor images
if (($this->setup['transparentBackground'] || is_array($this->setup['transparentColor_array'])) && ($this->gifExtension=='gif' || !$this->png_truecolor || isset($this->setup['reduceColors']))) {
linkWrap.width = 800m
linkWrap.height = 600m
linkWrap.effects =
- # cat=content/cImage/x; type=boolean; label= Advanced, New window: If set, every click-enlarged image will open in it's own popup window and not the current popup window (which may have a wrong size for the image to fit in)
- linkWrap.newWindow = 0
- # cat=content/cImage/d1; type=boolean; label= Images, new window: If set, every click-enlarged image will open in it's own popup window and not the current popup window (which may have a wrong size for the image to fit in).
+ # cat=content/cImage/x; type=boolean; label= Advanced, New window: If set, every click-enlarged image will open in it's own popup window and not the current popup window (which may have a wrong size for the image to fit in)
linkWrap.newWindow = 0
captionSplit = 0
# cat=content/cImage/e4; type=boolean; label= Images, title in link and IMG: If you have the title in the <a>-tag (titleInLink=true), you don't get the 'title' in the <img>-tag. IE will not show the tooltip anymore. So to get the 'title' in <img> too (to keep IE happy), set this too. Recommended for accessibility is "false". For correct tooltips on IE, set this to "true".
titleInLinkAndImg = 0
- # cat=content/cImage/g1; type=int[0-100]; label= Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting acordingly
+ # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
colSpace = 10
- # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+ # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+ rowSpace = 5
+ # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
textMargin = 10
# cat=content/cImage/i1; type=color; label= Image border, color: Bordercolor of images in content elements when "Border"-option for element is set.
DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-image IMG { margin: 0; }
/* Space below each image (also in-between rows) */
- DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-image { margin-bottom: 5px; }
- DIV.csc-textpic-equalheight DIV.csc-textpic-imagerow { margin-bottom: 5px; display: block; }
+ DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-image { margin-bottom: {$styles.content.imgtext.rowSpace}px; }
+ DIV.csc-textpic-equalheight DIV.csc-textpic-imagerow { margin-bottom: {$styles.content.imgtext.rowSpace}px; display: block; }
DIV.csc-textpic DIV.csc-textpic-imagerow { clear: both; }
/* No margins around the whole image-block */
projects / Packages / TYPO3.CMS.git / commitdiff