updated helper text styles and comments

OSDUApp/src/app/dasboard/dashboard-main/dashboard-main.component.html

@@ -7,8 +7,8 @@
             <div class="card text-white bg-flat-color-2" style="    height: 404px;">
                 <div class="card-body pb-0">
                     <div class="text-light"><i class="fa fa-sitemap" aria-hidden="true"></i>&nbsp;<span> Manage Groups & Legal Tags</span>
-                        <div class="tool-tip" style=" left: -10px;   top: -10px;">          
-                            <i class="fa fa-info-circle " aria-hidden="true"></i>           
+                        <div class="tool-tip" style=" left: -7px;">          
+                            <i style="color: white;" class="fa fa-info-circle " aria-hidden="true"></i>           
                             <p class="tool-tip__info tooltip_right">
                               <span class="info">{{entitlements_helptext}}</span>              
                             </p>
@@ -50,8 +50,8 @@
                     <div class="card text-white bg-flat-color-2">
                         <div class="card-body pb-0">                     
                             <div class="text-light"><i class="fa fa-database" aria-hidden="true"></i>&nbsp; Search for Data
-                                <div class="tool-tip" style=" left: -10px;   top: -10px;">          
-                                    <i class="fa fa-info-circle " aria-hidden="true"></i>           
+                                <div class="tool-tip"  style=" left: -7px;">          
+                                    <i style="color: white;" class="fa fa-info-circle " aria-hidden="true"></i>           
                                     <p class="tool-tip__info tooltip_right" style="top: 4px;">
                                       <span class="info">{{searchdata_helptext}}</span>              
                                     </p>
@@ -71,12 +71,12 @@
             </div>
             <div class="col-sm-6 col-lg-6">
                 <!-- routerLink="/data-ingestion/workflow" -->
-                <div class="container1 cont_router1">
+                <div class="container1 cont_router1" >
                     <div class="card text-white bg-flat-color-1">
                         <div class="card-body pb-0"> 
                             <div class="text-light"><i class="fa fa-paper-plane" aria-hidden="true"></i>&nbsp; WorkFlow Service(Coming Soon!)
-                                <div class="tool-tip"  style=" left: -10px;   top: -10px;">
-                                    <i class="fa fa-info-circle " aria-hidden="true"></i>
+                                <div class="tool-tip"   style=" left: -7px;">
+                                    <i style="color: white;" class="fa fa-info-circle " aria-hidden="true"></i>
                                     <p class="tool-tip__info tooltip_right">
                                         <span class="info">{{workflow_helptext}}</span>
                                     </p>
@@ -99,8 +99,8 @@
                     <div class="card text-white bg-flat-color-1">
                         <div class="card-body pb-0">                        
                             <div class="text-light"><i class="fa fa-arrows" aria-hidden="true"></i>&nbsp; External Data Source(Coming Soon!)
-                                <div class="tool-tip" style=" left: -10px;   top: -10px;">          
-                                    <i class="fa fa-info-circle " aria-hidden="true"></i>           
+                                <div class="tool-tip"  style=" left: -7px;">          
+                                    <i style="color: white;" class="fa fa-info-circle " aria-hidden="true"></i>           
                                     <p class="tool-tip__info tooltip_right">
                                       <span class="info">{{eds_helptext}}</span>              
                                     </p>
@@ -123,8 +123,8 @@
                     <div class="card text-white bg-flat-color-2">
                         <div class="card-body pb-0">                       
                             <div class="text-light"><i class="fa fa-object-group" aria-hidden="true"></i>&nbsp; Data Loading(Coming Soon!)
-                                <div class="tool-tip" style=" left: -10px;   top: -10px;">          
-                                    <i class="fa fa-info-circle " aria-hidden="true"></i>           
+                                <div class="tool-tip"  style=" left: -7px;">          
+                                    <i style="color: white;" class="fa fa-info-circle " aria-hidden="true"></i>           
                                     <p class="tool-tip__info tooltip_right"  style="top: 4px;">
                                       <span class="info">{{dataloading_helptext}}</span>              
                                     </p>

OSDUApp/src/app/data-platform/data-platform/data-platform.component.html

@@ -6,7 +6,7 @@
         <!-- <ng-select [items]="storageKindList" bindLabel="name" (change)="populateStorageKind(selectedStorageKind)" placeholder="Select item"
             [(ngModel)]="selectedStorageKind">
         </ng-select> -->
-        <input type="text" name="product" autocomplete="off" (click) = "$event.target.select()" (change)="populateStorageKind(selectedStorageKind)" placeholder="select item" [(ngModel)]="selectedStorageKind" list="productName"/>
+        <input type="text" name="product" autocomplete="off" (click) = "$event.target.select()" (change)="populateStorageKind(selectedStorageKind)" placeholder="Please select a Kind value to search" [(ngModel)]="selectedStorageKind" list="productName"/>
         <datalist id="productName" >
             <option value="0" disabled="disabled">Select a value</option>
             <option value="{{item}}" *ngFor="let item of storageKindList">{{item}}</option>
@@ -85,7 +85,9 @@
                         <span [innerHTML]="header"></span>
                     </div>
                     <div class="headerRotate" *ngIf="header =='.<wbr>.<wbr>Legal Tag'">
-                        <span>Legal Tags</span>
+                        <span>Legal Tags
+                            
+                        </span>
                     </div>
                     <div class="headerRotate" *ngIf="header =='.<wbr>Id'">
                         <span>Id</span>

OSDUApp/src/app/data-platform/data-platform/data-platform.component.ts

@@ -46,6 +46,7 @@ export class DataPlatformComponent implements OnInit {
   search_btn_dpd_help=search_dpd_helptxt;
   search_modifyFilter=search_modifyFilter;
   search_spatailfilter=search_spatailfilter;
+  //search_legal_navigate=search_legal_navigate;
   spatialArr=[];
   searchObjectArr=[];
  // headersList=["DataSourceOrganisationID","FacilityName","TrajectoryTypeID","FacilityTypeID","SequenceNumber","PrimaryMaterialID",

OSDUApp/src/app/data-platform/dataplatform-search-filters/dataplatform-search-filters.component.html

@@ -11,9 +11,9 @@
         </div>
         <div class="col-xs-12 col-md-4">
         <input type="text" [(ngModel)]="ngEditableselectedKindValues" (click) = "$event.target.select()" autocomplete="off"
-         (change)="populateSubKindValues(ngEditableselectedKindValues,'One')" placeholder="select value" name="product" list="kindValues"/>
+         (change)="populateSubKindValues(ngEditableselectedKindValues,'One')" placeholder="Select a Value" name="product" list="kindValues"/>
         <datalist id="kindValues" [(ngModel)]="ngselectedKindValues">
-            <option value="0" disabled="disabled">Select a value</option>
+            <option value="0" disabled="disabled">Select a Value</option>
             <option value="{{item}}" *ngFor="let item of storageKindValuesList">{{item}}</option>
         </datalist>
         </div>
@@ -64,7 +64,7 @@
         </div>
         <div class="col-xs-12 col-md-3">    
             <input type="text" [(ngModel)]="ngEditableselectedKindValues1" (click)="$event.target.select()"
-                autocomplete="off" (change)="populateSubKindValues(ngEditableselectedKindValues1,'Two')" placeholder="select a value"
+                autocomplete="off" (change)="populateSubKindValues(ngEditableselectedKindValues1,'Two')" placeholder="Select a Value"
                 name="product" list="kindValues1" />
             <datalist id="kindValues1" [(ngModel)]="ngselectedKindValues1">
                 <option value="0" disabled="disabled">Select a value</option>
@@ -86,7 +86,7 @@
         </div>
         <div class="col-xs-12 col-md-4">
             <select *ngIf="ngCondition11=='OR'" [(ngModel)]="ngselectedSubKindValues1">
-                <option value="0" disabled="disabled">Select a value</option>
+                <option value="0" disabled="disabled">Select a Value</option>
                 <option value="{{item}}" *ngFor="let item of storageSubKindValuesList1">{{item}}</option>
             </select>
             <input  *ngIf="ngCondition11=='AND'" type="text" value="" autocomplete="off" placeholder="enter the query value" [(ngModel)]="ngCondText1" />
@@ -106,9 +106,9 @@
     <div *ngIf="fieldValueList.length>0" class="row">
         <div class="col-xs-12 col-md-12"> 
             <input type="text" [(ngModel)]="ngEditableSpatialcoordinate" (click)="$event.target.select()" autocomplete="off"
-             (change)="populateSpatial(ngEditableSpatialcoordinate,'value')" placeholder="select value" name="product" list="spatialValues"/>
+             (change)="populateSpatial(ngEditableSpatialcoordinate,'value')" placeholder="Select a Spatial Location Coordinates" name="product" list="spatialValues"/>
             <datalist id="spatialValues" [(ngModel)]="ngselectedSpatialField">
-                <option value="0" disabled="disabled">Select a value</option>
+                <option value="0" disabled="disabled">Select a Value</option>
                 <option value="{{items}}" *ngFor="let items of fieldValueList">{{items}}</option>
             </datalist>
             <!-- <ng-select [items]="fieldValueList" (change)="populateSpatial(ngselectedSpatialField,'field')" placeholder="Select a Spatial Field" [(ngModel)]="ngselectedSpatialField" bindLabel="name" bindValue="name">

OSDUApp/src/app/entitlements/add-member/add-member.component.html

@@ -25,7 +25,7 @@
                         <span class="info">Enter the member email to add member to a group. Or enter a Group email to add group into a group.</span>
                     </p>
                 </div>
-                <input type="text" value="" id="memberEmail" [(ngModel)]="selectedmemberEmail" name="selectedmemberEmail" placeholder="New Member Email or Group Email"/>
+                <input type="text" value="" id="memberEmail" [(ngModel)]="selectedmemberEmail" name="selectedmemberEmail" placeholder="Please enter Member Email or Group Email"/>
             </div>              
           
         </div>
@@ -37,7 +37,7 @@
                         <span class="info">Select a group email to which a member has to be added..</span>
                     </p>
                 </div>
-                <ng-select [items]="groupList" bindLabel="name" name="selectedGroupType"  bindValue="id" placeholder="Please select a group email"
+                <ng-select [items]="groupList" bindLabel="name" name="selectedGroupType"  bindValue="id" placeholder="Please select a Group Email"
                     [(ngModel)]="selectedGroupType">
                 </ng-select>
               
@@ -49,10 +49,13 @@
                         <span class="info">Select a role for the member to be added</span>
                     </p>
                 </div>
-                <select class="form-control" [(ngModel)]="selectedRole" name="selectedRole">
+                <ng-select [items]="roleList" bindLabel="name" name="selectedRole"  bindValue="name" placeholder="Please select a Role"
+                [(ngModel)]="selectedRole">
+            </ng-select>
+                <!-- <select class="form-control" [(ngModel)]="selectedRole" name="selectedRole">
                     <option value="0" selected="selected">Please select a Role</option>
                     <option value="{{role.name}}" *ngFor="let role of roleList">{{role.name}}</option>
-                </select>
+                </select> -->
             </div>
          
            
@@ -67,7 +70,7 @@
         <p *ngIf="isSuccess" style="color:green"> {{successMessge}}</p>
         <p *ngIf="isError" style="color:red"> {{errorMessge}}</p>
    </div>
-    <div class="row" style="justify-content: center;">
+    <div class="row" style="justify-content: center;    margin-top: 1%;">
         <button class="btn btn-success" form="login-form" type="submit"
          style="width: 150px;" (click)="requestSubmit()" >
         Add<i class="icon-material-outline-arrow-right-alt"></i>

OSDUApp/src/app/entitlements/add-member/add-member.component.ts

@@ -19,7 +19,7 @@ export class AddMemberComponent implements OnInit {
   groupName;
   selectedGroupType;
   selectedPermissionLevel='0';
-  selectedRole='0';
+  selectedRole;
   selectedmemberEmail='';
   isSuccess: boolean;
   isError: boolean;

OSDUApp/src/app/entitlements/creat-group/creat-group.component.html

@@ -26,7 +26,7 @@
                     </p>
                 </div>
                <select class="form-control" [(ngModel)]="selectedGroupType" (change)="selParam('Group',$event.target.value)" name="selectedGroupType">
-                   <option value="0" selected="selected">Please select a group Type</option>
+                   <option value="0" selected="selected">Please select a Group Type</option>
                    <option value="{{group.group}}" *ngFor="let group of groupListNew">{{group.group}}</option>
                </select>
             </div>
@@ -78,7 +78,7 @@
                     <span class="info">Enter the description for the group.</span>
                 </p>
             </div>
-            <textarea placeholder="description..." [(ngModel)]="selecteddescription" value="" id="description" name="selecteddescription"></textarea>
+            <textarea placeholder="Description..." [(ngModel)]="selecteddescription" value="" id="description" name="selecteddescription"></textarea>
         </div>
        </div>
         

OSDUApp/src/app/entitlements/manage-groups/manage-groups.component.html

@@ -15,13 +15,18 @@
     <p style="color: red;">{{error_Message_Div}}</p>
     <table id="tblUserDetails" class="table table-striped">
         <thead>   
-              <th *ngFor="let head of headers" (click)="sort(head)">
+              <!-- <th *ngFor="let head of headers" (click)="sort(head)">
                   {{head}} <span style="float: right;" [ngClass]="istoggle ? 'fa fa-toggle-down' : 'fa fa-toggle-up'"></span>
-              </th> 
-            <!-- <th class="thHover" (click)="sort('name')">Name<span style="float: right;" [ngClass]="istoggle ? 'fa fa-toggle-down' : 'fa fa-toggle-up'"></span></th>
+              </th>  -->
+            <th class="thHover" (click)="sort('name')">Name        <div class="tool-tip">
+                <i style="    color: white;" class="fa fa-info-circle " aria-hidden="true"></i>
+                <p class="tool-tip__info">
+                    <span style="text-transform: none;" class="info">Click on the names to manage / view all the members of a group</span>
+                </p>
+            </div>  <span style="float: right;" [ngClass]="istoggle ? 'fa fa-toggle-down' : 'fa fa-toggle-up'"></span></th>
             <th class="thHover" (click)="sort('email')">Email<span style="float: right;" [ngClass]="istoggle ? 'fa fa-toggle-down' : 'fa fa-toggle-up'"></span></th>
             <th class="thHover" (click)="sort('description')">Description<span style="float: right;" [ngClass]="istoggle ? 'fa fa-toggle-down' : 'fa fa-toggle-up'"></span></th>
-                   -->
+                  
         </thead>
         <tbody id="myTableUsers">
             <tr *ngFor="let user of UserList | slice: (page-1) * pageSize : (page-1) * pageSize + pageSize">        
@@ -30,15 +35,10 @@
                         class="editUserhref">
                         {{user.name}}        
                     </a>   
-                    <div class="tool-tip">
-                        <i class="fa fa-info-circle " aria-hidden="true"></i>
-                        <p class="tool-tip__info">
-                            <span class="info">Click here to manage / view all the members of group {{user.name}}</span>
-                        </p>
-                    </div>     
+                
                 </td>
                 <td>{{user.email}}</td>
-                <td *ngIf="user.description">{{user.description}}</td>
+                <td>{{user.description}}</td>
             </tr>
         </tbody>
     </table>

OSDUApp/src/app/entitlements/manage-users/manage-users.component.html

@@ -13,7 +13,7 @@
             </div>
        </div>
         <div class="col-xs-6  col-md-4" > 
-            <ng-select [items]="groupListNew" bindLabel="name" placeholder="Select a group email"
+            <ng-select [items]="groupListNew" bindLabel="name" placeholder="Please select a Group Email"
                 [(ngModel)]="selectedGroupType">
             </ng-select>      
         </div>

OSDUApp/src/app/header/header.component.html

@@ -43,7 +43,7 @@
                         <div class="panel panel-default">
                           <div class="panel-heading">
                             <h4 class="panel-title">
-                              <a data-toggle="collapse" href="#collapse2"><h3 class="menu-title">Data Platform <i class="fa fa-plus"></i></h3></a>
+                              <a data-toggle="collapse" href="#collapse2"><h3 class="menu-title">Search for Data<i class="fa fa-plus"></i></h3></a>
                             </h4>
                           </div>
                           <div id="collapse2" class="panel-collapse collapse show">

OSDUApp/src/app/legal-tags/legal-tags/legal-tags.component.html

@@ -12,7 +12,7 @@
             (keyup)="searchFilter($event.target.value)">
     </div>
     <div class="col-xs-6 col-md-4">
-        <ng-multiselect-dropdown [placeholder]="'Select Tags to Filter'" [settings]="dropdownSettings"
+        <ng-multiselect-dropdown [placeholder]="'Please select Tags to Filter'" [settings]="dropdownSettings"
             [data]="legalTagNameList" [(ngModel)]="selectedLegalTagNames" name="countryOfOrigin"
             (onSelect)="onItemSelect($event)" (onSelectAll)="onSelectAll($event)">
         </ng-multiselect-dropdown>
@@ -35,7 +35,13 @@
         <table id="tbllegalDetails" class="table table-bordered table-striped">
             <thead>
                <tr>              
-                <th class="thHover" (click)="sort('name')" rowspan="2">Name </th>
+                <th class="thHover" (click)="sort('name')" rowspan="2">Name  
+                    <div class="tool-tip" style="margin-left: 0%;">
+                    <i style="color: white;" class="fa fa-info-circle " aria-hidden="true"></i>
+                    <p class="tool-tip__info">
+                        <span style="text-transform: none;" class="info">Click on legal tag names to edit its details.</span>
+                    </p>
+                </div>   </th>
                 <th class="thHover" (click)="sort('description')" rowspan="2">Description</th>
                 <th  colspan="8">Properties</th>
                </tr>
@@ -50,12 +56,7 @@
                             class="editUserhref">
                             {{tags.name}}            
                         </a> 
-                        <div class="tool-tip" style="margin-left: 0%;">
-                            <i class="fa fa-info-circle " aria-hidden="true"></i>
-                            <p class="tool-tip__info">
-                                <span class="info">Click here to edit {{tags.name}} details.</span>
-                            </p>
-                        </div>   
+                       
                     </td>            
                     <td>{{tags.description}}</td>
                     <td>{{tags.properties.countryOfOrigin}}</td>

OSDUApp/src/assets/css/style.css

@@ -2866,7 +2866,7 @@ a:focus + .tool-tip .tool-tip__info {
 }
 
 i.fa.fa-info-circle{
-  color: red;
+  color:  #00667f;
   padding-left: 2px;
 }
 

OSDUApp/src/config.ts

@@ -21,6 +21,7 @@ export var search_filterAND2=" eg: 'query': '(data.Data.IndividualTypeProperties
 export var search_filter_limit="The maximum number of results to return from the given offset. If no limit is provided, then it will return 10 items. Max number of items which can be fetched by the query is 100.";
 export var search_spatailfilter="The below dropdown consists of all the SpatialmLocation filters like Coordinates,HorizontalCRSID,etc which can be edited and modified to make a Spatial Location Filter.";
 
+export var search_legal_navigate="Click on Legal Tag names to view Legal details."
 //--------- legal help texts----------------
 export var legat_filter="To Filter specific legal tags from the given legal tags list. Select any legal tag you want to view from the multiselectable dropdown list and then click on Filter button to view all the selected legal tag details.";