MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Remove the View All from related organizations tile - (Issue #101) and fixes wizard responsiveness

This commit is contained in:
apapachristou 2019-06-14 13:43:12 +03:00
parent e01d752315
commit 98d0b67561
7 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/ui/dashboard/dashboard.component.html
View File

@ -37,7 +37,7 @@
buttonRedirectLink="/projects/new" icon="work_outline"></app-info-counter>
</div>
<div class="col-lg-3 col-md-6 col-sm-6">
<app-info-counter title="Related Organizations"
<app-info-counter [title]="'DASHBOARD.ORGANIZATIONS'"
[subtitle]="dashboardStatisticsData?.totalOrganisationCount" icon="scatter_plot">
</app-info-counter>
</div>

8
dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.html
View File

@ -1,6 +1,9 @@
<div class="card card-stats">
<div class="card-header card-header-default card-header-icon" [class.clickable]="isAuthenticated()" (click)="navigateToUrl()">
<div class="card-icon">
<div *ngIf="routerLink" class="card-icon">
<i class="material-icons-outlined">{{ icon }}</i>
</div>
<div *ngIf="!routerLink" class="card-icon card-icon-nocursor">
<i class="material-icons-outlined">{{ icon }}</i>
</div>
<p class="card-category">{{ title | translate }}</p>
@ -10,7 +13,8 @@
</div>
<div class="card-footer">
<div class="stats">
<div class="view-all" [class.clickable]="isAuthenticated()" (click)="navigateToUrl()">{{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}</div>
<div *ngIf="routerLink" class="view-all" [class.clickable]="isAuthenticated()" (click)="navigateToUrl()">{{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}</div>
<div *ngIf="!routerLink" class="view-all-hidden" [class.clickable]="isAuthenticated()" (click)="navigateToUrl()">{{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}</div>
</div>
</div>
</div>

25
dmp-frontend/src/app/ui/dashboard/info-counter/info-counter.component.spec.ts
View File

@ -1,25 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { InfoCounterComponent } from './info-counter.component';
describe('InfoCounterComponent', () => {
let component: InfoCounterComponent;
let fixture: ComponentFixture<InfoCounterComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ InfoCounterComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(InfoCounterComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

4
dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.css
View File

@ -3,8 +3,8 @@
}
.play_circle {
display: inline-block;
float: right;
display: flex;
align-self: center;
margin: 0px 10px 0px 0px;
font-size: 40px;
}

8
dmp-frontend/src/app/ui/dashboard/wizard/wizard.component.html
View File

@ -1,10 +1,10 @@
<div class="card clickable">
<div class="card-header card-header-blue">
<div class="card-desc">
<h4 class="card-title">{{ title }}</h4>
<div class="row card-header card-header-blue">
<div class="col card-desc">
<h4 class="card-title pb-1">{{ title }}</h4>
<p class="card-category">{{ subtitle }}</p>
</div>
<i class="material-icons play_circle">{{ icon }}</i>
<i class="col-auto material-icons play_circle">{{ icon }}</i>
</div>
<div class="card-body table-responsive"></div>
</div>

10
dmp-frontend/src/assets/css/demo.css
View File

@ -142,6 +142,10 @@ h6 {
cursor: pointer;
}
.card-icon-nocursor {
cursor: default !important;
}
.card .card-header-default .card-icon, .card .card-header-default .card-text, .card .card-header-default:not(.card-header-icon):not(.card-header-text), .card.bg-warning, .card.card-rotate.bg-warning .front, .card.card-rotate.bg-warning .back {
background: linear-gradient(60deg, #fff, #fff);
}
@ -261,6 +265,12 @@ h6 {
color: rgb(46, 117, 182);
}
.view-all-hidden {
visibility: hidden;
margin-top: 10px;
margin-right: 10px;
}
.card-header-plain h4 {
color: black !important;
}

1
dmp-frontend/src/assets/i18n/en.json
View File

@ -762,6 +762,7 @@
"MY-PROJECTS": "My Projects",
"PROJECTS": "Projects",
"MY-DMPS": "My DMPs",
"ORGANIZATIONS": "Related Organizations",
"DMPS": "DMPs",
"MY-DATASETS": "My Dataset Descriptions",
"DATASETS": "Datasets",