Merge pull request #6 from Rafaelgfirmino/embedIcon

Embedded Git Icon

Author: kendrick-k

DataCollector/GitDataCollector.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Kendrick\SymfonyDebugToolbarGit\DataCollector;
 
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
@@ -19,9 +18,7 @@ class GitDataCollector extends DataCollector
 	 */
 	public function __construct($repositoryCommitUrl)
 	{
-
 		$this->data['repositoryCommitUrl'] = $repositoryCommitUrl;
-
 	}
 
 	/**
@@ -300,4 +297,31 @@ public function getName()
 
 	}
 
+	/**
+	 * change the icon color depending on the kernel version
+	 *
+	 * #3f3f3f < 2.8
+	 * #AAAAAA >= 2.8
+	 *
+	 * @return string
+	 */
+	public final function getIconColor()
+	{
+		if ((float)$this->getSymfonyVersion() >= 2.8) {
+			return $this->data['iconColor'] = '#AAAAAA';
+		}
+		return $this->data['iconColor'] = '#3F3F3F';
+	}
+
+	/**
+	 * @return string
+	 */
+	private function getSymfonyVersion()
+	{
+		$symfonyVersion = \Symfony\Component\HttpKernel\Kernel::VERSION;
+		$symfonyVersion = explode('.', $symfonyVersion, -1);
+		$symfonyMajorMinorVersion = implode('.', $symfonyVersion);
+		return $symfonyMajorMinorVersion;
+	}
+
 }

README.md

@@ -19,7 +19,7 @@ And visualize quickly the latest commit into your repository by clicking on the
 
 Since release 1.4 : no icon (better integration for Symfony 2.8)
 
-![SymfonyDebugToolbarGit2.8](symfony_toolbar_2-8.jpg "SymfonyDebugToolbarGit2.8")
+![SymfonyDebugToolbarGit2.8](symfony_toolbar_2-8.png "SymfonyDebugToolbarGit2.8")
 
 Information displayed :
 

Resources/views/Collector/git.html.twig

@@ -7,7 +7,7 @@
             <div class="sf-toolbar-icon">
                 <a href="#">
                     {# style needs this img #}
-                    <img width="0" height="28" style="width:0px;padding-top:0px;padding-bottom:0px;" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7">
+                    {{ include("@SymfonyDebugToolbarGit/Icons/git.svg.twig") }}
                     <span class="sf-toolbar-status sf-toolbar-status-green">{{ collector.branch }}</span>
                 <span class="sf-toolbar-status sf-toolbar-status{%
                 if collector.timeCommitIntervalMinutes <= 30%}-green{% elseif collector.timeCommitIntervalMinutes > 60 %}-red{% endif

Resources/views/Icons/git.svg.twig

@@ -0,0 +1,12 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="28px" viewBox="0 0 97 97" enable-background="new 0 0 24 28" xml:space="preserve">
+<g>
+	<path fill="{{ collector.iconColor }}" d="M92.71,44.408L52.591,4.291c-2.31-2.311-6.057-2.311-8.369,0l-8.33,8.332L46.459,23.19
+		c2.456-0.83,5.272-0.273,7.229,1.685c1.969,1.97,2.521,4.81,1.67,7.275l10.186,10.185c2.465-0.85,5.307-0.3,7.275,1.671
+		c2.75,2.75,2.75,7.206,0,9.958c-2.752,2.751-7.208,2.751-9.961,0c-2.068-2.07-2.58-5.11-1.531-7.658l-9.5-9.499v24.997
+		c0.67,0.332,1.303,0.774,1.861,1.332c2.75,2.75,2.75,7.206,0,9.959c-2.75,2.749-7.209,2.749-9.957,0c-2.75-2.754-2.75-7.21,0-9.959
+		c0.68-0.679,1.467-1.193,2.307-1.537V36.369c-0.84-0.344-1.625-0.853-2.307-1.537c-2.083-2.082-2.584-5.14-1.516-7.698
+		L31.798,16.715L4.288,44.222c-2.311,2.313-2.311,6.06,0,8.371l40.121,40.118c2.31,2.311,6.056,2.311,8.369,0L92.71,52.779
+		C95.021,50.468,95.021,46.719,92.71,44.408z"/>
+</g>
+</svg>