Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-08 15:25:22 +02:00
Code Issues Releases Activity

fix(ui): fix ui bugs [EE-3847] (#7453)

Browse source
This commit is contained in:
Chaim Lev-Ari 2022-08-12 06:47:56 +03:00 • committed by GitHub
parent dd372637cb
commit 95fb5a4baa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 246 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/portainer/components/PageHeader/HeaderContainer.html
View file

@ -1,4 +0,0 @@
<div class="row header">
<div id="loadingbar-placeholder"></div>
<div class="col-xs-12"> <div class="meta" ng-transclude></div></div>
</div>

4
app/portainer/components/PageHeader/HeaderContainer.ts
View file

@ -1,4 +0,0 @@
export const Header = {
transclude: true,
templateUrl: './HeaderContainer.html',
};

15
app/portainer/components/PageHeader/HeaderContent.controller.js
View file

@ -1,15 +0,0 @@
export default class HeaderContentController {
/* @ngInject */
constructor(Authentication) {
this.Authentication = Authentication;
this.display = !window.ddExtension;
this.username = null;
}
$onInit() {
const userDetails = this.Authentication.getUserDetails();
if (userDetails) {
this.username = userDetails.username;
}
}
}

3
app/portainer/components/PageHeader/HeaderContent.html
View file

@ -1,3 +0,0 @@
<div class="breadcrumb-links">
<div class="pull-left" ng-transclude></div>
</div>

8
app/portainer/components/PageHeader/HeaderContent.ts
View file

@ -1,8 +0,0 @@
import controller from './HeaderContent.controller';
export const HeaderContent = {
requires: '^rdHeader',
transclude: true,
templateUrl: './HeaderContent.html',
controller,
};

15
app/portainer/components/PageHeader/HeaderTitle.controller.js
View file

@ -1,15 +0,0 @@
export default class HeaderTitle {
/* @ngInject */
constructor(Authentication) {
this.Authentication = Authentication;
this.display = !window.ddExtension;
this.username = null;
}
$onInit() {
const userDetails = this.Authentication.getUserDetails();
if (userDetails) {
this.username = userDetails.username;
}
}
}

20
app/portainer/components/PageHeader/HeaderTitle.html
View file

@ -1,20 +0,0 @@
<div class="page white-space-normal">
{{ $ctrl.titleText }}
<span class="header_title_content" ng-transclude></span>
</div>
<span class="pull-right myaccount-container" uib-dropdown on-toggle="toggled(open)">
<a href class="myaccount-dropdown" uib-dropdown-toggle data-cy="userMenu-button" aria-label="User menu toggle">
<span class="pull-right user-box" ng-if="$ctrl.username">
<i class="fa fa-user-circle" aria-hidden="true"></i> {{ $ctrl.username }} <i class="fa fa-angle-down myaccount-icon" aria-hidden="true"></i>
</span>
</a>
<ul class="dropdown-menu" uib-dropdown-menu aria-label="User Menu" data-cy="userMenu">
<li>
<a ui-sref="portainer.account" data-cy="userMenu-myAccount">My account</a>
</li>
<li>
<a ui-sref="portainer.logout({performApiLogout: true})" data-cy="userMenu-logOut">Log out</a>
</li>
</ul>
</span>

11
app/portainer/components/PageHeader/HeaderTitle.ts
View file

@ -1,11 +0,0 @@
import controller from './HeaderTitle.controller';
export const HeaderTitle = {
requires: '^rdHeader',
bindings: {
titleText: '@',
},
transclude: true,
templateUrl: './HeaderTitle.html',
controller,
};

12
app/portainer/components/PageHeader/index.ts
View file

@ -1,12 +0,0 @@
import angular from 'angular';
import { Header } from './HeaderContainer';
import { HeaderContent } from './HeaderContent';
import { HeaderTitle } from './HeaderTitle';
export const pageHeaderModule = angular
.module('portainer.app.components.header', [])
.component('rdHeader', Header)
.component('rdHeaderContent', HeaderContent)
.component('rdHeaderTitle', HeaderTitle).name;

70
app/portainer/components/datatables/datatable.css
View file

@ -39,12 +39,12 @@
@apply text-blue-7;
}
.datatable tr > td a {
.datatable tr > td a:not(.btn) {
color: var(--ui-blue-8);
}
.datatable tr > td a:hover,
.datatable tr > td a:focus {
.datatable tr > td a:not(.btn):hover,
.datatable tr > td a:not(.btn):focus {
text-decoration: underline;
}
@ -84,10 +84,13 @@
.datatable .searchBar input[type='text'] {
border: 0px !important;
@apply placeholder:text-gray-7;
@apply th-dark:placeholder:text-gray-warm-7;
}
.datatable .searchIcon {
color: #767676;
@apply text-gray-7;
@apply th-dark:text-gray-warm-5;
margin-right: 5px;
}
@ -165,31 +168,6 @@
vertical-align: middle;
}
[data-reach-menu-list],
[data-reach-menu-items] {
padding: 0px;
border: 1px var(--bg-dropdown-menu-color);
}
.tableMenu {
color: #767676;
padding: 15px;
background-color: var(--bg-dropdown-menu-color) !important;
}
.tableMenu .menuHeader {
font-size: 16px;
}
.tableMenu .menuContent {
font-size: 12px;
margin: 10px 0;
}
.tableMenu .menuContent .md-radio:first-child {
margin: 0;
}
.datatable thead tr > th {
white-space: nowrap;
vertical-align: middle;
@ -362,3 +340,37 @@
border-radius: 8px;
flex-grow: 2;
}
/* Databatle Setting Menu */
.tableMenu {
border: 1px solid var(--border-bootbox);
border-radius: 8px;
color: var(--text-dropdown-menu-color);
padding: 15px;
background-color: var(--bg-dropdown-menu-color) !important;
}
[data-reach-menu-list],
[data-reach-menu-items] {
padding: 0px;
border: 1px var(--bg-dropdown-menu-color);
}
.dropdown-menu .tableMenu {
border: 0px;
}
.tableMenu .menuHeader {
font-size: 16px;
}
.tableMenu .menuContent {
font-size: 12px;
margin: 10px 0;
}
.tableMenu .menuContent .md-radio:first-child {
margin: 0;
}

3
app/portainer/components/index.js
View file

@ -5,12 +5,11 @@ import gitFormModule from './forms/git-form';
import porAccessManagementModule from './accessManagement';
import widgetModule from './widget';
import { boxSelectorModule } from './BoxSelector';
import { pageHeaderModule } from './PageHeader';
import { beFeatureIndicator } from './BEFeatureIndicator';
import { InformationPanelAngular } from './InformationPanel';
export default angular
.module('portainer.app.components', [pageHeaderModule, boxSelectorModule, widgetModule, gitFormModule, porAccessManagementModule, formComponentsModule])
.module('portainer.app.components', [boxSelectorModule, widgetModule, gitFormModule, porAccessManagementModule, formComponentsModule])
.component('informationPanel', InformationPanelAngular)
.component('beFeatureIndicator', beFeatureIndicator).name;