Minor ui changes

This commit is contained in:
Nikolaos Laskaris 2017-11-27 18:34:11 +02:00
parent 01fb9bfcc4
commit 8ab9dedec1
5 changed files with 32 additions and 28 deletions

View File

@ -66,24 +66,20 @@
<tr *ngFor="let dmp of mf.data" class="hover"> <tr *ngFor="let dmp of mf.data" class="hover">
<td [ngClass]="{true:'visible', false:'invisible'}[showIDs]">{{dmp?.id}}</td> <td [ngClass]="{true:'visible', false:'invisible'}[showIDs]">{{dmp?.id}}</td>
<!-- data-toggle="modal" data-target="#dmp-deatils-fullscreen" --> <!-- data-toggle="modal" data-target="#dmp-deatils-fullscreen" -->
<td class="url-like" (click)="viewDetailedDMP(dmp)">{{(dmp?.label?.length > 40) ? (dmp?.label | slice:0:40)+'...':(dmp?.label) }}</td> <td>{{(dmp?.label?.length > 40) ? (dmp?.label | slice:0:40)+'...':(dmp?.label) }} <span class="url-like" (click)="viewDetailedDMP(dmp)">(info)</span></td>
<td style="width:20px;">{{dmp?.version}}</td> <td style="width:20px;">{{dmp?.version}}</td>
<td style="width:300px;">{{(dmp?.previous?.label?.length > 40) ? (dmp?.previous?.label | slice:0:40)+'...':(dmp?.previous?.label) }}</td> <td style="width:300px;">{{(dmp?.previous?.label?.length > 40) ? (dmp?.previous?.label | slice:0:40)+'...':(dmp?.previous?.label) }}</td>
<td class="url-like" (click)="viewDetailedProject(dmp)">{{(dmp?.project?.label?.length > 40) ? (dmp?.project?.label | slice:0:40)+'...':(dmp?.project?.label) }}</td> <td>{{(dmp?.project?.label?.length > 40) ? (dmp?.project?.label | slice:0:40)+'...':(dmp?.project?.label) }} <span class="url-like" (click)="viewDetailedProject(dmp)">(info)</span></td>
<td>{{(dmp?.description?.length > 40) ? (dmp?.description | slice:0:40)+'...':(dmp?.description) }}</td> <td>{{(dmp?.description?.length > 40) ? (dmp?.description | slice:0:40)+'...':(dmp?.description) }}</td>
<td>{{dmp?.created | date:'yyyy-MM-dd HH:mm:ss Z'}}</td> <td>{{dmp?.created | date:'yyyy-MM-dd HH:mm:ss Z'}}</td>
<td>{{dmp?.status | statusToString }}</td> <td>{{dmp?.status | statusToString }}</td>
<td> <td>
<a class="editGridColumn cursor-link" (click)="editDmp(dmp)"> <!--btn btn-primary btn-rounded css for button style --> <a class="editGridColumn cursor-link" (click)="editDmp(dmp)"> <!--btn btn-primary btn-rounded css for button style -->
<i class="fa fa-pencil fa-fw" data-toggle="tooltip" title="edit properties" id="editDMP"></i></a> <i class="fa fa-pencil fa-fw" data-toggle="tooltip" title="Edit" id="editDMP"></i></a>
<a class="editGridColumn cursor-link" (click)="cloneDmp(dmp)"> <a class="editGridColumn cursor-link" (click)="cloneDmp(dmp)">
<i class="fa fa-clone fa-fw" data-toggle="tooltip" title="create new version" id="changeVersionDMP"></i> </a> <i class="fa fa-clone fa-fw" data-toggle="tooltip" title="Clone" id="changeVersionDMP"></i> </a>
<a class="editGridColumn cursor-link" (click)="markDMPForDelete(dmp)"> <a class="editGridColumn cursor-link" (click)="markDMPForDelete(dmp)">
<i class="fa fa-eraser fa-fw" data-toggle="modal" data-target="#delete-dmp-confirm" title="delete DMP"></i> </a> <i class="fa fa-eraser fa-fw" data-toggle="modal" data-target="#delete-dmp-confirm" title="Delete"></i> </a>
<!--
<a class="editGridColumn cursor-link" (click)="selectDmp(dmp)">
<i class="fa fa-table fa-fw" data-toggle="tooltip" title="show dataset for this DMP" id="showDatasets"></i></a>
-->
</td> </td>
<td style="max-width:100px;"> <td style="max-width:100px;">
<button type="button" class="btn btn-default table-button" (click)="showDatasetsOfDmp(dmp)"> <i class="fa fa-folder-o" aria-hidden="true"></i> Datasets</button> <button type="button" class="btn btn-default table-button" (click)="showDatasetsOfDmp(dmp)"> <i class="fa fa-folder-o" aria-hidden="true"></i> Datasets</button>
@ -95,7 +91,7 @@
<td colspan="1"> <td colspan="1">
<button type="button" class="btn btn-info btncustom" (click)="newDmpForm(item)">Create New</button> <button type="button" class="btn btn-info btncustom" (click)="newDmpForm(item)">Create New</button>
</td> </td>
<td colspan="7"> <td colspan="8">
<mfBootstrapPaginator [rowsOnPageSet]="[5,10,20]"></mfBootstrapPaginator> <mfBootstrapPaginator [rowsOnPageSet]="[5,10,20]"></mfBootstrapPaginator>
</td> </td>
</tr> </tr>

View File

@ -1,4 +1,11 @@
.row {
padding-top:30px;
padding-bottom:30px;
}
/* START - FOR DETAILS MODALS */ /* START - FOR DETAILS MODALS */
.modal-content { .modal-content {
@ -53,8 +60,3 @@
} }
/* END - FOR DETAILS MODALS */ /* END - FOR DETAILS MODALS */
.row {
padding-top:30px;
padding-bottom:30px;
}

View File

@ -30,8 +30,7 @@ export class DmpDetailedComponent implements OnInit {
let sub = this.route.queryParams.subscribe(params => { let sub = this.route.queryParams.subscribe(params => {
let dmpid = params.dmpid; let dmpid = params.dmpid;
let getParams : any = {"eager":true}; this.serverService.getDmp(dmpid, true).subscribe(
this.serverService.getDmp(dmpid, getParams).subscribe(
response => { response => {
this.dmp = response; this.dmp = response;

View File

@ -5,7 +5,9 @@
padding-bottom:30px; padding-bottom:30px;
} }
.grayed{
opacity: 50%;
}
/* START - FOR DETAILS MODALS */ /* START - FOR DETAILS MODALS */

View File

@ -28,8 +28,10 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-1">
<b>Begins:</b> <b>Begins:</b>
</div>
<div class="col-md-2">
<time class="date-as-calendar position-pixels"> <time class="date-as-calendar position-pixels">
<span class="weekday">{{project?.startdate | date:'EEEE' }}</span> <span class="weekday">{{project?.startdate | date:'EEEE' }}</span>
<span class="day">{{project?.startdate | date:'dd' }}</span> <span class="day">{{project?.startdate | date:'dd' }}</span>
@ -37,8 +39,10 @@
<span class="year">{{project?.startdate | date:'y' }}</span> <span class="year">{{project?.startdate | date:'y' }}</span>
</time> </time>
</div> </div>
<div class="col-md-3"> <div class="col-md-1">
<b>Ends:</b> <b>Ends:</b>
</div>
<div class="col-md-2">
<time class="date-as-calendar position-pixels"> <time class="date-as-calendar position-pixels">
<span class="weekday">{{project?.enddate | date:'EEEE' }}</span> <span class="weekday">{{project?.enddate | date:'EEEE' }}</span>
<span class="day">{{project?.enddate | date:'dd' }}</span> <span class="day">{{project?.enddate | date:'dd' }}</span>
@ -61,13 +65,13 @@
<div class="col-md-6 row-cell"><b>Associated DMPs:</b> <div class="col-md-6 row-cell"><b>Associated DMPs:</b>
<ul> <ul>
<li *ngFor="let dmp of project?.dmps"> <li *ngFor="let dmp of project?.dmps">
{{ dmp?.label }} (owner: {{ users.get(dmp?.creator) }}) {{ dmp?.label }}
<span style="opacity:0.6;">(owner: {{ users.get(dmp?.creator) }}) </span>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
{{users | json}}
<!-- <!--
STUFF NOT USED: STUFF NOT USED:
@ -75,18 +79,19 @@
--> -->
</div> </div>
<p class=""></p>
</div>
<div class="modal-footer">
<!-- <!--
<p class=""></p>
-->
</div>
<!--
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button> <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button> <button type="button" class="btn btn-primary">Save changes</button>
-->
</div> </div>
-->
</div> </div>
</div> </div>
</div> </div>