Moved timepicker to components

public/app/features/dashboard/timepicker/timepicker.ts → public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts

@@ -159,7 +159,7 @@ export class TimePickerCtrl {
 export function settingsDirective() {
   return {
     restrict: 'E',
-    templateUrl: 'public/app/features/dashboard/timepicker/settings.html',
+    templateUrl: 'public/app/features/dashboard/components/TimePicker/settings.html',
     controller: TimePickerCtrl,
     bindToController: true,
     controllerAs: 'ctrl',
@@ -172,7 +172,7 @@ export function settingsDirective() {
 export function timePickerDirective() {
   return {
     restrict: 'E',
-    templateUrl: 'public/app/features/dashboard/timepicker/timepicker.html',
+    templateUrl: 'public/app/features/dashboard/components/TimePicker/template.html',
     controller: TimePickerCtrl,
     bindToController: true,
     controllerAs: 'ctrl',
@@ -185,5 +185,5 @@ export function timePickerDirective() {
 angular.module('grafana.directives').directive('gfTimePickerSettings', settingsDirective);
 angular.module('grafana.directives').directive('gfTimePicker', timePickerDirective);
 
-import { inputDateDirective } from './input_date';
+import { inputDateDirective } from './validation';
 angular.module('grafana.directives').directive('inputDatetime', inputDateDirective);

public/app/features/dashboard/components/TimePicker/index.ts

@@ -0,0 +1 @@
+export { TimePickerCtrl } from './TimePickerCtrl';

public/app/features/dashboard/index.ts

@@ -12,7 +12,6 @@ import './validation_srv';
 import './time_srv';
 import './unsaved_changes_srv';
 import './unsaved_changes_modal';
-import './timepicker/timepicker';
 import './upload';
 import './ad_hoc_filters';
 import './repeat_option/repeat_option';
@@ -27,6 +26,7 @@ import './components/FolderPicker';
 import './components/VersionHistory';
 import './components/DashboardSettings';
 import './components/SubMenu';
+import './components/TimePicker';
 import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions';
 
 // angular wrappers