public dashboard changes

This commit is contained in:
Diamantis Tziotzios 2019-05-10 16:20:53 +03:00
parent 4445cf4bc3
commit 0440ecba41
10 changed files with 43 additions and 18 deletions

View File

@ -1,10 +1,10 @@
<div class="header-image">
<div class="header-text-container">
<h3>Welcome to OpenDMP</h3>
<h4>Lorem ipsum dolor sit amet concectetum lorem ipsum</h4>
<h4>Start using this tool to create your own Data Management Plans</h4>
</div>
</div>
<div class="main-content">
<div class="main-content dashboard-main-container" [class.non-auth-main-container]="!this.isAuthenticated()">
<div *ngIf="this.isAuthenticated()" class="container-fluid">
<div class="row" *ngIf="this.isAuthenticated()">
<div class="col-sm-6 col-md-6 col-lg-6">
@ -42,7 +42,7 @@
</div>
</div>
<div *ngIf="!this.isAuthenticated()" class="container-fluid">
<div class="row">
<div class="row non-auth-stats">
<div class="col-lg-3 col-md-6 col-sm-6">
<app-info-counter [title]="'DASHBOARD.DMPS'" [subtitle]="dashboardStatisticsData?.totalDataManagementPlanCount" routerLink='/plans' buttonRedirectLink="/plans/new" icon="view_agenda"></app-info-counter>
</div>
@ -56,5 +56,11 @@
<app-info-counter title="Related Organizations" [subtitle]="dashboardStatisticsData?.totalOrganisationCount" icon="scatter_plot"></app-info-counter>
</div>
</div>
<div class="d-flex flex-column align-items-center non-auth-title-container">
<h4>This project is funded by Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor</h4>
<p>incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui official deserunt mollit anim id est laborum.
</p>
</div>
</div>
</div>

View File

@ -16,6 +16,22 @@
padding-bottom: 2em;
}
.dashboard-main-container {
margin-top: 0px;
}
.non-auth-main-container {
padding: 0;
}
.non-auth-stats {
background-color: rgba(255, 255, 255, 0.5);
}
.non-auth-title-container {
margin-top: 3em;
}
.dashboard {
.card {
padding: 25px 20px 20px 20px;

View File

@ -12,11 +12,6 @@
<h4 class="card-title">{{'DASHBOARD.DATASETS' | translate}} {{titlePrefix}}</h4>
<p class="card-category">{{'DATASET-LISTING.SUBTITLE' | translate}}</p>
</div>
<div class="d-flex align-items-center ml-auto p-2">
<button mat-raised-button color="primary" class="text-uppercase" [routerLink]="['/datasets/new']">
<mat-icon>add</mat-icon> {{'DATASET-LISTING.ACTIONS.NEW' | translate}}
</button>
</div>
</div>
<div class="card-body table-responsive">
<div class="dmp-listing row">

View File

@ -48,7 +48,7 @@ export class ExploreDatasetListingComponent extends BaseComponent implements OnI
}
rowClicked(dataset: DatasetListingModel) {
this.router.navigate(['/datasets/editPublic/' + dataset.id]);
//this.router.navigate(['/datasets/editPublic/' + dataset.id]);
}
onCriteriaChange(event: ExploreDatasetCriteriaModel) {

View File

@ -4,5 +4,5 @@
Glossary
</a>
<a class="option vl" href="#"><i class="fa fa-book style-icon"></i>Guide</a>
<a class="option" href="#"><i class="fa fa-life-ring style-icon"></i>Help</a>
<a class="option vl" href="#"><i class="fa fa-life-ring style-icon"></i>Help</a>
</div>

View File

@ -45,7 +45,7 @@
<!-- END OF MOBILE MENU -->
<!-- Sidebar Menu -->
<ul class="nav" *ngFor="let groupMenuItem of groupMenuItems; last as isLast; first as isFirst">
<ul class="nav" *ngFor="let groupMenuItem of groupMenuItems; last as isLast; first as isFirst" [class.nav-list-item]="(isAuthenticated() || !groupMenuItem.requiresAuthentication)">
<div *ngIf="isAuthenticated() || !groupMenuItem.requiresAuthentication">
<div class="sidebarSubtitle">
<p>{{groupMenuItem.title | translate}}</p>

View File

@ -1,8 +1,13 @@
$mat-card-header-size: 40px !default;
.my-mat-card-avatar {
height: $mat-card-header-size;
width: $mat-card-header-size;
border-radius: 50%;
flex-shrink: 0;
margin-right: 7px;
height: $mat-card-header-size;
width: $mat-card-header-size;
border-radius: 50%;
flex-shrink: 0;
margin-right: 7px;
}
.nav-list-item {
margin-top: 20px;
}

View File

@ -50,7 +50,7 @@ export class SidebarComponent implements OnInit {
this.generalItems = {
title: 'SIDE-BAR.GENERAL',
routes: GENERAL_ROUTES,
requiresAuthentication: true
requiresAuthentication: false
}
this.groupMenuItems.push(this.generalItems);

View File

@ -219,6 +219,9 @@ h6 {
font-size: 13px;
/* font-size: 9px; */
/* font-weight: 500; */
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.card [class*="card-header-"]:not(.card-header-icon):not(.card-header-text):not(.card-header-image) {

View File

@ -121,7 +121,7 @@
}
.nav {
margin-top: 20px;
//margin-top: 20px;
display: block;
.caret {