Merge branch 'develop' of github.com:grafana/grafana into develop

public/app/features/dashboard/partials/dashboardList.html

@@ -51,8 +51,8 @@
         </div>
         </div>
       </div>
       </div>
 
 
-        <div class="admin-list-table" style="height: 80%">
-          <div>
+        <div style="height: 80%">
+          <div style="width: 40%; display: flex; float: right;">
             <select
             <select
               class="gf-form-input"
               class="gf-form-input"
               ng-model="ctrl.selectedStarredFilter"
               ng-model="ctrl.selectedStarredFilter"
@@ -67,16 +67,15 @@
             />
             />
           </div>
           </div>
           <div gemini-scrollbar>
           <div gemini-scrollbar>
-            <div ng-show="ctrl.sections.length > 0">
+            <div class="search-results-container" ng-show="ctrl.sections.length > 0">
               <div ng-repeat="section in ctrl.sections" class="search-section">
               <div ng-repeat="section in ctrl.sections" class="search-section">
 
 
-                <div class="search-section__header pointer" ng-show="::section.title">
+                <div class="search-section__header__with-checkbox" ng-hide="section.hideHeader">
                   <gf-form-switch
                   <gf-form-switch
-                    switch-class="gf-form-switch--table-cell"
                     on-change="ctrl.selectionChanged()"
                     on-change="ctrl.selectionChanged()"
                     checked="section.checked">
                     checked="section.checked">
                   </gf-form-switch>
                   </gf-form-switch>
-                  <a ng-click="ctrl.toggleFolder(section)">
+                  <a  class="search-section__header pointer" ng-click="ctrl.toggleFolder(section)" ng-hide="section.hideHeader">
                     <i class="search-section__header__icon" ng-class="section.icon"></i>
                     <i class="search-section__header__icon" ng-class="section.icon"></i>
                     <span class="search-section__header__text">{{::section.title}}</span>
                     <span class="search-section__header__text">{{::section.title}}</span>
                     <i class="fa fa-minus search-section__header__toggle" ng-show="section.expanded"></i>
                     <i class="fa fa-minus search-section__header__toggle" ng-show="section.expanded"></i>
@@ -85,17 +84,20 @@
                 </div>
                 </div>
 
 
                 <div ng-if="section.expanded">
                 <div ng-if="section.expanded">
-                  <div ng-repeat="item in section.items" class="search-item" ng-class="{'selected': item.selected}">
+                  <div ng-repeat="item in section.items" class="search-item__with-checkbox" ng-class="{'selected': item.selected}">
                     <gf-form-switch
                     <gf-form-switch
-                      switch-class="gf-form-switch--table-cell"
                       on-change="ctrl.selectionChanged()"
                       on-change="ctrl.selectionChanged()"
                       checked="item.checked" />
                       checked="item.checked" />
-                    <a ng-href="{{::item.url}}">
+                    <a ng-href="{{::item.url}}" class="search-item">
                       <span class="search-item__icon">
                       <span class="search-item__icon">
                         <i class="fa fa-th-large"></i>
                         <i class="fa fa-th-large"></i>
                       </span>
                       </span>
-                      <span class="search-item__title">
-                        {{::item.title}}
+                      <span class="search-item__body">
+                        <div class="search-item__body-title">{{::item.title}}</div>
+                        <div class="search-item__body-sub-title" ng-show="item.folderTitle && section.hideHeader">
+                          <i class="fa fa-folder-o"></i>
+                          {{::item.folderTitle}}
+                        </div>
                       </span>
                       </span>
                       <span class="search-item__tags">
                       <span class="search-item__tags">
                         <span ng-click="ctrl.filterByTag(tag, $event)" ng-repeat="tag in item.tags" tag-color-from-name="tag"  class="label label-tag">
                         <span ng-click="ctrl.filterByTag(tag, $event)" ng-repeat="tag in item.tags" tag-color-from-name="tag"  class="label label-tag">

public/sass/components/_search.scss

@@ -16,12 +16,6 @@
   bottom: 0;
   bottom: 0;
   z-index: ($zindex-modal-backdrop + 10);
   z-index: ($zindex-modal-backdrop + 10);
   position: fixed;
   position: fixed;
-
-  .label-tag {
-    margin-left: 6px;
-    font-size: 11px;
-    padding: 2px 6px;
-  }
 }
 }
 
 
 // Search
 // Search
@@ -84,6 +78,12 @@
   position: relative;
   position: relative;
   flex-grow: 10;
   flex-grow: 10;
 
 
+  .label-tag {
+    margin-left: 6px;
+    font-size: 11px;
+    padding: 2px 6px;
+  }
+
   .selected {
   .selected {
     .search-result-tag {
     .search-result-tag {
       opacity: 0.70;
       opacity: 0.70;
@@ -97,6 +97,7 @@
   padding: 0.6rem 0;
   padding: 0.6rem 0;
   color: $text-color-weak;
   color: $text-color-weak;
   display: flex;
   display: flex;
+  flex-grow: 1;
 
 
   &:hover {
   &:hover {
     color: $text-color-weak;
     color: $text-color-weak;
@@ -107,6 +108,10 @@
   }
   }
 }
 }
 
 
+.search-section__header__with-checkbox {
+  display: flex;
+}
+
 .search-section__header__icon {
 .search-section__header__icon {
   padding: 3px 10px;
   padding: 3px 10px;
 }
 }
@@ -119,11 +124,16 @@
   flex-grow: 1;
   flex-grow: 1;
 }
 }
 
 
+.search-item__with-checkbox {
+  display: flex;
+}
+
 .search-item {
 .search-item {
   @include list-item();
   @include list-item();
   @include left-brand-border();
   @include left-brand-border();
 
 
   display: flex;
   display: flex;
+  flex-grow: 1;
   height: 37px;
   height: 37px;
   white-space: nowrap;
   white-space: nowrap;
   padding: 0px;
   padding: 0px;