mega2

package-lock.json

@@ -1462,7 +1462,6 @@
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
-      "optional": true,
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -2713,8 +2712,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "constants-browserify": {
       "version": "1.0.0",
@@ -3128,8 +3126,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "depd": {
       "version": "1.1.2",
@@ -4191,8 +4188,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4213,14 +4209,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4235,20 +4229,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4365,8 +4356,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4378,7 +4368,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4393,7 +4382,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4401,14 +4389,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4427,7 +4413,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4508,8 +4493,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4521,7 +4505,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4607,8 +4590,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4644,7 +4626,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4664,7 +4645,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4708,14 +4688,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -4724,7 +4702,6 @@
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "inherits": "~2.0.0",
@@ -4737,7 +4714,6 @@
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
-      "optional": true,
       "requires": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -4769,8 +4745,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "get-stream": {
       "version": "3.0.0",
@@ -5030,8 +5005,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "has-value": {
       "version": "1.0.0",
@@ -5733,8 +5707,7 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -6415,7 +6388,6 @@
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^2.2.0",
@@ -6428,8 +6400,7 @@
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -6612,8 +6583,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "map-visit": {
       "version": "1.0.0",
@@ -7434,7 +7404,6 @@
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -8453,7 +8422,6 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
-      "optional": true,
       "requires": {
         "load-json-file": "^1.0.0",
         "normalize-package-data": "^2.3.2",
@@ -8465,7 +8433,6 @@
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "graceful-fs": "^4.1.2",
             "pify": "^2.0.0",
@@ -8476,8 +8443,7 @@
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -8486,7 +8452,6 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
-      "optional": true,
       "requires": {
         "find-up": "^1.0.0",
         "read-pkg": "^1.0.0"
@@ -8497,7 +8462,6 @@
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "path-exists": "^2.0.0",
             "pinkie-promise": "^2.0.0"
@@ -8508,7 +8472,6 @@
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "pinkie-promise": "^2.0.0"
           }
@@ -9788,7 +9751,6 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-utf8": "^0.2.0"
       }
@@ -11140,7 +11102,6 @@
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "string-width": "^1.0.2 || 2"
       }

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

@@ -23,21 +23,21 @@
 .information {
     width: 100%;
     min-height: 400px;
-    padding: 20px;
-    border: 1px solid #ccc;
+    /*padding: 20px;
+    border: 1px solid #ccc;*/
     border-radius: 5px 0;
     margin: 45px 0;
     text-align: right;
 }
 
 .information h2 {
-    color: #dac4a6;
+    color: #a28b6b;
     font-weight: 600;
     margin: 10px;
 }
 
 .information p {
-    color: #a9a8a8;
+    color: #535d5c;
     font-size: 16px;
     margin: 10px;
 }
@@ -134,21 +134,21 @@
 .achievementsLang-w {
     width: 100%;
     height: 400px;
-    padding: 20px;
-    border: 1px solid #ccc;
+  /*  padding: 20px;
+    border: 1px solid #ccc;*/
     border-radius: 5px 0;
     margin: 45px 0;
     text-align: left;
 }
 
 .achievementsLang-w h2 {
-    color: #dac4a6;
+    color: #9a774d;
     font-weight: 600;
     margin: 10px;
 }
 
 .achievementsLang-w p {
-    color: #a9a8a8;
+    color: #5c6362;
     font-size: 16px;
     margin: 0 10px;
 }

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

@@ -20,7 +20,7 @@
                                 </div>                                  
                             </li>
                           </ul> -->
-                          <div class="accordion" id="accordionExample">
+                          <div class="accordion nothome" id="accordionExample">
                               <div class="panel-group testGroup-w" *ngFor="let hospital of hospitalCenters; let i = index"  id="accordion">
                                   <div class="panel panel-default">
                                       <div class="panel-heading accordion-toggle collapsed" [ngClass]="{ 'collapsed' : i == 0 }" id="{{ 'heading' + (i+1) }}" data-toggle="collapse" [attr.data-target]=" '#collapse' + (i+1) " [attr.aria-controls] = " 'collapse' + (i+1) ">
@@ -54,7 +54,7 @@
                 <div class="row">
                     <div class="col-6 col-md-3">
                         <div class="recordsContent-w">
-                            <div class="accordion" id="accordionExample">
+                            <div class="accordion nothome" id="accordionExample">
                                 <div class="panel-group testGroupEn-w" *ngFor="let hospital of hospitalCenters; let i = index"  id="accordion">
                                     <div class="panel panel-default">
                                         <div class="panel-headingEn accordion-toggle collapsed"  [ngClass]="{ 'collapsed' : i == 0 }" id="{{ 'heading' + (i+1) }}" data-toggle="collapse" [attr.data-target]=" '#collapse' + (i+1) " [attr.aria-controls] = " 'collapse' + (i+1) ">

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

@@ -283,15 +283,12 @@ input,button {
 .slider  .extra {
     color: #bea380;
     font-weight: bold;
-    font-size: 18px;
     cursor: pointer;
     display: inline-block;
     font-size: 13px;
     position: absolute;
     bottom: 43px;
     left: 14px;
-    font-weight: bold;
-    cursor: pointer;
     background-color: #dedede;
     padding: 5px;
     transform: all 0.5s;
@@ -311,22 +308,39 @@ input,button {
     bottom: 0;
     left: 0;
     z-index: 10;
-    padding-top: 20px;
+    padding-top: 5px;
     padding-bottom: 20px;
     color: #fff;
     text-align: center;
-    height: 160px;
+    height: 90px;
     background: rgba(0 , 0 , 0 , 0.6);
 }
 
 .carousel-caption h4 {
-    font-size: 18px;
+    font-size: 14px;
     color: #bea380;
     font-weight: 600;
+    width: 69%;
+    margin-right: auto;
+    margin-left: auto;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.paragraphTemplate-w {
+	    margin-right: auto;
+    margin-left: auto;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+	width: 69%;
+    height: 24px;
+	/*background-color: red !important;*/
 }
-
 .carousel-caption p{
-    font-size: 16px;
+    font-size: 13px;
+
 }
 .carousel-indicators li {
     position: relative;
@@ -360,7 +374,7 @@ input,button {
     margin: 5px 0;
     color: #fff;
     text-align: center;
-    background: linear-gradient(0.5turn,#f1e3cf, #c0a786, #c0a786);
+    background: linear-gradient(0.5turn,#decbb1, #c0a786, #c0a786);
     border-bottom: 4px solid #00a99d;
     transition: all 0.5s;
 }
@@ -369,7 +383,6 @@ input,button {
     border-bottom: 4px solid #efe1ce;
     background: linear-gradient(0.5turn,#f1e3cf, #c0a786, #c0a786);
     color: #fff;
-    background: linear-gradient(0.5turn,#ccc, #bda380, #c0a786);
 }
 
 .servicesContent-w .serviceItem-w img {
@@ -714,7 +727,6 @@ input,button {
     text-align: center;
     color: #fff;
     font-size: 18px;
-    color: #fff;
     font-weight: bold;
 }
 
@@ -1020,15 +1032,16 @@ input,button {
 
 .advertisiment {
     width: 98%;
-    height: 100px;
+    max-height: 100px;
     padding: 10px 0;
     margin: 0 8px;
     position: relative;
+	overflow: hidden;
 }
 
 .advertisiment img {
     width: 100%;
-    height: 100%;
+  /*  height: 100%;*/
 }
 
 

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

@@ -11,7 +11,7 @@
                     <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">
+                                <div class="col-lg-6 col-md-12 col-sm-4 col-xs-12 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"/>
@@ -83,9 +83,9 @@
                                                 <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>
+                                                        <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>
@@ -112,7 +112,7 @@
                                                 <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><span>{{conga.employee_name}}</span></p>
                                                             <p class="event">{{conga.name}}</p>
                                                             <p>{{conga.created_at}}</p>
                                                         </div>   
@@ -133,7 +133,7 @@
                                                 <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><span>{{cond.employee_name}}</span></p>
                                                             <p class="event">{{cond.name}}</p>
                                                             <p>{{cond.created_at}}</p>
                                                         </div>   
@@ -152,14 +152,14 @@
             <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="col-12 col-sm-12 col-md-6 col-lg-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']">
+                                        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-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' : '' " />

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

@@ -248,7 +248,7 @@ input,button {
     font-size: 20px;
     border: none;
     outline: none;
-    color: #00A99D;
+    color: #078c82;
     padding: 14px 5px;
     background-color: inherit;
     font: inherit;
@@ -259,28 +259,60 @@ input,button {
 .pagesHeader-w .dropdown .dropbtn {
     margin: 0 10px;
 }
-
+.dropdown-content ul{
+	    width: 100%;
+    padding: 0 10px;
+}
 .pagesHeader-w .navbar a:hover, .dropdown:hover .dropbtn {
 }
 
+.arar ul li{
+    text-align: right;
+    padding: 10px;
+    border-bottom: 1px solid #e4e4e4;
+}
+.arar ul li:hover{
+	     padding: 10px 4px 10px 0px !important;
+    border-right: 7px solid #987b5b;
+    background-color: #ab9275;
+    cursor: pointer;
+}
+.enen ul li{
+	text-align:left;
+	padding: 10px;
+	border-bottom: 1px solid #e4e4e4
+}
+.enen ul li:hover{
+	     padding: 10px 0px 10px 4px !important;
+    border-left: 7px solid #987b5b;
+    background-color: #ab9275;
+    cursor: pointer;
+}
+.arar .pagesHeader-w .dropdown-content {
+	padding: 3px 17px 0px 9px;
+}
+.enen .pagesHeader-w .dropdown-content {
+	padding: 3px 17px 0px 9px;
+}
 .pagesHeader-w .dropdown-content {
-    display: none;
+  display: none;
     position: absolute;
-    background-color: #bea380;
-    border-radius: 10px;
-    width: 100%;
-    height: 120px;
-    left: 0;
-    top: 55px;
-    padding: 10px;
+    background-color: #bea380e0;
+    border-radius: 3px;
     box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
     z-index: 1;
+    width: 280px;
+    
 }
 
 
-
 .pagesHeader-w .dropdown-content ul li a {
     color: #fff;
+    width: 100%;
+    display: block;
+}
+.pagesHeader-w .dropdown-content ul li a:hover {
+	text-decoration: none;
 }
 
 .pagesHeader-w .dropdown-content .header {
@@ -335,7 +367,7 @@ input,button {
 }
 
 .pagesHeader-w .parentName-w:hover {
-    color: #09d4c5;
+    color: #00ac9d;
 }
 
 .navbar {
@@ -533,6 +565,9 @@ input,button {
     }
     .pagesHeader-w .dropdown {
         float: right;
+		    width: 100%;
+    background-color: #efefef;
+    margin: 0px 0px 2px 0px;
     }
 
     .btn-outline-primary {

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

@@ -72,7 +72,7 @@
             <div class="row">
                 <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                     <div class="rightLogo-w">
-                        <img src="../../assets/image/logo1.png" alt="logo" title="logo" />
+                        <a href="./"><img src="../../assets/image/logo1.png" alt="logo" title="logo" /></a>
                     </div>
                 </div>
                 <div class="col-12 col-sm-12 col-md-4 col-lg-4">
@@ -107,11 +107,11 @@
                                     <a href="{{parent.link}}" style="text-decoration:none"> <span class="parentName-w"> {{parent.name}}</span> </a>
                                     <i class="fa fa-caret-down"  *ngIf="parent['childs'].length > 0"></i>
                                 </button>
-                                <div class="dropdown-content" *ngIf="parent['childs'].length > 0">
+                                <div class="dropdown-content"  *ngIf="parent['childs'].length > 0">
                                     <div class="row">
                                         <div *ngFor="let child of parent['childs']" style="width:100%;">
                                             <ul class="list-unstyled" style="width: 100%; padding: 0 10px;">
-                                                <li style="text-align:right; padding: 5px 5px; border-bottom: 1px solid #ccc">
+                                                <li style="text-align:right; padding: 5px 5px; border-bottom: 1px solid #e4e4e4">
                                                     <a href="{{child.link}}"> {{child.name}}</a>
                                                 </li>
                                             </ul>
@@ -139,11 +139,11 @@
                             </a>
                             <i class="fa fa-caret-down"  *ngIf="parent['childs'].length > 0"></i>
                         </button>
-                        <div class="dropdown-content" *ngIf="parent['childs'].length > 0">
+                        <div class="dropdown-content arar" style="right:0px;" *ngIf="parent['childs'].length > 0">
                             <div class="row">
-                                <div *ngFor="let child of parent['childs']" style="width:100%;">
-                                    <ul class="list-unstyled" style="width: 100%; padding: 0 10px;">
-                                        <li style="text-align:right; padding: 5px 5px; border-bottom: 1px solid #ccc">
+                                <div *ngFor="let child of parent['childs']" style="width:100%;margin-right: 15px;margin-left: 15px;">
+                                    <ul class="list-unstyled">
+                                        <li >
                                             <a href="{{child.link}}"> {{child.name}}</a>
                                         </li>
                                     </ul>
@@ -269,11 +269,11 @@
                                     <!-- <img class="iconMenu" src="{{authSer.pathImg + parent.photo}}" /> -->
                                     <i class="fa fa-caret-down"  *ngIf="parent['childs'].length > 0"></i>
                                 </button>
-                                <div class="dropdown-content" *ngIf="parent['childs'].length > 0">
+                                <div class="dropdown-content enen" style="left:0px;" *ngIf="parent['childs'].length > 0">
                                     <div class="row">
                                         <div *ngFor="let child of parent['childs']" style="width:100%;">
                                             <ul class="list-unstyled" style="width: 100%; padding: 0 10px;">
-                                                <li style="text-align:right; padding: 5px 5px; border-bottom: 1px solid #ccc">
+                                                <li>
                                                     <a href="{{child.link}}"> {{child.name_en}}</a>
                                                 </li>
                                             </ul>
@@ -296,7 +296,7 @@
                             </a>
                             <i class="fa fa-caret-down"  *ngIf="parent['childs'].length > 0"></i>
                         </button>
-                        <div class="dropdown-content" *ngIf="parent['childs'].length > 0">
+                        <div class="dropdown-content enen" *ngIf="parent['childs'].length > 0">
                             <ul class="list-unstyled">
                                 <li  *ngFor="let child of parent['childs']" [className]="arabicTemplate ? '' : 'menuEnglish' ">
                                     <a href="{{child.link}}"> {{child.name_en}}</a>

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

@@ -122,6 +122,61 @@
     text-decoration: none;
 }
 
+.inside_links{
+	    width: 100%;
+    overflow: hidden;
+	margin-top: 70px;
+	display: block;
+}
+
+.inside_links ul{
+      display: block;
+    width: 100%;
+    padding: 0px;
+}
+
+.inside_links ul li{
+display: block;
+    width: 100%;
+    height: 65px;
+}
+
+.inside_links ul li span{
+    display: block;
+    float: right;
+    margin: 1px 4px 0px 0px;
+}
+.eninside_links ul li span{
+	 float: left !important;
+}
+.eninside_links ul li a img{
+	 float: left !important;
+}
+.inside_links ul li a img{
+      display: block;
+    width: 30px;
+    float: right;
+    height: 30px;
+    margin: 15px 10px 0px 10px;
+    filter: invert(65%);
+}
+
+.inside_links ul li a{
+    display: block;
+    float: right;
+    color: #755a07;
+    line-height: 62px;
+    margin: 0px 2px 2px 0px;
+    width: 100%;
+    background-color: #e6e6e6;
+    height: 65px;
+    border-bottom: 1px solid #ceb79d96;
+    transition: all 0.5s;
+}
+.inside_links ul li a:hover{
+	    background: linear-gradient(1turn,#e6ded5cc, #e6e6e6, #e6e6e6);
+}
+
 @media(max-width:767px) {
     .news h2 {
         font-size: 11px;
@@ -130,6 +185,9 @@
     .saredLinks-w li button{
         margin: 5px 0;
     }
+		.inside_links{
+		display: none !important;
+	}
 }
 
 @media(min-width:767px) and (max-width: 991px) {
@@ -140,4 +198,10 @@
     .saredLinks-w li button{
         margin: 5px 0;
     }
-}
+}
+
+
+
+
+
+

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

@@ -2,7 +2,9 @@
 	<div class="container">
   <div class="news" [style.min-height.px]="myInnerHeight">
       <div class="contentPage-w">
-        <div class="container">
+        <div class="container row">
+			
+			 <div class="col-12 col-sm-12 col-md-9">
             <div class="row">
               <div class="col-12">
                 <h2 class="reporTitle-w">
@@ -11,14 +13,14 @@
 					</h2> 
 				
               </div>
-              <div class="col-12 col-sm-12 col-md-9" style="margin-left: auto;margin-right: auto;">
+              <div class="col-12 col-sm-12 col-md-11" 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-9" style="margin-left: auto;margin-right: auto;">
+                  <div class="col-12 col-sm-12 col-md-11" 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>
@@ -46,6 +48,58 @@
               </div>
     
             </div>
+			</div>
+			
+			<div class="col-12 col-sm-12 col-md-3">
+					<div class="col-12 col-sm-12 col-md-12 inside_links">
+						<ul>
+							<li>
+								
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286652.png" />
+									<span>مكتبة الصيدلية</span>
+								</a>
+							</li>
+							<li>
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286545.png" />
+									<span>دليل المستخدم</span>
+								</a>
+							</li>
+							<li>
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286575.png" />
+									<span>كتيب الموظف</span>
+								</a>
+							</li>
+							<li>
+								<a href="service.link">
+									<img src="http://kfmc.info/back_end/public/uploads/1548286592.png" />
+									<span>مبادرات </span>
+								</a>
+								
+							</li>
+							<li>
+								<a href="service.link">
+									<img src="http://kfmc.info/back_end/public/uploads/1547465492.png" />
+									<span>نظام البلاغات -OVR </span>
+								</a>
+								
+							</li>
+							<li>
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286494.png" />
+									<span>المكتبة الطبية </span>
+								</a>
+							</li>
+						</ul>
+					</div>
+			
+				
+				</div>
+			
+			
+			
           </div>
       </div>
     </div>
@@ -57,28 +111,75 @@
     <div class="news" [style.min-height.px]="myInnerHeight">
         <div class="container">
             <div class="contentPage-w">
-                <div class="row">
+                <div class="container row">
+					<div class="col-12 col-sm-12 col-md-3">
+					<div class="col-12 col-sm-12 col-md-12 inside_links eninside_links">
+						<ul>
+							<li>
+								
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286652.png" />
+									<span>Pharmacy Library</span>
+								</a>
+							</li>
+							<li>
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286545.png" />
+									<span>User Guide</span>
+								</a>
+							</li>
+							<li>
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286575.png" />
+									<span>Employee Handbook</span>
+								</a>
+							</li>
+							<li>
+								<a href="service.link">
+									<img src="http://kfmc.info/back_end/public/uploads/1548286592.png" />
+									<span>Initiatives </span>
+								</a>
+								
+							</li>
+							<li>
+								<a href="service.link">
+									<img src="http://kfmc.info/back_end/public/uploads/1547465492.png" />
+									<span> OVR System </span>
+								</a>
+								
+							</li>
+							<li>
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286494.png" />
+									<span>Medical Library</span>
+								</a>
+							</li>
+						</ul>
+					</div>
+			
+				
+				</div>
+					
+					<div class="col-12 col-sm-12 col-md-9">
+         			   <div class="row">
                     <div class="col-12">
                       <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-9 col-lg-9" style="margin-left: auto;margin-right: auto;" *ngIf="image0.photo != ''">
+                    <div class="col-12 col-sm-12 col-md-9 col-lg-11" style="margin-left: auto;margin-right: auto;" *ngIf="image0.photo != ''">
                       <div class="image">
                         <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">
+                          <div class="col-12 col-sm-12 col-md-11">
                           
                           </div>
                            <div class="col-12 col-sm-12 col-md-9" style="margin-left: auto;margin-right: auto;">
-                           <ul class="list-unstyled saredLinks-w">
+                           <ul class="list-unstyled saredLinks-w" style="text-align: right; direction: ltr;float: right !important;">
                               <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>
                               <li><button class="googleplus" ceiboShare  [googlePlus]="{url:repoUrl}"><i class="fab fa-google-plus-g"></i></button></li>
@@ -95,10 +196,15 @@
                       </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 class="image">
+							  <img src="{{authSer.pathImg + img.photo}}"/>
+						  </div>
+					  </div>
+					
+					  </div>
+						</div>
+					
+					
                   </div>
             </div>
         </div>

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

@@ -12,7 +12,7 @@
 
 .imgNew-w {
     width: 100%;
-    height: 200px;
+    max-height: 130px;
 	overflow: hidden;
 }
 
@@ -37,6 +37,7 @@
     font-size: 16px;
     margin: 0px 0;
     cursor: pointer;
+	    text-align: justify;
 }
 
 .content p span {
@@ -53,6 +54,53 @@
     font-size: 20px;
     color: #888;
 }
+.inside_links{
+	    width: 100%;
+    overflow: hidden;
+}
+
+.inside_links ul{
+      display: block;
+    width: 100%;
+    padding: 0px;
+}
+
+.inside_links ul li{
+display: block;
+    width: 100%;
+    height: 65px;
+}
+
+.inside_links ul li span{
+    display: block;
+    float: right;
+    margin: 1px 4px 0px 0px;
+}
+
+.inside_links ul li a img{
+      display: block;
+    width: 30px;
+    float: right;
+    height: 30px;
+    margin: 15px 10px 0px 10px;
+    filter: invert(65%);
+}
+
+.inside_links ul li a{
+    display: block;
+    float: right;
+    color: #755a07;
+    line-height: 62px;
+    margin: 0px 2px 2px 0px;
+    width: 100%;
+    background-color: #e6e6e6;
+    height: 65px;
+    border-bottom: 1px solid #ceb79d96;
+    transition: all 0.5s;
+}
+.inside_links ul li a:hover{
+	    background: linear-gradient(1turn,#e6ded5cc, #e6e6e6, #e6e6e6);
+}
 
 englishContent-w p {
     color: #bda380;

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

@@ -3,10 +3,11 @@
       <div class="container">
           <div class="contentPage-w">
             <div class="row">
-              <div class="col-12 col-sm-12 col-md-10" *ngFor="let report of dataPagesNews | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }">
+				<div class="col-12 col-sm-12 col-md-9">
+              <div class="col-12 col-sm-12 col-md-12" *ngFor="let report of dataPagesNews | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }">
                 <div class="newContent">
                   <div class="row">
-                    <div class="col-12 col-sm-12 col-md-4">
+                    <div class="col-12 col-sm-12 col-md-3">
                       <div class="imgNew-w">
                         <img src="{{authSer.pathImg + report.photo.photo}}" />
                       </div>
@@ -20,6 +21,56 @@
                   </div>
                 </div>
               </div>
+				</div>
+				<!-- start Mega add -->
+				<div class="col-12 col-sm-12 col-md-3">
+					<div class="col-12 col-sm-12 col-md-12 inside_links">
+						<ul>
+							<li>
+								
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286652.png" />
+									<span>مكتبة الصيدلية</span>
+								</a>
+							</li>
+							<li>
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286545.png" />
+									<span>دليل المستخدم</span>
+								</a>
+							</li>
+							<li>
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286575.png" />
+									<span>كتيب الموظف</span>
+								</a>
+							</li>
+							<li>
+								<a href="service.link">
+									<img src="http://kfmc.info/back_end/public/uploads/1548286592.png" />
+									<span>مبادرات </span>
+								</a>
+								
+							</li>
+							<li>
+								<a href="service.link">
+									<img src="http://kfmc.info/back_end/public/uploads/1547465492.png" />
+									<span>نظام البلاغات -OVR </span>
+								</a>
+								
+							</li>
+							<li>
+								<a href="service.link">
+									 <img src="http://kfmc.info/back_end/public/uploads/1548286494.png" />
+									<span>المكتبة الطبية </span>
+								</a>
+							</li>
+						</ul>
+					</div>
+			
+				
+				</div>
+				<!-- end Mega add -->
             </div>
 			  
 			  <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
@@ -36,10 +87,11 @@
         <div class="container">
           <div class="contentPage-w">
               <div class="row">
-                <div class="col-12 col-sm-12 col-md-10" *ngFor="let report of dataPagesNews | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }">
+				  <div class="col-12 col-sm-12 col-md-9">
+                <div class="col-12 col-sm-12 col-md-12" *ngFor="let report of dataPagesNews | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }">
                   <div class="newContent">
                     <div class="row">
-                      <div class="col-12 col-sm-12 col-md-4">
+                      <div class="col-12 col-sm-12 col-md-3">
                         <div class="imgNew-w">
                             <img src="{{authSer.pathImg + report.photo.photo}}" />
                         </div>
@@ -51,6 +103,8 @@
                     </div>
                   </div>
                 </div>
+					  </div>
+				  <div class="col-12 col-sm-12 col-md-3">cccc</div>
               </div>
           </div>
           <pagination-controls nextLabel="Next" previousLabel="Prev" (pageChange)="onPageChange($event)"></pagination-controls>

src/app/dashboard/header/header.component.css

@@ -52,11 +52,11 @@ background-color: #f1f1f1;
     background: rgba(185, 183, 183, 0.8); */
     padding-top: 7px;
     height: 55px !important;
-    background-color:#a1a1a15e !important; 
+    background-color:#8a6f4e !important; 
 }
 
 .header p{
-  text-shadow: 2px 2px 4px #000000;
+  /*text-shadow: 2px 2px 4px #000000;*/
   font-size: 14px;
   margin: 5px 0;
 }
@@ -98,7 +98,7 @@ background-color: #f1f1f1;
     background-color: transparent;
     border: none;
     cursor: pointer;
-    color: #02635c;
+    color: #fff;
     outline: none;
     text-shadow: 0px 0px 2px #0000002e;
     font-weight: bold;
@@ -167,9 +167,10 @@ background-color: #f1f1f1;
     display: inline-block;
     padding: 20px;
     background-size: cover;
-    margin-top: -6px;
+   /* margin-top: -6px;*/
     font-family: 'Cairo', sans-serif;
     direction: rtl; 
+	    background: url('../../../assets/image/bottomBackground.jpg');
 }
 
 .bottomHeader-w .rightLogo-w,
@@ -194,9 +195,11 @@ background-color: #f1f1f1;
     bottom: 0;
     right: 0;
     left: 0;
-    background: rgba(245, 245, 245, 0.3);
 }
+.headerDashBoard{
+	
 
+}
 .bottomHeader-w .rightLogo-w  {
     text-align:right; 
     margin-right:20px;

src/app/dashboard/header/header.component.html

@@ -44,10 +44,10 @@
                                 <i class="fas fa-tasks"></i>
                                 <span>مهامي</span>
                                 </button>
-                                 <button class="dropdown-item" style="cursor: pointer;" (click)="onInternalPage()">
+                                <!-- <button class="dropdown-item" style="cursor: pointer;" (click)="onInternalPage()">
                                     <i class="fas fa-solar-panel"></i>
                                     <span> البوابه الداخليه</span>
-                                </button>
+                                </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>
@@ -78,18 +78,18 @@
           <div class="row">
             <div class="col-12 col-sm-6 col-md-4 col-lg-4">
               <div class="rightLogo-w">
-                <img src="../../assets/image/logo1.png" alt="logo" title="logo" />
+                <a href="./" target="_blank"> <img src="../../assets/image/logo1.png" alt="KFMC" title="logo" /></a>
               </div>
             </div>
             <div class="col-12 col-sm-6 col-md-4 col-lg-4">
               <div class="center text-center">
-                <h2>المنصه الداخليه</h2>
-                <p>مجمع الملك فيصل الطبي بصحه الطائف</p>
+                <h2> لوحة التحكم</h2>
+                <p>انظمة وخدمات مجمع الملك فيصل الطبي بصحه الطائف</p>
               </div>
             </div>
             <div class="col-6 col-sm-6 col-md-4 col-lg-4 hidden-xs">
               <div class="leftLogo-w">
-                <img src="../../assets/image/logo2.png" alt="logo" title="alt" />
+				  <img src="../../assets/image/logo2.png" alt="logo" title="alt" /> 
               </div>
             </div>
           </div>
@@ -98,7 +98,7 @@
     </div>     
     
     <!-- services content -->
-    <div class="pagesHeader-w">
+    <div class="pagesHeader-w" style="    display: none;height: 50px;background: #777777bd;margin-top: -6px;width: 100%;">
       
     </div>
 </div>

src/app/dashboard/hospitals/add-hospital/add-hospital.component.html

@@ -4,7 +4,7 @@
     <div class="row">
       <div class="col-12">
         <ul class="list-unstyled titileLi-w">
-          <li class="headingText-w">خدمه إداره المحتوي > </li>
+          <li class="headingText-w">خدمه إداره المحتوي </li>
           <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> {{typeFirstLink}} > </li>
           <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
         </ul>
@@ -12,7 +12,7 @@
     </div>
     
     <div class="containerContent-w">
-        <div class="row" style="margin-top: 30px;">
+        <div class="row">
             <div class="col-12">
               <form (ngSubmit)="onSubmitted()" [formGroup]="addHospitalForm">
                 

src/app/dashboard/main-footer/footer.component.css

@@ -1,11 +1,11 @@
 .footer {
     width: 100%;
-    height: 250px;
+    height: 160px;
     position: absolute;
     bottom: 0;
-    background: url('../../../assets/image/footer.png') no-repeat center center;
-    background-size: cover;
-    margin-top: -13px;
+    background: url('../../../assets/image/bg-patt.gif') center center;
+   /* background-size: cover;
+    margin-top: -13px;*/
     position: relative;
     direction: rtl;
     font-family: 'Cairo', sans-serif;
@@ -20,13 +20,13 @@
     bottom: 0;
     right: 0;
     left: 0;
-    background: rgba(223, 212, 198, 0.6);
+       background: rgba(179, 151, 117, 0.55);
 }
 
 .leftFooter-w {
     width: 100%;
     height: 80px;
-    margin-top: 30px;
+    margin-top: 45px;
 }
 
 .leftFooter-w ul {
@@ -52,23 +52,37 @@
 .linksSection-w ul {
     width: 100%;
     display: inline-block;
+	    margin: 0;
+    padding: 0px 0px 10px 0px;
 }
 
 .linksSection-w ul li{
     display: inline-block;
     margin: 0 5px;
     margin: 10px 0;
+	border-right: 0.5px solid #967750; 
+	border-left: 0.5px solid #967750; 
+}
+.linksSection-w ul li:first-child{
+	border-right: 0px; 
+	border-left: 0px; 
+}
+.linksSection-w ul li:last-child{
+	border-right: 0px; 
+	border-left: 0px; 
 }
 
 .linksSection-w ul li a {
-    text-decoration: none;
+text-decoration: none;
     font-size: 14px;
     font-weight: 600;
-    color: #4dbcb1;
-    margin: 5px;
+    color: #ffffff;
     transition: all 0.5s;
+    padding: 0px 20px 0px 20px;
+	    text-shadow: 0 1px 1px #737373;
 }
 
+
 .linksSection-w ul li a img {
     width: 30px;
     height: 30px;
@@ -82,7 +96,7 @@
 .rightFooter-w {
     width: 100%;
     height: 80px; 
-    margin-top: 30px;   
+    margin-top: 45px;   
 }
 
 .rightFooter-w img {
@@ -91,9 +105,9 @@
 
 .rights {
     text-align: center;
-    color: #00a99d;
+    color: #fff;
     font-weight: bold;
-    text-shadow: 0 1px 1px #252525;
+    text-shadow: 0 1px 1px #737373;
 }
 
 /* start media query */

src/app/dashboard/main-footer/footer.component.html

@@ -7,7 +7,7 @@
 
         <div class="col-12 col-sm-6 col-md-3 col-lg-3 hidden-xs hidden-sm">
           <div class="rightFooter-w text-center">
-            <img src="../../assets/image/logo1.png" alt="logo" title="logo" />
+            <img src="../../assets/image/logo11.png" alt="logo" title="logo" />
           </div> 
         </div>
 
@@ -19,6 +19,22 @@
                 </li>
             </ul>
           </div>
+			
+			 <div class="col-12">
+				  <div class="copyRights">
+                <p class="rights">كافة الحقوق محفوظة لمجمع الملك فيصل الطبي بصحة الطائف 2018</p>
+            </div>
+				 
+          <div class="linksSection-w text-center" style="margin-top:0 !important;">
+              <ul class="list-unstyled">
+                  <li *ngFor="let socialMedia of socialLinks">
+                    <a href="{{socialMedia.link}}"><img src="{{authSer.pathImg +socialMedia.photo}}" /></a>
+                  </li>
+              </ul>
+            </div>
+           
+        </div>
+			
         </div>
 
         <div class="col-12 col-sm-6 col-md-3 col-lg-3">
@@ -31,18 +47,7 @@
             </div>
         </div>
 
-        <div class="col-12">
-          <div class="linksSection-w text-center" style="margin-top:0">
-              <ul class="list-unstyled">
-                  <li *ngFor="let socialMedia of socialLinks">
-                    <a href="{{socialMedia.link}}"><img src="{{authSer.pathImg +socialMedia.photo}}" /></a>
-                  </li>
-              </ul>
-            </div>
-            <div class="copyRights">
-                <p class="rights">جميع الحقوق محفوظه لمجمع الملك فيصل الطبي 2019</p>
-            </div>
-        </div>
+       
 
         <!-- <div class="col-12 col-sm-6 col-md-3  d-none d-sm-none d-md-block">
             

src/app/dashboard/service-item/service-item.component.css

@@ -16,7 +16,7 @@
 .serviceItem-w .itemHeader-w {
     width: 100%;
     height: 50px;
-    background-color: #ecdcc7;
+    background-color: #ab8e6b;
 }
 
 .pages {

src/app/dashboard/service-item/service-item.component.html

@@ -14,13 +14,13 @@
 
           <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav mr-auto" style="margin: 0 auto">
-              <li class="nav-item" style="color: #00a99d; font-weight:bold;margin-top:13px;margin-left:10px;" (click)="goToHome()">الرئيسيه</li>
+              <li class="nav-item" style="color: #fff; font-weight:bold;margin-top:13px;margin-left:10px;" (click)="goToHome()">الرئيسيه</li>
               <li class="nav-item active" *ngFor="let page of pages; let i = index">
-                <a class="nav-link" style="color: #00a99d; padding:13px 10px; font-weight:bold"  [ngClass]="page.active == 0 ? '' : 'activeLink'" (click)="getListPage(page)">{{page.name}}</a>
+                <a class="nav-link" style="color: #fff; padding:13px 10px; font-weight:bold"  [ngClass]="page.active == 0 ? '' : 'activeLink'" (click)="getListPage(page)">{{page.name}}</a>
               </li>
               <div class="btn-group mr-3" *ngIf="authService.showMoreLinks">
                 <div class="btn-group" ngbDropdown role="group" aria-label="Button group with nested dropdown">
-                  <button class="btn btn-outline-primary" ngbDropdownToggle style="background-color: transparent;border: none;color: #00a99d; font-weight: bold;border-right: 1px solid #00a99d;border-radius: 0;">المزيد </button>
+                  <button class="btn btn-outline-primary" ngbDropdownToggle style="background-color: transparent;border: none;color: #fff; font-weight: bold;border-right: 1px solid #00a99d;border-radius: 0;">المزيد </button>
                   <div class="dropdown-menu" ngbDropdownMenu>
                     <button class="dropdown-item" style="cursor: pointer; text-align:right;color:#00a99d" *ngFor="let extra of extraPages" (click)="getListPage(extra)">{{extra.name}}</button>
                   </div>

src/app/login/login.component.css

@@ -25,13 +25,37 @@
     color: #bda380;
     font-size: 30px;
 }
+.btn-success{
+	    color: #fff;
+    background-color: #73542e;
+    border-color: #9b7648;
+}
+.btn-success:hover{
+	    color: #fff;
+    background-color: #866338;
+    border-color: #9b7648;
+}
 
+.btn-success.focus, .btn-success:focus{
+	    box-shadow: 0 0 0 0.2rem rgba(167, 93, 40, 0.5);
+}
+.form-control:focus{
+	color: #ffffff !important;
+    background-color: #654721 !important;
+    border-color: #c3a279 !important;
+    outline: none ;
+}
 .formContent-w p {
     text-align: center;
     color: #888;
     font-weight: bold;
 }
-
+.btn-success:not(:disabled):not(.disabled).active, .btn-success:not(:disabled):not(.disabled):active, .show>.btn-success.dropdown-toggle{
+		    color: #fff;
+    background-color: #866338;
+    border-color: #9b7648;
+	
+}
 .formContent-w form {
     width: 600px;
     padding: 20px;
@@ -60,10 +84,14 @@
 
 .formContent-w form a {
     float: right;
-    color: #3dcc6d;
+    color: #775327;
     font-weight: bold;
     letter-spacing: 0.5px;
     margin-top: 5px;
+    border: 1px solid #c1bfbf;
+    padding: 2px 17px;
+    background-color: #eaeaea;
+    font-size: 13px;
 }
 
 .formContent-w form button {

src/app/regester/regester.component.css

@@ -8,7 +8,7 @@
 
 input,select {
     font-size: 12px; 
-    background-color: #f9f9f9;
+    background-color: #fff;
     border: 2px solid #bda380;
 }
 
@@ -23,7 +23,35 @@ input.ng-invalid {
 select.ng-invalid{
     border: 2px solid #ccc;
 } */
+.custom-radio .custom-control-label::before{
+	    border: 1px solid #b28c5e;
+}
+.custom-radio .custom-control-input:checked~.custom-control-label::before{
+	background-color: #906635;
+	    border: 1px solid #fff;
+}
 
+.formfieldset{
+	border: 1px solid #61606073;
+    width: 100%;
+	border-radius: 3px;
+	    margin-top: 40px;
+    background-color: #a5a3a31a;
+}
+.formfieldset legend{
+	    float: right;
+}
+.formfieldset legend span{
+    width: auto !important;
+    font-size: 15px;
+    border: 1px solid #616060;
+    padding: 2px 15px;
+    background-color: #616060;
+    float: right;
+    margin: -15px 14px 0px 0px;
+    border-radius: 3px;
+    color: #ffffff;
+}
 .imgProfile {
     width: 200px;
     height: 200px;

src/app/regester/regester.component.html

@@ -23,95 +23,105 @@
                   <label for="file" class="iconUpload-w"><i class="fas fa-upload"></i></label>
               </div>
             </div>
+			
+			<div class="col-sm-12 col-md-12 col-lg-12">
+				<div class="row">
+					
+					<fieldset class="formfieldset">
+					  <legend>
+						<span>المعلومات شخصية</span>
+						</legend>
+						
+						 <div class="col-12 col-sm-12 col-md-6 col-lg-4">
+							  <div class="form-group">
+								<label for="name" style="float:right">الأسم <span class="spanReqired-w">*</span></label>
+								<input type="text" id="name" placeholder="أدخل الاسم رباعي" class="form-control" formControlName="name" />
+							  </div>
+							</div>
 
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-              <div class="form-group">
-                <label for="name" style="float:right">الأسم <span class="spanReqired-w">*</span></label>
-                <input type="text" id="name" placeholder="أدخل الأسم رباعي" class="form-control" formControlName="name" />
-              </div>
-            </div>
-            
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-              <div class="form-group">
-                <label style="float:right">الجنسيه <span class="spanReqired-w">*</span></label>
-                <select class="form-control" formControlName="nationality_id">
-                  <option *ngFor="let country of countries; let i = index" [value]="country.id">{{country.name}}</option>
-                </select>
-              </div>
-            </div>
+							<div class="col-12 col-sm-12 col-md-6 col-lg-4">
+							  <div class="form-group">
+								<label style="float:right">الجنسية <span class="spanReqired-w">*</span></label>
+								<select class="form-control" formControlName="nationality_id">
+								  <option *ngFor="let country of countries; let i = index" [value]="country.id">{{country.name}}</option>
+								</select>
+							  </div>
+							</div>
 
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-              <div class="form-group">
-                  <label for="identity" style="float:right"> الهويه <span class="spanReqired-w">*</span></label>
-                <select class="form-control select" id="identity" formControlName="identity_type_id" (change)="getSelectedOptionText($event)">
-                  <option *ngFor="let identity of identities" [value]="identity.id">{{identity.name}}</option>
-                </select>
-              </div>
-            </div>
+							<div class="col-12 col-sm-12 col-md-6 col-lg-4">
+							  <div class="form-group">
+								  <label for="identity" style="float:right"> الهويه <span class="spanReqired-w">*</span></label>
+								<select class="form-control select" id="identity" formControlName="identity_type_id" (change)="getSelectedOptionText($event)">
+								  <option *ngFor="let identity of identities" [value]="identity.id">{{identity.name}}</option>
+								</select>
+							  </div>
+							</div>
 
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4" *ngIf="identity_id != 4">
-              <div class="form-group">
-                <label for="identityNumber" style="float:right">رقم الهويه <span class="spanReqired-w">*</span></label>
-                <input type="phone" class="form-control" placeholder="رقم الهويه" id="identityNumber" formControlName="identity_number" appOnlyNumber (input)="onIdentitiyChange($event.target.value)" />
-                <span class="errorMessage-w" *ngIf="identity_id == 1">أدخل رقم هويه مكون من 10 أرقام يبدأ برقم 1</span>
-                <span class="errorMessage-w" *ngIf="identity_id == 2">أدخل رقم هويه مكون من 10 أرقام </span>
-                <span class="errorMessage-w" *ngIf="identity_id == 3">أدخل رقم الإقامه مكون من 10 أرقام يبدأ برقم 2 </span>
-              </div>
-            </div>
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4" *ngIf="identity_id == 4">
+							<div class="col-12 col-sm-12 col-md-6 col-lg-4" *ngIf="identity_id != 4">
+							  <div class="form-group">
+								<label for="identityNumber" style="float:right">رقم الهويه <span class="spanReqired-w">*</span></label>
+								<input type="number" class="form-control" placeholder="رقم الهويه" id="identityNumber" formControlName="identity_number" appOnlyNumber (input)="onIdentitiyChange($event.target.value)" />
+								<span class="errorMessage-w" *ngIf="identity_id == 1">أدخل رقم هويه مكون من 10 أرقام يبدأ برقم 1</span>
+								<span class="errorMessage-w" *ngIf="identity_id == 2">أدخل رقم هويه مكون من 10 أرقام </span>
+								<span class="errorMessage-w" *ngIf="identity_id == 3">أدخل رقم الإقامه مكون من 10 أرقام يبدأ برقم 2 </span>
+							  </div>
+							</div>
+
+						  <div class="col-12 col-sm-12 col-md-6 col-lg-4" *ngIf="identity_id == 4">
+						  <div class="form-group">
+							<label for="identityNumber" style="float:right">رقم الهويه <span class="spanReqired-w">*</span></label>
+							<input type="number" class="form-control" placeholder="رقم الهويه" id="identityNumber" formControlName="identity_number" />
+							<span class="errorMessage-w"> أدخل رقم جواز السفر </span>
+						  </div>
+						</div>
+							 <div class="col-12 col-sm-12 col-md-6 col-lg-4">
               <div class="form-group">
-                <label for="identityNumber" style="float:right">رقم الهويه <span class="spanReqired-w">*</span></label>
-                <input type="phone" class="form-control" placeholder="رقم الهويه" id="identityNumber" formControlName="identity_number" />
-                <span class="errorMessage-w"> أدخل رقم جواز السفر </span>
+                <label for="birthday" style="float:right">تاريخ الميلاد <span class="spanReqired-w">*</span></label>
+                <input type="date" max="{{min}}" id="birthdate" placeholder="تاريخ الميلاد" class="form-control" formControlName="birthday" /> 
               </div>
             </div>
-
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
+						 <div class="col-12 col-sm-12 col-md-6 col-lg-4">
               <div class="form-group">
-                <label for="email" style="float:right">البريد الإلكتروني <span class="spanReqired-w">*</span></label>
-                <input type="email" id="email" placeholder="البريد الإلكتروني" class="form-control" appEnglishCharacters formControlName="email" />
-                <span class="help-block" *ngIf="!regesterForm.get('email').valid && regesterForm.get('email').touched" style="color:red">من فضلك أدخل بريد إلكتروني صحيح</span>
+                <label style="float: right; margin-right:5px;margin-top:10px">النوع <span class="spanReqired-w">*</span></label>
+                <div class="custom-control custom-radio inlineBlock-w" style="padding: 2px 31px;background: #bd90592e;color: #a98559;border: 1px solid #b38553c2;">
+                  <input type="radio" class="custom-control-input" id="defaultUnchecked" value="male" formControlName="gender" name="gender">
+                  <label class="custom-control-label" for="defaultUnchecked" style="cursor: pointer;">ذكر</label>
+                </div>
+                
+                <div class="custom-control custom-radio inlineBlock-w" style="padding: 2px 31px;background: #bd90592e;color: #a98559;border: 1px solid #b38553c2;">
+                  <input type="radio" class="custom-control-input" id="defaultChecked" value="female" formControlName="gender" name="gender">
+                  <label class="custom-control-label" for="defaultChecked" style="cursor: pointer; margin-right:30px">انثي</label>
+                </div>
               </div>
             </div>
-
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
+					
+					 </fieldset>
+				
+				</div>  
+			</div>
+           
+          
+			  <div class="col-sm-12 col-md-12 col-lg-12">
+				<div class="row">
+					
+					<fieldset class="formfieldset">
+					  <legend>
+						<span>المعلومات الوظيفية</span>
+						</legend>
+					
+						  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
               <div class="form-group">
                 <label for="phone" style="float:right">رقم الجوال <span class="spanReqired-w">*</span></label>
                 <input type="text" id="phone" appNumberDerictive class="form-control" placeholder="رقم الجوال يبدأ ب 05 ومكون من 10 أرقام" formControlName="phone" />
               </div>
             </div>
-
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-              <div class="form-group">
-                <label for="password" style="float:right">كلمه المرور <span *ngIf="checkShowSpanRequired" class="spanReqired-w">*</span></label>
-                <input type="password" id="password" class="form-control" placeholder="كلمه المرور" formControlName="password" />
-                <span class="help-block" *ngIf="password.errors?.minlength && regesterForm.get('password').touched" style="color:red;font-size:12px"> من فضلك , أدخل كلمه مرور لاتقل عن 6 ارقام</span>
-              </div>
-            </div>
-
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-              <div class="form-group">
-                <label for="password_confirmation" style="float:right" >تأكيد كلمه المرور <span *ngIf="checkShowSpanRequired" class="spanReqired-w">*</span></label>
-                <input type="password" id="password_confirmation" placeholder="تأكيد كلمه المرور" class="form-control" formControlName="password_confirmation" minlength="6"/>
-                <span class="help-block" *ngIf="repeatPassword.errors?.minlength && regesterForm.get('password_confirmation').touched" style="color:red;font-size:12px">من فضلك , أدخل كلمه مرور لاتقل عن 6 ارقام</span>
-              </div>
-            </div>
-
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
+						  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
               <div class="form-group">
                 <label for="functional_number" style="float:right"> الرقم الوظيفي <span class="spanReqired-w">*</span></label>
                 <input type="number" class="form-control" min="0" id="functional_number" placeholder="الرقم الوظيفي" formControlName="functional_number" />
               </div>
             </div> 
-           
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-              <div class="form-group">
-                <label for="birthday" style="float:right">تاريخ الميلاد <span class="spanReqired-w">*</span></label>
-                <input type="date" max="{{min}}" id="birthdate" placeholder="تاريخ الميلاد" class="form-control" formControlName="birthday" /> 
-              </div>
-            </div>
-
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
+						  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
               <div class="form-group">
                 <label for="date_employment" style="float:right">تاريخ التوظيف الميلادي <span class="spanReqired-w">*</span></label>
                 <input type="date" class="form-control" id="date_employment" formControlName="date_of_employment_gre" />
@@ -193,6 +203,60 @@
               </div>
             </div>
 
+					 </fieldset>
+				
+				</div>  
+			</div>
+			  
+			  
+			  <div class="col-sm-12 col-md-12 col-lg-12">
+				<div class="row">
+					
+					<fieldset class="formfieldset">
+					  <legend>
+						<span>معلومات الاتصال</span>
+						</legend>
+					
+						 <div class="col-12 col-sm-12 col-md-6 col-lg-4">
+              <div class="form-group">
+                <label for="email" style="float:right">البريد الإلكتروني <span class="spanReqired-w">*</span></label>
+                <input type="email" id="email" placeholder="البريد الإلكتروني" class="form-control" appEnglishCharacters formControlName="email" />
+                <span class="help-block" *ngIf="!regesterForm.get('email').valid && regesterForm.get('email').touched" style="color:red">من فضلك أدخل بريد إلكتروني صحيح</span>
+              </div>
+            </div>
+						
+            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
+              <div class="form-group">
+                <label for="password" style="float:right">كلمه المرور <span *ngIf="checkShowSpanRequired" class="spanReqired-w">*</span></label>
+                <input type="password" id="password" class="form-control" placeholder="كلمه المرور" formControlName="password" />
+                <span class="help-block" *ngIf="password.errors?.minlength && regesterForm.get('password').touched" style="color:red;font-size:12px"> من فضلك , أدخل كلمه مرور لاتقل عن 6 ارقام</span>
+              </div>
+            </div>
+						 <div class="col-12 col-sm-12 col-md-6 col-lg-4">
+              <div class="form-group">
+                <label for="password_confirmation" style="float:right" >تأكيد كلمه المرور <span *ngIf="checkShowSpanRequired" class="spanReqired-w">*</span></label>
+                <input type="password" id="password_confirmation" placeholder="تأكيد كلمه المرور" class="form-control" formControlName="password_confirmation" minlength="6"/>
+                <span class="help-block" *ngIf="repeatPassword.errors?.minlength && regesterForm.get('password_confirmation').touched" style="color:red;font-size:12px">من فضلك , أدخل كلمه مرور لاتقل عن 6 ارقام</span>
+              </div>
+            </div>
+
+						
+					 </fieldset>
+				
+				</div>  
+			</div>
+
+           
+
+          
+
+
+           
+          
+           
+           
+
+          
             <div class="col-12 col-sm-12 col-md-6 col-lg-4" *ngIf="showStatus">
               <div class="form-group">
                 <label style="float: right; margin-right:5px">الحاله</label>
@@ -204,20 +268,7 @@
               </div>
             </div>
           
-            <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-              <div class="form-group">
-                <label style="float: right; margin-right:5px;margin-top:10px">النوع <span class="spanReqired-w">*</span></label>
-                <div class="custom-control custom-radio inlineBlock-w">
-                  <input type="radio" class="custom-control-input" id="defaultUnchecked" value="male" formControlName="gender" name="gender">
-                  <label class="custom-control-label" for="defaultUnchecked" style="cursor: pointer;">ذكر</label>
-                </div>
-                
-                <div class="custom-control custom-radio inlineBlock-w">
-                  <input type="radio" class="custom-control-input" id="defaultChecked" value="female" formControlName="gender" name="gender">
-                  <label class="custom-control-label" for="defaultChecked" style="cursor: pointer; margin-right:30px">انثي</label>
-                </div>
-              </div>
-            </div>
+           
             
             <div class="col-12">
                 <button type="submit" [disabled]="!regesterForm.valid" class="btn btn-success regesterBtn-w">{{userProfileId ? 'حفظ' : 'سجل'}}</button>