gohary

src/app/Internal-Page/circulars-page/circulars-page.component.html

@@ -104,4 +104,3 @@
     </div>
   </div>
 </ng-template>
-

src/app/Internal-Page/hospital-content/hospital-content.component.ts

@@ -40,6 +40,7 @@ export class HospitalContentComponent implements OnInit {
 
   ngOnInit() {
     this.spinner.show();
+    this.authSer.homeStyle = false;
     this.expandedIndex = 0;
     this.route.params.subscribe(
       (params: Params) => {

src/app/Internal-Page/internal-page-content/internal-page-content.component.css

@@ -348,6 +348,8 @@ input,button {
 
 
 
+
+
 .servicesContent-w {
     width: 100%;
     padding: 0;
@@ -1081,7 +1083,19 @@ input,button {
     .eventPart-w .event {
         width: 100%;
         height: 200px;
+    }
+    .eventPart-w .event .now{
+        text-align: center;
+        font-size: 14px;
+        padding: 10px 0;
+    }
 
+    .eventPart-w .event .next{
+        color: #007A71;
+        border-bottom: 1px solid #ccc;
+        border-top: 1px solid #ccc;
+        padding: 10px 0;
+        text-align: center;
     }
 
     .eventPart-w .event .now{

src/app/Internal-Page/internal-page-content/internal-page-content.component.html

@@ -1,145 +1,144 @@
 <ng-template [ngIf]="authSer.arabicTemplate" [ngIfElse]="englishTemplate">
     <div class="container">
         <div class="contentPage-w">
-            
+                
             <div class="advertisiment">
                 <img src="{{ authSer.pathImg + advertisiment.photo }}" />
             </div>
 
-            <div class="servicesContent-w">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-12 col-md-4 order-2 order-sm-2 order-md-1">
-                            <div class="row">
-                                <div class="col-6 col-md-6 editRowPadding-w" *ngFor="let service of externalServices">
-                                    <a class="hyperLink" href="{{service.link}}">
-                                        <div class="serviceItem-w">
-                                            <img src="{{authSer.pathImg + service.photo}}" title="TITLE NEED SHOW ON HOVER"/>
-                                            <p>{{service.name}}</p>
-                                        </div>
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-12 col-md-8 order-1 order-sm-1 order-md-2">
-                            <div class="slider">
-                                 
-                                <div *ngIf="reportsData.length > 1"> 
-                                    <ngb-carousel #myCarousel="ngbCarousel">
-                                        <ng-template ngbSlide *ngFor="let report of reportsData; let i = index" id={{i}} >
-                                            <img [src]="authSer.pathImg + report.photo.photo" alt="Random first slide">
-                                            <div class="carousel-caption">
-                                            <h4>{{report.title}}</h4>
-                                            <p class="paragraphTemplate-w" [innerHTML] = "report.description"> </p>
-                                            <span class="extra d-none d-sm-none d-md-block" *ngIf="report.description" (click)="onExtraPage(report.id)"> تفاصيل الخبر</span>
-                                            <span class="allNews d-none d-sm-none d-md-block" (click)="getAllNews()" *ngIf="report.description"> المزيد من الأخبار</span>
+                <div class="servicesContent-w">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-12 col-md-4 order-2 order-sm-2 order-md-1">
+                                <div class="row">
+                                    <div class="col-6 col-md-6 editRowPadding-w" *ngFor="let service of externalServices">
+                                        <a class="hyperLink" href="{{service.link}}">
+                                            <div class="serviceItem-w">
+                                                <img src="{{authSer.pathImg + service.photo}}" title="TITLE NEED SHOW ON HOVER"/>
+                                                <p>{{service.name}}</p>
                                             </div>
-                                        </ng-template>
-                                    </ngb-carousel>
+                                        </a>
+                                    </div>
                                 </div>
                             </div>
-                        </div> 
-                    </div>
-                </div>
-            </div>
 
-                <div class="eventPart-w">
-                <div class="container containerPaddingEdit-w">
-                    <div class="event">
-                        <div class="row">
-                            <div class="col-12 col-sm-12 col-md-12 col-lg-4">
-                                <p class="now"> <img src="../../../assets/image/live.png"/>  يعرض الأن :<span>{{live_event ? live_event.name : 'لايوجد حدث '}}</span></p>
-                            </div>
-                            <div class="col-12 col-sm-12 col-md-12 col-lg-4">
-                                <p class="next"> <img src="../../../assets/image/back.png"> يعرض لاحقاً :<span>{{next_lecture ? next_lecture.name : 'لايوجد حدث '}}</span></p>
-                            </div>
-                            <div class="col-12 col-sm-12 col-md-12 col-lg-4">
-                                <p class="lectureHeading" (click)="onLectureTable()"> <img class="lectureCalenderImg" src="../../../assets/image/calendar.png" /> جدول المحاضرات</p>
-                            </div>
+                            <div class="col-12 col-md-8 order-1 order-sm-1 order-md-2">
+                                <div class="slider">
+                                    <div *ngIf="reportsData.length > 1"> 
+                                        <ngb-carousel #myCarousel="ngbCarousel">
+                                            <ng-template ngbSlide *ngFor="let report of reportsData; let i = index" id={{i}} >
+                                                <img [src]="authSer.pathImg + report.photo.photo" alt="Random first slide">
+                                                <div class="carousel-caption">
+                                                <h4>{{report.title}}</h4>
+                                                <p class="paragraphTemplate-w" [innerHTML] = "report.description"> </p>
+                                                <span class="extra d-none d-sm-none d-md-block" *ngIf="report.description" (click)="onExtraPage(report.id)"> تفاصيل الخبر</span>
+                                                <span class="allNews d-none d-sm-none d-md-block" (click)="getAllNews()" *ngIf="report.description"> المزيد من الأخبار</span>
+                                                </div>
+                                            </ng-template>
+                                        </ngb-carousel>
+                                    </div>
+                                </div>
+                            </div> 
                         </div>
-                    </div>
+                     </div>
                 </div>
-            </div>
 
-            <div class="contentsData-w">
-                <div class="container containerPaddingEdit-w">
-                    <div class="row">
-                        <div class="col-12 col-sm-12 col-md-4 editRowPadding-w">
-                            <div class="joinUs-w">
-                                <div class="joinHeader-w">
-                                    إنضم إلينا
+                <div class="eventPart-w">
+                    <div class="container containerPaddingEdit-w">
+                        <div class="event">
+                            <div class="row">
+                                <div class="col-12 col-sm-12 col-md-12 col-lg-4">
+                                    <p class="now"> <img src="../../../assets/image/live.png"/>  يعرض الأن :<span>{{live_event ? live_event.name : 'لايوجد حدث '}}</span></p>
                                 </div>
-                                <div class="joinHeading-w">
-                                    <h2>ترحيب بالإنضمام للمجمع الطبي</h2>
+                                <div class="col-12 col-sm-12 col-md-12 col-lg-4">
+                                    <p class="next"> <img src="../../../assets/image/back.png"> يعرض لاحقاً :<span>{{next_lecture ? next_lecture.name : 'لايوجد حدث '}}</span></p>
                                 </div>
-                                <div class="dataContent">
-                                    <div class="row">                                         
-                                        <div id="demo" class="carousel slide" data-ride="carousel">
-                                            <ul class="carousel-indicators">
-                                                <li *ngFor="let join of joinUs; let i = index" data-target="#demo" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
-                                            </ul>
-                                            <div class="carousel-inner">
-                                                <div class="carousel-item" *ngFor="let join of joinUs; let i = index" [ngClass]="i == 0 ? 'active' : ''">
-                                                    <div class="carousel-caption">
-                                                        <img src="{{authSer.pathImg + join.photo}}" />
-                                                        <p> الموظف : <span>{{join.name}}</span></p>
-                                                        <p> الإداره: <span>{{join.adminstration_name ? join.adminstration_name : 'not found'}}</span></p>
-                                                        <p>  التاريخ : <span>{{join.date_of_employment_hij ? join.date_of_employment_hij : 'not found'}}</span></p>
-                                                    </div>   
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
+                                <div class="col-12 col-sm-12 col-md-12 col-lg-4">
+                                    <p class="lectureHeading" (click)="onLectureTable()"> <img class="lectureCalenderImg" src="../../../assets/image/calendar.png" /> جدول المحاضرات</p>
                                 </div>
                             </div>
                         </div>
-                            <div class="col-12 col-md-8 editRowPadding-w">
-                            <div class="sharingEvent-w">
-                                <div class="sharingHeader-w">
-                                    <h2>مشاركه اللحظات</h2>
-                                </div>
-                                <div class="row">
-                                    <div class="col-12 col-md-6" style="padding-left:5px">
-                                        <div class="congeratolation">
-                                            <h2>التهانى</h2>
-                                        </div>
-                                        <div class="content">
-                                            <div id="demo1" class="carousel slide" data-ride="carousel">
+                    </div>
+                </div>
+                <div class="contentsData-w">
+                    <div class="container containerPaddingEdit-w">
+                        <div class="row">
+                            <div class="col-12 col-sm-12 col-md-4 editRowPadding-w">
+                                <div class="joinUs-w">
+                                    <div class="joinHeader-w">
+                                        إنضم إلينا
+                                    </div>
+                                    <div class="joinHeading-w">
+                                        <h2>ترحيب بالإنضمام للمجمع الطبي</h2>
+                                    </div>
+                                    <div class="dataContent">
+                                        <div class="row">                                         
+                                            <div id="demo" class="carousel slide" data-ride="carousel">
                                                 <ul class="carousel-indicators">
-                                                    <li *ngFor="let conga of congratulations; let i = index" data-target="#demo1" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
+                                                    <li *ngFor="let join of joinUs; let i = index" data-target="#demo" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
                                                 </ul>
                                                 <div class="carousel-inner">
-                                                    <div class="carousel-item" *ngFor="let conga of congratulations; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                                                    <div class="carousel-item" *ngFor="let join of joinUs; let i = index" [ngClass]="i == 0 ? 'active' : ''">
                                                         <div class="carousel-caption">
-                                                            <p>الموظف : <span>{{conga.employee_name}}</span></p>
-                                                            <p class="event">{{conga.name}}</p>
-                                                            <p>{{conga.created_at}}</p>
+                                                            <img src="{{authSer.pathImg + join.photo}}" />
+                                                            <p> الموظف : <span>{{join.name}}</span></p>
+                                                            <p> الإداره: <span>{{join.adminstration_name ? join.adminstration_name : 'not found'}}</span></p>
+                                                            <p>  التاريخ : <span>{{join.date_of_employment_hij ? join.date_of_employment_hij : 'not found'}}</span></p>
                                                         </div>   
                                                     </div>
                                                 </div>
-                                            </div> 
+                                            </div>
                                         </div>
                                     </div>
-                                    <div class="col-12 col-md-6" style="padding-right:5px">
-                                        <div class="sadDead-w">
-                                            <h2>التعازى</h2>
+                                </div>
+                            </div>
+                                <div class="col-12 col-md-8 editRowPadding-w">
+                                <div class="sharingEvent-w">
+                                    <div class="sharingHeader-w">
+                                        <h2>مشاركه اللحظات</h2>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-12 col-md-6" style="padding-left:5px">
+                                            <div class="congeratolation">
+                                                <h2>التهانى</h2>
+                                            </div>
+                                            <div class="content">
+                                                <div id="demo1" class="carousel slide" data-ride="carousel">
+                                                    <ul class="carousel-indicators">
+                                                        <li *ngFor="let conga of congratulations; let i = index" data-target="#demo1" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
+                                                    </ul>
+                                                    <div class="carousel-inner">
+                                                        <div class="carousel-item" *ngFor="let conga of congratulations; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                                                            <div class="carousel-caption">
+                                                                <p>الموظف : <span>{{conga.employee_name}}</span></p>
+                                                                <p class="event">{{conga.name}}</p>
+                                                                <p>{{conga.created_at}}</p>
+                                                            </div>   
+                                                        </div>
+                                                    </div>
+                                                </div> 
+                                            </div>
                                         </div>
-                                        <div class="content">    
-                                            <div id="demo2" class="carousel slide" data-ride="carousel">
-                                                <ul class="carousel-indicators">
-                                                    <li *ngFor="let cond of condolences; let i = index" data-target="#demo2" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
-                                                </ul>
-                                                <div class="carousel-inner">
-                                                    <div class="carousel-item" *ngFor="let cond of condolences; let i = index" [ngClass]="i == 0 ? 'active' : ''">
-                                                        <div class="carousel-caption">
-                                                            <p>الموظف : <span>{{cond.employee_name}}</span></p>
-                                                            <p class="event">{{cond.name}}</p>
-                                                            <p>{{cond.created_at}}</p>
-                                                        </div>   
+                                        <div class="col-12 col-md-6" style="padding-right:5px">
+                                            <div class="sadDead-w">
+                                                <h2>التعازى</h2>
+                                            </div>
+                                            <div class="content">    
+                                                <div id="demo2" class="carousel slide" data-ride="carousel">
+                                                    <ul class="carousel-indicators">
+                                                        <li *ngFor="let cond of condolences; let i = index" data-target="#demo2" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
+                                                    </ul>
+                                                    <div class="carousel-inner">
+                                                        <div class="carousel-item" *ngFor="let cond of condolences; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                                                            <div class="carousel-caption">
+                                                                <p>الموظف : <span>{{cond.employee_name}}</span></p>
+                                                                <p class="event">{{cond.name}}</p>
+                                                                <p>{{cond.created_at}}</p>
+                                                            </div>   
+                                                        </div>
                                                     </div>
-                                                </div>
-                                            </div>  
+                                                </div>  
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -147,25 +146,25 @@
                         </div>
                     </div>
                 </div>
-            </div>
-        
-            <div class="secondServices-w">
-                <div class="container containerPaddingEdit-w" style="height:560px; overflow-y:auto">
-                    <div class="row" style="padding:0 10px;">
-                        <div class="col-12 col-sm-6 col-md-4 editRowPadding-w" *ngFor="let ser of internalService">
-                            <div class="contentSecondSer-w">
-                                <div class="headerSer-w">
-                                    {{ser.name}}
-                                </div>
-                                <div class="contentSer" style="overflow:auto; overflow-x:hidden">
-                                    <div class="row" style="padding: 0 10px; margin-left: 0; margin-right: 0">
-                                        <div class="col-6 col-md-4"  *ngFor="let field of ser['fields']">
-                                        <a [attr.href]=" field.apperance == 1 ? field.link : '#' " [className]=" field.apperance == 1 ? '' : 'notAllowed-w' " style="text-decoration:none">
-                                            <div class="fieldData-w text-center">
-                                                <img src="{{authSer.pathImg ? authSer.pathImg + field.photo : authSer.iconImg}}" [className]=" field.apperance == 0 ? 'iconeActive' : '' " />
-                                                <p style="color:#767676; font-size:13px;">{{field.name ? field.name : 'إضافه خدمه'}}</p>
+            
+                <div class="secondServices-w">
+                    <div class="container containerPaddingEdit-w" style="height:560px; overflow-y:auto">
+                        <div class="row" style="padding:0 10px;">
+                            <div class="col-12 col-sm-6 col-md-4 editRowPadding-w" *ngFor="let ser of internalService">
+                                <div class="contentSecondSer-w">
+                                    <div class="headerSer-w">
+                                        {{ser.name}}
+                                    </div>
+                                    <div class="contentSer" style="overflow:auto; overflow-x:hidden">
+                                        <div class="row" style="padding: 0 10px; margin-left: 0; margin-right: 0">
+                                            <div class="col-6 col-md-4"  *ngFor="let field of ser['fields']">
+                                            <a [attr.href]=" field.apperance == 1 ? field.link : '#' " [className]=" field.apperance == 1 ? '' : 'notAllowed-w' " style="text-decoration:none">
+                                                <div class="fieldData-w text-center">
+                                                    <img src="{{authSer.pathImg ? authSer.pathImg + field.photo : authSer.iconImg}}" [className]=" field.apperance == 0 ? 'iconeActive' : '' " />
+                                                    <p style="color:#767676; font-size:13px;">{{field.name ? field.name : 'إضافه خدمه'}}</p>
+                                                </div>
+                                            </a>
                                             </div>
-                                        </a>
                                         </div>
                                     </div>
                                 </div>
@@ -173,51 +172,51 @@
                         </div>
                     </div>
                 </div>
-            </div>
 
-            <div class="tabs">
-                <div class="container containerPaddingEdit-w">
-                    <div class="row">
-                        
-                        <div class="col-12 col-md-12 col-lg-8 editRowPadding-w">
-                            <div class="lastTab-w">
-                                <div class="headerTab-w">
-                                    أخر التعاميم
-                                </div>
-                                <div class="menuTab-w">
-                                    <ul class="list-unstyled">
-                                        <li (click)="onGetData(0)" [ngClass]="{'active': selectedItem == 0}">التعاميم الداخليه</li>
-                                        <li (click)="onGetData(1)" [ngClass]="{'active': selectedItem == 1}">التعاميم الخارجيه</li>
-                                        <li (click)="onGetData(2)" [ngClass]="{'active': selectedItem == 2}">السياسات</li>
-                                    </ul>
-                                </div>
-                                <div class="menuTabContent-w">
-                                    <h2 class="text-center" *ngIf="checkShowData">لايوجد بيانات الأن لعرضها</h2>
-                                    <ol>
-                                        <li *ngFor="let data of tabsData">{{data.name}}
-                                             <button class="btn btn-default" *ngIf="data.file" type="button" style="position: absolute; background:transparent; border:none; left:45px"> <a href="{{authSer.pathImg + data.file}}" target="_blank"><i class="fas fa-download"></i></a></button>
-                                        </li>
-                                    </ol>
-                                    <button class="btn btn-primary" (click)="onPageCir()" style="margin:0 auto; display:block; background-color:#bda380; width:150px;border:none;">المزيد</button>
+                <div class="tabs">
+                    <div class="container containerPaddingEdit-w">
+                        <div class="row">
+                            
+                            <div class="col-12 col-md-12 col-lg-8 editRowPadding-w">
+                                <div class="lastTab-w">
+                                    <div class="headerTab-w">
+                                        أخر التعاميم
+                                    </div>
+                                    <div class="menuTab-w">
+                                        <ul class="list-unstyled">
+                                            <li (click)="onGetData(0)" [ngClass]="{'active': selectedItem == 0}">التعاميم الداخليه</li>
+                                            <li (click)="onGetData(1)" [ngClass]="{'active': selectedItem == 1}">التعاميم الخارجيه</li>
+                                            <li (click)="onGetData(2)" [ngClass]="{'active': selectedItem == 2}">السياسات</li>
+                                        </ul>
+                                    </div>
+                                    <div class="menuTabContent-w">
+                                        <h2 class="text-center" *ngIf="checkShowData">لايوجد بيانات الأن لعرضها</h2>
+                                        <ol>
+                                            <li *ngFor="let data of tabsData">{{data.name}}
+                                                <button class="btn btn-default" *ngIf="data.file" type="button" style="position: absolute; background:transparent; border:none; left:45px"> <a href="{{authSer.pathImg + data.file}}" target="_blank"><i class="fas fa-download"></i></a></button>
+                                            </li>
+                                        </ol>
+                                        <button class="btn btn-primary" (click)="onPageCir()" style="margin:0 auto; display:block; background-color:#bda380; width:150px;border:none;">المزيد</button>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
 
-                        <div class="col-12 col-md-12 col-lg-4 editRowPadding-w">
-                            <div class="recods">
-                                <div class="headerRecords-w">
-                                    إحصائيات عامه - إنجازات
-                                </div>
-                                <div class="recordsContent-w">
-                                    <div class="accordion" id="accordionExample">
-                                        <div class="panel-group testGroup-w" *ngFor="let achiev of achievements; let i = index"  id="accordion">
-                                            <div class="panel panel-default">
-                                                <div class="panel-heading accordion-toggle collapsed" id="{{ 'heading' + (i+1) }}" data-toggle="collapse" [attr.data-target]=" '#collapse' + (i+1) " [attr.aria-controls] = " 'collapse' + (i+1) ">
-                                                    <h4 class="panel-title">{{achiev.title}}</h4>
-                                                </div>
-                                                <div id="{{ 'collapse'+(i+1) }}" class="panel-collapse collapse" [attr.aria-labelledby] = " 'heading' + (i+1) " data-parent="#accordionExample">
-                                                    <div class="panel-body testBody-w">
-                                                        <p [innerHTML]="achiev.description"></p>
+                            <div class="col-12 col-md-12 col-lg-4 editRowPadding-w">
+                                <div class="recods">
+                                    <div class="headerRecords-w">
+                                        إحصائيات عامه - إنجازات
+                                    </div>
+                                    <div class="recordsContent-w">
+                                        <div class="accordion" id="accordionExample">
+                                            <div class="panel-group testGroup-w" *ngFor="let achiev of achievements; let i = index"  id="accordion">
+                                                <div class="panel panel-default">
+                                                    <div class="panel-heading accordion-toggle collapsed" id="{{ 'heading' + (i+1) }}" data-toggle="collapse" [attr.data-target]=" '#collapse' + (i+1) " [attr.aria-controls] = " 'collapse' + (i+1) ">
+                                                        <h4 class="panel-title">{{achiev.title}}</h4>
+                                                    </div>
+                                                    <div id="{{ 'collapse'+(i+1) }}" class="panel-collapse collapse" [attr.aria-labelledby] = " 'heading' + (i+1) " data-parent="#accordionExample">
+                                                        <div class="panel-body testBody-w">
+                                                            <p [innerHTML]="achiev.description"></p>
+                                                        </div>
                                                     </div>
                                                 </div>
                                             </div>
@@ -230,7 +229,6 @@
                 </div>
             </div>
         </div>
-    </div> 
 
 
 </ng-template>
@@ -239,237 +237,237 @@
 
  <ng-template #englishTemplate>
     <div class="container">
-    <div class="contentPage-w">
-        <div class="servicesContent-w" style="direction:ltr">
-        <div class="container">
-            <div class="row">
+        <div class="contentPage-w">
+            <div class="servicesContent-w" style="direction:ltr">
+                <div class="container">
+                    <div class="row">
 
-            <div class="col-12">
-                <div class="advertisiment">
-                        <img src="{{ authSer.pathImg + advertisiment.photo }}" />
-                </div>
-            </div>
-            
-            <div class="col-12 col-md-4 order-2 order-sm-2 order-md-1">
-                <div class="row">
-                <div class="col-6 col-md-6 editRowPadding-w" *ngFor="let service of externalServices">
-                    <a class="hyperLink" href="{{service.link}}">
-                        <div class="serviceItem-w">
-                            <img src="{{authSer.pathImg + service.photo}}" />
-                            <p>{{service.name_en}}</p>
+                    <div class="col-12">
+                        <div class="advertisiment">
+                                <img src="{{ authSer.pathImg + advertisiment.photo }}" />
                         </div>
-                    </a>
-                </div>
-                </div>
-            </div>
-
-            <div class="col-12 col-md-8 order-1 order-sm-1 order-md-2">
-                <div class="slider" *ngIf="reportsData.length > 1">
-                <ngb-carousel>
-                    <ng-template *ngFor="let report of reportsData" ngbSlide>
-                    <img src="{{authSer.pathImg + report.photo.photo}}" alt="Random first slide">
-                    <div class="carousel-caption">
-                        <h4>{{report.title_en}}</h4>
-                        <p class="paragraphTemplate-w" [innerHTML] = "report.description_en"></p>
-                        <a class="extra d-none d-sm-none d-md-block" (click)="onExtraPage(report.id)" style="left:15px;">Read More</a>
-                        <span class="allNews d-none d-sm-none d-md-block" (click)="getAllNews()" *ngIf="report.description"> More From News</span>
                     </div>
-                    </ng-template>
-                </ngb-carousel>
-                </div>
-            </div>
-
-            </div>
-        </div>
-        </div>
-
-        <div class="eventPart-w" style="direction:ltr">
-            <div class="container" style="padding-left: 5px;">
-                <div class="event">
-                    <div class="row">
-                        <div class="col-12 col-sm-12 col-md-12 col-lg-4">
-                        <p class="now"> <img src="../../../assets/image/live.png"/>   Live Now :<span>{{live_event ? live_event.name : ' now event'}}</span></p>
+                    
+                    <div class="col-12 col-md-4 order-2 order-sm-2 order-md-1">
+                        <div class="row">
+                        <div class="col-6 col-md-6 editRowPadding-w" *ngFor="let service of externalServices">
+                            <a class="hyperLink" href="{{service.link}}">
+                                <div class="serviceItem-w">
+                                    <img src="{{authSer.pathImg + service.photo}}" />
+                                    <p>{{service.name_en}}</p>
+                                </div>
+                            </a>
                         </div>
-                        <div class="col-12 col-sm-12 col-md-12 col-lg-4">
-                        <p class="next"> <img src="../../../assets/image/back.png"> Soon :<span>{{next_lecture ? next_lecture.name : 'now event'}}</span></p>
                         </div>
-                        <div class="col-12 col-sm-12 col-md-12 col-lg-4">
-                            <p class="lectureHeading" (click)="onLectureTable()"> <img class="lectureCalenderImg" src="../../../assets/image/calendar.png" /> Lecture Table</p>
+                    </div>
+
+                    <div class="col-12 col-md-8 order-1 order-sm-1 order-md-2">
+                        <div class="slider" *ngIf="reportsData.length > 1">
+                        <ngb-carousel>
+                            <ng-template *ngFor="let report of reportsData" ngbSlide>
+                            <img src="{{authSer.pathImg + report.photo.photo}}" alt="Random first slide">
+                            <div class="carousel-caption">
+                                <h4>{{report.title_en}}</h4>
+                                <p class="paragraphTemplate-w" [innerHTML] = "report.description_en"></p>
+                                <a class="extra d-none d-sm-none d-md-block" (click)="onExtraPage(report.id)" style="left:15px;">Read More</a>
+                                <span class="allNews d-none d-sm-none d-md-block" (click)="getAllNews()" *ngIf="report.description"> More From News</span>
+                            </div>
+                            </ng-template>
+                        </ngb-carousel>
                         </div>
                     </div>
+
+                    </div>
                 </div>
             </div>
-        </div>
 
-        <div class="contentsData-w" style="direction:ltr">
-        <div class="container" style="padding-left:5px;">
-            <div class="row">
-            <div class="col-12 col-sm-12 col-md-4 editRowPadding-w">
-                <div class="joinUs-w" style="float:right"  [className]="authSer.arabicTemplate ? '' : 'joinUsEn-w' ">
-                    <div class="joinHeader-w">
-                        Join Us
-                    </div>
-                    <div class="joinHeading-w">
-                        <h2>Welcome to join the medical center</h2>
-                    </div>
-                    <div class="dataContent">
+            <div class="eventPart-w" style="direction:ltr">
+                <div class="container" style="padding-left: 5px;">
+                    <div class="event">
                         <div class="row">
-                            <div id="demo" class="carousel slide" data-ride="carousel">
-                                <ul class="carousel-indicators">
-                                    <li *ngFor="let join of joinUs; let i = index" data-target="#demo" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
-                                </ul>
-                                <div class="carousel-inner">
-                                    <div class="carousel-item" *ngFor="let join of joinUs; let i = index" [ngClass]="i == 0 ? 'active' : ''">
-                                        <div class="carousel-caption">
-                                            <img src="{{authSer.pathImg + join.photo}}" />
-                                            <p> Employee : <span>{{join.name_en}}</span></p>
-                                            <p>  Date : <span>{{join.date_of_employment_hij ? join.date_of_employment_hij : 'not found'}}</span></p>
-                                        </div>   
-                                    </div>
-                                </div>
+                            <div class="col-12 col-sm-12 col-md-12 col-lg-4">
+                            <p class="now"> <img src="../../../assets/image/live.png"/>   Live Now :<span>{{live_event ? live_event.name : ' now event'}}</span></p>
+                            </div>
+                            <div class="col-12 col-sm-12 col-md-12 col-lg-4">
+                            <p class="next"> <img src="../../../assets/image/back.png"> Soon :<span>{{next_lecture ? next_lecture.name : 'now event'}}</span></p>
+                            </div>
+                            <div class="col-12 col-sm-12 col-md-12 col-lg-4">
+                                <p class="lectureHeading" (click)="onLectureTable()"> <img class="lectureCalenderImg" src="../../../assets/image/calendar.png" /> Lecture Table</p>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="col-12 col-md-8 editRowPadding-w">
-                <div class="sharingEvent-w"  style="float:left">
-                    <div class="sharingHeader-w">
-                        <h2>Share moments</h2>
-                    </div>
+
+            <div class="contentsData-w" style="direction:ltr">
+                <div class="container" style="padding-left:5px;">
                     <div class="row">
-                        <div class="col-12 col-md-6" style="padding-right:5px">
-                            <div class="congeratolation">
-                                <h2>Congratulations</h2>
+                    <div class="col-12 col-sm-12 col-md-4 editRowPadding-w">
+                        <div class="joinUs-w" style="float:right"  [className]="authSer.arabicTemplate ? '' : 'joinUsEn-w' ">
+                            <div class="joinHeader-w">
+                                Join Us
+                            </div>
+                            <div class="joinHeading-w">
+                                <h2>Welcome to join the medical center</h2>
                             </div>
-                            <div class="content">     
-                                <div id="demo1" class="carousel slide" data-ride="carousel">
-                                    <ul class="carousel-indicators">
-                                        <li *ngFor="let conga of congratulations; let i = index" data-target="#demo1" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
-                                    </ul>
-                                    <div class="carousel-inner">
-                                        <div class="carousel-item" *ngFor="let conga of congratulations; let i = index" [ngClass]="i == 0 ? 'active' : ''">
-                                            <div class="carousel-caption">
-                                                <p>Employee : <span>{{conga.employee_name_en}}</span></p>
-                                                <p class="event">{{conga.name_en}}</p>
-                                                <p>{{conga.created_at}}</p>
-                                            </div>   
+                            <div class="dataContent">
+                                <div class="row">
+                                    <div id="demo" class="carousel slide" data-ride="carousel">
+                                        <ul class="carousel-indicators">
+                                            <li *ngFor="let join of joinUs; let i = index" data-target="#demo" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
+                                        </ul>
+                                        <div class="carousel-inner">
+                                            <div class="carousel-item" *ngFor="let join of joinUs; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                                                <div class="carousel-caption">
+                                                    <img src="{{authSer.pathImg + join.photo}}" />
+                                                    <p> Employee : <span>{{join.name_en}}</span></p>
+                                                    <p>  Date : <span>{{join.date_of_employment_hij ? join.date_of_employment_hij : 'not found'}}</span></p>
+                                                </div>   
+                                            </div>
                                         </div>
                                     </div>
-                                </div>    
+                                </div>
                             </div>
-                        
                         </div>
-                        <div class="col-12 col-md-6" style="padding-left:5px">
-                            <div class="sadDead-w">
-                                <h2>Condolences</h2>
+                    </div>
+                    <div class="col-12 col-md-8 editRowPadding-w">
+                        <div class="sharingEvent-w"  style="float:left">
+                            <div class="sharingHeader-w">
+                                <h2>Share moments</h2>
                             </div>
-                            <div class="content">     
-                                <div id="demo2" class="carousel slide" data-ride="carousel">
-                                    <ul class="carousel-indicators">
-                                        <li *ngFor="let cond of condolences; let i = index" data-target="#demo2" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
-                                    </ul>
-                                    <div class="carousel-inner">
-                                        <div class="carousel-item" *ngFor="let cond of condolences; let i = index" [ngClass]="i == 0 ? 'active' : ''">
-                                            <div class="carousel-caption">
-                                                <p>Employee : <span>{{cond.employee_name_en}}</span></p>
-                                                <p class="event">{{cond.name_en}}</p>
-                                                <p>{{cond.created_at}}</p>
-                                            </div>   
-                                        </div>
+                            <div class="row">
+                                <div class="col-12 col-md-6" style="padding-right:5px">
+                                    <div class="congeratolation">
+                                        <h2>Congratulations</h2>
+                                    </div>
+                                    <div class="content">     
+                                        <div id="demo1" class="carousel slide" data-ride="carousel">
+                                            <ul class="carousel-indicators">
+                                                <li *ngFor="let conga of congratulations; let i = index" data-target="#demo1" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
+                                            </ul>
+                                            <div class="carousel-inner">
+                                                <div class="carousel-item" *ngFor="let conga of congratulations; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                                                    <div class="carousel-caption">
+                                                        <p>Employee : <span>{{conga.employee_name_en}}</span></p>
+                                                        <p class="event">{{conga.name_en}}</p>
+                                                        <p>{{conga.created_at}}</p>
+                                                    </div>   
+                                                </div>
+                                            </div>
+                                        </div>    
+                                    </div>
+                                
+                                </div>
+                                <div class="col-12 col-md-6" style="padding-left:5px">
+                                    <div class="sadDead-w">
+                                        <h2>Condolences</h2>
+                                    </div>
+                                    <div class="content">     
+                                        <div id="demo2" class="carousel slide" data-ride="carousel">
+                                            <ul class="carousel-indicators">
+                                                <li *ngFor="let cond of condolences; let i = index" data-target="#demo2" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
+                                            </ul>
+                                            <div class="carousel-inner">
+                                                <div class="carousel-item" *ngFor="let cond of condolences; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                                                    <div class="carousel-caption">
+                                                        <p>Employee : <span>{{cond.employee_name_en}}</span></p>
+                                                        <p class="event">{{cond.name_en}}</p>
+                                                        <p>{{cond.created_at}}</p>
+                                                    </div>   
+                                                </div>
+                                            </div>
+                                        </div>    
                                     </div>
-                                </div>    
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
-            </div>
 
 
-            <div class="secondServices-w">
-                <div class="container" style="height:560px; overflow-y:auto; padding-left:5px">
-                    <div class="row" style="padding:0 10px;">
-                        <div class="col-12 col-sm-6 col-md-4 editRowPadding-w" *ngFor="let ser of internalService">
-                            <div class="contentSecondSer-w" style="float:left;">
-                                <div class="headerSer-w">
-                                    {{ser.name_en}}
-                                </div>
-                                <div class="contentSer" style="overflow:auto; overflow-x:hidden">
-                                    <div class="row" style="padding: 0 10px; margin-left: 0; margin-right: 0">
-                                        <div class="col-6 col-md-4"  *ngFor="let field of ser['fields']">
-                                            <a [href]=" field.apperance == 1 ? field.link : ' ' " style="text-decoration:none">
-                                                <div class="fieldData-w text-center">
-                                                    <img src="{{authSer.pathImg ? authSer.pathImg + field.photo : authSer.iconImg}}" [className]=" field.apperance == 1 && authSer.isAuthenticated() ? 'iconeActive' : 'defaultIconn-w' " />
-                                                    <p style="color:#767676; font-size:13px;">{{field.name_en ? field.name_en : 'إضافه خدمه'}}</p>
+                    <div class="secondServices-w">
+                        <div class="container" style="height:560px; overflow-y:auto; padding-left:5px">
+                            <div class="row" style="padding:0 10px;">
+                                <div class="col-12 col-sm-6 col-md-4 editRowPadding-w" *ngFor="let ser of internalService">
+                                    <div class="contentSecondSer-w" style="float:left;">
+                                        <div class="headerSer-w">
+                                            {{ser.name_en}}
+                                        </div>
+                                        <div class="contentSer" style="overflow:auto; overflow-x:hidden">
+                                            <div class="row" style="padding: 0 10px; margin-left: 0; margin-right: 0">
+                                                <div class="col-6 col-md-4"  *ngFor="let field of ser['fields']">
+                                                    <a [href]=" field.apperance == 1 ? field.link : ' ' " style="text-decoration:none">
+                                                        <div class="fieldData-w text-center">
+                                                            <img src="{{authSer.pathImg ? authSer.pathImg + field.photo : authSer.iconImg}}" [className]=" field.apperance == 1 && authSer.isAuthenticated() ? 'iconeActive' : 'defaultIconn-w' " />
+                                                            <p style="color:#767676; font-size:13px;">{{field.name_en ? field.name_en : 'إضافه خدمه'}}</p>
+                                                        </div>
+                                                    </a>
                                                 </div>
-                                            </a>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
-            </div>
 
-            <div class="tabs">
-                <div class="container" style="float-left:5px;">
-                <div class="row">
-                    <div class="col-12 col-md-8 editRowPadding-w">
-                    <div class="lastTab-w">
-                        <div class="headerTab-w">
-                            Latest Circulars
-                        </div>
-                        <div class="menuTab-w">
-                        <ul class="list-unstyled">
-                            <li (click)="onGetData(0)" [ngClass]="{'active': selectedItem == 0}"> Internal Circulars</li>
-                            <li (click)="onGetData(1)" [ngClass]="{'active': selectedItem == 1}">External Circulars</li>
-                            <li (click)="onGetData(2)" [ngClass]="{'active': selectedItem == 2}">Policies</li>
-                        </ul>
-                        </div>
-                        <div class="menuTabContent-w">
-                        <h2 class="text-center" *ngIf="checkShowData"> no data to show , now </h2>
-                        <ol [className]="authSer.arabicTemplate ? '' : 'achievementsLang-w' ">
-                            <li *ngFor="let data of tabsData">
-                                {{data.name_en}}
-                                <button class="btn btn-default" *ngIf="data.file" type="button" style="position: absolute; background:transparent; border:none; right:45px"> <a href="{{authSer.pathImg + data.file}}" target="_blank"><i class="fas fa-download"></i></a></button>
-                            </li>
-                        </ol>
-                        <button class="btn btn-primary" (click)="onPageCir()" style="margin:0 auto; display:block; background-color:#bda380; width:150px; border:none;">more</button>
-                        </div>
-                    </div>
-                    </div>
-                    <div class="col-12 col-md-4 editRowPadding-w">
-                    <div class="recods">
-                        <div class="headerRecords-w">
-                            General Statistics - Achievements
-                        </div>
-                        <div class="recordsContent-w">
-                            <div class="accordion" id="accordionExample">
-                                <div class="panel-group testGroupEn-w" *ngFor="let achiev of achievements; let i = index"  id="accordion">
-                                    <div class="panel panel-default">
-                                        <div class="panel-headingEn accordion-toggle collapsed" id="{{ 'heading' + (i+1) }}" data-toggle="collapse" [attr.data-target]=" '#collapse' + (i+1) " [attr.aria-controls] = " 'collapse' + (i+1) ">
-                                            <h4 class="panel-title">{{achiev.title_en}}</h4>
-                                        </div>
-                                        <div id="{{ 'collapse'+(i+1) }}" class="panel-collapse collapse" [attr.aria-labelledby] = " 'heading' + (i+1) " data-parent="#accordionExample">
-                                            <div class="panel-body testBodyEn-w">
-                                                <p [innerHTML]="achiev.description_en"></p>
+                    <div class="tabs">
+                        <div class="container" style="float-left:5px;">
+                        <div class="row">
+                            <div class="col-12 col-md-8 editRowPadding-w">
+                            <div class="lastTab-w">
+                                <div class="headerTab-w">
+                                    Latest Circulars
+                                </div>
+                                <div class="menuTab-w">
+                                <ul class="list-unstyled">
+                                    <li (click)="onGetData(0)" [ngClass]="{'active': selectedItem == 0}"> Internal Circulars</li>
+                                    <li (click)="onGetData(1)" [ngClass]="{'active': selectedItem == 1}">External Circulars</li>
+                                    <li (click)="onGetData(2)" [ngClass]="{'active': selectedItem == 2}">Policies</li>
+                                </ul>
+                                </div>
+                                <div class="menuTabContent-w">
+                                <h2 class="text-center" *ngIf="checkShowData"> no data to show , now </h2>
+                                <ol [className]="authSer.arabicTemplate ? '' : 'achievementsLang-w' ">
+                                    <li *ngFor="let data of tabsData">
+                                        {{data.name_en}}
+                                        <button class="btn btn-default" *ngIf="data.file" type="button" style="position: absolute; background:transparent; border:none; right:45px"> <a href="{{authSer.pathImg + data.file}}" target="_blank"><i class="fas fa-download"></i></a></button>
+                                    </li>
+                                </ol>
+                                <button class="btn btn-primary" (click)="onPageCir()" style="margin:0 auto; display:block; background-color:#bda380; width:150px; border:none;">more</button>
+                                </div>
+                            </div>
+                            </div>
+                            <div class="col-12 col-md-4 editRowPadding-w">
+                            <div class="recods">
+                                <div class="headerRecords-w">
+                                    General Statistics - Achievements
+                                </div>
+                                <div class="recordsContent-w">
+                                    <div class="accordion" id="accordionExample">
+                                        <div class="panel-group testGroupEn-w" *ngFor="let achiev of achievements; let i = index"  id="accordion">
+                                            <div class="panel panel-default">
+                                                <div class="panel-headingEn accordion-toggle collapsed" id="{{ 'heading' + (i+1) }}" data-toggle="collapse" [attr.data-target]=" '#collapse' + (i+1) " [attr.aria-controls] = " 'collapse' + (i+1) ">
+                                                    <h4 class="panel-title">{{achiev.title_en}}</h4>
+                                                </div>
+                                                <div id="{{ 'collapse'+(i+1) }}" class="panel-collapse collapse" [attr.aria-labelledby] = " 'heading' + (i+1) " data-parent="#accordionExample">
+                                                    <div class="panel-body testBodyEn-w">
+                                                        <p [innerHTML]="achiev.description_en"></p>
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
+                            </div>
+                        </div>
                         </div>
                     </div>
                     </div>
-                </div>
+
+                
                 </div>
             </div>
-            </div>
-
-          
-        </div>
         </div>
-     </div>
     </div>
 </ng-template>

src/app/Internal-Page/internal-page-content/internal-page-content.component.ts

@@ -102,6 +102,22 @@ export class InternalPageContentComponent implements OnInit {
    //console.log(this.checkTokenExpire);
        //get profile data
     //this.userservice.getUserDataProfile();
+    this.authSer.homeStyle = true;
+    this.internalService.getParentData().subscribe(
+
+      (responce) => {
+        this.authSer.parentsPage = responce['parents'];
+        for(let i = 0; i < this.authSer.parentsPage.length; i++) {
+            this.authSer.parentsPage[i].active = 0;
+        }
+        this.spinner.hide();
+      },
+      (error) => {
+        console.log(error);
+      }
+
+    );
+
     this.internalService.getInternalPageData().subscribe(
       (responce) => {
         console.log(responce);

src/app/Internal-Page/internal-page-header/internal-page-header.component.html

@@ -43,8 +43,6 @@
                             </div>
                          </div>
                       </li>
-                          <!-- <li><span><i class="fas fa-comments"></i></span></li>
-                          <li><span><i class="fas fa-bell"></i></span></li> -->
                       </ul>
                       </div>
                     <p *ngIf="authSer.isAuthenticated()" class="login"><a (click)="onLogin()">تسجيل دخول </a></p>
@@ -125,7 +123,7 @@
 
                     <!-- start large screen navbar -->
 
-                    <button class="dropbtn d-none d-sm-none d-md-none d-lg-block homeBtn" (click)="goToHome()" style="background:transparent; border:none;color:#00A99D;height: 100%" [ngClass]="{'activeInternalHeader-w': authSer.headereClassActive}">
+                    <button class="dropbtn d-none d-sm-none d-md-none d-lg-block homeBtn" [ngClass]=" authSer.homeStyle ? 'activeInternalHeaderHome' : '' " (click)="goToHome()" style="background:transparent; border:none;color:#00A99D;height: 100%" [ngClass]="{'activeInternalHeader-w': authSer.headereClassActive}">
                         <a style="cursor: pointer; font-size:18px; font-weight:bold">   <i class="fa fa-home" style="font-size: 30px;margin:0 5px;"></i> <span class="parentName-w"> الرئيسيه</span></a>
                     </button>
                     <div *ngFor="let parent of authSer.parentsPage; let i = index" class="dropdown d-none d-sm-none d-md-none d-lg-block">
@@ -198,15 +196,9 @@
 										<i class="fas fa-sign-out-alt" style="color: #da0b0b !important;"></i>
 										<span>Log Out</span>
 									</button>
-									
-                                   <!-- <button class="dropdown-item" style="cursor: pointer;" (click)="onGetProfile()">Profile</button>
-                                    <button class="dropdown-item" style="cursor: pointer;" (click)="onDashBoard()"> DashBoard</button>
-                                    <button class="dropdown-item" style="cursor: pointer;" (click)="onLogout()">Log Out</button> -->
                                 </div>
                             </div>
                         </li>
-                        <!-- <li><span><i class="fas fa-comments"></i></span></li>
-                        <li><span><i class="fas fa-bell"></i></span></li> -->
                     </ul>
                     <p *ngIf="authSer.isAuthenticated()" class="login"><a (click)="onLogin()">LOG IN</a></p>
                 </div>

src/app/Internal-Page/internal-page.module.ts

@@ -23,7 +23,6 @@ import { CollapsibleModule } from 'angular2-collapsible'; // <-- import the modu
 import { CircularsPageComponent } from './circulars-page/circulars-page.component';
 
 
-
 @NgModule({
     declarations: [
         InternalPageComponent,

src/app/Internal-Page/news-page/news-page.component.html

@@ -1,6 +1,6 @@
 <ng-template [ngIf]="authSer.arabicTemplate" [ngIfElse]="englishTemplate">  
 	<div class="container">
-  <div class="news" [style.min-height.px]="myInnerHeight">
+   <div class="news" [style.min-height.px]="myInnerHeight">
       <div class="contentPage-w">
         <div class="container">
             <div class="row">

src/app/app.module.ts

@@ -50,6 +50,9 @@ import { CalendarModule, DateAdapter } from 'angular-calendar';
 import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 
 import { BootstrapModalModule } from 'ngx-modialog/plugins/bootstrap';
+import { JwSocialButtonsModule } from 'jw-angular-social-buttons';
+//import { CeiboShare } from 'ng2-social-share';
+
 
 //import { registerLocaleData } from '@angular/common';
 //import localeAr from '@angular/common/locales/ar-SA';

src/app/dashboard/news/add-news/add-news.component.ts

@@ -187,8 +187,6 @@ export class AddNewsComponent implements OnInit {
   }
  }
 
-
-
  deleteImg(index, data) {
    if(this.typeMode) {
     this.images.splice(index , 1);
@@ -206,6 +204,10 @@ export class AddNewsComponent implements OnInit {
  
  }
 
+
+
+
+
  deleteMainImg() {
    this.mainPhotoPath = '';
  }

src/app/shared/auth-service.service.ts

@@ -58,6 +58,7 @@ export class AuthServiceService {
 
   showSearchHeader: boolean = true;
   headereClassActive:boolean = false;
+  homeStyle:boolean = true;
   cachedRequests: Array<HttpRequest<any>> = [];
   notificationLogin: boolean = true;
   parentsPage = [];

src/styles.css

@@ -415,6 +415,10 @@ input:-webkit-autofill:active  {
     background-color: #d8cdbd !important;
   }
 
+  .activeInternalHeaderHome {
+    background-color: #d8cdbd !important;
+  }
+
   .testGroup-w {
     margin: 10px 0;
     border: 1px solid #ccc;
@@ -658,15 +662,16 @@ width: 55px !important;
 border: 1px solid #BDA380 !important;
     margin-right: 10px;
 }
-.pagesHeader-w[_ngcontent-c6]{
+.pagesHeader-w{
     margin-top: 0px !important;
-background-color: #926f3f2e !important;
-height: 70px !important;
+  background-color: #926f3f2e !important;
+  height: 70px !important;
+  display: block;
 }
-.pagesHeader-w[_ngcontent-c6] .navbar[_ngcontent-c6]{
+.pagesHeader-w .navbar{
 height: 70px !important;
 }
-.pagesHeader-w[_ngcontent-c6] .dropdown[_ngcontent-c6] .dropbtn[_ngcontent-c6]{
+.pagesHeader-w .dropdown .dropbtn{
 margin: 0 4px !important;
 }
 .pagesHeader-w[_ngcontent-c6] .dropdown[_ngcontent-c6] .dropbtn[_ngcontent-c6]:hover{