[TASK] Remove last usages of gfx/ol/ images 73/41673/7
authorWouter Wolters <typo3@wouterwolters.nl>
Sat, 18 Jul 2015 14:10:04 +0000 (16:10 +0200)
committerBenjamin Mack <benni@typo3.org>
Sat, 18 Jul 2015 22:31:47 +0000 (00:31 +0200)
Resolves: #68344
Resolves: #68024
Releases: master
Change-Id: Ie14d89759a5ecad8e092079cd023ced247cd72e1
Reviewed-on: http://review.typo3.org/41673
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
31 files changed:
typo3/gfx/ol/blank.gif [deleted file]
typo3/gfx/ol/join.gif [deleted file]
typo3/gfx/ol/joinbottom.gif [deleted file]
typo3/gfx/ol/jointop.gif [deleted file]
typo3/gfx/ol/line.gif [deleted file]
typo3/gfx/ol/minus.gif [deleted file]
typo3/gfx/ol/minusbottom.gif [deleted file]
typo3/gfx/ol/minusbullet.gif [deleted file]
typo3/gfx/ol/minusonly.gif [deleted file]
typo3/gfx/ol/minustop.gif [deleted file]
typo3/gfx/ol/plus.gif [deleted file]
typo3/gfx/ol/plusbottom.gif [deleted file]
typo3/gfx/ol/plusbullet.gif [deleted file]
typo3/gfx/ol/plusonly.gif [deleted file]
typo3/gfx/ol/plustop.gif [deleted file]
typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
typo3/sysext/t3skin/ext_tables.php
typo3/sysext/t3skin/icons/gfx/ol/arrowbullet.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/blank.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/halfline.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/jointop.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/minusbullet.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/minusonly.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/minustop.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/plusbullet.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/plusbullet_list.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/plusonly.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/plustop.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/quadline.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/ol/stopper.gif [deleted file]
typo3/sysext/t3skin/stylesheets/standalone/admin_panel.css

diff --git a/typo3/gfx/ol/blank.gif b/typo3/gfx/ol/blank.gif
deleted file mode 100644 (file)
index f30a299..0000000
Binary files a/typo3/gfx/ol/blank.gif and /dev/null differ
diff --git a/typo3/gfx/ol/join.gif b/typo3/gfx/ol/join.gif
deleted file mode 100644 (file)
index 84dcaa5..0000000
Binary files a/typo3/gfx/ol/join.gif and /dev/null differ
diff --git a/typo3/gfx/ol/joinbottom.gif b/typo3/gfx/ol/joinbottom.gif
deleted file mode 100644 (file)
index 7525042..0000000
Binary files a/typo3/gfx/ol/joinbottom.gif and /dev/null differ
diff --git a/typo3/gfx/ol/jointop.gif b/typo3/gfx/ol/jointop.gif
deleted file mode 100644 (file)
index 90a2711..0000000
Binary files a/typo3/gfx/ol/jointop.gif and /dev/null differ
diff --git a/typo3/gfx/ol/line.gif b/typo3/gfx/ol/line.gif
deleted file mode 100644 (file)
index 9883cbe..0000000
Binary files a/typo3/gfx/ol/line.gif and /dev/null differ
diff --git a/typo3/gfx/ol/minus.gif b/typo3/gfx/ol/minus.gif
deleted file mode 100644 (file)
index 20d2af7..0000000
Binary files a/typo3/gfx/ol/minus.gif and /dev/null differ
diff --git a/typo3/gfx/ol/minusbottom.gif b/typo3/gfx/ol/minusbottom.gif
deleted file mode 100644 (file)
index 80d6095..0000000
Binary files a/typo3/gfx/ol/minusbottom.gif and /dev/null differ
diff --git a/typo3/gfx/ol/minusbullet.gif b/typo3/gfx/ol/minusbullet.gif
deleted file mode 100644 (file)
index a5a1e57..0000000
Binary files a/typo3/gfx/ol/minusbullet.gif and /dev/null differ
diff --git a/typo3/gfx/ol/minusonly.gif b/typo3/gfx/ol/minusonly.gif
deleted file mode 100644 (file)
index 07072ce..0000000
Binary files a/typo3/gfx/ol/minusonly.gif and /dev/null differ
diff --git a/typo3/gfx/ol/minustop.gif b/typo3/gfx/ol/minustop.gif
deleted file mode 100644 (file)
index f9b44ad..0000000
Binary files a/typo3/gfx/ol/minustop.gif and /dev/null differ
diff --git a/typo3/gfx/ol/plus.gif b/typo3/gfx/ol/plus.gif
deleted file mode 100644 (file)
index 39c8bb2..0000000
Binary files a/typo3/gfx/ol/plus.gif and /dev/null differ
diff --git a/typo3/gfx/ol/plusbottom.gif b/typo3/gfx/ol/plusbottom.gif
deleted file mode 100644 (file)
index aa0317b..0000000
Binary files a/typo3/gfx/ol/plusbottom.gif and /dev/null differ
diff --git a/typo3/gfx/ol/plusbullet.gif b/typo3/gfx/ol/plusbullet.gif
deleted file mode 100644 (file)
index e2e2d96..0000000
Binary files a/typo3/gfx/ol/plusbullet.gif and /dev/null differ
diff --git a/typo3/gfx/ol/plusonly.gif b/typo3/gfx/ol/plusonly.gif
deleted file mode 100644 (file)
index 2247b9b..0000000
Binary files a/typo3/gfx/ol/plusonly.gif and /dev/null differ
diff --git a/typo3/gfx/ol/plustop.gif b/typo3/gfx/ol/plustop.gif
deleted file mode 100644 (file)
index db718e7..0000000
Binary files a/typo3/gfx/ol/plustop.gif and /dev/null differ
index ef42fc8..f9be0f7 100755 (executable)
@@ -415,16 +415,17 @@ class TimeTracker {
                        if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($k)) {
                                $c++;
                                $deeper = is_array($arr[$k . '.']) ? 1 : 0;
-                               $PM = 'join';
                                $LN = $ac == $c ? 'blank' : 'line';
+
                                $BTM = $ac == $c ? 'bottom' : '';
-                               $PM = is_array($arr[$k . '.']) ? ($deeper ? 'minus' : 'plus') : 'join';
-                               $this->tsStackLog[$v]['icons'] = $depthData . ($first ? '' : '<img src="' . TYPO3_mainDir . 'gfx/ol/' . $PM . $BTM . '.gif" width="18" height="16" align="top" border="0" alt="" />');
+                               $PM = is_array($arr[$k . '.']) ? '<i class="fa fa-' . ($deeper ? 'minus' : 'plus') . '-square-o"></i>' : '<span class="treeline-icon treeline-icon-join' . ($BTM ? 'bottom' : '') . '"></span>';
+
+                               $this->tsStackLog[$v]['icons'] = $depthData . ($first ? '' : $PM);
                                if ($this->tsStackLog[$v]['content'] !== '') {
                                        $content = str_replace($this->tsStackLog[$v]['content'], $v, $content);
                                }
                                if (is_array($arr[$k . '.'])) {
-                                       $this->tsStackLog[$v]['content'] = $this->fixContent($arr[$k . '.'], $this->tsStackLog[$v]['content'], $depthData . ($first ? '' : '<img src="' . TYPO3_mainDir . 'gfx/ol/' . $LN . '.gif" width="18" height="16" align="top" border="0" alt="" />'), 0, $v);
+                                       $this->tsStackLog[$v]['content'] = $this->fixContent($arr[$k . '.'], $this->tsStackLog[$v]['content'], $depthData . ($first ? '' : '<span class="treeline-icon treeline-icon-' . $LN . '"></span>'), 0, $v);
                                } else {
                                        $this->tsStackLog[$v]['content'] = $this->fixCLen($this->tsStackLog[$v]['content'], $this->tsStackLog[$v]['value']);
                                        $this->tsStackLog[$v]['subtime'] = '';
index 7a574ee..54f4f1f 100644 (file)
@@ -12,9 +12,6 @@ if (TYPO3_MODE === 'BE' || TYPO3_MODE === 'FE' && isset($GLOBALS['BE_USER'])) {
                )
        );
 
-       // Manual setting up of alternative icons.
-       $GLOBALS['TBE_STYLES']['skinImg']['gfx/ol/blank.gif'] = array('clear.gif', 'width="18" height="16"');
-
        // Alternative dimensions for frameset sizes:
        // Left menu frame width
        $GLOBALS['TBE_STYLES']['dims']['leftMenuFrameW'] = 190;
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/arrowbullet.gif b/typo3/sysext/t3skin/icons/gfx/ol/arrowbullet.gif
deleted file mode 100644 (file)
index 08143fd..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/arrowbullet.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/blank.gif b/typo3/sysext/t3skin/icons/gfx/ol/blank.gif
deleted file mode 100644 (file)
index 1a2ca90..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/blank.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/halfline.gif b/typo3/sysext/t3skin/icons/gfx/ol/halfline.gif
deleted file mode 100644 (file)
index 7023613..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/halfline.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/jointop.gif b/typo3/sysext/t3skin/icons/gfx/ol/jointop.gif
deleted file mode 100644 (file)
index 4117cfb..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/jointop.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/minusbullet.gif b/typo3/sysext/t3skin/icons/gfx/ol/minusbullet.gif
deleted file mode 100644 (file)
index b0d0638..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/minusbullet.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/minusonly.gif b/typo3/sysext/t3skin/icons/gfx/ol/minusonly.gif
deleted file mode 100644 (file)
index 3e83521..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/minusonly.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/minustop.gif b/typo3/sysext/t3skin/icons/gfx/ol/minustop.gif
deleted file mode 100644 (file)
index 7f8441f..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/minustop.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/plusbullet.gif b/typo3/sysext/t3skin/icons/gfx/ol/plusbullet.gif
deleted file mode 100644 (file)
index 335b26e..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/plusbullet.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/plusbullet_list.gif b/typo3/sysext/t3skin/icons/gfx/ol/plusbullet_list.gif
deleted file mode 100644 (file)
index 7e08deb..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/plusbullet_list.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/plusonly.gif b/typo3/sysext/t3skin/icons/gfx/ol/plusonly.gif
deleted file mode 100644 (file)
index 17fbc4b..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/plusonly.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/plustop.gif b/typo3/sysext/t3skin/icons/gfx/ol/plustop.gif
deleted file mode 100644 (file)
index d6039d3..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/plustop.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/quadline.gif b/typo3/sysext/t3skin/icons/gfx/ol/quadline.gif
deleted file mode 100644 (file)
index 6f64980..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/quadline.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/ol/stopper.gif b/typo3/sysext/t3skin/icons/gfx/ol/stopper.gif
deleted file mode 100644 (file)
index b9b33f0..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/ol/stopper.gif and /dev/null differ
index 34d2d6b..91024d7 100644 (file)
 }
 
 #TSFE_ADMIN_PANEL_FORM tr.typo3-adminPanel-itemRow td {
-       padding: 7px 15px;
+       padding: 0px 15px;
        line-height: 16px;
 }
 
        -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
        -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
        transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-}
\ No newline at end of file
+}
+
+#TSFE_ADMIN_PANEL_FORM .treeline-icon {
+  position: relative;
+  display: inline-block;
+  margin-right: 2px;
+  padding: 0;
+  height: 18px;
+  width: 16px;
+  white-space: nowrap;
+  overflow: hidden;
+  vertical-align: middle;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon:after,
+#TSFE_ADMIN_PANEL_FORM .treeline-icon:before {
+  position: absolute;
+  content: '';
+  left: 50%;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon:before {
+  top: 0;
+  height: 100%;
+  width: 2px;
+  margin-left: -1px;
+  border-left: 1px dotted #666666;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon:after {
+  border-top: 1px dotted #666666;
+  height: 2px;
+  width: 100%;
+  top: 50%;
+  margin-top: -1px;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-jointop:before {
+  top: 50%;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-joinbottom:before {
+  top: -50%;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-line:after {
+  display: none;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-blank {
+  display: none;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-clear:before,
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-clear:after {
+  display: none;
+}