From e63ff167a79a2365a6e43ff93c6594497ea2b7d2 Mon Sep 17 00:00:00 2001 From: Nick Christus Date: Thu, 29 Oct 2015 21:09:21 -0500 Subject: [PATCH] updated-list-views: added filter controls, updated tables on API Keys and Data Sources --- .../dashboard/partials/globalAlerts.html | 6 +- .../features/org/partials/datasources.html | 56 +++++++++++- .../app/features/org/partials/orgApiKeys.html | 87 +++++++++++++++---- public/less/filter-controls.less | 33 +++++++ public/less/filter-list.less | 31 ------- public/less/gfbox.less | 2 +- public/less/grafana.less | 1 + 7 files changed, 161 insertions(+), 55 deletions(-) create mode 100644 public/less/filter-controls.less diff --git a/public/app/features/dashboard/partials/globalAlerts.html b/public/app/features/dashboard/partials/globalAlerts.html index d66c7e98d8c..a849f50ffdd 100644 --- a/public/app/features/dashboard/partials/globalAlerts.html +++ b/public/app/features/dashboard/partials/globalAlerts.html @@ -8,7 +8,7 @@

Global alerts

-
+
  • Filters:
    • @@ -25,7 +25,7 @@
-
    +
    • - 2 selected, showing 6 of 6 total + 2 selected, showing 6 of 6 total
      diff --git a/public/app/features/org/partials/datasources.html b/public/app/features/org/partials/datasources.html index b1b37a572a9..6cf40deccde 100644 --- a/public/app/features/org/partials/datasources.html +++ b/public/app/features/org/partials/datasources.html @@ -9,6 +9,51 @@

      Data sources

      +
      +
      +
        +
      • Filters:
        • +
      • Name
        • +
        • +
      • URL
        • +
        • +
      • + + + +
        • +
      +
      +
      +
      + +
        +
      • +
        + + +
        +
        • +
      • +
        + + +
        +
        • +
      • + 0 selected, showing 2 of 2 total +
        • +
      +
      No datasources defined
      @@ -16,15 +61,20 @@ - - + + + - + +
      NameUrlNameUrl
      + + +   diff --git a/public/app/features/org/partials/orgApiKeys.html b/public/app/features/org/partials/orgApiKeys.html index 9db700ab437..c24b5c53ec1 100644 --- a/public/app/features/org/partials/orgApiKeys.html +++ b/public/app/features/org/partials/orgApiKeys.html @@ -4,9 +4,8 @@ -
      +
      -

      API Keys

      @@ -32,21 +31,75 @@ - - - - - - - - - - - +
      +
      +
        +
      • Filters:
        • +
      • Name
        • +
        • +
      • Role
        • +
        • +
      • + + + +
        • +
      +
      +
      +
      + +
        +
      • +
        + + +
        +
        • +
      • +
        + + +
        +
        • +
      • + 0 selected, showing 2 of 2 total +
        • +
      + +
      NameRole
      {{t.name}}{{t.role}} - - - -
      + + + + + + + + + + + + + + + +
      NameRole
      + + + {{t.name}}{{t.role}} + + + +
      diff --git a/public/less/filter-controls.less b/public/less/filter-controls.less new file mode 100644 index 00000000000..f1489431a7d --- /dev/null +++ b/public/less/filter-controls.less @@ -0,0 +1,33 @@ +// ========================================================================== +// FILTER CONTROLS +// ========================================================================== + + + +// Filters +// -------------------------------------------------------------------------- + +.filter-controls-filters { + display: inline-block; + margin-bottom: 40px; +} + + + +// Actions +// -------------------------------------------------------------------------- + +.filter-controls-actions { + margin: 0 0 10px; + padding: 0; + list-style: none; +} + +.filter-controls-actions > li { + display: inline-block; + margin-right: 10px; +} + +.filter-controls-actions-selected { + text-transform: uppercase; +} diff --git a/public/less/filter-list.less b/public/less/filter-list.less index 50da5864db0..181aedf4d3c 100644 --- a/public/less/filter-list.less +++ b/public/less/filter-list.less @@ -8,7 +8,6 @@ // -------------------------------------------------------------------------- .filter-list { - max-width: 1000px; margin: 0; padding: 0; list-style: none; @@ -135,33 +134,3 @@ font-size: 12px; } } - - - -// Filters -// -------------------------------------------------------------------------- - -.filter-list-filters { - display: inline-block; - margin-bottom: 40px; -} - - - -// Actions -// -------------------------------------------------------------------------- - -.filter-list-actions { - margin: 0 0 10px; - padding: 0; - list-style: none; -} - -.filter-list-actions > li { - display: inline-block; - margin-right: 10px; -} - -.filter-list-actions-selected { - text-transform: uppercase; -} diff --git a/public/less/gfbox.less b/public/less/gfbox.less index d173ace1787..46967d143c5 100644 --- a/public/less/gfbox.less +++ b/public/less/gfbox.less @@ -81,7 +81,7 @@ } .page-wide { - max-width: none; + max-width: 1000px; } .admin-page { diff --git a/public/less/grafana.less b/public/less/grafana.less index 3ee21297dd0..268b516f397 100644 --- a/public/less/grafana.less +++ b/public/less/grafana.less @@ -19,6 +19,7 @@ @import "tabs.less"; @import "timepicker.less"; @import "alerting.less"; +@import "filter-controls.less"; @import "filter-list.less"; @import "filter-table.less";