Merge branch 'master' into playlist_tags

circle.yml

@@ -12,6 +12,8 @@ dependencies:
     - mkdir -p ${GOPATH}/src/${ORG_PATH}
     - mkdir -p ${GOPATH}/src/${ORG_PATH}
     - ln -s ~/grafana ${GOPATH}/src/${ORG_PATH}
     - ln -s ~/grafana ${GOPATH}/src/${ORG_PATH}
     - go get github.com/tools/godep
     - go get github.com/tools/godep
+    - rm -rf node_modules
+    - npm install -g npm
     - npm install
     - npm install
 
 
 test:
 test:

docs/sources/reference/singlestat.md

@@ -31,7 +31,7 @@ The coloring options of the Singlestat Panel config allow you to dynamically cha
 
 
 1. `Background`: This checkbox applies the configured thresholds and colors to the entirety of the Singlestat Panel background.
 1. `Background`: This checkbox applies the configured thresholds and colors to the entirety of the Singlestat Panel background.
 2. `Value`: This checkbox applies the configured thresholds and colors to the summary stat.
 2. `Value`: This checkbox applies the configured thresholds and colors to the summary stat.
-3. `Thresholds`: Change the background and value colors dynamically within the panel, depending on the Singlestat value. The threshold field accepts **3 comma-separated** values, corresponding to the three colors directly to the right.
+3. `Thresholds`: Change the background and value colors dynamically within the panel, depending on the Singlestat value. The threshold field accepts **2 comma-separated** values which represent 3 ranges that correspond to the three colors directly to the right. For example: if the thresholds are 70, 90 then the first color represents < 70, the second color represents between 70 and 90 and the third color represents > 90.
 4. `Colors`: Select a color and opacity
 4. `Colors`: Select a color and opacity
 5. `Invert order`: This link toggles the threshold color order.</br>For example: Green, Orange, Red (<img class="no-shadow" src="/img/v1/gyr.png">) will become Red, Orange, Green (<img class="no-shadow" src="/img/v1/ryg.png">).
 5. `Invert order`: This link toggles the threshold color order.</br>For example: Green, Orange, Red (<img class="no-shadow" src="/img/v1/gyr.png">) will become Red, Orange, Green (<img class="no-shadow" src="/img/v1/ryg.png">).
 
 

public/app/core/components/search/search.html

@@ -5,11 +5,11 @@
 		</span>
 		</span>
 		<div class="search-switches">
 		<div class="search-switches">
 			<i class="fa fa-filter"></i>
 			<i class="fa fa-filter"></i>
-			<a class="pointer" href="javascript:void 0;" ng-click="showStarred()" tabindex="2">
+			<a class="pointer" href="javascript:void 0;" ng-click="ctrl.showStarred()" tabindex="2">
 				<i class="fa fa-remove" ng-show="ctrl.query.starred"></i>
 				<i class="fa fa-remove" ng-show="ctrl.query.starred"></i>
 				starred
 				starred
 			</a> |
 			</a> |
-			<a class="pointer" href="javascript:void 0;" ng-click="getTags()" tabindex="3">
+			<a class="pointer" href="javascript:void 0;" ng-click="ctrl.getTags()" tabindex="3">
 				<i class="fa fa-remove" ng-show="ctrl.tagsMode"></i>
 				<i class="fa fa-remove" ng-show="ctrl.tagsMode"></i>
 				tags
 				tags
 			</a>
 			</a>
@@ -30,7 +30,7 @@
 			<div class="span6 offset1">
 			<div class="span6 offset1">
 				<div ng-repeat="tag in results" class="pointer" style="width: 180px; float: left;"
 				<div ng-repeat="tag in results" class="pointer" style="width: 180px; float: left;"
 					ng-class="{'selected': $index === selectedIndex }"
 					ng-class="{'selected': $index === selectedIndex }"
-					ng-click="filterByTag(tag.term, $event)">
+					ng-click="ctrl.filterByTag(tag.term, $event)">
 					<a class="search-result-tag label label-tag" tag-color-from-name="tag.term">
 					<a class="search-result-tag label label-tag" tag-color-from-name="tag.term">
 						<i class="fa fa-tag"></i>
 						<i class="fa fa-tag"></i>
 						<span>{{tag.term}} &nbsp;({{tag.count}})</span>
 						<span>{{tag.term}} &nbsp;({{tag.count}})</span>

public/less/login.less

@@ -110,13 +110,9 @@
   text-align: center;
   text-align: center;
   border: 1px solid @grafanaTargetFuncBackground;
   border: 1px solid @grafanaTargetFuncBackground;
 	background-color: @grafanaPanelBackground;
 	background-color: @grafanaPanelBackground;
-	position: fixed;
-  max-width: 800px;
-  left: 0;
-  right: 0;
+  width: 800px;
   margin-left: auto;
   margin-left: auto;
   margin-right: auto;
   margin-right: auto;
-  top: 20%;
 
 
   .tight-form {
   .tight-form {
     text-align: left;
     text-align: left;