diff --git a/Build/Resources/Public/Less/TYPO3/_element_tree.less b/Build/Resources/Public/Less/TYPO3/_element_tree.less
index 72d3992eca26c4fc912e654cc56ad1ef910f8934..704a8eb6b2c9492cb4c01d3b1edcb753cd0c609f 100644
--- a/Build/Resources/Public/Less/TYPO3/_element_tree.less
+++ b/Build/Resources/Public/Less/TYPO3/_element_tree.less
@@ -10,7 +10,7 @@
// Trees Variables
//
@tree-indentation: 0.5em;
-@tree-border: @navigation-border;
+@tree-border: #666666;
//
@@ -90,6 +90,62 @@
}
+//
+// Treeline Icons
+//
+.treeline-icon {
+ position: relative;
+ display: block;
+ float: left;
+ margin-top: -6px;
+ margin-bottom: -6px;
+ margin-right: 2px;
+ padding: 0;
+ height: 31px;
+ width: 16px;
+ white-space: nowrap;
+ overflow: hidden;
+ &:after,
+ &:before {
+ position: absolute;
+ content: '';
+ left: 50%;
+ }
+ &:before {
+ top: 0;
+ height: 100%;
+ width: 2px;
+ margin-left: -1px;
+ border-left: 1px dotted @tree-border;
+ }
+ &:after {
+ border-top: 1px dotted @tree-border;
+ height: 2px;
+ width: 100%;
+ top: 50%;
+ margin-top: -1px;
+ }
+}
+.treeline-icon-jointop:before {
+ top: 50%;
+}
+.treeline-icon-joinbottom:before {
+ top: -50%;
+}
+.treeline-icon-line:after {
+ display: none;
+}
+.treeline-icon-blank {
+ display: none;
+}
+.treeline-icon-clear {
+ &:before,
+ &:after {
+ display: none;
+ }
+}
+
+
table#typo3-tree {
margin: 10px 0 20px 10px;
width: 95%;
@@ -345,18 +401,6 @@ ul.tree div.treeLinkItem span.dragIcon {
margin: 2px;
}
-// Sprite icons for tree lines. Single lines need 6px padding. Can also be used directly inside .table
-
-.t3-icon-treeline {
- display: block;
- float: left;
- margin-top: -6px;
- margin-bottom: -6px;
- padding: 0;
- height: 30px;
- white-space: nowrap;
- overflow: hidden;
-}
//
// Tree
diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index 414432ea5b55ec7e196ae13d91314cd634c9787f..4dd3b9eb819353359225fea26ab9d6ed0a389cd0 100644
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -667,7 +667,6 @@ class ExtendedTemplateService extends TemplateService {
$row = $arr[$key];
$LN = $a == $c ? 'blank' : 'line';
$BTM = $a == $c ? 'top' : '';
- $PM = 'join';
$HTML .= $depthData;
$alttext = '[' . $row['templateID'] . ']';
$alttext .= $row['pid'] ? ' - ' . BackendUtility::getRecordPath($row['pid'], $GLOBALS['SOBE']->perms_clause, 20) : '';
@@ -690,7 +689,7 @@ class ExtendedTemplateService extends TemplateService {
$A_B = '';
$A_E = '';
}
- $HTML .= ($first ? '' : IconUtility::getSpriteIcon('treeline-' . $PM . $BTM)) . $icon . $A_B
+ $HTML .= ($first ? '' : '<span class="treeline-icon treeline-icon-join' . $BTM . '"></span>') . $icon . $A_B
. htmlspecialchars(GeneralUtility::fixed_lgd_cs($row['title'], $GLOBALS['BE_USER']->uc['titleLen']))
. $A_E . ' ';
$RL = $this->ext_getRootlineNumber($row['pid']);
@@ -704,7 +703,7 @@ class ExtendedTemplateService extends TemplateService {
<td>' . ($row['next'] ? ' ' . $row['next'] . ' ' : '') . '</td>
</tr>';
if ($deeper) {
- $keyArray = $this->ext_getTemplateHierarchyArr($arr[$key . '.'], $depthData . ($first ? '' : IconUtility::getSpriteIcon('treeline-' . $LN)), $keyArray);
+ $keyArray = $this->ext_getTemplateHierarchyArr($arr[$key . '.'], $depthData . ($first ? '' : '<span class="treeline-icon treeline-icon-' . $LN . '"></span>'), $keyArray);
}
}
return $keyArray;
diff --git a/typo3/sysext/core/ext_tables.php b/typo3/sysext/core/ext_tables.php
index a4c8d8f790f14497eedadca98fab95b305396e42..6a05bdb12bd158dac29edb9dc290de6146b46102 100644
--- a/typo3/sysext/core/ext_tables.php
+++ b/typo3/sysext/core/ext_tables.php
@@ -496,26 +496,7 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageNames'] = array(
'status-version-50',
'status-version-no-version',
'status-warning-in-use',
- 'status-warning-lock',
- 'treeline-blank',
- 'treeline-join',
- 'treeline-joinbottom',
- 'treeline-jointop',
- 'treeline-line',
- 'treeline-minus',
- 'treeline-minusbottom',
- 'treeline-minusonly',
- 'treeline-minustop',
- 'treeline-plus',
- 'treeline-plusbottom',
- 'treeline-plusonly',
- 'treeline-stopper',
- 'module-web',
- 'module-file',
- 'module-system',
- 'module-tools',
- 'module-user',
- 'module-help',
+ 'status-warning-lock'
);
diff --git a/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css b/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
index 064a040f98ad171890c8e029b41d9e1be651268d..509fa4c2123b80cb06d73ac1c511613986218a41 100644
--- a/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
+++ b/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
@@ -10740,7 +10740,7 @@ div.t3-form-field-container:first-child .t3-form-field-label-flex {
bottom: 1em;
left: 0;
margin-bottom: -2px;
- border-left: 1px dotted #c3c3c3;
+ border-left: 1px dotted #666666;
}
.list-tree li {
margin: 0;
@@ -10763,7 +10763,7 @@ a.list-tree li.active > .list-tree-group a:focus {
display: block;
width: 0.8em;
height: 0;
- border-top: 1px dotted #c3c3c3;
+ border-top: 1px dotted #666666;
margin-top: -2px;
position: absolute;
top: 1em;
@@ -10796,6 +10796,55 @@ a.list-tree li.active > .list-tree-group a:focus {
.list-tree-control.list-tree-control-closed > .fa:before {
content: "\f0da";
}
+.treeline-icon {
+ position: relative;
+ display: block;
+ float: left;
+ margin-top: -6px;
+ margin-bottom: -6px;
+ margin-right: 2px;
+ padding: 0;
+ height: 31px;
+ width: 16px;
+ white-space: nowrap;
+ overflow: hidden;
+}
+.treeline-icon:after,
+.treeline-icon:before {
+ position: absolute;
+ content: '';
+ left: 50%;
+}
+.treeline-icon:before {
+ top: 0;
+ height: 100%;
+ width: 2px;
+ margin-left: -1px;
+ border-left: 1px dotted #666666;
+}
+.treeline-icon:after {
+ border-top: 1px dotted #666666;
+ height: 2px;
+ width: 100%;
+ top: 50%;
+ margin-top: -1px;
+}
+.treeline-icon-jointop:before {
+ top: 50%;
+}
+.treeline-icon-joinbottom:before {
+ top: -50%;
+}
+.treeline-icon-line:after {
+ display: none;
+}
+.treeline-icon-blank {
+ display: none;
+}
+.treeline-icon-clear:before,
+.treeline-icon-clear:after {
+ display: none;
+}
table#typo3-tree {
margin: 10px 0 20px 10px;
width: 95%;
@@ -10980,16 +11029,6 @@ ul.tree div.treeLinkItem span.dragIcon {
#typo3-pagetree #typo3-docheader img {
margin: 2px;
}
-.t3-icon-treeline {
- display: block;
- float: left;
- margin-top: -6px;
- margin-bottom: -6px;
- padding: 0;
- height: 30px;
- white-space: nowrap;
- overflow: hidden;
-}
body#typo3-pagetree,
body#ext-backend-Modules-FileSystemNavigationFrame-index-php {
background: #ebebeb;
diff --git a/typo3/sysext/t3skin/images/icons/treeline/blank.gif b/typo3/sysext/t3skin/images/icons/treeline/blank.gif
deleted file mode 100644
index e1d2d83216e249399411d7e5caf10b5ece31db3d..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/blank.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/join.gif b/typo3/sysext/t3skin/images/icons/treeline/join.gif
deleted file mode 100644
index 539de0b435a5c2e21d0f4c5ce0706e6def41c403..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/join.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/joinbottom.gif b/typo3/sysext/t3skin/images/icons/treeline/joinbottom.gif
deleted file mode 100644
index 226329965affff4d77a5b75536b0e16067e15bc0..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/joinbottom.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/jointop.gif b/typo3/sysext/t3skin/images/icons/treeline/jointop.gif
deleted file mode 100644
index 98f6cd7ce3c77b906df4de1b8b08534916f1ad8e..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/jointop.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/line.gif b/typo3/sysext/t3skin/images/icons/treeline/line.gif
deleted file mode 100644
index 3be2d471523f7b2b7ac8f91723cc13c1efd4be2a..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/line.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/minus.gif b/typo3/sysext/t3skin/images/icons/treeline/minus.gif
deleted file mode 100644
index 6a663defdb3548559390e26546748c71d7459688..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/minus.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/minusbottom.gif b/typo3/sysext/t3skin/images/icons/treeline/minusbottom.gif
deleted file mode 100644
index e9eeaa9b5ca4459deb81581333c725495afe2e43..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/minusbottom.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/minusonly.gif b/typo3/sysext/t3skin/images/icons/treeline/minusonly.gif
deleted file mode 100644
index 4556a1034a6301ea82a20a59f7a257799551ecd0..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/minusonly.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/minustop.gif b/typo3/sysext/t3skin/images/icons/treeline/minustop.gif
deleted file mode 100644
index 4161dcf222dd6ab0bcf8cc4ee1c9a64631aaf97c..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/minustop.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/plus.gif b/typo3/sysext/t3skin/images/icons/treeline/plus.gif
deleted file mode 100644
index 666e05c4c330c2c830f2624cff8863276759a6ab..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/plus.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/plusbottom.gif b/typo3/sysext/t3skin/images/icons/treeline/plusbottom.gif
deleted file mode 100644
index 4b975b2a8cfbb58c1e3005f2985e0e860961a94f..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/plusbottom.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/plusonly.gif b/typo3/sysext/t3skin/images/icons/treeline/plusonly.gif
deleted file mode 100644
index 74d154ab036b695e295a20be3251384075037b2c..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/plusonly.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/icons/treeline/stopper.gif b/typo3/sysext/t3skin/images/icons/treeline/stopper.gif
deleted file mode 100644
index ddb37dad5ead96ce34f0b5cbfb92a849d7935c8b..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/t3skin/images/icons/treeline/stopper.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/images/sprites/t3skin.png b/typo3/sysext/t3skin/images/sprites/t3skin.png
index d75a31f91d6f2bb0c6f74a5768caf1c9c626831f..3d15d22115bf3dfb038412b6f028343683284113 100644
Binary files a/typo3/sysext/t3skin/images/sprites/t3skin.png and b/typo3/sysext/t3skin/images/sprites/t3skin.png differ
diff --git a/typo3/sysext/t3skin/images/sprites/t3skin@x2.png b/typo3/sysext/t3skin/images/sprites/t3skin@x2.png
index d1e451324ac4e4e138996c8dd7e1c2c15bd6d421..1e53625f4e2ab5f64f9c61256c63965a6bebc9a7 100644
Binary files a/typo3/sysext/t3skin/images/sprites/t3skin@x2.png and b/typo3/sysext/t3skin/images/sprites/t3skin@x2.png differ
diff --git a/typo3/sysext/t3skin/stylesheets/sprites/t3skin.css b/typo3/sysext/t3skin/stylesheets/sprites/t3skin.css
index 985a47062ea924c49768a89bc2a3d22eb6dbdd9a..a855ddced2adcf9616f338bc7184702f9becb9ae 100644
--- a/typo3/sysext/t3skin/stylesheets/sprites/t3skin.css
+++ b/typo3/sysext/t3skin/stylesheets/sprites/t3skin.css
@@ -1,57 +1,46 @@
.t3-icon-actions {
- background-image: url('../../images/sprites/t3skin.png?1427061024') !important;
+ background-image: url('../../images/sprites/t3skin.png?1436912180') !important;
height: 16px;
width: 16px;
}
.backgroundsize .t3-icon-actions {
- background-image: url('../../images/sprites/t3skin@x2.png?1427061024') !important;
- background-size:322px 534px;
+ background-image: url('../../images/sprites/t3skin@x2.png?1436912180') !important;
+ background-size:322px 435px;
}
.t3-icon-apps {
- background-image: url('../../images/sprites/t3skin.png?1427061024') !important;
+ background-image: url('../../images/sprites/t3skin.png?1436912180') !important;
height: 16px;
width: 16px;
}
.backgroundsize .t3-icon-apps {
- background-image: url('../../images/sprites/t3skin@x2.png?1427061024') !important;
- background-size:322px 534px;
+ background-image: url('../../images/sprites/t3skin@x2.png?1436912180') !important;
+ background-size:322px 435px;
}
.t3-icon-mimetypes {
- background-image: url('../../images/sprites/t3skin.png?1427061024') !important;
+ background-image: url('../../images/sprites/t3skin.png?1436912180') !important;
height: 16px;
width: 16px;
}
.backgroundsize .t3-icon-mimetypes {
- background-image: url('../../images/sprites/t3skin@x2.png?1427061024') !important;
- background-size:322px 534px;
+ background-image: url('../../images/sprites/t3skin@x2.png?1436912180') !important;
+ background-size:322px 435px;
}
.t3-icon-status {
- background-image: url('../../images/sprites/t3skin.png?1427061024') !important;
+ background-image: url('../../images/sprites/t3skin.png?1436912180') !important;
height: 16px;
width: 16px;
}
.backgroundsize .t3-icon-status {
- background-image: url('../../images/sprites/t3skin@x2.png?1427061024') !important;
- background-size:322px 534px;
-}
-
-.t3-icon-treeline {
- background-image: url('../../images/sprites/t3skin.png?1427061024') !important;
- height: 16px;
- width: 16px;
-}
-
-.backgroundsize .t3-icon-treeline {
- background-image: url('../../images/sprites/t3skin@x2.png?1427061024') !important;
- background-size:322px 534px;
+ background-image: url('../../images/sprites/t3skin@x2.png?1436912180') !important;
+ background-size:322px 435px;
}
.t3-icon-document-close {
background-position: -0px -0px !important;
@@ -230,7 +219,7 @@
}
.t3-icon-input-clear {
- background-position: -0px -516px !important;
+ background-position: -0px -420px !important;
height: 13px;
width: 13px;
@@ -244,7 +233,7 @@
}
.t3-icon-markstate {
- background-position: -0px -476px !important;
+ background-position: -0px -380px !important;
height: 14px;
width: 14px;
@@ -278,7 +267,7 @@
}
.t3-icon-move-move {
- background-position: -0px -503px !important;
+ background-position: -0px -407px !important;
height: 11px;
}
@@ -419,7 +408,7 @@
}
.t3-icon-unmarkstate {
- background-position: -16px -476px !important;
+ background-position: -16px -380px !important;
height: 14px;
width: 14px;
@@ -573,13 +562,13 @@
}
.t3-icon-irre-collapsed {
- background-position: -0px -492px !important;
+ background-position: -0px -396px !important;
height: 9px;
width: 9px;
}
.t3-icon-irre-expanded {
- background-position: -11px -492px !important;
+ background-position: -11px -396px !important;
height: 9px;
width: 9px;
@@ -653,7 +642,7 @@
}
.t3-icon-pagetree-folder-contains-shop {
- background-position: -0px -440px !important;
+ background-position: -0px -344px !important;
width: 18px;
}
@@ -974,12 +963,12 @@
}
.t3-icon-x-sys_category {
- background-position: -20px -440px !important;
+ background-position: -20px -344px !important;
width: 18px;
}
.t3-icon-x-sys_language {
- background-position: -0px -458px !important;
+ background-position: -0px -362px !important;
width: 18px;
}
@@ -1347,81 +1336,3 @@
background-position: -18px -306px !important;
}
-.t3-icon-blank {
- background-position: -0px -531px !important;
- height: 1px;
- width: 1px;
-
-}
-.t3-icon-join {
- background-position: -0px -344px !important;
- height: 30px;
- width: 18px;
-
-}
-.t3-icon-joinbottom {
- background-position: -20px -344px !important;
- height: 30px;
- width: 18px;
-
-}
-.t3-icon-jointop {
- background-position: -40px -344px !important;
- height: 30px;
- width: 18px;
-
-}
-.t3-icon-line {
- background-position: -60px -344px !important;
- height: 30px;
- width: 18px;
-
-}
-.t3-icon-minus {
- background-position: -0px -376px !important;
- height: 30px;
- width: 18px;
-
-}
-.t3-icon-minusbottom {
- background-position: -20px -376px !important;
- height: 30px;
- width: 18px;
-
-}
-.t3-icon-minusonly {
- background-position: -40px -376px !important;
- height: 30px;
- width: 18px;
-
-}
-.t3-icon-minustop {
- background-position: -60px -376px !important;
- height: 30px;
- width: 18px;
-
-}
-.t3-icon-plus {
- background-position: -0px -408px !important;
- height: 30px;
- width: 18px;
-
-}
-.t3-icon-plusbottom {
- background-position: -20px -408px !important;
- height: 30px;
- width: 18px;
-
-}
-.t3-icon-plusonly {
- background-position: -40px -408px !important;
- height: 30px;
- width: 18px;
-
-}
-.t3-icon-stopper {
- background-position: -60px -408px !important;
- height: 30px;
- width: 18px;
-
-}