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

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

@ -2,6 +2,10 @@ 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;

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

@ -24,32 +24,39 @@
<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>
<td><a [routerLink]="['../plans/overview/' + activity.id]">
<div *ngIf="activity.profile" matTooltip="{{ activity.profile }}" class="template-name"> <div *ngIf="activity.profile" matTooltip="{{ activity.profile }}" class="template-name">
{{ activity.profile }} {{ activity.profile }}
</div> </div>
<div *ngIf="!(activity.profile)" class="template-name">--</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>
</td>
<td><a [routerLink]="['../plans/overview/' + activity.id]">
<!-- <i class="material-icons more-icon">more_horiz</i> --> <!-- <i class="material-icons more-icon">more_horiz</i> -->
<button mat-icon-button [matMenuTriggerFor]="actionsMenu" class="ml-auto more-icon" (click)="$event.stopImmediatePropagation();"> <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> <mat-icon class="more-horiz">more_horiz</mat-icon>
</button> </button>
<mat-menu #actionsMenu="matMenu"> <mat-menu #actionsMenu="matMenu">
@ -84,8 +91,9 @@
<span>{{'GENERAL.FILE-TYPES.JSON' | translate}}</span> <span>{{'GENERAL.FILE-TYPES.JSON' | translate}}</span>
</button> </button>
</mat-menu> </mat-menu>
</a>
</td> </td>
</tr> </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;
} }
@ -68,6 +69,10 @@
> tbody > tr{ > tbody > tr{
position: relative; position: relative;
} }
> tbody > a{
position: relative;
}
} }
.table-shopping{ .table-shopping{
@ -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;
}