Updated readme for 1.2 release.

Positioned timeline containers to fix absolute positioning of events inside.
Refactored Toolbar event.
2014-05-18 23:04:09 +03:00 · 2014-05-18 23:01:09 +03:00 · 2014-05-18 22:41:45 +03:00 · 2014-05-18 22:02:46 +03:00 · 2014-05-18 22:00:51 +03:00 · 2014-04-14 14:36:38 +00:00
19 changed files with 996 additions and 421 deletions
@@ -21,7 +21,7 @@
 	},
 	"require"    : {
 		"composer/installers": "~1.0",
-		"symfony/stopwatch"  : "~2.2.0",
-		"mustache/mustache"  : "~2.3.0"
+		"symfony/stopwatch"  : "~2.4",
+		"mustache/mustache"  : "~2.4"
 	}
 }
@@ -1,265 +0,0 @@
-/*! Hint.css - v1.2.1 - 2013-03-24
-* http://kushagragour.in/lab/hint/
-* Copyright (c) 2013 Kushagra Gour; Licensed MIT */
-
-/*-------------------------------------*\
-	HINT.css - A CSS tooltip library
-\*-------------------------------------*/
-/**
- * HINT.css is a tooltip library made in pure CSS.
- *
- * Source: https://github.com/chinchang/hint.css
- * Demo: http://kushagragour.in/labs/hint/
- *
- * Release under The MIT License
- *
- */
-/**
- * source: hint-core.scss
- *
- * Defines the basic styling for the tooltip.
- * Each tooltip is made of 2 parts:
- * 	1) body (:after)
- * 	2) arrow (:before)
- * 
- * Classes added:
- * 	1) hint
- */
-.hint, [data-hint] {
-  position: relative;
-  display: inline-block;
-  /**
-	 * tooltip arrow
-	 */
-  /**
-	 * tooltip body
-	 */ }
-  .hint:before, .hint:after, [data-hint]:before, [data-hint]:after {
-    position: absolute;
-    visibility: hidden;
-    opacity: 0;
-    z-index: 1000000;
-    pointer-events: none;
-    -webkit-transition: 0.3s ease;
-    -moz-transition: 0.3s ease;
-    transition: 0.3s ease; }
-  .hint:hover:before, .hint:hover:after, [data-hint]:hover:before, [data-hint]:hover:after {
-    visibility: visible;
-    opacity: 1; }
-  .hint:before, [data-hint]:before {
-    content: '';
-    position: absolute;
-    background: transparent;
-    border: 6px solid transparent;
-    z-index: 1000001; }
-  .hint:after, [data-hint]:after {
-    content: attr(data-hint);
-    background: #383838;
-    color: white;
-    text-shadow: 0 -1px 0px black;
-    padding: 8px 10px;
-    font-size: 12px;
-    line-height: 12px;
-    white-space: nowrap;
-    box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.3); }
-
-/**
- * source: hint-position.scss
- *
- * Defines the positoning logic for the tooltips.
- * 
- * Classes added:
- * 	1) hint--top
- * 	2) hint--bottom
- * 	3) hint--left
- * 	4) hint--right
- */
-/**
- * set default color for tooltip arrows
- */
-.hint--top:before {
-  border-top-color: #383838; }
-
-.hint--bottom:before {
-  border-bottom-color: #383838; }
-
-.hint--left:before {
-  border-left-color: #383838; }
-
-.hint--right:before {
-  border-right-color: #383838; }
-
-/**
- * top tooltip
- */
-.hint--top:before {
-  margin-bottom: -12px; }
-.hint--top:after {
-  margin-left: -18px; }
-.hint--top:before, .hint--top:after {
-  bottom: 100%;
-  left: 50%; }
-.hint--top:hover:before, .hint--top:hover:after {
-  -webkit-transform: translateY(-8px);
-  -moz-transform: translateY(-8px);
-  transform: translateY(-8px); }
-
-/**
- * bottom tooltip
- */
-.hint--bottom:before {
-  margin-top: -12px; }
-.hint--bottom:after {
-  margin-left: -18px; }
-.hint--bottom:before, .hint--bottom:after {
-  top: 100%;
-  left: 50%; }
-.hint--bottom:hover:before, .hint--bottom:hover:after {
-  -webkit-transform: translateY(8px);
-  -moz-transform: translateY(8px);
-  transform: translateY(8px); }
-
-/**
- * right tooltip
- */
-.hint--right:before {
-  margin-left: -12px;
-  margin-bottom: -6px; }
-.hint--right:after {
-  margin-bottom: -14px; }
-.hint--right:before, .hint--right:after {
-  left: 100%;
-  bottom: 50%; }
-.hint--right:hover:before, .hint--right:hover:after {
-  -webkit-transform: translateX(8px);
-  -moz-transform: translateX(8px);
-  transform: translateX(8px); }
-
-/**
- * left tooltip
- */
-.hint--left:before {
-  margin-right: -12px;
-  margin-bottom: -6px; }
-.hint--left:after {
-  margin-bottom: -14px; }
-.hint--left:before, .hint--left:after {
-  right: 100%;
-  bottom: 50%; }
-.hint--left:hover:before, .hint--left:hover:after {
-  -webkit-transform: translateX(-8px);
-  -moz-transform: translateX(-8px);
-  transform: translateX(-8px); }
-
-/**
- * source: hint-color-types.scss
- *
- * Contains tooltips of various types based on color differences.
- * 
- * Classes added:
- * 	1) hint--error
- * 	2) hint--warning
- * 	3) hint--info
- * 	4) hint--success
- * 	
- */
-/**
- * Error
- */
-.hint--error:after {
-  background-color: #b34e4d;
-  text-shadow: 0 -1px 0px #5a2626; }
-.hint--error.hint--top:before {
-  border-top-color: #b34e4d; }
-.hint--error.hint--bottom:before {
-  border-bottom-color: #b34e4d; }
-.hint--error.hint--left:before {
-  border-left-color: #b34e4d; }
-.hint--error.hint--right:before {
-  border-right-color: #b34e4d; }
-
-/**
- * Warning
- */
-.hint--warning:after {
-  background-color: #c09854;
-  text-shadow: 0 -1px 0px #6d5228; }
-.hint--warning.hint--top:before {
-  border-top-color: #c09854; }
-.hint--warning.hint--bottom:before {
-  border-bottom-color: #c09854; }
-.hint--warning.hint--left:before {
-  border-left-color: #c09854; }
-.hint--warning.hint--right:before {
-  border-right-color: #c09854; }
-
-/**
- * Info
- */
-.hint--info:after {
-  background-color: #3986ac;
-  text-shadow: 0 -1px 0px #193c4c; }
-.hint--info.hint--top:before {
-  border-top-color: #3986ac; }
-.hint--info.hint--bottom:before {
-  border-bottom-color: #3986ac; }
-.hint--info.hint--left:before {
-  border-left-color: #3986ac; }
-.hint--info.hint--right:before {
-  border-right-color: #3986ac; }
-
-/**
- * Success
- */
-.hint--success:after {
-  background-color: #458746;
-  text-shadow: 0 -1px 0px #1a331a; }
-.hint--success.hint--top:before {
-  border-top-color: #458746; }
-.hint--success.hint--bottom:before {
-  border-bottom-color: #458746; }
-.hint--success.hint--left:before {
-  border-left-color: #458746; }
-.hint--success.hint--right:before {
-  border-right-color: #458746; }
-
-/**
- * source: hint-always.scss
- *
- * Defines a persisted tooltip which shows always.
- * 
- * Classes added:
- * 	1) hint--always
- * 	
- */
-.hint--always:after, .hint--always:before {
-  opacity: 1;
-  visibility: visible; }
-.hint--always.hint--top:after, .hint--always.hint--top:before {
-  -webkit-transform: translateY(-8px);
-  -moz-transform: translateY(-8px);
-  transform: translateY(-8px); }
-.hint--always.hint--bottom:after, .hint--always.hint--bottom:before {
-  -webkit-transform: translateY(8px);
-  -moz-transform: translateY(8px);
-  transform: translateY(8px); }
-.hint--always.hint--left:after, .hint--always.hint--left:before {
-  -webkit-transform: translateX(-8px);
-  -moz-transform: translateX(-8px);
-  transform: translateX(-8px); }
-.hint--always.hint--right:after, .hint--always.hint--right:before {
-  -webkit-transform: translateX(8px);
-  -moz-transform: translateX(8px);
-  transform: translateX(8px); }
-
-/**
- * source: hint-rounded.scss
- *
- * Defines rounded corner tooltips.
- * 
- * Classes added:
- * 	1) hint--rounded
- *  
- */
-.hint--rounded:after {
-  border-radius: 4px; }
@@ -4,6 +4,9 @@
  position: fixed;
  left: 5%;
 }
+#wpadminbar #wp-admin-bar-laps .ab-submenu {
+  padding: 0;
+}
 #wpadminbar #wp-admin-bar-laps_output {
  padding: 0 10px;
 }
@@ -16,89 +19,147 @@
 #wpadminbar .laps-timeline {
  overflow: hidden;
  height: 20px;
-  background-color: #f7f7f7;
-  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
+  margin: 6px 0;
+  background-color: #f5f5f5;
  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  position: relative;
 }
 #wpadminbar .laps-timeline .event {
+  float: left;
  width: 0%;
  height: 20px;
-  color: #fff;
-  float: left;
  font-size: 12px;
+  color: #fff;
  text-align: center;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #dd514c;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+  background-color: #5bc0de;
  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
  -webkit-transition: width 0.6s ease;
-  -moz-transition: width 0.6s ease;
-  -o-transition: width 0.6s ease;
  transition: width 0.6s ease;
  position: absolute;
-}
-#wpadminbar .laps-timeline .event + .event {
-  -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
-  -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
-  box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+  border-left: 1px solid #f5f5f5;
+  min-width: 2px;
 }
 #wpadminbar .laps-timeline .event-theme {
-  background-color: #5eb95e;
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(to bottom, #62c462, #57a957);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+  background-color: #5cb85c;
 }
 #wpadminbar .laps-timeline .event-plugin {
-  background-color: #4bb1cf;
-  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+  background-color: #428bca;
 }
 #wpadminbar .laps-timeline .event-core {
-  background-color: #faa732;
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(to bottom, #fbb450, #f89406);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+  background-color: #f0ad4e;
 }
-#wpadminbar [data-hint]:after {
-  font-size: 13px;
+#wpadminbar .laps-timeline .event-query {
+  background-color: #5bc0de;
+}
+#wpadminbar .laps-timeline .event-http {
+  background-color: #d9534f;
+}
+#wpadminbar .tooltip {
+  position: absolute;
+  z-index: 100000;
+  display: block;
+  visibility: visible;
+  font-size: 12px;
+  line-height: 1.4;
+  opacity: 0;
+  filter: alpha(opacity=0);
+}
+#wpadminbar .tooltip.in {
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+#wpadminbar .tooltip.top {
+  margin-top: -3px;
+  padding: 5px 0;
+}
+#wpadminbar .tooltip.right {
+  margin-left: 3px;
+  padding: 0 5px;
+}
+#wpadminbar .tooltip.bottom {
+  margin-top: 3px;
+  padding: 5px 0;
+}
+#wpadminbar .tooltip.left {
+  margin-left: -3px;
+  padding: 0 5px;
+}
+#wpadminbar .tooltip-inner {
+  max-width: 300px;
+  padding: 3px 8px;
+  color: #cccccc;
+  text-align: center;
+  text-decoration: none;
  background-color: #464646;
-  text-shadow: none;
+  border-radius: 4px;
 }
-#wpadminbar .hint--bottom:before {
+#wpadminbar .tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+#wpadminbar .tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-width: 5px 5px 0;
+  border-top-color: #464646;
+}
+#wpadminbar .tooltip.top-left .tooltip-arrow {
+  bottom: 0;
+  left: 5px;
+  border-width: 5px 5px 0;
+  border-top-color: #464646;
+}
+#wpadminbar .tooltip.top-right .tooltip-arrow {
+  bottom: 0;
+  right: 5px;
+  border-width: 5px 5px 0;
+  border-top-color: #464646;
+}
+#wpadminbar .tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-width: 5px 5px 5px 0;
+  border-right-color: #464646;
+}
+#wpadminbar .tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-width: 5px 0 5px 5px;
+  border-left-color: #464646;
+}
+#wpadminbar .tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-width: 0 5px 5px;
  border-bottom-color: #464646;
 }
+#wpadminbar .tooltip.bottom-left .tooltip-arrow {
+  top: 0;
+  left: 5px;
+  border-width: 0 5px 5px;
+  border-bottom-color: #464646;
+}
+#wpadminbar .tooltip.bottom-right .tooltip-arrow {
+  top: 0;
+  right: 5px;
+  border-width: 0 5px 5px;
+  border-bottom-color: #464646;
+}
+#wpadminbar .tooltip.in {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+#wpadminbar .tooltip-inner {
+  line-height: 20px;
+  text-align: left;
+}
@@ -1,15 +1,22 @@
+@import "variables.less";
@import "mixins.less";

 #wpadminbar {

-	#wp-admin-bar-laps .ab-sub-wrapper {
-//		display: block !important;
+	#wp-admin-bar-laps {
+
+		.ab-sub-wrapper {
 			min-width: 90%;
 			width: 90%;
 			position: fixed;
 			left: 5%;
 		}

+		.ab-submenu {
+			padding: 0;
+		}
+	}
+
 	#wp-admin-bar-laps_output {

 		padding: 0 10px;
@@ -21,57 +28,62 @@
 		.ab-empty-item {
 			display: none;
 		}
-
 	}

 	.laps-timeline {
 		overflow: hidden;
 		height: 20px;
-		#gradient > .vertical(#f5f5f5, #f9f9f9);
+		margin: 6px 0;
+		background-color: @timeline-bg;
+		border-radius: 4px;
 		.box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
-		.border-radius(4px);
+		position: relative;
 	}

 	.laps-timeline .event {
+		float: left;
 		width: 0%;
 		height: 20px;
+		font-size: @font-size-small;
 		color: #fff;
-		float: left;
-		font-size: 12px;
 		text-align: center;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
-		#gradient > .vertical(#ee5f5b, #c43c35);
+		background-color: @event-info-color;
 		.box-shadow(inset 0 -1px 0 rgba(0, 0, 0, .15));
-		.box-sizing(border-box);
 		.transition(width .6s ease);
-
-		position: absolute;
-	}
-
-	.laps-timeline .event + .event {
-		.box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)");
+		position: absolute; // disable stacking at start
+		border-left: 1px solid @timeline-bg;
+		min-width: 2px;
 	}

 	.laps-timeline .event-theme {
-		#gradient > .vertical(#62c462, #57a957);
+		background-color: @event-theme-color;
 	}

 	.laps-timeline .event-plugin {
-		#gradient > .vertical(#5bc0de, #339bb9);
+		background-color: @event-plugin-color;
 	}

 	.laps-timeline .event-core {
-		#gradient > .vertical(lighten(#f89406, 15%), #f89406);
+		background-color: @event-core-color;
 	}

-	[data-hint]:after {
-		font-size: 13px;
-		background-color: #464646;
-		text-shadow: none;
+	.laps-timeline .event-query {
+		background-color: @event-info-color;
 	}

-	.hint--bottom:before {
-	  border-bottom-color: #464646;
+	.laps-timeline .event-http {
+		background-color: @event-warning-color;
+	}
+
+	@import "tooltip.less";
+
+	.tooltip.in {
+		.opacity(1);
+	}
+
+	.tooltip-inner {
+		line-height: 20px;
+		text-align: left;
 	}
 }

@@ -1,38 +1,16 @@
 .transition(@transition) {
 	-webkit-transition: @transition;
-	-moz-transition: @transition;
-	-o-transition: @transition;
 	transition: @transition;
 }

-.box-sizing(@boxmodel) {
-	-webkit-box-sizing: @boxmodel;
-	-moz-box-sizing: @boxmodel;
-	box-sizing: @boxmodel;
-}
-
-.border-radius(@radius) {
-	-webkit-border-radius: @radius;
-	-moz-border-radius: @radius;
-	border-radius: @radius;
-}
-
 .box-shadow(@shadow) {
-	-webkit-box-shadow: @shadow;
-	-moz-box-shadow: @shadow;
+	-webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1
 	box-shadow: @shadow;
 }

-#gradient {
-
-	.vertical(@startColor: #555, @endColor: #333) {
-		background-color: mix(@startColor, @endColor, 60%);
-		background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
-		background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
-		background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-		background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
-		background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
-		background-repeat: repeat-x;
-		filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor), argb(@endColor))); // IE9 and down
-	}
+.opacity(@opacity) {
+  opacity: @opacity;
+  // IE8 filter
+  @opacity-ie: (@opacity * 100);
+  filter: ~"alpha(opacity=@{opacity-ie})";
 }
@@ -0,0 +1,94 @@
+//
+// Tooltips
+// --------------------------------------------------
+
+// Base class
+.tooltip {
+  position: absolute;
+  z-index: @zindex-tooltip;
+  display: block;
+  visibility: visible;
+  font-size: @font-size-small;
+  line-height: 1.4;
+  .opacity(0);
+
+  &.in     { .opacity(.9); }
+  &.top    { margin-top:  -3px; padding: @tooltip-arrow-width 0; }
+  &.right  { margin-left:  3px; padding: 0 @tooltip-arrow-width; }
+  &.bottom { margin-top:   3px; padding: @tooltip-arrow-width 0; }
+  &.left   { margin-left: -3px; padding: 0 @tooltip-arrow-width; }
+}
+
+// Wrapper for the tooltip content
+.tooltip-inner {
+  max-width: @tooltip-max-width;
+  padding: 3px 8px;
+  color: @tooltip-color;
+  text-align: center;
+  text-decoration: none;
+  background-color: @tooltip-bg;
+  border-radius: @border-radius-base;
+}
+
+// Arrows
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+.tooltip {
+  &.top .tooltip-arrow {
+    bottom: 0;
+    left: 50%;
+    margin-left: -@tooltip-arrow-width;
+    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
+    border-top-color: @tooltip-arrow-color;
+  }
+  &.top-left .tooltip-arrow {
+    bottom: 0;
+    left: @tooltip-arrow-width;
+    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
+    border-top-color: @tooltip-arrow-color;
+  }
+  &.top-right .tooltip-arrow {
+    bottom: 0;
+    right: @tooltip-arrow-width;
+    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
+    border-top-color: @tooltip-arrow-color;
+  }
+  &.right .tooltip-arrow {
+    top: 50%;
+    left: 0;
+    margin-top: -@tooltip-arrow-width;
+    border-width: @tooltip-arrow-width @tooltip-arrow-width @tooltip-arrow-width 0;
+    border-right-color: @tooltip-arrow-color;
+  }
+  &.left .tooltip-arrow {
+    top: 50%;
+    right: 0;
+    margin-top: -@tooltip-arrow-width;
+    border-width: @tooltip-arrow-width 0 @tooltip-arrow-width @tooltip-arrow-width;
+    border-left-color: @tooltip-arrow-color;
+  }
+  &.bottom .tooltip-arrow {
+    top: 0;
+    left: 50%;
+    margin-left: -@tooltip-arrow-width;
+    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
+    border-bottom-color: @tooltip-arrow-color;
+  }
+  &.bottom-left .tooltip-arrow {
+    top: 0;
+    left: @tooltip-arrow-width;
+    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
+    border-bottom-color: @tooltip-arrow-color;
+  }
+  &.bottom-right .tooltip-arrow {
+    top: 0;
+    right: @tooltip-arrow-width;
+    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
+    border-bottom-color: @tooltip-arrow-color;
+  }
+}
@@ -0,0 +1,18 @@
+@font-size-small: 12px;
+
+// colors
+@timeline-bg: #f5f5f5;
+@event-theme-color: #5cb85c;
+@event-plugin-color: #428bca;
+@event-core-color: #f0ad4e;
+@event-info-color: #5bc0de;
+@event-warning-color: #d9534f;
+
+// because admin bar is 99999
+@zindex-tooltip: 100000;
+@tooltip-max-width: 300px;
+@tooltip-color: #ccc;
+@tooltip-bg: #464646;
+@tooltip-arrow-width: 5px;
+@tooltip-arrow-color: @tooltip-bg;
+@border-radius-base: 4px;
@@ -0,0 +1,387 @@
+/* ========================================================================
+ * Bootstrap: tooltip.js v3.0.2
+ * http://getbootstrap.com/javascript/#tooltip
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ========================================================================
+ * Copyright 2013 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ======================================================================== */
+
+// modified to use lapstooltip as name
+
+function ($) { "use strict";
+
+  // TOOLTIP PUBLIC CLASS DEFINITION
+  // ===============================
+
+  var Tooltip = function (element, options) {
+    this.type       =
+    this.options    =
+    this.enabled    =
+    this.timeout    =
+    this.hoverState =
+    this.$element   = null
+
+    this.init('lapstooltip', element, options)
+  }
+
+  Tooltip.DEFAULTS = {
+    animation: true
+  , placement: 'top'
+  , selector: false
+  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+  , trigger: 'hover focus'
+  , title: ''
+  , delay: 0
+  , html: false
+  , container: false
+  }
+
+  Tooltip.prototype.init = function (type, element, options) {
+    this.enabled  = true
+    this.type     = type
+    this.$element = $(element)
+    this.options  = this.getOptions(options)
+
+    var triggers = this.options.trigger.split(' ')
+
+    for (var i = triggers.length; i--;) {
+      var trigger = triggers[i]
+
+      if (trigger == 'click') {
+        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+      } else if (trigger != 'manual') {
+        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focus'
+        var eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
+
+        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+      }
+    }
+
+    this.options.selector ?
+      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+      this.fixTitle()
+  }
+
+  Tooltip.prototype.getDefaults = function () {
+    return Tooltip.DEFAULTS
+  }
+
+  Tooltip.prototype.getOptions = function (options) {
+    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
+
+    if (options.delay && typeof options.delay == 'number') {
+      options.delay = {
+        show: options.delay
+      , hide: options.delay
+      }
+    }
+
+    return options
+  }
+
+  Tooltip.prototype.getDelegateOptions = function () {
+    var options  = {}
+    var defaults = this.getDefaults()
+
+    this._options && $.each(this._options, function (key, value) {
+      if (defaults[key] != value) options[key] = value
+    })
+
+    return options
+  }
+
+  Tooltip.prototype.enter = function (obj) {
+    var self = obj instanceof this.constructor ?
+      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
+
+    clearTimeout(self.timeout)
+
+    self.hoverState = 'in'
+
+    if (!self.options.delay || !self.options.delay.show) return self.show()
+
+    self.timeout = setTimeout(function () {
+      if (self.hoverState == 'in') self.show()
+    }, self.options.delay.show)
+  }
+
+  Tooltip.prototype.leave = function (obj) {
+    var self = obj instanceof this.constructor ?
+      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
+
+    clearTimeout(self.timeout)
+
+    self.hoverState = 'out'
+
+    if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+    self.timeout = setTimeout(function () {
+      if (self.hoverState == 'out') self.hide()
+    }, self.options.delay.hide)
+  }
+
+  Tooltip.prototype.show = function () {
+    var e = $.Event('show.bs.'+ this.type)
+
+    if (this.hasContent() && this.enabled) {
+      this.$element.trigger(e)
+
+      if (e.isDefaultPrevented()) return
+
+      var $tip = this.tip()
+
+      this.setContent()
+
+      if (this.options.animation) $tip.addClass('fade')
+
+      var placement = typeof this.options.placement == 'function' ?
+        this.options.placement.call(this, $tip[0], this.$element[0]) :
+        this.options.placement
+
+      var autoToken = /\s?auto?\s?/i
+      var autoPlace = autoToken.test(placement)
+      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
+
+      $tip
+        .detach()
+        .css({ top: 0, left: 0, display: 'block' })
+        .addClass(placement)
+
+      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+
+      var pos          = this.getPosition()
+      var actualWidth  = $tip[0].offsetWidth
+      var actualHeight = $tip[0].offsetHeight
+
+      if (autoPlace) {
+        var $parent = this.$element.parent()
+
+        var orgPlacement = placement
+        var docScroll    = document.documentElement.scrollTop || document.body.scrollTop
+        var parentWidth  = this.options.container == 'body' ? window.innerWidth  : $parent.outerWidth()
+        var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight()
+        var parentLeft   = this.options.container == 'body' ? 0 : $parent.offset().left
+
+        placement = placement == 'bottom' && pos.top   + pos.height  + actualHeight - docScroll > parentHeight  ? 'top'    :
+                    placement == 'top'    && pos.top   - docScroll   - actualHeight < 0                         ? 'bottom' :
+                    placement == 'right'  && pos.right + actualWidth > parentWidth                              ? 'left'   :
+                    placement == 'left'   && pos.left  - actualWidth < parentLeft                               ? 'right'  :
+                    placement
+
+        $tip
+          .removeClass(orgPlacement)
+          .addClass(placement)
+      }
+
+      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
+
+      this.applyPlacement(calculatedOffset, placement)
+      this.$element.trigger('shown.bs.' + this.type)
+    }
+  }
+
+  Tooltip.prototype.applyPlacement = function(offset, placement) {
+    var replace
+    var $tip   = this.tip()
+    var width  = $tip[0].offsetWidth
+    var height = $tip[0].offsetHeight
+
+    // manually read margins because getBoundingClientRect includes difference
+    var marginTop = parseInt($tip.css('margin-top'), 10)
+    var marginLeft = parseInt($tip.css('margin-left'), 10)
+
+    // we must check for NaN for ie 8/9
+    if (isNaN(marginTop))  marginTop  = 0
+    if (isNaN(marginLeft)) marginLeft = 0
+
+    offset.top  = offset.top  + marginTop
+    offset.left = offset.left + marginLeft
+
+    $tip
+      .offset(offset)
+      .addClass('in')
+
+    // check to see if placing tip in new offset caused the tip to resize itself
+    var actualWidth  = $tip[0].offsetWidth
+    var actualHeight = $tip[0].offsetHeight
+
+    if (placement == 'top' && actualHeight != height) {
+      replace = true
+      offset.top = offset.top + height - actualHeight
+    }
+
+    if (/bottom|top/.test(placement)) {
+      var delta = 0
+
+      if (offset.left < 0) {
+        delta       = offset.left * -2
+        offset.left = 0
+
+        $tip.offset(offset)
+
+        actualWidth  = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+      }
+
+      this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
+    } else {
+      this.replaceArrow(actualHeight - height, actualHeight, 'top')
+    }
+
+    if (replace) $tip.offset(offset)
+  }
+
+  Tooltip.prototype.replaceArrow = function(delta, dimension, position) {
+    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
+  }
+
+  Tooltip.prototype.setContent = function () {
+    var $tip  = this.tip()
+    var title = this.getTitle()
+
+    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+    $tip.removeClass('fade in top bottom left right')
+  }
+
+  Tooltip.prototype.hide = function () {
+    var that = this
+    var $tip = this.tip()
+    var e    = $.Event('hide.bs.' + this.type)
+
+    function complete() {
+      if (that.hoverState != 'in') $tip.detach()
+    }
+
+    this.$element.trigger(e)
+
+    if (e.isDefaultPrevented()) return
+
+    $tip.removeClass('in')
+
+    $.support.transition && this.$tip.hasClass('fade') ?
+      $tip
+        .one($.support.transition.end, complete)
+        .emulateTransitionEnd(150) :
+      complete()
+
+    this.$element.trigger('hidden.bs.' + this.type)
+
+    return this
+  }
+
+  Tooltip.prototype.fixTitle = function () {
+    var $e = this.$element
+    if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
+    }
+  }
+
+  Tooltip.prototype.hasContent = function () {
+    return this.getTitle()
+  }
+
+  Tooltip.prototype.getPosition = function () {
+    var el = this.$element[0]
+    return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
+      width: el.offsetWidth
+    , height: el.offsetHeight
+    }, this.$element.offset())
+  }
+
+  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
+    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
+        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
+  }
+
+  Tooltip.prototype.getTitle = function () {
+    var title
+    var $e = this.$element
+    var o  = this.options
+
+    title = $e.attr('data-original-title')
+      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+    return title
+  }
+
+  Tooltip.prototype.tip = function () {
+    return this.$tip = this.$tip || $(this.options.template)
+  }
+
+  Tooltip.prototype.arrow = function () {
+    return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
+  }
+
+  Tooltip.prototype.validate = function () {
+    if (!this.$element[0].parentNode) {
+      this.hide()
+      this.$element = null
+      this.options  = null
+    }
+  }
+
+  Tooltip.prototype.enable = function () {
+    this.enabled = true
+  }
+
+  Tooltip.prototype.disable = function () {
+    this.enabled = false
+  }
+
+  Tooltip.prototype.toggleEnabled = function () {
+    this.enabled = !this.enabled
+  }
+
+  Tooltip.prototype.toggle = function (e) {
+    var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
+    self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
+  }
+
+  Tooltip.prototype.destroy = function () {
+    this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
+  }
+
+
+  // TOOLTIP PLUGIN DEFINITION
+  // =========================
+
+  var old = $.fn.lapstooltip
+
+  $.fn.lapstooltip = function (option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.lapstooltip')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.lapstooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.lapstooltip.Constructor = Tooltip
+
+
+  // TOOLTIP NO CONFLICT
+  // ===================
+
+  $.fn.lapstooltip.noConflict = function () {
+    $.fn.lapstooltip = old
+    return this
+  }
+
+}(jQuery);
@@ -1,12 +1,12 @@
 <?php
 /*
 Plugin Name: Laps
-Plugin URI: 
+Plugin URI: https://bitbucket.org/Rarst/laps/
 Description: Light WordPress profiler.
 Author: Andrey "Rarst" Savchenko
-Version: 1.0
+Version: 1.1
 Author URI: http://www.rarst.net/
-Text Domain: 
+Text Domain: laps
 Domain Path: /lang
 License: MIT

@@ -1,28 +1,59 @@
 # Description

-Laps is light WordPress profiler, which aims to be:
+Laps is light WordPress profiler (in a plugin), which aims to be:

 - always on and zero click (just hover on toolbar entry) away
 - quick indicator of what hogs page in general or right now

 It is no match or replacement for *real* profiler, but is friendly and cute.

-# Installation
+Out of the box Laps supports common stage of WordPress page life cycle:

-Laps is a Composer package and can be installed via:
+ - plugins load
+ - themes load
+ - core init
+ - main loop

-    php composer.phar create-project rarst/laps --repository-url=http://rarst.net
+And some of third party hooks conventions for themes using:

-# Frequently Asked Questions
+ - Theme Hook Alliance
+ - Hybrid
+ - Genesis
+ - Thematic

-None... Yet.
+There are also additional optional timelines, displaying:
+
+ - SQL queries (with `SAVEQUERIES` constant enabled)
+ - HTTP requests performed

 # Screenshot

 ![Laps screenshot](http://i.imgur.com/zFokmkU.png)

+# Installation
+
+Laps is a Composer package and can be installed in plugin directory via:
+
+    composer create-project rarst/laps --no-dev
+
+# Frequently Asked Questions
+
+None... Yet.
+
 # Changelog

+## 1.2
+
+ - merged RP with additional core events in admin
+ - implemented (ballpark) toolbar event
+ - fixed issue with event offsets in timelines
+
+## 1.1
+
+ - added SQL timeline
+ - added HTTP timeline
+ - switched tooltips implementation to Bootstrap script
+
 ## 1.0

 - Initial public release
@@ -35,4 +66,3 @@ Laps own code is licensed under MIT and it makes use of code from:
 - Symfony Stopwatch (MIT)
 - Mustache.php (MIT)
 - Twitter Bootstrap (Apache License 2.0)
- - Hint.css (MIT)
@@ -2,8 +2,14 @@

 namespace Rarst\Laps;

+/**
+ * Main set of events for WordPress core
+ */
 class Core_Events extends Laps_Events {

+	/**
+	 * @return array
+	 */
 	public function get_events() {

 		$stops = array();
@@ -36,6 +42,32 @@ class Core_Events extends Laps_Events {
 			'category' => 'core',
 		);

+		$stops['admin_init'][- 1] = array(
+			'event'    => 'Core Admin Init',
+			'category' => 'core',
+		);
+
+		$stops['admin_init'][ PHP_INT_MAX -1 ] = array(
+			'action'   => 'stop',
+			'event'    => 'Core Admin Init',
+			'category' => 'core',
+		);
+
+		$stops['_admin_menu'][- 1] = array(
+			'event'    => 'Admin Menu',
+			'category' => 'core',
+		);
+		$stops['admin_menu'][ PHP_INT_MAX -1 ] = array(
+			'action'   => 'stop',
+			'event'    => 'Admin Menu',
+			'category' => 'core',
+		);
+
+		$stops['admin_bar_menu'][-1] = array(
+			'event'    => 'Toolbar',
+			'category' => 'core',
+		);
+
 		$stops['loop_start'][10] = array(
 			'event'    => 'Main Loop',
 			'category' => 'theme',
@@ -47,6 +79,17 @@ class Core_Events extends Laps_Events {
 			'category' => 'theme',
 		);

+		$stops['admin_enqueue_scripts'][10] = array(
+			'event'    => 'Admin Print Scripts',
+			'category' => 'core',
+		);
+
+		$stops['admin_print_scripts'][10] = array(
+			'action'   => 'stop',
+			'event'    => 'Admin Print Scripts',
+			'category' => 'core',
+		);
+
 		return $stops;
 	}
 }
@@ -2,9 +2,28 @@

 namespace Rarst\Laps;

+/**
+ * Base class for bulk event providers
+ */
 abstract class Laps_Events {

 	/**
+	 * Retrieve array of event data
+	 *
+	 * @return array
+	 */
+	public function get() {
+
+		if ( $this->is_applicable() ) {
+			return $this->get_events();
+		}
+
+		return array();
+	}
+
+	/**
+	 * Is event pack relevant to current runtime
+	 *
 	 * @return bool
 	 */
 	protected function is_applicable() {
@@ -13,17 +32,8 @@ abstract class Laps_Events {
 	}

 	/**
-	 * @return array
-	 */
-	public function get() {
-
-		if( $this->is_applicable() )
-			return $this->get_events();
-
-		return array();
-	}
-
-	/**
+	 * Inherit with internal events compiling and return
+	 *
 	 * @return array()
 	 */
 	abstract protected function get_events();
@@ -2,13 +2,24 @@

 namespace Rarst\Laps;

+/**
+ * Events for Genesis Framework based themes
+ *
+ * @link http://my.studiopress.com/themes/genesis/
+ */
 class Genesis_Events extends Laps_Events {

+	/**
+	 * @return bool
+	 */
 	protected function is_applicable() {

 		return function_exists( 'genesis' );
 	}

+	/**
+	 * @return array
+	 */
 	protected function get_events() {

 		$events = array();
@@ -2,13 +2,24 @@

 namespace Rarst\Laps;

+/**
+ * Events for Hybrid Core based themes
+ *
+ * @link http://themehybrid.com/hybrid-core
+ */
 class Hybrid_Events extends Laps_Events {

+	/**
+	 * @return bool
+	 */
 	protected function is_applicable() {

 		return defined( 'HYBRID_VERSION' );
 	}

+	/**
+	 * @return array
+	 */
 	protected function get_events() {

 		$events = array();
@@ -27,7 +38,7 @@ class Hybrid_Events extends Laps_Events {

 		$sidebars = get_theme_support( 'hybrid-core-sidebars' );

-		if ( ! empty( $sidebars[0] ) )
+		if ( ! empty( $sidebars[0] ) ) {
 			foreach ( $sidebars[0] as $sidebar ) {

 				$events["{$prefix}_before_{$sidebar}"][10] = array(
@@ -41,6 +52,7 @@ class Hybrid_Events extends Laps_Events {
 					'category' => 'theme',
 				);
 			}
+		}

 		return $events;
 	}
@@ -12,14 +12,16 @@ class Laps {
 	/**  @var Stopwatch $stopwatch */
 	public static $stopwatch;
 	public static $events = array();
+	public static $query_starts = array();

 	/**
 	 * Start Stopwatch and timing plugin load immediately, then set up core events and needed hooks.
 	 */
 	static function on_load() {

-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
 			return;
+		}

 		self::$stopwatch = new Stopwatch();
 		self::$stopwatch->start( 'Plugins Load', 'plugin' );
@@ -28,8 +30,14 @@ class Laps {

 		add_action( 'pre_update_option_active_plugins', array( __CLASS__, 'pre_update_option_active_plugins' ) );
 		add_action( 'pre_update_site_option_active_sitewide_plugins', array( __CLASS__, 'pre_update_option_active_plugins' ) );
+		add_action( 'pre_http_request', array( __CLASS__, 'pre_http_request' ), 10, 3 );
+		add_action( 'http_api_debug', array( __CLASS__, 'http_api_debug' ), 10, 5 );
 		add_action( 'after_setup_theme', array( __CLASS__, 'after_setup_theme' ), 15 );
 		add_action( 'init', array( __CLASS__, 'init' ) );
+
+		if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) {
+			add_filter( 'query', array( __CLASS__, 'query' ), 20 );
+		}
 	}

 	/**
@@ -86,16 +94,73 @@ class Laps {
 		$filter   = current_filter();
 		$priority = key( $wp_filter[$filter] );

-		$event = wp_parse_args( self::$events[$filter][$priority], array(
+		$event = wp_parse_args(
+			self::$events[$filter][$priority],
+			array(
 				'action'   => 'start',
 				'category' => null,
-		) );
+			)
+		);

 		self::$stopwatch->$event['action']( $event['event'], $event['category'] );

 		return $input;
 	}

+	/**
+	 * Capture SQL queries start times
+	 *
+	 * @param string $query
+	 *
+	 * @return string
+	 */
+	static function query( $query ) {
+
+		global $wpdb;
+
+		if ( empty( self::$query_starts ) && ! empty( $wpdb->queries ) ) {
+			self::$query_starts[count( $wpdb->queries )] = microtime( true ) * 1000;
+		} else {
+			self::$query_starts[] = microtime( true ) * 1000;
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Capture start time of HTTP request
+	 *
+	 * @param boolean $false
+	 * @param array   $args
+	 * @param string  $url
+	 *
+	 * @return boolean
+	 */
+	static function pre_http_request( $false, $args, $url ) {
+
+		self::$stopwatch->start( $url, 'http' );
+
+		return $false;
+	}
+
+	/**
+	 * Capture end time of HTTP request
+	 *
+	 * @param array|\WP_Error $response
+	 * @param string          $type
+	 * @param object          $class
+	 * @param array           $args
+	 * @param string          $url
+	 *
+	 * @return mixed
+	 */
+	static function http_api_debug( $response, $type, $class, $args, $url ) {
+
+		self::$stopwatch->stop( $url );
+
+		return $response;
+	}
+
 	/**
 	 * When theme is done possibly add theme-specific events.
 	 */
@@ -115,16 +180,35 @@ class Laps {
 		add_action( 'wp_enqueue_scripts', array( __CLASS__, 'enqueue_scripts' ) );
 		add_action( 'admin_enqueue_scripts', array( __CLASS__, 'enqueue_scripts' ) );
 		add_action( 'admin_bar_menu', array( __CLASS__, 'admin_bar_menu' ), 100 );
+		add_action( 'wp_print_footer_scripts', array( __CLASS__, 'print_footer_scripts' ), 11 );
+		add_action( 'admin_print_footer_scripts', array( __CLASS__, 'print_footer_scripts' ), 11 );
 	}

 	static function enqueue_scripts() {

-		wp_register_style( 'laps-hint', plugins_url( 'css/hint.css', __DIR__ ), array(), '1.2.1' );
-		wp_register_style( 'laps', plugins_url( 'css/laps.css', __DIR__ ), array( 'laps-hint' ) );
+		wp_register_script( 'laps-tooltip', plugins_url( 'js/tooltip.js', __DIR__ ), array( 'jquery' ), '3.0.2', true );
+		wp_register_style( 'laps', plugins_url( 'css/laps.css', __DIR__ ) );

-		if ( is_admin_bar_showing() )
+		if ( is_admin_bar_showing() ) {
+			wp_enqueue_script( 'laps-tooltip' );
 			wp_enqueue_style( 'laps' );
 		}
+	}
+
+	static function print_footer_scripts() {
+
+		if ( wp_script_is( 'laps-tooltip', 'done' ) ) {
+			?>
+			<script type="text/javascript">
+				jQuery(document).ready(function () {
+					jQuery(".laps-timeline .event").lapstooltip({
+						container: '#wpadminbar', placement: 'bottom', html: true
+//						, trigger: 'click'
+					});
+				});
+			</script><?php
+		}
+	}

 	/**
 	 * Render interface and add to the toolbar.
@@ -133,20 +217,26 @@ class Laps {
 	 */
 	static function admin_bar_menu( $wp_admin_bar ) {

-		if ( ! apply_filters( 'laps_can_see', current_user_can( 'manage_options' ) ) )
+		if ( ! apply_filters( 'laps_can_see', current_user_can( 'manage_options' ) ) ) {
 			return;
+		}

-		global $timestart;
+		global $timestart, $wpdb;

-		$mustache = new \Mustache_Engine( array(
+		$mustache = new \Mustache_Engine(
+			array(
 				'loader' => new \Mustache_Loader_FilesystemLoader( dirname( __DIR__ ) . '/views' ),
-		) );
+			)
+		);
+
+		self::$stopwatch->stop( 'Toolbar' );

 		$events     = self::$stopwatch->getSectionEvents( '__root__' );
 		$start      = $timestart * 1000;
 		$end        = microtime( true ) * 1000;
 		$total      = $end - $start;
 		$event_data = array();
+		$http_data  = array();

 		foreach ( $events as $name => $event ) {

@@ -154,22 +244,78 @@ class Laps {
 			$duration = $event->getDuration();
 			$width    = round( $duration / $total * 100, 2 );
 			$category = $event->getCategory();
+
+			if ( 'http' == $category ) {
+				$http_data[] = compact( 'name', 'offset', 'duration', 'width', 'category' );
+				continue;
+			}
+
 			$memory = $event->getMemory() / 1024 / 1024;

 			$event_data[] = compact( 'name', 'offset', 'duration', 'width', 'category', 'memory' );
 		}

-		$html = $mustache->render( 'laps', array( 'events' => $event_data ) );
+		$query_data     = array();
+		$last_query_end = 0;
+		$last_offset    = 0;
+		$last_duration  = 0;
+		$category       = 'query';

-		$wp_admin_bar->add_node( array(
+		if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) {
+
+			foreach ( $wpdb->queries as $key => $query ) {
+				$query_start = isset( self::$query_starts[$key] ) ? self::$query_starts[$key] : $last_query_end;
+				list( $sql, $duration, $trace ) = $query;
+				$duration *= 1000;
+				$last_query_end = $query_start + $duration;
+				$offset         = round( ( $query_start - $start ) / $total * 100, 2 );
+
+				// if query is indistinguishably close to previous then stack it
+				if ( $offset == $last_offset ) {
+					$key = count( $query_data ) - 1;
+					$query_data[$key]['sql'] .= '<br />' . $sql;
+
+					$last_duration += $duration;
+					$width                     = round( $last_duration / $total * 100, 2 );
+					$query_data[$key]['width'] = $width;
+
+					continue;
+				}
+
+				$width         = round( $duration / $total * 100, 2 );
+				$last_offset   = $offset;
+				$last_duration = $duration;
+
+				$query_data[] = compact( 'sql', 'duration', 'offset', 'width', 'category' );
+			}
+		}
+
+//		!d( self::$query_starts, $wpdb->queries, $query_data );
+
+		$html = $mustache->render(
+			'laps',
+			array(
+				'events'      => $event_data,
+				'queries'     => $query_data,
+				'savequeries' => defined( 'SAVEQUERIES' ) && SAVEQUERIES,
+				'http'        => $http_data,
+				'savehttp'    => ! empty( $http_data ),
+			)
+		);
+
+		$wp_admin_bar->add_node(
+			array(
 				'id'    => 'laps',
 				'title' => sprintf( 'Lap: %ss', round( $total / 1000, 3 ) ),
-		) );
+			)
+		);

-		$wp_admin_bar->add_node( array(
+		$wp_admin_bar->add_node(
+			array(
 				'id'     => 'laps_output',
 				'parent' => 'laps',
 				'meta'   => array( 'html' => $html ),
-		) );
+			)
+		);
 	}
 }
@@ -2,13 +2,24 @@

 namespace Rarst\Laps;

+/**
+ * Events for Theme Hook Alliance
+ *
+ * @link http://zamoose.github.io/themehookalliance/
+ */
 class THA_Events extends Laps_Events {

+	/**
+	 * @return bool
+	 */
 	protected function is_applicable() {

 		return defined( 'THA_HOOKS_VERSION' );
 	}

+	/**
+	 * @return array
+	 */
 	protected function get_events() {

 		$events = array();
@@ -2,13 +2,24 @@

 namespace Rarst\Laps;

+/**
+ * Events for Thematic Framework based themes
+ *
+ * @link http://thematictheme.com/
+ */
 class Thematic_Events extends Laps_Events {

+	/**
+	 * @return bool
+	 */
 	protected function is_applicable() {

 		return function_exists( 'thematic_init' );
 	}

+	/**
+	 * @return array
+	 */
 	protected function get_events() {

 		$events = array();
@@ -1,5 +1,21 @@
 <div class="laps-timeline">
 	{{#events}}
-		<div class="event event-{{category}} hint--bottom" data-hint="{{name}} - {{duration}} ms - {{memory}} MB" style="width:{{width}}%; left:{{offset}}%;"></div>
+		<div class="event event-{{category}}" data-toggle="tooltip" title="{{name}} - {{duration}} ms - {{memory}} MB" style="width:{{width}}%; left:{{offset}}%;"></div>
 	{{/events}}
 </div>
+
+{{#savequeries}}
+<div class="laps-timeline">
+	{{#queries}}
+		<div class="event event-{{category}}" title="{{sql}}" style="width:{{width}}%; left:{{offset}}%;"></div>
+	{{/queries}}
+</div>
+{{/savequeries}}
+
+{{#savehttp}}
+<div class="laps-timeline">
+	{{#http}}
+		<div class="event event-{{category}}" title="{{name}} - {{duration}} ms" style="width:{{width}}%; left:{{offset}}%;"></div>
+	{{/http}}
+</div>
+{{/savehttp}}
Author	SHA1	Message	Date
Andrey Savchenko	5cea91d656	Updated readme for 1.2 release.	2014-05-18 23:04:09 +03:00
Andrey Savchenko	f568830513	Positioned timeline containers to fix absolute positioning of events inside.	2014-05-18 23:01:09 +03:00
Andrey Savchenko	00ba356da7	Refactored Toolbar event.	2014-05-18 22:41:45 +03:00
Andrey Savchenko	54bb79b202	Updated installation instructions for Packagist.	2014-05-18 22:02:46 +03:00
Andrey Savchenko	334d1cbacc	Renamed .hgignore to .gitignore	2014-05-18 22:00:51 +03:00
Tom Nowell	32d8752261	use the core event category rather than admin	2014-04-14 14:36:38 +00:00
Tom Nowell	84eba6e39d	Add additional core events	2014-04-12 18:41:11 +00:00
Andrey Savchenko	b774292fda	Added tag 1.1 for changeset a0de24fa9421	2013-12-11 18:05:59 +02:00
Andrey Savchenko	8c21576f02	Updated version and readme	2013-12-11 18:05:35 +02:00
Andrey Savchenko	edb6941eb7	Cleaned up for inspection (coding style, PHPDoc)	2013-12-11 17:47:45 +02:00
Andrey Savchenko	68d6154a5e	Switched handling of minimum event width to CSS	2013-12-06 19:17:55 +02:00
Andrey Savchenko	6565cf9cdb	Implemented initial HTTP timeline	2013-12-06 00:58:59 +02:00
Andrey Savchenko	247f6f53aa	More coding style stuff	2013-12-06 00:15:32 +02:00
Andrey Savchenko	4cc18430da	Moved script to normal queue since noConflict was a bust	2013-12-05 23:49:08 +02:00
Andrey Savchenko	0ed37d4d92	Updated for coding style	2013-12-05 23:40:42 +02:00
Andrey Savchenko	b7028e1f5a	Changed dependency versions to allow minor version updates	2013-12-05 23:35:11 +02:00
Andrey Savchenko	3031ca5ca0	Implemented stacking close queries	2013-12-04 23:18:31 +02:00
Andrey Savchenko	e2a176f8ef	Switched tooltips implementation to modified Bootstrap script	2013-12-04 22:18:38 +02:00
Andrey Savchenko	d8f354afbc	Added initial take on SQL queries timeline.	2013-11-30 18:14:36 +02:00
Andrey Savchenko	06c4d5a57a	Updates styles with Bootstrap v3	2013-11-27 19:14:33 +02:00
Rarst	ea99e8bd35	Tweaked styling for multiple timelines.	2013-06-19 01:21:29 +03:00
Rarst	382f61a78d	Clarified it is a plugin in readme, moved screenshot section higher.	2013-04-23 00:47:50 +03:00
Rarst	100411fb7d	Added plugin URL and text domain to header.	2013-04-23 00:42:18 +03:00
Rarst	9b7c6e303d	Added info about supported stages and frameworks to readme.	2013-04-22 23:45:01 +03:00
Rarst	8d9ff845cf	Added tag 1.0 for changeset bf0eefc37428	2013-04-22 23:38:22 +03:00