added bundled dashboards

public/app/features/plugins/import_list/import_list.html

@@ -13,12 +13,6 @@
 						{{dash.title}}
 					</span>
 				</td>
-				<td>
-          <span>
-            Revision: {{dash.revision}}
-            <span ng-if="dash.imported" class="small">(Imported: {{dash.importedRevision}})</span>
-          <span>
-				</td>
 				<td style="text-align: right">
 					<button class="btn btn-secondary btn-small" ng-click="ctrl.import(dash, false)" ng-show="!dash.imported">
 						Import

public/app/features/plugins/partials/ds_edit.html

@@ -30,16 +30,15 @@
 
 <div class="page-container page-body">
 
-  <h3 class="page-sub-heading" ng-hide="ctrl.isNew">Edit Data Source</h3>
-  <h3 class="page-sub-heading" ng-show="ctrl.isNew">New Data Source</h3>
-
   <div ng-if="ctrl.current.readOnly"  class="page-action-bar">
     <div class="grafana-info-box span8">
       Disclaimer. This datasource was added by config and cannot be modified using the UI. Please contact your server admin to update this datasource.
     </div>
   </div>
 
-	<div ng-if="ctrl.tabIndex === 0">
+  <h3 class="page-sub-heading" ng-hide="ctrl.isNew">Edit Data Source</h3>
+  <h3 class="page-sub-heading" ng-show="ctrl.isNew">New Data Source</h3>
+
   <form name="ctrl.editForm" ng-if="ctrl.current">
     <div class="gf-form-group">
       <div class="gf-form-inline">
@@ -73,6 +72,13 @@
       </plugin-component>
     </rebuild-on-change>
 
+    <div ng-if="ctrl.hasDashboards">
+      <h3 class="section-heading">Bundled Plugin Dashboards</h3>
+      <div class="section">
+        <dashboard-import-list plugin="ctrl.datasourceMeta" datasource="ctrl.current"></dashboard-import-list>
+      </div>
+    </div>
+
     <div ng-if="ctrl.testing" class="gf-form-group section">
       <h5 ng-show="!ctrl.testing.done">Testing.... <i class="fa fa-spiner fa-spin"></i></h5>
       <div class="alert-{{ctrl.testing.status}} alert" ng-show="ctrl.testing.done">
@@ -99,8 +105,4 @@
     <br />
 
   </form>
-	</div>
-	<div ng-if="ctrl.tabIndex === 1">
-		<dashboard-import-list plugin="ctrl.datasourceMeta" datasource="ctrl.current"></dashboard-import-list>
-	</div>
 </div>

public/app/features/plugins/partials/ds_http_settings.html

@@ -53,7 +53,6 @@
   <div class="gf-form-inline">
     <gf-form-switch class="gf-form" ng-if="current.access=='proxy'" label="Skip TLS Verification (Insecure)" label-class="width-16" checked="current.jsonData.tlsSkipVerify" switch-class="max-width-6"></gf-form-switch>
   </div>
-  </div>
 </div>
 
 <div class="gf-form-group" ng-if="current.basicAuth">

public/app/plugins/datasource/graphite/partials/config.html

@@ -3,7 +3,7 @@
 	suggest-url="http://localhost:8080">
 </datasource-http-settings>
 
-<h3 class="page-heading">Graphite details</h3>
+<h3 class="section-heading">Graphite details</h3>
 
 <div class="gf-form-group">
 	<div class="gf-form">