diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html index a1a4cb989cd..674f1cf4b0d 100644 --- a/public/app/features/admin/partials/edit_user.html +++ b/public/app/features/admin/partials/edit_user.html @@ -9,7 +9,7 @@

- User details + Edit User

@@ -17,7 +17,7 @@
  • - Name + Name
  • @@ -28,7 +28,7 @@
    • - Email + Email
    • @@ -39,7 +39,7 @@
      • - Username + Username
      • @@ -53,16 +53,16 @@
        • -

        +

        Change password -

        +
        • - New password + New password
        • @@ -76,9 +76,9 @@
          • -

          +

          Permissions -

          +
          @@ -97,9 +97,9 @@
          -

          +

          Organizations -

          +
          diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js index 7318d4824d5..2b220bda9f8 100644 --- a/public/app/features/dashboard/unsavedChangesSrv.js +++ b/public/app/features/dashboard/unsavedChangesSrv.js @@ -7,7 +7,7 @@ function(angular, _) { var module = angular.module('grafana.services'); - module.service('unsavedChangesSrv', function($modal, $q, $location, $timeout, contextSrv, $window) { + module.service('unsavedChangesSrv', function($rootScope, $q, $location, $timeout, contextSrv, $window) { function Tracker(dashboard, scope) { var self = this; @@ -139,17 +139,10 @@ function(angular, _) { tracker.scope.$emit('save-dashboard'); }; - var confirmModal = $modal({ - template: './app/partials/unsaved-changes.html', - modalClass: 'confirm-modal', - persist: false, - show: false, + $rootScope.appEvent('show-modal', { + src: './app/partials/unsaved-changes.html', + modalClass: 'modal-no-header confirm-modal', scope: modalScope, - keyboard: false - }); - - $q.when(confirmModal).then(function(modalEl) { - modalEl.modal('show'); }); }; diff --git a/public/app/features/org/orgUsersCtrl.js b/public/app/features/org/orgUsersCtrl.js index 9623e2566a7..d5756b5f025 100644 --- a/public/app/features/org/orgUsersCtrl.js +++ b/public/app/features/org/orgUsersCtrl.js @@ -15,6 +15,7 @@ function (angular) { $scope.init = function() { $scope.get(); + $scope.editor = { index: 0 }; }; $scope.get = function() { @@ -36,6 +37,14 @@ function (angular) { backendSrv.post('/api/org/users', $scope.user).then($scope.get); }; + $scope.openInviteModal = function() { + $scope.appEvent('show-modal', { + src: './app/partials/invite_users.html', + modalClass: 'modal-no-header invite-modal', + scope: $scope.$new() + }); + }; + $scope.init(); }); diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html index b32ffb67081..dcbb180b160 100644 --- a/public/app/features/org/partials/orgUsers.html +++ b/public/app/features/org/partials/orgUsers.html @@ -9,54 +9,45 @@

          Organization users

          - -
          -
            -
          • - Username or Email -
            • -
          • - -
            • -
          • - role -
            • -
          • - -
            • -
          • - -
            • -
            -
          -
          - +
          - - - - - - - - - - - - - -
          LoginEmailRole
          {{user.login}}{{user.email}} - - - - - -
          +
          +
          +
          +
          +
          + + + + + + + + + + + + + +
          LoginEmailRole
          {{user.login}}{{user.email}} + + + + + +
          + +
          + +
          + Pending invitaitons +
          diff --git a/public/app/features/profile/partials/profile.html b/public/app/features/profile/partials/profile.html index 5512245b275..fde49edcc72 100644 --- a/public/app/features/profile/partials/profile.html +++ b/public/app/features/profile/partials/profile.html @@ -8,7 +8,7 @@
          -

          Profile details

          +

          Profile

          @@ -64,7 +64,7 @@ -

          Organizations

          +

          Organizations

          diff --git a/public/app/partials/confirm_modal.html b/public/app/partials/confirm_modal.html index 8730cfb1596..24802814be1 100644 --- a/public/app/partials/confirm_modal.html +++ b/public/app/partials/confirm_modal.html @@ -12,7 +12,7 @@ {{title}} -
          +
          {{text}}
          diff --git a/public/app/partials/invite_users.html b/public/app/partials/invite_users.html new file mode 100644 index 00000000000..0299baae403 --- /dev/null +++ b/public/app/partials/invite_users.html @@ -0,0 +1,55 @@ +
          + + + + + +

          + Invite Users +

          + +
          + Invite new or existing Grafana users to the organization + {{contextSrv.user.orgName}} +
          + +
          +
          + +
          +
          +
            +
          • + Email +
            • +
          • + +
            • +
          • + Name +
            • +
          • + +
            • + +
          • + Role +
            • +
          • + +
            • +
            +
          +
          + + +
          + + +
          + +
          + diff --git a/public/app/services/alertSrv.js b/public/app/services/alertSrv.js index 4a8ef273523..88885f4bd78 100644 --- a/public/app/services/alertSrv.js +++ b/public/app/services/alertSrv.js @@ -71,7 +71,7 @@ function (angular, _) { var confirmModal = $modal({ template: './app/partials/confirm_modal.html', persist: false, - modalClass: 'confirm-modal', + modalClass: 'modal-no-header confirm-modal', show: false, scope: scope, keyboard: false diff --git a/public/app/services/utilSrv.js b/public/app/services/utilSrv.js index 7fca0c0334e..12aa518e24c 100644 --- a/public/app/services/utilSrv.js +++ b/public/app/services/utilSrv.js @@ -14,6 +14,7 @@ function (angular) { this.showModal = function(e, options) { var modal = $modal({ + modalClass: options.modalClass, template: options.src, persist: false, show: false, diff --git a/public/css/less/bootswatch.dark.less b/public/css/less/bootswatch.dark.less index bb216b38c2d..b134a3d495a 100644 --- a/public/css/less/bootswatch.dark.less +++ b/public/css/less/bootswatch.dark.less @@ -547,8 +547,6 @@ a:hover { } .modal { - .border-radius(1px); - border-top: solid 1px lighten(@grayDark, 5%); background-color: @grafanaPanelBackground; } diff --git a/public/css/less/bootswatch.light.less b/public/css/less/bootswatch.light.less index a369be152c7..42672d7f0b4 100644 --- a/public/css/less/bootswatch.light.less +++ b/public/css/less/bootswatch.light.less @@ -531,19 +531,6 @@ a.thumbnail { .border-radius(0); } -.modal { - .border-radius(0); - background-color: @bodyBackground; - &-header { - border-bottom: none; - } - - &-footer { - border-top: none; - background-color: transparent; - } -} - .popover { .border-radius(0); diff --git a/public/css/less/gfbox.less b/public/css/less/gfbox.less index 8f4469b1390..6ca2558fba3 100644 --- a/public/css/less/gfbox.less +++ b/public/css/less/gfbox.less @@ -65,14 +65,8 @@ margin: 15px; background: @grafanaPanelBackground; position: relative; - border: 1px solid @grayDark; + border: 1px solid @pageContainerBorderColor; padding: 20px 20px 60px 49px; - - h2 { - color: @textColor; - font-weight: normal; - font-size: 22px; - } } .page { diff --git a/public/css/less/grafana.less b/public/css/less/grafana.less index 681702315c0..612cfd26818 100644 --- a/public/css/less/grafana.less +++ b/public/css/less/grafana.less @@ -257,18 +257,28 @@ td:first-child { text-align: right; } } -.confirm-modal { +.modal-no-header { border: 1px solid @grafanaTargetFuncBackground; - max-width: 500px; - background-color: @grafanaPanelBackground; text-align: center; + h3 { + margin-top: 30px; + } + .modal-close { float: right; font-size: 140%; padding: 10px; } + .modal-tagline { + font-size: 16px; + } +} + +.confirm-modal { + max-width: 500px; + .confirm-modal-icon { padding-top: 41px; font-size: 280%; @@ -282,10 +292,6 @@ margin-bottom: 15px; } - .confirm-modal-text { - font-size: 16px; - } - .confirm-modal-buttons { margin-top: 35px; margin-bottom: 35px; @@ -354,5 +360,7 @@ color: @orange; } - +.highlight-word { + color: @orange; +} diff --git a/public/css/less/variables.dark.less b/public/css/less/variables.dark.less index bc49b66cd74..9614d61ba74 100644 --- a/public/css/less/variables.dark.less +++ b/public/css/less/variables.dark.less @@ -69,8 +69,8 @@ @altFontFamily: @serifFontFamily; @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily -@headingsFontWeight: bold; // instead of browser default, bold -@headingsColor: @textColor; // empty to use BS default, @textColor +@headingsFontWeight: normal; // instead of browser default, bold +@headingsColor: darken(@white,11%); // empty to use BS default, @textColor @inputText: @black; @@ -98,6 +98,8 @@ @grafanaListHighlight: #333; @grafanaListMainLinkColor: @textColor; +@pageContainerBorderColor: @grayDark; + // Scrollbars @scrollbarBackground: #3a3a3a; @scrollbarBackground2: #3a3a3a; diff --git a/public/css/less/variables.light.less b/public/css/less/variables.light.less index ab04ca01585..f9930f0a82c 100644 --- a/public/css/less/variables.light.less +++ b/public/css/less/variables.light.less @@ -33,9 +33,9 @@ // grafana Variables // ------------------------- -@grafanaPanelBackground: @white; -@grafanaPanelBorder: solid 1px #ddd; -@grafanaTriggerBorder: solid 1px @grayLighter; +@grafanaPanelBackground: @grayLighter; +@grafanaPanelBorder: solid 1px #ddd; +@grafanaTriggerBorder: solid 1px @grayLight; // Submenu @submenuBackground: rgb(218, 217, 217); @@ -58,16 +58,14 @@ // Scaffolding // ------------------------- -@bodyBackground: #EAEAEA; +@bodyBackground: #EFEFEF; @textColor: @gray; - // Links // ------------------------- @linkColor: @gray; @linkColorDisabled: lighten(@linkColor,30%); -@linkColorHover: @grayDarker; - +@linkColorHover: darken(@linkColor, 20%); // Typography // ------------------------- @@ -76,14 +74,14 @@ @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; @baseFontSize: 14px; -@baseFontWeight: 400; +@baseFontWeight: 400; @baseFontFamily: @sansFontFamily; @baseLineHeight: 20px; @altFontFamily: @serifFontFamily; @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily -@headingsFontWeight: bold; // instead of browser default, bold -@headingsColor: @grayDarker; // empty to use BS default, @textColor +@headingsFontWeight: normal; // instead of browser default, bold +@headingsColor: @textColor; // empty to use BS default, @textColor // Component sizing @@ -111,6 +109,7 @@ @grafanaListHighlightContrast: #ddd; @grafanaListMainLinkColor: @textColor; +@pageContainerBorderColor: darken(@grafanaTargetBackground, 5%); // Tables // ------------------------- diff --git a/public/vendor/bootstrap/less/type.less b/public/vendor/bootstrap/less/type.less index 6a472db4979..109b09de44d 100644 --- a/public/vendor/bootstrap/less/type.less +++ b/public/vendor/bootstrap/less/type.less @@ -74,9 +74,9 @@ h1, h2, h3 { line-height: @baseLineHeight * 2; } -h1 { font-size: @baseFontSize * 2.75; } // ~38px -h2 { font-size: @baseFontSize * 2.25; } // ~32px -h3 { font-size: @baseFontSize * 1.75; } // ~24px +h1 { font-size: @baseFontSize * 2.00; } // ~38px +h2 { font-size: @baseFontSize * 1.75; } // ~32px +h3 { font-size: @baseFontSize * 1.50; } // ~24px h4 { font-size: @baseFontSize * 1.25; } // ~18px h5 { font-size: @baseFontSize; } h6 { font-size: @baseFontSize * 0.85; } // ~12px