[fli-iam#2084] Change some icons

youennmerel · Mar 27, 2024 · d950b29 · d950b29
1 parent 7751cae
commit d950b29
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/shanoir-ng-front/src/app/datasets/tree/dataset-node.component.html b/shanoir-ng-front/src/app/datasets/tree/dataset-node.component.html
@@ -16,7 +16,7 @@
         *ngIf="node"
         [class.selected]="this.menuOpened"
         [label]="node.label"
-        awesome="fas fa-camera"
+        [awesome]="node.awesome"
         [(opened)]="node.open"
         (labelClick)="toggleMenu()"
         [dataLoading]="loading"

diff --git a/shanoir-ng-front/src/app/datasets/tree/processing-node.component.html b/shanoir-ng-front/src/app/datasets/tree/processing-node.component.html
@@ -15,7 +15,7 @@
 <node
         *ngIf="node"
         [label]="node.label"
-        awesome="fas fa-cog"
+        awesome="fas fa-gears"
         [(opened)]="node.open"
         (labelClick)="toggleMenu()"
         [hasChildren]="hasChildren()"

diff --git a/shanoir-ng-front/src/app/shared/side-menu/side-menu.component.html b/shanoir-ng-front/src/app/shared/side-menu/side-menu.component.html
@@ -82,7 +82,7 @@
                     <i class="fa-solid fa-upload"></i>
                 </ng-template>
                 <ng-template [ngSwitchCase]="'executionMonitoring.event'">
-                    <i class="fa-solid fa-cog"></i>
+                    <i class="fa-solid fa-gears"></i>
                 </ng-template>
                 <ng-template [ngSwitchCase]="'copyDataset.event'">
                     <i class="fa-solid fa-copy"></i>
@@ -129,14 +129,14 @@
     <div *ngIf="state.uploadOpened" class="sub-menu" [@slideDown]="state.uploadOpened">
         <li routerLink="/imports/upload" routerLinkActive="active"><i class="fas fa-compact-disc"></i>DICOM</li>
         <li routerLink="/imports/pacs" routerLinkActive="active" *ngIf="canUserImportFromPACS()"><i class="fas fa-server"></i>PACS</li>
-        <li routerLink="/imports/bids" routerLinkActive="active"><i class="fas fa-brain"></i>BIDS</li>
+        <li routerLink="/imports/bids" routerLinkActive="active"><i class="fas fa-folder-tree"></i>BIDS</li>
         <li routerLink="/imports/bruker" routerLinkActive="active"><i class="fas fa-atom"></i>Bruker</li>
         <li routerLink="/imports/eeg" routerLinkActive="active"><i class="fas fa-bolt"></i>EEG</li>
-        <li routerLink="/imports/processed-dataset" routerLinkActive="active"><i class="fas fa-brain"></i>Processed datasets</li>
+        <li routerLink="/imports/processed-dataset" routerLinkActive="active"><i class="fas fa-gears"></i>Processed datasets</li>
         <!-- <li routerLink="" routerLinkActive="active"><i class="fas fa-cat"></i>From ShanoirUploader</li>
         <li routerLink="" routerLinkActive="active"><i class="fas fa-file-archive"></i>From files ...</li> -->
     </div>
-    <li (click)="state.adminOpened = !state.adminOpened; saveState();" *ngIf="isUserAdmin()"><i class="fas fa-cogs"></i>Administration<span class="chevron"><i class="fas fa-chevron-down"></i></span></li>
+    <li (click)="state.adminOpened = !state.adminOpened; saveState();" *ngIf="isUserAdmin()"><i class="fas fa-user-gear"></i>Administration<span class="chevron"><i class="fas fa-chevron-down"></i></span></li>
     <div *ngIf="isUserAdmin() && state.adminOpened" class="sub-menu" [@slideDown]="state.adminOpened">
         <li routerLink="/user" routerLinkActive="active"><i class="fas fa-users"></i>Manage users</li>
         <li (click)="indexToSolr()"><i class="fas fa-list-ol"></i>Index to Solr</li>

diff --git a/shanoir-ng-front/src/app/solr/solr.search.component.html b/shanoir-ng-front/src/app/solr/solr.search.component.html
@@ -55,7 +55,7 @@ <h2>Solr Search</h2>
 
         <solr-paging-criterion
             label="Processed Dataset"
-            awesome="fa-solid fa-cog"
+            awesome="fa-solid fa-gears"
             facetName="processed"
             [getPage]="getFacetFieldPage.bind(this)"
             [(ngModel)]="solrRequest.processed"

diff --git a/shanoir-ng-front/src/app/solr/solr.search.component.ts b/shanoir-ng-front/src/app/solr/solr.search.component.ts
@@ -428,8 +428,8 @@ export class SolrSearchComponent implements AfterViewChecked, AfterContentInit {
         let columnDefs: ColumnDefinition[] = [
             {headerName: "Id", field: "id", type: "number", width: "60px", defaultSortCol: true, defaultAsc: false},
             {headerName: "Admin", type: "boolean", cellRenderer: row => this.hasAdminRight(row.data.studyId), awesome: "fa-solid fa-shield", color: "goldenrod", disableSorting: true},
+            {headerName: "", type: "boolean", cellRenderer: row => row.data.processed, awesome: "fa-solid fa-gears", color: "dimgrey", disableSorting: true, tip: item => { return item.processed ? "processed dataset" : "" }},
             {headerName: "Name", field: "datasetName"},
-            {headerName: "", type: "boolean", cellRenderer: row => row.data.processed, awesome: "fa-solid fa-cog", color: "dimgrey", disableSorting: true, tip: item => { return item.processed ? "is a processed dataset" : "" }},
             {headerName: "Tags", field: "tags"},
             {headerName: "Type", field: "datasetType"},
             {headerName: "Nature", field: "datasetNature"},

diff --git a/shanoir-ng-front/src/app/tree/tree.model.ts b/shanoir-ng-front/src/app/tree/tree.model.ts
@@ -133,11 +133,16 @@ export class DatasetNode implements ShanoirNode {
         public processings: ProcessingNode[] | UNLOADED,
         public processed: boolean,
         public canDelete: boolean
-    ) {}
+    ) {
+        if(processed){
+            this.title = "processed-dataset";
+            this.awesome = "fas fa-camera-rotate";
+        }
+    }
 
     public open: boolean = false;
     public selected: boolean = false;
-
+    public awesome: string = "fas fa-camera"
     public title: string = "dataset";
 
 }