Merge branch 'application_submit' into 'develop'

Fixed manual link. Help desk form  is now available only to student role

See merge request !192
parents 9fbce7e6 2385051a
...@@ -20,20 +20,17 @@ ...@@ -20,20 +20,17 @@
<div class="header-wrapper"> <div class="header-wrapper">
<header id="navbar" role="banner" class="navbar navbar-default"> <header id="navbar" role="banner" class="navbar navbar-default">
<div class="container"> <div class="container">
<div *ngIf="(loginInfo$ | async).size > 0"> <div *ngFor="let loginInfoRow$ of loginInfo$ | async; let i=index;">
<ul class="navbar-nav"> <ul class="navbar-nav">
<div *ngIf="(loginInfo$ | async).cu_name !== ''"> <div *ngIf="loginInfoRow$.cu_name !== ''">
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
<i class="fa fa-home isclickable" (click)="goHome()"></i> <i class="fa fa-home isclickable" (click)="goHome()"></i>
<span class="signout isclickable" (click)="goHome()" style="color:#CC3300;">&nbsp;&nbsp;Αρχική</span> <span class="signout isclickable" (click)="goHome()" style="color:#CC3300;">&nbsp;&nbsp;Αρχική</span>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<span class="signout isclickable" (click)="gohelpDesk()" style="color:#CC3300;">&nbsp;&nbsp;Επικοινωνία</span> <span *ngIf="loginInfoRow$.auth_role===studentRole" class="signout isclickable" (click)="gohelpDesk()" style="color:#CC3300;">Επικοινωνία</span>
</div> </div>
<div class="col-md-4">&nbsp;</div> <div class="col-md-4">&nbsp;</div>
<div class="col-md-4" style="text-align: right"> <div class="col-md-4" style="text-align: right">
......
...@@ -23,6 +23,7 @@ import { StudentDataFieldsActions } from "../../actions/studentdatafields.action ...@@ -23,6 +23,7 @@ import { StudentDataFieldsActions } from "../../actions/studentdatafields.action
}) })
export default class HeaderComponent implements OnInit, OnDestroy { export default class HeaderComponent implements OnInit, OnDestroy {
private authToken: string; private authToken: string;
private studentRole = STUDENT_ROLE;
private authRole: string; private authRole: string;
private cuName: string; private cuName: string;
private loginInfo$: BehaviorSubject<ILoginInfo>; private loginInfo$: BehaviorSubject<ILoginInfo>;
...@@ -141,7 +142,7 @@ export default class HeaderComponent implements OnInit, OnDestroy { ...@@ -141,7 +142,7 @@ export default class HeaderComponent implements OnInit, OnDestroy {
gohelpDesk() gohelpDesk()
{ {
this.router.navigate(['/help-desk']); this.router.navigate(['/help-desk']);
} }
public showModal(): void { public showModal(): void {
......
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
<div style="margin-top:15px; margin-bottom: 10px;" class="left-choices"> <div style="margin-top:15px; margin-bottom: 10px;" class="left-choices">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<button type="button" class="btn-primary btn-lg pull-left isclickable" style="width: 10em;" > <a href="/pdfs/files/odigies.pdf" target="_blank" class="btn btn-primary btn-lg pull-left isclickable active" style="width: 10em; " role="button" aria-pressed="true">
<a style="font-size: 0.9em; font-family: arial, sans-serif!important; font-weight: bold; color: #ffffff;" href="../pdfs/files/odigies.pdf" target="_blank">Οδηγίες χρήσης</a> <span style="font-size: 0.9em; font-family: arial, sans-serif!important; font-weight: bold; color: #ffffff;">Οδηγίες χρήσης</span>
</a>
</button>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment