From 02ac7a4001c99a17ecdf5a5a116f5aac479553c4 Mon Sep 17 00:00:00 2001 From: marknmel Date: Fri, 19 Feb 2016 10:05:01 -0500 Subject: [PATCH 1/8] Update kbn.js data rate for Mbits has typo - should be megabits/sec - not megabites/sec --- public/app/core/utils/kbn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/core/utils/kbn.js b/public/app/core/utils/kbn.js index fbb854148f9..1f827dcbb80 100644 --- a/public/app/core/utils/kbn.js +++ b/public/app/core/utils/kbn.js @@ -595,7 +595,7 @@ function($, _) { {text: 'bytes/sec', value: 'Bps'}, {text: 'kilobites/sec', value: 'Kbits'}, {text: 'kilobytes/sec', value: 'KBs'}, - {text: 'megabites/sec', value: 'Mbits'}, + {text: 'megabits/sec', value: 'Mbits'}, {text: 'megabytes/sec', value: 'MBs'}, {text: 'gigabytes/sec', value: 'GBs'}, {text: 'gigabites/sec', value: 'Gbits'}, From 2c0b191ef532d515a77e486a11cdae8a1eaa5aaa Mon Sep 17 00:00:00 2001 From: marknmel Date: Fri, 19 Feb 2016 10:24:49 -0500 Subject: [PATCH 2/8] Updated typos - Kilobits, Megabits and Gigabits Update typos - Kilobits, Megabits and Gigabits - not Kilobites, Megabites, or Gigabites --- public/app/core/utils/kbn.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/core/utils/kbn.js b/public/app/core/utils/kbn.js index 1f827dcbb80..97f2f10f799 100644 --- a/public/app/core/utils/kbn.js +++ b/public/app/core/utils/kbn.js @@ -593,12 +593,12 @@ function($, _) { {text: 'packets/sec', value: 'pps'}, {text: 'bits/sec', value: 'bps'}, {text: 'bytes/sec', value: 'Bps'}, - {text: 'kilobites/sec', value: 'Kbits'}, + {text: 'kilobits/sec', value: 'Kbits'}, {text: 'kilobytes/sec', value: 'KBs'}, {text: 'megabits/sec', value: 'Mbits'}, {text: 'megabytes/sec', value: 'MBs'}, {text: 'gigabytes/sec', value: 'GBs'}, - {text: 'gigabites/sec', value: 'Gbits'}, + {text: 'gigabits/sec', value: 'Gbits'}, ] }, { From 17904a6e8b6f4a4907280d3452dc5753fce87448 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Sat, 20 Feb 2016 15:33:58 -0800 Subject: [PATCH 3/8] some nav fixes --- public/app/features/admin/partials/admin_home.html | 2 +- public/app/features/apps/partials/list.html | 2 +- public/app/features/playlist/partials/playlists.html | 2 +- public/app/features/profile/partials/profile.html | 2 +- public/app/features/snapshot/partials/snapshots.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/app/features/admin/partials/admin_home.html b/public/app/features/admin/partials/admin_home.html index eed8f503ed8..c6d0807a5d2 100644 --- a/public/app/features/admin/partials/admin_home.html +++ b/public/app/features/admin/partials/admin_home.html @@ -1,4 +1,4 @@ - +
diff --git a/public/app/features/apps/partials/list.html b/public/app/features/apps/partials/list.html index bab4ca5c687..bb39e6c6504 100644 --- a/public/app/features/apps/partials/list.html +++ b/public/app/features/apps/partials/list.html @@ -1,4 +1,4 @@ - +
diff --git a/public/app/features/playlist/partials/playlists.html b/public/app/features/playlist/partials/playlists.html index d790de40069..888bdb2b6b9 100644 --- a/public/app/features/playlist/partials/playlists.html +++ b/public/app/features/playlist/partials/playlists.html @@ -1,4 +1,4 @@ - +
diff --git a/public/app/features/profile/partials/profile.html b/public/app/features/profile/partials/profile.html index 00ae3b5e163..042344eeac6 100644 --- a/public/app/features/profile/partials/profile.html +++ b/public/app/features/profile/partials/profile.html @@ -1,4 +1,4 @@ - +
diff --git a/public/app/features/snapshot/partials/snapshots.html b/public/app/features/snapshot/partials/snapshots.html index f6e54b9f0c5..90b65058e21 100644 --- a/public/app/features/snapshot/partials/snapshots.html +++ b/public/app/features/snapshot/partials/snapshots.html @@ -1,4 +1,4 @@ - +
From b9d50fa144f36a5463910f6ec167c4d0cdaebc88 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 22 Feb 2016 15:32:55 +0100 Subject: [PATCH 4/8] ux(admin): migrates admin edit user page --- .../features/admin/partials/edit_user.html | 160 ++++++------------ 1 file changed, 53 insertions(+), 107 deletions(-) diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html index 192a1e556ea..24f98a206f4 100644 --- a/public/app/features/admin/partials/edit_user.html +++ b/public/app/features/admin/partials/edit_user.html @@ -4,126 +4,72 @@
-

- Edit User -

+

Edit User

-
-
-
-
    -
  • - Name -
    • -
  • - -
    • -
-
+ +
+ Name +
-
-
    -
  • - Email -
    • -
  • - -
    • -
-
+
+ Email +
-
-
    -
  • - Username -
    • -
  • - -
    • -
-
+
+ Username +
-
-
- +
+ +
-

- Change password -

+

Change password

-
-
-
-
    -
  • - New password -
    • -
  • - -
    • -
-
-
+ +
+ New password +
-
- - - -

- Permissions -

- -
-
-
    -
  • - Grafana Admin  - - -
    • -
-
-
-
- -
-
- -

- Organizations -

- -
-
-
    -
  • - Add organization -
    • -
  • - -
    • -
  • - Role -
    • -
  • - -
    • -
  • - -
    • -
    -
+
+
- +

Permissions

+ + +
+ +
+ +
+ +
+ + +

Organizations

+ + +
+
+ Add organization + +
+
+ Role + +
+
+ +
+
+ + +
@@ -134,7 +80,7 @@ {{org.name}} Current
Name Role - From 0aa4b47d59dd93a0f9c7adff0d1b150689905ded Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 22 Feb 2016 15:56:18 +0100 Subject: [PATCH 5/8] ux(admin): migrated admin new user page to gf-form --- .../app/features/admin/partials/new_user.html | 71 ++++++------------- 1 file changed, 20 insertions(+), 51 deletions(-) diff --git a/public/app/features/admin/partials/new_user.html b/public/app/features/admin/partials/new_user.html index 99d2f974565..3ae2dbfc209 100644 --- a/public/app/features/admin/partials/new_user.html +++ b/public/app/features/admin/partials/new_user.html @@ -4,60 +4,29 @@
-

- Add new user -

+

Add new user

-
-
-
-
    -
  • - Name -
    • -
  • - -
    • -
-
-
-
-
    -
  • - Email -
    • -
  • - -
    • -
-
-
-
-
    -
  • - Username -
    • -
  • - -
    • -
-
-
-
-
    -
  • - Password -
    • -
  • - -
    • -
-
-
+ +
+ Name + +
+
+ Email + +
+
+ Username + +
+
+ Password +
-
- +
+ +
From b1e9327a2b4e071fe5e3ff45396866179212d14f Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 22 Feb 2016 16:05:55 +0100 Subject: [PATCH 6/8] ux(admin): migrates edit org page --- .../app/features/admin/partials/edit_org.html | 78 ++++++++----------- 1 file changed, 32 insertions(+), 46 deletions(-) diff --git a/public/app/features/admin/partials/edit_org.html b/public/app/features/admin/partials/edit_org.html index 804076d8eed..de92cd3adf5 100644 --- a/public/app/features/admin/partials/edit_org.html +++ b/public/app/features/admin/partials/edit_org.html @@ -4,55 +4,41 @@
-

- Edit Organization -

+

Edit Organization

-
-
-
-
    -
  • - Name -
    • -
  • - -
    • -
-
-
-
+ +
+ Name + +
-
- -
+
+ +
+ -

- Organization Users -

+

Organization Users

- - - - - - - - - - - - - -
UsernameEmailRole
{{orgUser.login}}{{orgUser.email}} - - - - - -
- -
+ + + + + + + + + + + + + +
UsernameEmailRole
{{orgUser.login}}{{orgUser.email}} + + + + + +
From fc62af6b3a000e77ee2fed605a8764ccfed810ae Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 22 Feb 2016 16:12:59 +0100 Subject: [PATCH 7/8] style(admin): remove white spaces --- public/app/features/admin/partials/orgs.html | 4 +--- public/app/features/admin/partials/settings.html | 4 +--- public/app/features/admin/partials/stats.html | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/public/app/features/admin/partials/orgs.html b/public/app/features/admin/partials/orgs.html index fbda738b501..aba3ef70a92 100644 --- a/public/app/features/admin/partials/orgs.html +++ b/public/app/features/admin/partials/orgs.html @@ -4,9 +4,7 @@
-

- Organizations -

+

Organizations

diff --git a/public/app/features/admin/partials/settings.html b/public/app/features/admin/partials/settings.html index a941ed69bae..5e070f4d3c0 100644 --- a/public/app/features/admin/partials/settings.html +++ b/public/app/features/admin/partials/settings.html @@ -3,9 +3,7 @@
-

- Server settings -

+

Server settings

diff --git a/public/app/features/admin/partials/stats.html b/public/app/features/admin/partials/stats.html index e9af199fa60..1ad114f50e2 100644 --- a/public/app/features/admin/partials/stats.html +++ b/public/app/features/admin/partials/stats.html @@ -3,9 +3,7 @@
-

- Stats -

+

Stats

From 31ea5f550f2f87fceeb22f34d64594dea6816137 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 22 Feb 2016 16:45:14 +0100 Subject: [PATCH 8/8] feat(playlist): changes tag result into a list --- .../features/playlist/partials/playlist.html | 30 ++++++++++++------- public/sass/pages/_playlist.scss | 10 +++---- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/public/app/features/playlist/partials/playlist.html b/public/app/features/playlist/partials/playlist.html index beb311a9e6c..3701796b4a1 100644 --- a/public/app/features/playlist/partials/playlist.html +++ b/public/app/features/playlist/partials/playlist.html @@ -26,7 +26,6 @@
-
Available
@@ -40,7 +39,9 @@
-   {{playlistItem.title}} + +   {{playlistItem.title}} +
-
- - - {{tag.term}}  ({{tag.count}}) - -
-
+ + + + + +
+ + + {{tag.term}}  ({{tag.count}}) + + + +
+
diff --git a/public/sass/pages/_playlist.scss b/public/sass/pages/_playlist.scss index f0d1cf4c038..412fbcaef50 100644 --- a/public/sass/pages/_playlist.scss +++ b/public/sass/pages/_playlist.scss @@ -27,6 +27,7 @@ margin-bottom: 15px; } + .playlist-search-field-wrapper { input { width: 100%; @@ -109,6 +110,10 @@ .add-dashboard { text-align: center; } + + .fa-star { + color: $orange; + } } .playlist-column-header { @@ -120,8 +125,3 @@ .selected-playlistitem-settings { text-align: right; } - -.tag-result-container { - width: 160px; - float: left; -} \ No newline at end of file