Hima 5 роки тому
батько
коміт
7bf08fe668

+ 0 - 1
src/app/Internal-Page/circulars-page/circulars-page.component.html

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

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

@@ -375,6 +375,7 @@ input,button {
     color: #fff;
     text-align: center;
     background: linear-gradient(0.5turn,#decbb1, #c0a786, #c0a786);
+    background: linear-gradient(0.5turn,#f1e3cf, #c0a786, #c0a786);
     border-bottom: 4px solid #00a99d;
     transition: all 0.5s;
 }
@@ -383,6 +384,7 @@ 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 {

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

@@ -1,7 +1,6 @@
 <ng-template [ngIf]="authSer.arabicTemplate" [ngIfElse]="englishTemplate">
     <div class="container">
         <div class="contentPage-w">
-            
             <div class="advertisiment">
                 <img src="{{ authSer.pathImg + advertisiment.photo }}" />
             </div>
@@ -23,8 +22,7 @@
                         </div>
 
                         <div class="col-12 col-md-8 order-1 order-sm-1 order-md-2">
-                            <div class="slider">
-                                 
+                            <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}} >
@@ -43,8 +41,9 @@
                     </div>
                 </div>
             </div>
+                       
 
-                <div class="eventPart-w">
+            <div class="eventPart-w">
                 <div class="container containerPaddingEdit-w">
                     <div class="event">
                         <div class="row">
@@ -61,18 +60,20 @@
                     </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>
+
                                 <div class="joinHeading-w">
                                     <h2>ترحيب بالإنضمام للمجمع الطبي</h2>
                                 </div>
+
                                 <div class="dataContent">
                                     <div class="row">                                         
                                         <div id="demo" class="carousel slide" data-ride="carousel">
@@ -92,9 +93,11 @@
                                         </div>
                                     </div>
                                 </div>
+
                             </div>
                         </div>
-                            <div class="col-12 col-md-8 editRowPadding-w">
+
+                        <div class="col-12 col-md-8 editRowPadding-w">
                             <div class="sharingEvent-w">
                                 <div class="sharingHeader-w">
                                     <h2>مشاركه اللحظات</h2>
@@ -148,7 +151,7 @@
                     </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;">
@@ -160,12 +163,12 @@
                                 <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-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' : '' " />
-                                                <p style="color:#767676; font-size:13px;">{{field.name ? field.name : 'إضافه خدمه'}}</p>
-                                            </div>
-                                        </a>
+                                            <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>
                                     </div>
                                 </div>
@@ -174,7 +177,7 @@
                     </div>
                 </div>
             </div>
-
+            
             <div class="tabs">
                 <div class="container containerPaddingEdit-w">
                     <div class="row">
@@ -231,8 +234,6 @@
             </div>
         </div>
     </div> 
-
-
 </ng-template>
 
 

+ 2 - 4
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>
@@ -217,11 +215,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">عربي</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">عربي</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>

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

@@ -79,7 +79,7 @@
 
 .saredLinks-w li {
     display: inline-block;
-    margin: 0 2px;
+    margin: 0 5px;
 }
 
 .saredLinks-w li button {
@@ -90,7 +90,7 @@
     color: #fff;
     cursor: pointer;
     transition: all 0.5s;
-	    border-radius: 3px;
+	border-radius: 3px;
 }
 
 .saredLinks-w li button:hover {

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

@@ -4,7 +4,7 @@
 }
 
 .newContent {
-      width: 100%;
+    width: 100%;
     padding: 12px 0;
     display: inline-block;
     border-bottom: 1px solid #aba9a9;
@@ -18,7 +18,7 @@
 
 .imgNew-w img {
     width: 100%;
-   /* height: 200px;*/
+    height: 200px;
 }
 
 .content {

+ 3 - 0
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';

+ 19 - 2
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,25 @@ export class AddNewsComponent implements OnInit {
  
  }
 
+
+
+//  deleteImg(index, data) {
+//    if(this.typeMode) {
+//     this.images.splice(index , 1);
+//     this.http.get(this.authSer.pathApi + '/delete_report_photo/' + data.id).subscribe(
+//       (responce) => {
+//         console.log(responce);
+//       },
+//       (error) => {
+//         console.log(error);
+//       }
+//     );
+//    } else {
+//      this.images.splice(index,1);
+//    }
+ 
+//  }
+
  deleteMainImg() {
    this.mainPhotoPath = '';
  }

+ 198 - 0
src/styles.css

@@ -477,6 +477,22 @@ width: 100%;
   }
 
  
+  /* .IN-5c1caa55-0e85-4bb1-925b-96b537f99da5-1G9ISYhSF8XoOmdcl0yKDu,
+  .IN-5c1caa55-0e85-4bb1-925b-96b537f99da5-1G9ISYhSF8XoOmdcl0yKDu.IN-5c1caa55-0e85-4bb1-925b-96b537f99da5-3uCBSbQNVNf2QjqHe1rfb6 {
+    width: 150px;
+  } */
+  /* .IN-5c1caa55-0e85-4bb1-925b-96b537f99da5-1G9ISYhSF8XoOmdcl0yKDu>xdoor-icon {
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+  }
+
+  .IN-5c1caa55-0e85-4bb1-925b-96b537f99da5-1G9ISYhSF8XoOmdcl0yKDu>xdoor-icon>svg{
+    margin: 0 10px; 
+  }
+
+  .inlineBlock _2tga _49ve {
+    display: none !important;
+  } */
   
   .panel-heading[data-toggle="collapse"]::before {
     font-family: 'Glyphicons Halflings';
@@ -1143,3 +1159,185 @@ height: 7px !important;
         margin: 0 10px;
       }
     }
+
+
+
+
+
+
+
+
+
+
+  /* Eng Magdy Style */
+  .internalHeader-w{
+    padding-top: 7px;
+    height: 55px !important;
+background-color:#a1a1a15e !important; 
+}
+.routerLinkContainer-w {
+  background: url('../src/assets/image/background_login.jpg') no-repeat top center !important;
+  background-size: auto !important;
+  background-attachment: fixed !important;
+}
+.internalHeader-w[_ngcontent-c6] input[type='text'][_ngcontent-c6]::placeholder{
+color: #BDA380;  
+}
+.internalHeader-w[_ngcontent-c6] input[type='text'][_ngcontent-c6]:-ms-input-placeholder{
+color: #BDA380;  
+}
+.internalHeader-w[_ngcontent-c6] input[type='text'][_ngcontent-c6]::-ms-input-placeholder{
+color: #BDA380;  
+}
+.internalHeader-w[_ngcontent-c6] .searchBtn[_ngcontent-c6]{
+
+    height: 35px !important;
+width: 55px !important;
+border: 1px solid #BDA380 !important;
+    margin-right: 10px;
+}
+.pagesHeader-w[_ngcontent-c6]{
+    margin-top: 0px !important;
+background-color: #926f3f2e !important;
+height: 70px !important;
+}
+.pagesHeader-w[_ngcontent-c6] .navbar[_ngcontent-c6]{
+height: 70px !important;
+}
+.pagesHeader-w[_ngcontent-c6] .dropdown[_ngcontent-c6] .dropbtn[_ngcontent-c6]{
+margin: 0 4px !important;
+}
+.pagesHeader-w[_ngcontent-c6] .dropdown[_ngcontent-c6] .dropbtn[_ngcontent-c6]:hover{
+background-color: #d8cdbd;
+}
+.pagesHeader-w[_ngcontent-c6] .parentName-w[_ngcontent-c6]{
+    margin: 8px 0px !important;
+}
+.contentPage-w[_ngcontent-c7]{
+background: rgba(255, 255, 255, 0.22) !important;
+border: 1px solid #eae9e6 !important;
+box-shadow: 0px 5px 10px #00000026 !important;
+}
+
+.internalHeader-w[_ngcontent-c6] input[type='text'][_ngcontent-c6]{
+width: 285px;
+height: 35px !important;
+border: 1px solid #BDA380 !important;
+}
+.searchBtn i{
+    color: #BDA380;
+}
+.dateW[_ngcontent-c6]{
+text-shadow: 0px 0px 0px #fff0 !important;
+font-size: 13px !important;
+}
+.ar[_ngcontent-c6], .en[_ngcontent-c6]{
+height: 35px !important;
+width: 55px !important;
+text-align: center;
+background-color: #f1eded !important;
+padding-top: 4px !important;
+}
+.logoHeader-w[_ngcontent-c6]{
+background-image: url('../src/assets/image/bottomBackground.jpg') !important;
+}
+.en[_ngcontent-c6]:hover{
+    background-color: #c3a58161 !important;
+color: #fff !important;
+border: 1px solid #bb9262 !important;
+}
+.contentPage-w[_ngcontent-c7]{
+    padding: 10px 10px !important;
+}
+
+.contentPage-w[_ngcontent-c7]{
+width:100% !important;
+}
+.eventPart-w[_ngcontent-c7] .event[_ngcontent-c7]{
+background-color: #eae9e6 !important;
+}
+.eventPart-w[_ngcontent-c7] .event[_ngcontent-c7] .now[_ngcontent-c7]{
+    padding: 9px 0 !important;
+}
+.contentsData-w[_ngcontent-c7] .joinUs-w[_ngcontent-c7] .dataContent[_ngcontent-c7], .contentsData-w[_ngcontent-c7] .joinUsEn-w[_ngcontent-c7] .dataContent[_ngcontent-c7]{
+   box-shadow: 0px 3px 7px #00000029 !important;
+}
+.contentsData-w[_ngcontent-c7] .joinUs-w[_ngcontent-c7] .joinHeading-w[_ngcontent-c7], .contentsData-w[_ngcontent-c7] .joinUsEn-w[_ngcontent-c7] .joinHeading-w[_ngcontent-c7]{
+    box-shadow: 0px 3px 7px #00000029 !important;
+}
+.sharingEvent-w[_ngcontent-c7] .content[_ngcontent-c7], .sharingEvent-w[_ngcontent-c7] .content[_ngcontent-c7]{
+ box-shadow: 0px 3px 7px #00000029 !important;
+}
+.sharingEvent-w[_ngcontent-c7] .congeratolation[_ngcontent-c7], .sharingEvent-w[_ngcontent-c7] .sadDead-w[_ngcontent-c7]{
+ box-shadow: 0px 3px 7px #00000029 !important;
+}
+.secondServices-w[_ngcontent-c7] .contentSecondSer-w[_ngcontent-c7] .contentSer[_ngcontent-c7]{
+    box-shadow: 0px 3px 7px #00000029 !important;
+}
+.contentsData-w .joinUs-w .dataContent .joinUs-photo,
+.contentsData-w .joinUsEn-w .dataContent .joinUs-photo{
+  height: 130px !important;
+  overflow: hidden !important;
+  border: 1px solid #e0e0e0;
+}
+.contentsData-w .joinUs-w .dataContent .joinUs-photo img,
+.contentsData-w .joinUsEn-w .dataContent .joinUs-photo img{
+    height: auto !important;
+margin: 0 !important;
+border: 1px solid #ccc0 !important;
+}
+.sharingEvent-w .content .eventsTab li{
+    border-radius: 10px !important;
+        width: 25px !important;
+height: 7px !important;
+    padding: 0px !important;
+}
+.contentsData-w .joinUs-w .dataContent .eventsTab,
+.contentsData-w .joinUsEn-w .dataContent .eventsTab {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  text-align: center;
+  padding-left: 40px;
+  margin: 10px 0;
+}
+.contentsData-w .joinUs-w .dataContent .eventsTab li,
+.contentsData-w .joinUsEn-w .dataContent .eventsTab li{
+  border-radius: 10px !important;
+      width: 25px !important;
+height: 7px !important;
+  padding: 0px !important;
+  background: #ccc;
+  margin: 0 5px;
+  cursor: pointer;
+}
+
+/* .actineTab {
+  background-color: #08726a !important;
+  color: #fff !important;
+} */
+
+.linksSection-w{
+    margin-top: 10px !important;
+}
+.footer{
+/*    height: 170px !important;*/
+}
+
+
+
+
+
+
+
+@media screen and (min-width: 1200px) {
+.container{
+    max-width: 1272px !important;
+}
+}
+@media screen and (min-width: 768px) and (max-width: 1200px) {}
+@media screen and (min-width: 599px) and (max-width:767px) {}
+@media screen and (max-width: 598px) {}
+@media screen and (max-width: 480px) {}
+
+  /* Eng Magdy Style */