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

Adds anchor to recent activity table row.

This commit is contained in:
apapachristou 2019-10-25 11:05:54 +03:00
parent 235715584b
commit 9b23f467a7
3 changed files with 124 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css
View File

@ -1,49 +1,53 @@
th { th {
text-transform: uppercase; text-transform: uppercase;
}
a {
color: #212529;
} }
.is-public { .is-public {
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
border: 1px solid #00b29f3b; border: 1px solid #00b29f3b;
color: #00b29f; color: #00b29f;
background-color: #00b29f0f; background-color: #00b29f0f;
border-radius: 10em; border-radius: 10em;
text-align: center; text-align: center;
} }
.template-name { .template-name {
padding-left: 0.5em; padding-left: 0.5em;
border: 1px solid rgb(218, 227, 243); border: 1px solid rgb(218, 227, 243);
color: rgb(43, 104, 209); color: rgb(43, 104, 209);
background-color: rgb(236, 241, 249); background-color: rgb(236, 241, 249);
border-radius: 10em; border-radius: 10em;
text-align: center; text-align: center;
max-width: 160px; max-width: 160px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.chip { .chip {
padding: 0.1em 1em; padding: 0.1em 1em;
margin-bottom: 1em; margin-bottom: 1em;
margin-left: 2.5em; margin-left: 2.5em;
margin-right: 2.5em; margin-right: 2.5em;
border-radius: 10em; border-radius: 10em;
background-color: #0d7489; background-color: #0d7489;
/* background-color: rgba(0, 112, 192, 1); */ /* background-color: rgba(0, 112, 192, 1); */
/* background-color: #007bff; */ /* background-color: #007bff; */
color: #fff; color: #fff;
text-transform: uppercase; text-transform: uppercase;
text-align: center; text-align: center;
font-weight: 500; font-weight: 500;
max-width: 160px; max-width: 160px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.mat-icon-button :hover { .mat-icon-button :hover {
color: rgb(120, 173, 220); color: rgb(120, 173, 220);
} }

118
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
View File

@ -24,68 +24,76 @@
<th></th> <th></th>
</thead> </thead>
<tbody *ngIf="dmpActivities != null"> <tbody *ngIf="dmpActivities != null">
<tr (click)="redirect(activity.id, recentActivityTypeEnum.Dmp)" *ngFor="let activity of dmpActivities" style="cursor: pointer;"> <a *ngFor="let activity of dmpActivities" style="cursor: pointer; display: table-row" [routerLink]="['../plans/overview/' + activity.id]">
<td>{{ activity.label }}</td> <!-- <tr (click)="redirect(activity.id, recentActivityTypeEnum.Dmp)" *ngFor="let activity of dmpActivities" style="cursor: pointer;"> -->
<td> <td><a [routerLink]="['../plans/overview/' + activity.id]">{{ activity.label }}</a></td>
<div *ngIf="activity.profile" matTooltip="{{ activity.profile }}" class="template-name"> <td><a [routerLink]="['../plans/overview/' + activity.id]">
{{ activity.profile }} <div *ngIf="activity.profile" matTooltip="{{ activity.profile }}" class="template-name">
</div> {{ activity.profile }}
<div *ngIf="!(activity.profile)" class="template-name">--</div> </div>
<div *ngIf="!(activity.profile)" class="template-name">--</div>
</a>
</td> </td>
<td>{{ activity.grant }}</td> <td><a [routerLink]="['../plans/overview/' + activity.id]">{{ activity.grant }}</a></td>
<td>{{ roleDisplay(activity.users)}}</td> <td><a [routerLink]="['../plans/overview/' + activity.id]">{{ roleDisplay(activity.users)}}</a></td>
<td>{{ activity.organisations }}</td> <td><a [routerLink]="['../plans/overview/' + activity.id]">{{ activity.organisations }}</a></td>
<td *ngIf="activity.status === 1 && activity.public === true"> <td *ngIf="activity.status === 1 && activity.public === true"><a [routerLink]="['plans/overview/' + activity.id]">
<div class="is-public"> <div class="is-public">
{{'TYPES.DMP-VISIBILITY.PUBLIC' | translate}} {{'TYPES.DMP-VISIBILITY.PUBLIC' | translate}}
</div> </div>
</a>
</td> </td>
<td *ngIf="activity.status === 1 && activity.public === false" class="text-center"> <td *ngIf="activity.status === 1 && activity.public === false" class="text-center">
{{ enumUtils.toDmpStatusString(activity.status) }} <a [routerLink]="['../plans/overview/' + activity.id]">
{{ enumUtils.toDmpStatusString(activity.status) }}</a>
</td> </td>
<td *ngIf="activity.status === 0" class="text-center"> <td *ngIf="activity.status === 0" class="text-center">
{{ enumUtils.toDmpStatusString(activity.status) }} <a [routerLink]="['../plans/overview/' + activity.id]">
{{ enumUtils.toDmpStatusString(activity.status) }}</a>
</td> </td>
<td>{{ activity.modifiedTime | date: "shortDate" }}</td> <td><a [routerLink]="['../plans/overview/' + activity.id]">
<td> {{ activity.modifiedTime | date: "shortDate" }}</a>
<!-- <i class="material-icons more-icon">more_horiz</i> -->
<button mat-icon-button [matMenuTriggerFor]="actionsMenu" class="ml-auto more-icon" (click)="$event.stopImmediatePropagation();">
<mat-icon class="more-horiz">more_horiz</mat-icon>
</button>
<mat-menu #actionsMenu="matMenu">
<button mat-menu-item (click)="editClicked(activity)" class="menu-item">
<mat-icon>edit</mat-icon>{{ 'DMP-LISTING.ACTIONS.EDIT' | translate }}
</button>
<button mat-menu-item (click)="cloneClicked(activity)" class="menu-item">
<mat-icon>add</mat-icon>{{ 'DMP-LISTING.ACTIONS.CLONE' | translate }}
</button>
<button mat-menu-item (click)="deleteClicked(activity)" class="menu-item">
<mat-icon>delete</mat-icon>{{ 'DMP-LISTING.ACTIONS.DELETE' | translate }}
</button>
<button mat-menu-item [matMenuTriggerFor]="exportMethod" class="menu-item">
<mat-icon>save_alt</mat-icon>{{ 'DMP-LISTING.ACTIONS.EXP-AS' | translate }}
</button>
</mat-menu>
<mat-menu #exportMethod>
<button mat-menu-item (click)="downloadPDF(activity.id)">
<i class="fa fa-file-pdf-o pr-2"></i>
<span>{{'GENERAL.FILE-TYPES.PDF' | translate}}</span>
</button>
<button mat-menu-item (click)="downloadDocx(activity.id)">
<i class="fa fa-file-word-o pr-2"></i>
<span>{{'GENERAL.FILE-TYPES.DOC' | translate}}</span>
</button>
<button mat-menu-item (click)="downloadXml(activity.id)">
<i class="fa fa-file-code-o pr-2"></i>
<span>{{'GENERAL.FILE-TYPES.XML' | translate}}</span>
</button>
<button mat-menu-item (click)="downloadJson(activity.id)">
<i class="fa fa-file-o pr-2"></i>
<span>{{'GENERAL.FILE-TYPES.JSON' | translate}}</span>
</button>
</mat-menu>
</td> </td>
</tr> <td><a [routerLink]="['../plans/overview/' + activity.id]">
<!-- <i class="material-icons more-icon">more_horiz</i> -->
<button mat-icon-button [matMenuTriggerFor]="actionsMenu" class="ml-auto more-icon" (click)="$event.preventDefault(); $event.stopPropagation();">
<mat-icon class="more-horiz">more_horiz</mat-icon>
</button>
<mat-menu #actionsMenu="matMenu">
<button mat-menu-item (click)="editClicked(activity)" class="menu-item">
<mat-icon>edit</mat-icon>{{ 'DMP-LISTING.ACTIONS.EDIT' | translate }}
</button>
<button mat-menu-item (click)="cloneClicked(activity)" class="menu-item">
<mat-icon>add</mat-icon>{{ 'DMP-LISTING.ACTIONS.CLONE' | translate }}
</button>
<button mat-menu-item (click)="deleteClicked(activity)" class="menu-item">
<mat-icon>delete</mat-icon>{{ 'DMP-LISTING.ACTIONS.DELETE' | translate }}
</button>
<button mat-menu-item [matMenuTriggerFor]="exportMethod" class="menu-item">
<mat-icon>save_alt</mat-icon>{{ 'DMP-LISTING.ACTIONS.EXP-AS' | translate }}
</button>
</mat-menu>
<mat-menu #exportMethod>
<button mat-menu-item (click)="downloadPDF(activity.id)">
<i class="fa fa-file-pdf-o pr-2"></i>
<span>{{'GENERAL.FILE-TYPES.PDF' | translate}}</span>
</button>
<button mat-menu-item (click)="downloadDocx(activity.id)">
<i class="fa fa-file-word-o pr-2"></i>
<span>{{'GENERAL.FILE-TYPES.DOC' | translate}}</span>
</button>
<button mat-menu-item (click)="downloadXml(activity.id)">
<i class="fa fa-file-code-o pr-2"></i>
<span>{{'GENERAL.FILE-TYPES.XML' | translate}}</span>
</button>
<button mat-menu-item (click)="downloadJson(activity.id)">
<i class="fa fa-file-o pr-2"></i>
<span>{{'GENERAL.FILE-TYPES.JSON' | translate}}</span>
</button>
</mat-menu>
</a>
</td>
</a>
</tbody> </tbody>
<tbody *ngIf="dmpActivities == null"> <tbody *ngIf="dmpActivities == null">
<tr> <tr>

23
dmp-frontend/src/assets/scss/core/_tables.scss
View File

@ -31,7 +31,8 @@
> tfoot > tr > th, > tfoot > tr > th,
> thead > tr > td, > thead > tr > td,
> tbody > tr > td, > tbody > tr > td,
> tfoot > tr > td{ > tfoot > tr > td,
> tbody > a > td{
padding: 12px 8px; padding: 12px 8px;
vertical-align: middle; vertical-align: middle;
} }
@ -67,6 +68,10 @@
> tbody > tr{ > tbody > tr{
position: relative; position: relative;
}
> tbody > a{
position: relative;
} }
} }
@ -83,6 +88,14 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
} }
> tbody > tr > a{
font-size: $font-paragraph;
b{
display: block;
margin-bottom: 5px;
}
}
.td-name{ .td-name{
font-weight: $font-weight-default; font-weight: $font-weight-default;
font-size: 1.5em; font-size: 1.5em;
@ -183,3 +196,11 @@ thead.thead-inverse,
.table.table-hover tbody tr:hover{ .table.table-hover tbody tr:hover{
background-color: #f5f5f5; background-color: #f5f5f5;
} }
.table-striped>tbody>a:nth-of-type(odd){
background-color: #f9f9f9;
}
.table.table-hover tbody a:hover{
background-color: #f5f5f5;
}