From 890c527ae5d4bfe24d60e3e02969916776ec4a53 Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Sat, 21 Nov 2015 06:16:28 -0800
Subject: [PATCH 1/6] Added info dropdown

---
 public/app/features/dashboard/dashboardNavCtrl.js  |  7 ++++++-
 .../dashboard/partials/dashboardTopNav.html        | 14 ++++++++++++++
 public/less/overrides.less                         |  5 +++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index 56a64c4933f..3f4cfc52ac3 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -1,9 +1,10 @@
 define([
   'angular',
   'lodash',
+  'moment',
   'vendor/filesaver'
 ],
-function (angular, _) {
+function (angular, _, moment) {
   'use strict';
 
   var module = angular.module('grafana.controllers');
@@ -157,6 +158,10 @@ function (angular, _) {
       playlistSrv.stop(1);
     };
 
+    $scope.dateFormat = function(date) {
+      return moment(date).format('MMMM Do YYYY, h:mm a');
+    };
+
   });
 
 });
diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html
index 8fa6da1ee2f..a8ffb08fa4c 100644
--- a/public/app/features/dashboard/partials/dashboardTopNav.html
+++ b/public/app/features/dashboard/partials/dashboardTopNav.html
@@ -41,6 +41,20 @@
 						<li ng-if="dashboardMeta.canSave"><a class="pointer" ng-click="deleteDashboard();">Delete dashboard</a></li>
 					</ul>
 				</li>
+        <li class="dropdown">
+          <a class="pointer" ng-click="hideTooltip($event)" bs-tooltip="'Dashboard info'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-info"></i></a>
+          <div class="dropdown-menu dropdown-text">
+          <table>
+            <tr>
+              <td><b>Updated at</b></td><td>&nbsp:&nbsp</td>
+              <td>{{dateFormat(dashboardMeta.updated)}}</td>
+            </tr>
+            <tr>
+              <td><b>Created at</b></td><td>&nbsp:&nbsp</td>
+              <td>{{dateFormat(dashboardMeta.created)}}</td>
+            </tr>
+          </table>
+        </li>
 			</ul>
 
 			<ul class="nav dash-playlist-actions" ng-if="playlistSrv">
diff --git a/public/less/overrides.less b/public/less/overrides.less
index fb6544cd99c..0c702f2a4cf 100644
--- a/public/less/overrides.less
+++ b/public/less/overrides.less
@@ -599,3 +599,8 @@ code, pre {
   margin-left: 0;
   margin-right: -1px;
 }
+
+.dropdown-text {
+  width: 250px;
+  font-size: 12px;  
+}

From e1432f43395f4c01e8cc4af32470db61f3dd47fb Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Sat, 21 Nov 2015 06:20:13 -0800
Subject: [PATCH 2/6] Function name makes sense now

---
 public/app/features/dashboard/dashboardNavCtrl.js           | 2 +-
 public/app/features/dashboard/partials/dashboardTopNav.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index 3f4cfc52ac3..2abf6563ab9 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -158,7 +158,7 @@ function (angular, _, moment) {
       playlistSrv.stop(1);
     };
 
-    $scope.dateFormat = function(date) {
+    $scope.formatDate = function(date) {
       return moment(date).format('MMMM Do YYYY, h:mm a');
     };
 
diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html
index a8ffb08fa4c..9bfeac03acd 100644
--- a/public/app/features/dashboard/partials/dashboardTopNav.html
+++ b/public/app/features/dashboard/partials/dashboardTopNav.html
@@ -47,11 +47,11 @@
           <table>
             <tr>
               <td><b>Updated at</b></td><td>&nbsp:&nbsp</td>
-              <td>{{dateFormat(dashboardMeta.updated)}}</td>
+              <td>{{formatDate(dashboardMeta.updated)}}</td>
             </tr>
             <tr>
               <td><b>Created at</b></td><td>&nbsp:&nbsp</td>
-              <td>{{dateFormat(dashboardMeta.created)}}</td>
+              <td>{{formatDate(dashboardMeta.created)}}</td>
             </tr>
           </table>
         </li>

From c863ea4aa1aeebc30b9dce7bc23763564ad2c3ce Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Sat, 21 Nov 2015 06:43:45 -0800
Subject: [PATCH 3/6] Shortened info details to use less space

---
 public/app/features/dashboard/dashboardNavCtrl.js | 2 +-
 public/less/overrides.less                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index 2abf6563ab9..0d3d42a0fbf 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -159,7 +159,7 @@ function (angular, _, moment) {
     };
 
     $scope.formatDate = function(date) {
-      return moment(date).format('MMMM Do YYYY, h:mm a');
+      return moment(date).format('MMM Do YYYY, h:mm a');
     };
 
   });
diff --git a/public/less/overrides.less b/public/less/overrides.less
index 0c702f2a4cf..e8e96bbd261 100644
--- a/public/less/overrides.less
+++ b/public/less/overrides.less
@@ -601,6 +601,6 @@ code, pre {
 }
 
 .dropdown-text {
-  width: 250px;
+  width: 220px;
   font-size: 12px;  
 }

From 5930dc635484659339734c5f5b105bfdd2690ebb Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Sat, 21 Nov 2015 16:37:15 -0800
Subject: [PATCH 4/6] Removed info icon, Included metadata feature

---
 public/app/core/directives/dash_edit_link.js  |  3 +-
 .../app/features/dashboard/dashboardCtrl.js   |  7 ++-
 .../features/dashboard/dashboardNavCtrl.js    |  7 +--
 .../dashboard/partials/dashboardTopNav.html   | 15 +-----
 .../features/dashboard/partials/metadata.html | 46 +++++++++++++++++++
 public/less/overrides.less                    |  5 --
 6 files changed, 56 insertions(+), 27 deletions(-)
 create mode 100644 public/app/features/dashboard/partials/metadata.html

diff --git a/public/app/core/directives/dash_edit_link.js b/public/app/core/directives/dash_edit_link.js
index 9ab74fe6d74..06c44cc8262 100644
--- a/public/app/core/directives/dash_edit_link.js
+++ b/public/app/core/directives/dash_edit_link.js
@@ -8,7 +8,8 @@ function ($, coreModule) {
   var editViewMap = {
     'settings':    { src: 'app/features/dashboard/partials/settings.html', title: "Settings" },
     'annotations': { src: 'app/features/annotations/partials/editor.html', title: "Annotations" },
-    'templating':  { src: 'app/features/templating/partials/editor.html', title: "Templating" }
+    'templating':  { src: 'app/features/templating/partials/editor.html', title: "Templating" },
+    'metadata':    { src: 'app/features/dashboard/partials/metadata.html', title: "Metadata" }
   };
 
   coreModule.directive('dashEditorLink', function($timeout) {
diff --git a/public/app/features/dashboard/dashboardCtrl.js b/public/app/features/dashboard/dashboardCtrl.js
index cf071565515..eb2aa3bad89 100644
--- a/public/app/features/dashboard/dashboardCtrl.js
+++ b/public/app/features/dashboard/dashboardCtrl.js
@@ -2,8 +2,9 @@ define([
   'angular',
   'jquery',
   'app/core/config',
+  'moment',
 ],
-function (angular, $, config) {
+function (angular, $, config, moment) {
   "use strict";
 
   var module = angular.module('grafana.controllers');
@@ -149,6 +150,10 @@ function (angular, $, config) {
       });
     };
 
+    $scope.formatDate = function(date) {
+      return moment(date).format('MMM Do YYYY, h:mm:ss a');
+    };
+
   });
 
 });
diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index 0d3d42a0fbf..56a64c4933f 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -1,10 +1,9 @@
 define([
   'angular',
   'lodash',
-  'moment',
   'vendor/filesaver'
 ],
-function (angular, _, moment) {
+function (angular, _) {
   'use strict';
 
   var module = angular.module('grafana.controllers');
@@ -158,10 +157,6 @@ function (angular, _, moment) {
       playlistSrv.stop(1);
     };
 
-    $scope.formatDate = function(date) {
-      return moment(date).format('MMM Do YYYY, h:mm a');
-    };
-
   });
 
 });
diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html
index 9bfeac03acd..baf6a9f3a62 100644
--- a/public/app/features/dashboard/partials/dashboardTopNav.html
+++ b/public/app/features/dashboard/partials/dashboardTopNav.html
@@ -39,22 +39,9 @@
 						<li><a class="pointer" ng-click="editJson();">View JSON</a></li>
 						<li ng-if="contextSrv.isEditor"><a class="pointer" ng-click="saveDashboardAs();">Save As...</a></li>
 						<li ng-if="dashboardMeta.canSave"><a class="pointer" ng-click="deleteDashboard();">Delete dashboard</a></li>
+            <li><a class="pointer" ng-click="openEditView('metadata');">Metadata</a></li>
 					</ul>
 				</li>
-        <li class="dropdown">
-          <a class="pointer" ng-click="hideTooltip($event)" bs-tooltip="'Dashboard info'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-info"></i></a>
-          <div class="dropdown-menu dropdown-text">
-          <table>
-            <tr>
-              <td><b>Updated at</b></td><td>&nbsp:&nbsp</td>
-              <td>{{formatDate(dashboardMeta.updated)}}</td>
-            </tr>
-            <tr>
-              <td><b>Created at</b></td><td>&nbsp:&nbsp</td>
-              <td>{{formatDate(dashboardMeta.created)}}</td>
-            </tr>
-          </table>
-        </li>
 			</ul>
 
 			<ul class="nav dash-playlist-actions" ng-if="playlistSrv">
diff --git a/public/app/features/dashboard/partials/metadata.html b/public/app/features/dashboard/partials/metadata.html
new file mode 100644
index 00000000000..4521986b530
--- /dev/null
+++ b/public/app/features/dashboard/partials/metadata.html
@@ -0,0 +1,46 @@
+<div class="gf-box-header">
+	<div class="gf-box-title">
+		<i class="fa fa-info"></i>
+		Metadata
+	</div>
+</div>
+
+<div class="gf-box-body" style="padding-bottom: 50px;">
+  <div class="editor-row">
+		<div class="tight-form-section">
+			<h5>Dashboard info</h5>
+      <div class="tight-form">
+        <ul class="tight-form-list">
+          <li class="tight-form-item" style="width: 120px">
+            Last updated at:
+          </li>
+          <li class="tight-form-item" style="width: 180px">
+            {{formatDate(dashboardMeta.updated)}}
+          </li>
+        </ul>
+        <div class="clearfix"></div>
+      </div>
+      <div class="tight-form last">
+        <ul class="tight-form-list">
+          <li class="tight-form-item" style="width: 120px">
+            Created at:
+          </li>
+          <li class="tight-form-item" style="width: 180px">
+            {{formatDate(dashboardMeta.created)}}
+          </li>
+        </ul>
+        <div class="clearfix"></div>
+      </div>
+    </div>
+	</div>
+</div>
+
+<div class="gf-box-footer">
+	<div class="grafana-version-info">
+		<span class="editor-option small">
+			Grafana version: {{contextSrv.version}} &nbsp;&nbsp;
+		</span>
+		<span grafana-version-check>
+		</span>
+	</div>
+</div>
diff --git a/public/less/overrides.less b/public/less/overrides.less
index e8e96bbd261..fb6544cd99c 100644
--- a/public/less/overrides.less
+++ b/public/less/overrides.less
@@ -599,8 +599,3 @@ code, pre {
   margin-left: 0;
   margin-right: -1px;
 }
-
-.dropdown-text {
-  width: 220px;
-  font-size: 12px;  
-}

From f88588db90b1c2e3b0ad284b9ccccfb474be99fd Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Sat, 21 Nov 2015 19:36:27 -0800
Subject: [PATCH 5/6] Added close button

---
 public/app/features/dashboard/partials/metadata.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/app/features/dashboard/partials/metadata.html b/public/app/features/dashboard/partials/metadata.html
index 4521986b530..11eaa6d542a 100644
--- a/public/app/features/dashboard/partials/metadata.html
+++ b/public/app/features/dashboard/partials/metadata.html
@@ -3,6 +3,9 @@
 		<i class="fa fa-info"></i>
 		Metadata
 	</div>
+  <button class="gf-box-header-close-btn" ng-click="dismiss();">
+    <i class="fa fa-remove"></i>
+  </button>
 </div>
 
 <div class="gf-box-body" style="padding-bottom: 50px;">

From 384292b647de901f3bdc039f5baef15b35174627 Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Wed, 2 Dec 2015 04:15:50 -0800
Subject: [PATCH 6/6] Removed metadata from dropdown, included in settings

---
 public/app/core/directives/dash_edit_link.js  |  3 +-
 .../dashboard/partials/dashboardTopNav.html   |  1 -
 .../features/dashboard/partials/metadata.html | 49 -------------------
 .../features/dashboard/partials/settings.html | 32 +++++++++++-
 4 files changed, 32 insertions(+), 53 deletions(-)
 delete mode 100644 public/app/features/dashboard/partials/metadata.html

diff --git a/public/app/core/directives/dash_edit_link.js b/public/app/core/directives/dash_edit_link.js
index 06c44cc8262..9ab74fe6d74 100644
--- a/public/app/core/directives/dash_edit_link.js
+++ b/public/app/core/directives/dash_edit_link.js
@@ -8,8 +8,7 @@ function ($, coreModule) {
   var editViewMap = {
     'settings':    { src: 'app/features/dashboard/partials/settings.html', title: "Settings" },
     'annotations': { src: 'app/features/annotations/partials/editor.html', title: "Annotations" },
-    'templating':  { src: 'app/features/templating/partials/editor.html', title: "Templating" },
-    'metadata':    { src: 'app/features/dashboard/partials/metadata.html', title: "Metadata" }
+    'templating':  { src: 'app/features/templating/partials/editor.html', title: "Templating" }
   };
 
   coreModule.directive('dashEditorLink', function($timeout) {
diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html
index baf6a9f3a62..8fa6da1ee2f 100644
--- a/public/app/features/dashboard/partials/dashboardTopNav.html
+++ b/public/app/features/dashboard/partials/dashboardTopNav.html
@@ -39,7 +39,6 @@
 						<li><a class="pointer" ng-click="editJson();">View JSON</a></li>
 						<li ng-if="contextSrv.isEditor"><a class="pointer" ng-click="saveDashboardAs();">Save As...</a></li>
 						<li ng-if="dashboardMeta.canSave"><a class="pointer" ng-click="deleteDashboard();">Delete dashboard</a></li>
-            <li><a class="pointer" ng-click="openEditView('metadata');">Metadata</a></li>
 					</ul>
 				</li>
 			</ul>
diff --git a/public/app/features/dashboard/partials/metadata.html b/public/app/features/dashboard/partials/metadata.html
deleted file mode 100644
index 11eaa6d542a..00000000000
--- a/public/app/features/dashboard/partials/metadata.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="gf-box-header">
-	<div class="gf-box-title">
-		<i class="fa fa-info"></i>
-		Metadata
-	</div>
-  <button class="gf-box-header-close-btn" ng-click="dismiss();">
-    <i class="fa fa-remove"></i>
-  </button>
-</div>
-
-<div class="gf-box-body" style="padding-bottom: 50px;">
-  <div class="editor-row">
-		<div class="tight-form-section">
-			<h5>Dashboard info</h5>
-      <div class="tight-form">
-        <ul class="tight-form-list">
-          <li class="tight-form-item" style="width: 120px">
-            Last updated at:
-          </li>
-          <li class="tight-form-item" style="width: 180px">
-            {{formatDate(dashboardMeta.updated)}}
-          </li>
-        </ul>
-        <div class="clearfix"></div>
-      </div>
-      <div class="tight-form last">
-        <ul class="tight-form-list">
-          <li class="tight-form-item" style="width: 120px">
-            Created at:
-          </li>
-          <li class="tight-form-item" style="width: 180px">
-            {{formatDate(dashboardMeta.created)}}
-          </li>
-        </ul>
-        <div class="clearfix"></div>
-      </div>
-    </div>
-	</div>
-</div>
-
-<div class="gf-box-footer">
-	<div class="grafana-version-info">
-		<span class="editor-option small">
-			Grafana version: {{contextSrv.version}} &nbsp;&nbsp;
-		</span>
-		<span grafana-version-check>
-		</span>
-	</div>
-</div>
diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index 541ef45e9ab..347265afed4 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -5,7 +5,7 @@
 	</div>
 
 	<div ng-model="editor.index" bs-tabs style="text-transform:capitalize;">
-		<div ng-repeat="tab in ['General', 'Rows', 'Links', 'Time picker']" data-title="{{tab}}">
+		<div ng-repeat="tab in ['General', 'Rows', 'Links', 'Time picker', 'Metadata']" data-title="{{tab}}">
 		</div>
 	</div>
 
@@ -114,6 +114,36 @@
 		<gf-time-picker-settings dashboard="dashboard"></gf-time-picker-settings>
 	</div>
 
+  <div ng-if="editor.index == 4">
+    <div class="editor-row">
+      <div class="tight-form-section">
+        <h5>Info</h5>
+        <div class="tight-form">
+          <ul class="tight-form-list">
+            <li class="tight-form-item" style="width: 120px">
+              Last updated at:
+            </li>
+            <li class="tight-form-item" style="width: 180px">
+              {{formatDate(dashboardMeta.updated)}}
+            </li>
+          </ul>
+          <div class="clearfix"></div>
+        </div>
+        <div class="tight-form last">
+          <ul class="tight-form-list">
+            <li class="tight-form-item" style="width: 120px">
+              Created at:
+            </li>
+            <li class="tight-form-item" style="width: 180px">
+              {{formatDate(dashboardMeta.created)}}
+           </li>
+          </ul>
+          <div class="clearfix"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+
 </div>
 
 <div class="clearfix"></div>