[Monitor Dashboard| Trunk]

- add link to monitor for Monitor logo
-Admin:
	-topics view: add public/private icon in md-card similar to stakeholders & indicators



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59009 d315682c-612b-4755-9ff5-7f18f6832af3

src/app/app.component.html

@@ -52,7 +52,7 @@ hasMiniMenu && hasSidebar" [class.stakeholderPage]="isFrontPage">
     </nav>
   </div>
   <dashboard-sidebar *ngIf="hasAdminMenu" [items]="adminMenuItems" headerName="Monitor"
-                     headerDashboard="Administration Panel"
+                     headerDashboard="Administration Panel" [headerUrl]="properties.baseLink"
   ></dashboard-sidebar>
   <div *ngIf="hasSidebar" id="hide_controls">
     <div id="toggle" [class.sidebar_main_open]="open" (click)="toggleOpen($event)">

src/app/monitor/monitor.component.html

@@ -50,7 +50,9 @@
     <dashboard-sidebar *ngIf=" stakeholder" [items]="sideBarItems"
                        [activeItem]="activeTopic?activeTopic.alias:null"
                        [activeSubItem]="activeSubCategory?activeSubCategory.alias:null" [showHeader]=true
-                       headerName="Monitor" [showSearch]="true" [headerUrl]="properties.baseLink"
+                       headerName="Monitor"
+                       [searchLink]="(properties.showContent)?properties.baseLink+'/search/'+stakeholder.alias+'/find/research-outcomes':null"
+                       [headerUrl]="properties.baseLink"
     ></dashboard-sidebar>
     <div id="page_content">
       <div  class="uk-navbar-container uk-sticky uk-sticky-fixed" style="top: 70px; position:

src/app/stakeholder/stakeholder.component.html

@@ -7,7 +7,7 @@
 <!--      <div *ngIf="!stakeholder.defaultId" class="uk-badge default">Default</div>-->
 <!--      <img class="logo" *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl">-->
 <!--      <div class="uk-margin-top" *ngIf="!stakeholder.logoUrl" >{{stakeholder.name}}</div>-->
-      <div   class="portalLogo logo" ></div>
+      <a [href]="properties.baseLink"><div   class="portalLogo logo" ></div></a>
     </div>
   </div>
   <div *ngIf="stakeholder" class="menu_section">
@@ -109,9 +109,54 @@
       <ng-template ngFor [ngForOf]="stakeholder.topics" let-topic>
         <div>
           <a [routerLink]="topic.alias" class="md-card">
-            <div class="md-card-content">
-              <h6 class="uk-text-bold">{{topic.name}}</h6>
-              <div class="uk-text-secondary">
+            <div class="md-card-toolbar">
+              <!--<div class="md-card-toolbar-actions" >
+
+                <div class="md-card-dropdown uk-inline">
+                  <i class="md-icon material-icons">more_vert</i>
+                  <div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false"
+                       class="uk-padding-remove-horizontal">
+                    <ul class="uk-nav uk-dropdown-nav">
+                      <li *ngIf="!editing"><a (click)="editChartIndicatorOpen(chart, indicator._id);hide(element)">Edit</a>
+                      </li>
+                      <li *ngIf="!editing"><a (click)="toggleIndicatorStatus(chart._id, indicator);hide(element)">
+                        {{indicator.isActive ? 'Inactive' : 'Active'}}</a>
+                      </li>
+                      <li *ngIf="!editing"><a (click)="toggleIndicatorAccess(chart._id, indicator);hide(element)">
+                        {{indicator.isPublic ? 'Private' : 'Public'}}</a>
+                      </li>
+                      <hr *ngIf="!indicator.defaultId " class="uk-nav-divider">
+                      <li *ngIf="!editing && !indicator.defaultId "><a
+                        (click)="deleteIndicatorOpen(chart, indicator._id, 'chart', 'delete');hide(element)">
+                        Delete</a>
+                        &lt;!&ndash;                            <a (click)="deleteIndicatorOpen(chart, indicator._id, 'chart', 'delete');hide(element)">Delete from all profiles</a>&ndash;&gt;
+                        &lt;!&ndash;                            <a (click)="deleteIndicatorOpen(chart, indicator._id, 'chart', 'disconnect');hide(element)">Delete and disconnect from all profiles</a>&ndash;&gt;
+                      </li>
+                    </ul>
+                  </div>
+                </div>
+              </div>-->
+              <div class="md-card-toolbar-heading-text">
+                {{topic.name}}
+              </div>
+            </div>
+            <div class="md-card-content uk-grid">
+<!--              <h6 class="uk-text-bold">{{topic.name}}</h6>-->
+              <div class="uk-width-1-2 uk-text-center"
+                   title="{{topic.isPublic?'Visible to all users':'Visible to members'}}">
+                <i class="material-icons md-24">
+                  {{indicatorUtils.isPublicIcon.get(topic.isPublic)}}
+                </i>
+                <div>{{(topic.isPublic) ? 'Public' : 'Private'}}</div>
+              </div>
+              <div class="uk-width-1-2 uk-text-center"
+                   title="{{topic.isActive?'Included in the indicators list':'Available only through administration dashboard'}}">
+                <i class="material-icons md-24" [class.md-color-green-300]="topic.isActive">
+                  {{indicatorUtils.isActiveIcon}}
+                </i>
+                <div>{{(topic.isActive) ? 'Active' : 'Inactive'}}</div>
+              </div>
+              <div *ngIf="topic.description && topic.description.length > 0 " class="uk-text-secondary uk-margin-top">
                 {{topic.description}}
               </div>
             </div>

src/app/stakeholder/stakeholder.component.ts

@@ -13,7 +13,7 @@ import {AlertModal} from "../openaireLibrary/utils/modal/alert";
 import {Subscriber} from "rxjs";
 import {FormBuilder, FormGroup, Validators} from "@angular/forms";
 import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service";
-import {StakeholderUtils} from "../utils/indicator-utils";
+import {IndicatorUtils, StakeholderUtils} from "../utils/indicator-utils";
 import {IDeactivateComponent} from "../openaireLibrary/utils/can-exit.guard";
 
 declare var UIkit;
@@ -31,6 +31,7 @@ export class StakeholderComponent implements OnInit, OnDestroy, IDeactivateCompo
   private errorMessages: ErrorMessagesComponent;
   public form: FormGroup;
   public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
+  public indicatorUtils: IndicatorUtils = new IndicatorUtils();
   public index: number = -1;
   properties: EnvProperties;
   

src/app/topic/topic.component.html

@@ -7,7 +7,7 @@
       <!--      <div *ngIf="!stakeholder.defaultId" class="uk-badge default">Default</div>-->
       <!--      <img class="logo" *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl">-->
       <!--      <div class="uk-margin-top" *ngIf="!stakeholder.logoUrl" >{{stakeholder.name}}</div>-->
-      <div   class="portalLogo logo" ></div>
+      <a [href]="properties.baseLink"><div   class="portalLogo logo" ></div></a>
     </div>
   </div>
   <div *ngIf="stakeholder && stakeholder.topics[topicIndex]" class="menu_section">