“mega1”

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

@@ -287,13 +287,14 @@ input,button {
     display: inline-block;
     font-size: 13px;
     position: absolute;
-    bottom: 50px;
-    left: 65px;
+    bottom: 43px;
+    left: 14px;
     font-weight: bold;
     cursor: pointer;
     background-color: #dedede;
     padding: 5px;
     transform: all 0.5s;
+	width: 100px;
 }
 
 .slider  .extra:hover {
@@ -817,6 +818,8 @@ input,button {
     padding: 5px;
     color: #fff;
     transition: all 0.5s;
+	font-size: 12px;
+	width: 100px;
 }
 
 .allNews:hover {

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

@@ -26,7 +26,7 @@
                                                 <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="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>

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

@@ -1,7 +1,48 @@
 input,button {
     outline: none;
 }
-
+.dropdown-menu {
+	    top: 46px !important;
+    right: 0 !important;
+    border-radius: 2px !important;
+    width: 245px;
+    background-color: #ffffffe0;
+    box-shadow: 0px 3px 9px #00000030;
+    border: 1px solid #cec8c8;
+}
+.en_ .dropdown-item{
+	float: left !important;
+}
+.dropdown-item{
+	    border: 0px solid #00000008 !important;
+    width: 75px !important;
+    padding: 4px 0px !important;
+    text-align: center !important;
+    font-weight: bold !important;
+    clear: none !important;
+    float: right;
+    margin: 3px 3px;
+}
+/*.dropdown-item span{
+	color: #a08b70 !important;
+    font-size: 12px !important;
+}*/
+.dropdown-item i{
+    color: #04756d !important;
+    font-size: 18px !important;
+}
+.mylistt{
+	display: block;
+    border: 1px solid #bdbbbb;
+    float: right;
+    width: 45px;
+    height: 45px;
+    margin: -12px 0px 0px 6px;
+    background-color: #f1f1f1;
+}
+.mylistt mg{
+	
+}
 .internalHeader-w {
     width: 100%;
     height: 35px;
@@ -43,11 +84,11 @@ input,button {
 }
 
 .internalHeader-w .notificationList-w li span {
-    color: #00a99d;
-    font-size: 25px;
+    color: #a08b70;
+    font-size: 12px;
     cursor: pointer;
     transition: all 0.5s;
-    margin-top: 5px;
+    margin-top: 0px;
     display: block;
 }
 
@@ -85,23 +126,26 @@ input,button {
 }
 
 .profileData-w img {
-    width: 35px;
-    border: 1px solid #252525;
-    margin: 0 5px;
+	width: 45px;
+    border: 1px solid #eceaea;
+    margin: -12px 0px 0px 6px;
+    height: 45px;
+    background-color: #fff;
+    display: block;
+    float: right;
 }
 
 .buttonW {
     background-color: transparent;
     border: none;
     cursor: pointer;
-    color: #fff;
+    color: #02635c;
     outline: none;
-    text-shadow: 0px 0px 2px #000;
+        text-shadow: 0px 0px 2px #0000002e;
     font-weight: bold;
-    margin-right: -25px;
-    font-size: 14px;
-    margin-top: 2px;
-    margin-right: 15px;
+    /*margin-right: -25px;*/
+    font-size: 15px;
+    margin-top: 8px;
 }
 
 .dateW {

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

@@ -1,18 +1,47 @@
 
 
 <ng-template [ngIf]="authSer.arabicTemplate" [ngIfElse]="englishTemplate">
-    <div class="internalHeader-w">
+    <div class="internalHeader-w"><link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
         <div class="container">
             <div class="row">
                 <div class="col-5 col-sm-5 col-md-4 col-lg-4"  style="margin:0;padding:0">
                     <ul class="list-unstyled notificationList-w" *ngIf="!authSer.isAuthenticated()">
                         <li class="profileData-w">
                             <div class="btn-group" ngbDropdown role="group" aria-label="Button group with nested dropdown">
-                                <button class="buttonW" ngbDropdownToggle><img src="{{authSer.dataLoginUser['photo'] ? authSer.pathImg + authSer.dataLoginUser['photo'] : authSer.imgSrc}}" title="imageProfile" /> {{authSer.dataLoginUser['name']}} </button>
+                                <button class="buttonW" ngbDropdownToggle>
+									<img src="{{authSer.dataLoginUser['photo'] ? authSer.pathImg + authSer.dataLoginUser['photo'] : authSer.imgSrc}}" title="imageProfile" alt="" />
+									
+									{{authSer.dataLoginUser['name']}} </button>
+								
                                 <div class="dropdown-menu" style="text-align:right" ngbDropdownMenu>
-                                    <button class="dropdown-item" style="cursor: pointer;" (click)="onGetProfile()">صفحتي</button>
-                                    <button class="dropdown-item" style="cursor: pointer;" (click)="onDashBoard()"> لوحه التحكم</button>
-                                    <button class="dropdown-item" style="cursor: pointer;" (click)="onLogout()">تسجيل الخروج</button>
+									 <button class="dropdown-item" style="cursor: pointer;" >
+										<i class="fas fa-bell"></i>
+										 <span>الاشعارات</span>
+									</button>
+									<!-- <button class="dropdown-item" style="cursor: pointer;" >
+										 <i class="fas fa-comments"></i>
+										 <span>رسائل</span>
+									</button> -->
+                                    <button class="dropdown-item" style="cursor: pointer;" (click)="onGetProfile()">
+										<i class="fas fa-user-alt"></i>
+										 <span>ملفي</span>
+									</button>
+									<button class="dropdown-item" style="cursor: pointer;" >
+										 <i class="fas fa-sticky-note"></i>
+										 <span>ملاحظاتي</span>
+									</button>
+									<button class="dropdown-item" style="cursor: pointer;" >
+										 <i class="fas fa-tasks"></i>
+										 <span>مهامي</span>
+									</button>
+                                    <button class="dropdown-item" style="cursor: pointer;" (click)="onDashBoard()">
+										<i class="fas fa-solar-panel"></i>
+										<span>لوحة التحكم</span>
+									</button>
+                                    <button class="dropdown-item" style="cursor: pointer;color: #da0b0b !important;background-color: #f3f3f3;border-radius: 4px;" (click)="onLogout()">
+										<i class="fas fa-sign-out-alt" style="color: #da0b0b !important;"></i>
+										<span>خروج</span>
+									</button>
                                 </div>
                             </div>
                         </li>
@@ -140,11 +169,40 @@
                     <ul class="list-unstyled notificationList-w" *ngIf="!authSer.isAuthenticated()">
                         <li class="profileData-w">
                             <div class="btn-group" ngbDropdown role="group" aria-label="Button group with nested dropdown">
-                                <button class="buttonW" ngbDropdownToggle><img src="{{authSer.dataLoginUser['photo'] ? authSer.pathImg + authSer.dataLoginUser['photo'] : authSer.imgSrc}}" title="imageProfile" /> {{authSer.dataLoginUser['name']}} </button>
-                                <div class="dropdown-menu" style="text-align:left" ngbDropdownMenu>
-                                    <button class="dropdown-item" style="cursor: pointer;" (click)="onGetProfile()">Profile</button>
+                                <button class="buttonW" ngbDropdownToggle><img src="{{authSer.dataLoginUser['photo'] ? authSer.pathImg + authSer.dataLoginUser['photo'] : authSer.imgSrc}}" title="imageProfile" alt=" " /> {{authSer.dataLoginUser['name']}} </button>
+                                <div class="dropdown-menu en_" style="text-align:left" ngbDropdownMenu>
+									 <button class="dropdown-item" style="cursor: pointer;" >
+										<i class="fas fa-bell"></i>
+										 <span>Notifications</span>
+									</button>
+									<!-- <button class="dropdown-item" style="cursor: pointer;" >
+										 <i class="fas fa-comments"></i>
+										 <span>رسائل</span>
+									</button> -->
+                                    <button class="dropdown-item" style="cursor: pointer;" (click)="onGetProfile()">
+										<i class="fas fa-user-alt"></i>
+										 <span>Profile</span>
+									</button>
+									<button class="dropdown-item" style="cursor: pointer;" >
+										 <i class="fas fa-sticky-note"></i>
+										 <span>Notes</span>
+									</button>
+									<button class="dropdown-item" style="cursor: pointer;" >
+										 <i class="fas fa-tasks"></i>
+										 <span>Tasks</span>
+									</button>
+                                    <button class="dropdown-item" style="cursor: pointer;" (click)="onDashBoard()">
+										<i class="fas fa-solar-panel"></i>
+										<span>DashBoard</span>
+									</button>
+                                    <button class="dropdown-item" style="cursor: pointer;color: #da0b0b !important;background-color: #f3f3f3;border-radius: 4px;" (click)="onLogout()">
+										<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>
+                                    <button class="dropdown-item" style="cursor: pointer;" (click)="onLogout()">Log Out</button> -->
                                 </div>
                             </div>
                         </li>
@@ -160,11 +218,11 @@
                 </div>
                 <div class="col-2 col-sm-2 col-md-4 col-lg-4  d-none d-sm-none d-md-block d-lg-block">
                     <p class="dateW"> {{currentEnglishDate | date:'fullDate'}} </p>
-                    <span class="ar" (click)="authSer.onLanguageContent('ar')" [ngClass]="{'activeLanguage':authSer. arabicLanguage}" *ngIf="authSer.showArabicIcon">Aa</span>
+                    <span class="ar" (click)="authSer.onLanguageContent('ar')" [ngClass]="{'activeLanguage':authSer. arabicLanguage}" *ngIf="authSer.showArabicIcon">عربي</span>
                     <span class="en" (click)="authSer.onLanguageContent('en')" [ngClass]="{'activeLanguage': authSer.englishLanguage}" *ngIf="authSer.showEnglishIcon">En</span>
                 </div>
                 <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-md-none d-lg-none">
-                    <span class="ar" (click)="authSer.onLanguageContent('ar')" [ngClass]="{'activeLanguage':authSer. arabicLanguage}" *ngIf="authSer.showArabicIcon">Aa</span>
+                    <span class="ar" (click)="authSer.onLanguageContent('ar')" [ngClass]="{'activeLanguage':authSer. arabicLanguage}" *ngIf="authSer.showArabicIcon">عربي</span>
                     <span class="en" (click)="authSer.onLanguageContent('en')" [ngClass]="{'activeLanguage': authSer.englishLanguage}" *ngIf="authSer.showEnglishIcon">En</span>
                 </div>
             </div>

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

@@ -4,35 +4,39 @@
 }
 
 .news h2 {
-    text-align: right;
-    font-size: 20px;
-    margin:  40px 0;
-    color: #bda380;
+       text-align: right;
+    font-size: 16px;
+    margin: 26px 0;
+    color: #035d56;
     font-weight: bold;
+    border-bottom: 2px solid #caaa80;
+    padding: 0px 0px 6px 0px;
 }
 
 .image {
     width: 100%;
-    height: 300px;
+    /*height: 300px;*/
     margin: 10px 0;
     border: 1px slid #000;
+
 }
 
 .image img {
     width: 100%;
-    height: 300px;
-    border: 3px solid #bda380;
+   /* height: 300px;*/
+       border: 1px solid #bda38085;
 }
 
 .description {
     width: 100%;
-    padding: 40px 0;
+    padding: 0px 0;
     text-align: right;
+	text-align: justify;
 }
 
 .description p {
     color: #252525;
-    margin: 30px 0;
+    margin: 0px 0;
     font-size: 16px;
 }
 
@@ -75,7 +79,7 @@
 
 .saredLinks-w li {
     display: inline-block;
-    margin: 0 5px;
+    margin: 0 2px;
 }
 
 .saredLinks-w li button {
@@ -86,6 +90,7 @@
     color: #fff;
     cursor: pointer;
     transition: all 0.5s;
+	    border-radius: 3px;
 }
 
 .saredLinks-w li button:hover {
@@ -93,23 +98,23 @@
 }
 
 .saredLinks-w li .facebook {
-    background-color: blue;
+    background-color: #3b5a97;
 }
 
 .saredLinks-w li .twitter {
-    background-color: #2ecde6;
+    background-color: #21a1f2;
 }
 
 .saredLinks-w li .linkedin {
-    background-color: #007bff;
+    background-color: #0676b5;
 }
 
 .saredLinks-w li .googleplus {
-    background-color: #bb0b0b;
+    background-color: #e21414;
 }
 
 .saredLinks-w li .whatsapp{
-    background-color: green;
+    background-color: #4fc248;
 }
 
 .saredLinks-w li .whatsapp a {

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

@@ -1,20 +1,25 @@
-<ng-template [ngIf]="authSer.arabicTemplate" [ngIfElse]="englishTemplate">    
+<ng-template [ngIf]="authSer.arabicTemplate" [ngIfElse]="englishTemplate">  
+	<div class="container">
   <div class="news" [style.min-height.px]="myInnerHeight">
       <div class="contentPage-w">
         <div class="container">
             <div class="row">
               <div class="col-12">
-                <h2 class="reporTitle-w">{{newsData.title}}</h2>
+                <h2 class="reporTitle-w">
+					{{newsData.title}}
+					- {{newsData.created_at}}
+					</h2> 
+				
               </div>
-              <div class="col-12 col-sm-6 col-md-6">
+              <div class="col-12 col-sm-12 col-md-9" style="margin-left: auto;margin-right: auto;">
                 <div class="image" *ngIf="image0.photo != ''">
                   <img src="{{authSer.pathImg + image0['photo'][0].photo}}"/>
                 </div>
               </div>
               <div class="col-12">
                 <div class="row">
-                  <div class="col-12 col-sm-12 col-md-6">
-                   <h2  style="color:#00a99d;width:40%;font-size:17px;float:right; margin:17px 0;">{{newsData.created_at}}</h2>
+                  <div class="col-12 col-sm-12 col-md-9" style="margin-left: auto;margin-right: auto;">
+                  
                    <ul class="list-unstyled saredLinks-w">
                       <li><button class="facebook" ceiboShare  [facebook]="{u: repoUrl}"><i class="fab fa-facebook-f"></i></button></li>
                       <li><button class="linkedin" ceiboShare  [linkedIn]="{url:repoUrl}"><i class="fab fa-linkedin-in"></i></button></li>
@@ -23,18 +28,18 @@
                       <li><button class="twitter" ceiboShare  [twitter]="{url:repoUrl, text:'Checkout this awesome ng2 social share directive', hashtags:'angular2, social, ceiboIT'}"><i class="fab fa-twitter"></i></button></li>
                     </ul>
                   </div>
-                  <div class="col-12 col-sm-12 col-md-6">
+                  <div class="col-12 col-sm-6 col-md-6">
                    
                   </div>
                 </div>
               </div>
               <div class="col-12">
                 <div class="description">
-                  <h3>{{newsData.title}}</h3>
+                <!--   <h3>{{newsData.title}}</h3> -->
                     <p [innerHTML]="newsData.description"></p>
                 </div>
               </div>
-              <div class="col-12 col-sm-6" *ngFor="let img of newsData['photos'] | slice:1;let i = index; ">
+              <div class="col-12 col-sm-12 col-md-6"  *ngFor="let img of newsData['photos'] | slice:1;let i = index; ">
                   <div class="image">
                       <img src="{{authSer.pathImg + img.photo}}"/>
                   </div>
@@ -44,6 +49,7 @@
           </div>
       </div>
     </div>
+	</div>
 </ng-template>
 
 
@@ -53,12 +59,15 @@
             <div class="contentPage-w">
                 <div class="row">
                     <div class="col-12">
-                      <h2 class="reporTitle-w" [className]="authSer.arabicTemplate ? '' : 'achievementsLangHeading-w' ">{{newsData.title_en}}</h2>
+                      <h2 class="reporTitle-w" [className]="authSer.arabicTemplate ? '' : 'achievementsLangHeading-w' ">
+						  {{newsData.title_en}}
+						-{{newsData.created_at}}
+						</h2>
                     </div>
                     <div class="col-12 col-sm-12 col-md-6 col-lg-6">
                       
                     </div>
-                    <div class="col-12 col-sm-12 col-md-6 col-lg-6" *ngIf="image0.photo != ''">
+                    <div class="col-12 col-sm-12 col-md-9 col-lg-9" style="margin-left: auto;margin-right: auto;" *ngIf="image0.photo != ''">
                       <div class="image">
                         <img src="{{authSer.pathImg + image0['photo'][0].photo}}"/>
                       </div>
@@ -68,8 +77,7 @@
                           <div class="col-12 col-sm-12 col-md-6">
                           
                           </div>
-                          <div class="col-12 col-sm-12 col-md-6">
-                           <h2  style="color:#00a99d;width:40%;font-size:17px;float:right; margin:17px 0;">{{newsData.created_at}}</h2>
+                           <div class="col-12 col-sm-12 col-md-9" style="margin-left: auto;margin-right: auto;">
                            <ul class="list-unstyled saredLinks-w">
                               <li><button class="facebook" ceiboShare  [facebook]="{u: repoUrl}"><i class="fab fa-facebook-f"></i></button></li>
                               <li><button class="linkedin" ceiboShare  [linkedIn]="{url:repoUrl}"><i class="fab fa-linkedin-in"></i></button></li>
@@ -82,10 +90,15 @@
                       </div>
                     <div class="col-12">
                       <div class="description" [className]="authSer.arabicTemplate ? '' : 'achievementsLang-w' ">
-                          <h3>{{newsData.title_en}}</h3>
+                        <!--  <h3>{{newsData.title_en}}</h3> -->
                           <p [innerHTML]="newsData.description_en"></p>
                       </div>
                     </div>
+					   <div class="col-12 col-sm-12 col-md-6"  *ngFor="let img of newsData['photos'] | slice:1;let i = index; ">
+                  <div class="image">
+                      <img src="{{authSer.pathImg + img.photo}}"/>
+                  </div>
+              </div>
                   </div>
             </div>
         </div>

src/app/Internal-Page/news-pages/news-pages.component.css

@@ -4,20 +4,21 @@
 }
 
 .newContent {
-    width: 100%;
-    padding: 20px 0;
+      width: 100%;
+    padding: 12px 0;
     display: inline-block;
-    border-bottom: 1px solid #ccc;
+    border-bottom: 1px solid #aba9a9;
 }
 
 .imgNew-w {
     width: 100%;
     height: 200px;
+	overflow: hidden;
 }
 
 .imgNew-w img {
     width: 100%;
-    height: 200px;
+   /* height: 200px;*/
 }
 
 .content {
@@ -26,14 +27,15 @@
 }
 
 .content h1{
-    font-size: 20px;
-    color: #888;
+  font-size: 18px;
+    color: #036b63;
+	cursor: pointer;
 }
 
 .content p {
-    color: #bda380;
-    font-size: 18px;
-    margin: 10px 0;
+ color: #9c8565;
+    font-size: 16px;
+    margin: 0px 0;
     cursor: pointer;
 }
 

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

@@ -13,7 +13,7 @@
                     </div>
                     <div class="col-12 col-sm-12 col-md-8">
                       <div class="content">
-                        <h1>{{report.title}}</h1>
+                        <h1 (click)="onGetNew(report.id)">{{report.title}}</h1>
                         <p [innerHTML]="report.description"  (click)="onGetNew(report.id)"></p>
                       </div>
                     </div>
@@ -21,8 +21,10 @@
                 </div>
               </div>
             </div>
+			  
+			  <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
           </div>
-          <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
+          
       </div>
 
     </div>
@@ -43,7 +45,7 @@
                         </div>
                       </div>
                       <div class="col-12 col-sm-12 col-md-8">
-                        <h1>{{report.title_en}}</h1>
+                        <h1 (click)="onGetNew(report.id)">{{report.title_en}}</h1>
                         <p [innerHTML]="report.description_en" (click)="onGetNew(report.id)"></p>
                       </div>
                     </div>

src/styles.css

@@ -20,7 +20,13 @@ input:-webkit-autofill:focus,
 input:-webkit-autofill:active  {
     -webkit-box-shadow: 0 0 0 30px #fff inset;
 }
-
+.contentPage-w{
+	    background: rgba(255, 255, 255, 0.22) !important;
+    border: 1px solid #eae9e6 !important;
+    box-shadow: 0px 5px 10px #00000026 !important;
+	padding: 10px 10px !important;
+	    width: 100% !important;
+}
 .form-control:focus {
     color: #495057;
     background-color: #fff;
@@ -471,6 +477,7 @@ input:-webkit-autofill:active  {
   display: flex ;
   justify-content: center ;
   text-align: center;
+	    margin-top: 10px;
 }