gohari_s edits

src/app/dashboard/achievements/achievement-list/achievement.component.css

@@ -27,4 +27,4 @@
     display: flex;
     justify-content: center;
     text-align: center;
-}
+}

src/app/dashboard/achievements/achievement-list/achievement.component.html

@@ -1,53 +1,53 @@
 <div class="container">
-    <div class="row">
-      <div class="col-12">
-          <ul class="list-unstyled titileLi-w">
-            <li class="headingText-w">خدمه إداره المحتوي / </li>
-            <li class="headingText-w activeLi-w" style="margin-right:5px"> الإنجازات العامه</li>
-          </ul>
-        <hr class="hr">
-      </div>
+  <div class="row">
+    <div class="col-12">
+      <ul class="list-unstyled titileLi-w">
+        <li class="headingText-w">خدمه إداره المحتوي > </li>
+        <li class="headingText-w activeLi-w" style="margin-right:5px"> الإنجازات العامه</li>
+      </ul>
     </div>
+  </div>
+  <div class="containerContent-w">
 
     <div class="row">
       <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-          <button type="button" class="btn btn-outline-success dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn">إنشاء</button>
-          <button type="button" class="btn btn-outline-danger dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn">حذف</button>
+        <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+        <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
       </div>
       <div class="col-12 col-sm-12 col-md-6 col-lg-6">
         <div class="form-group">
-          <input type="text" placeholder="البحث" class="form-control" style="margin-top:13px;" (input)="filtterFunc($event)"/>
+          <input type="text" placeholder="البحث" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
           <hr>
         </div>
       </div>
     </div>
-  
+
     <div class="row">
-      <div class="col-12 col-sm-12 col-md-6">
+      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
         <div class="form-group">
-          <span class="spanSelect-w">أظهر
+          <span class="spanSelect-w">
             <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
               <option value="5">5</option>
               <option value="10">10</option>
               <option value="15">15</option>
               <option value="20">20</option>
             </select>
-            من العناصر
+            من العناصر يتم عرضها
           </span>
         </div>
       </div>
-      <div class="col-12 col-sm-12 col-md-6">
-      
+      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+
       </div>
     </div>
-    
+
     <table class="table table-bordered">
       <thead class="headBackground-w">
         <tr>
           <th>
             <div class="custom-control custom-checkbox">
-                <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
-                <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px;"></label>
+              <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
+              <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px;"></label>
             </div>
           </th>
           <th>العنوان</th>
@@ -69,4 +69,4 @@
     </table>
     <pagination-controls (pageChange)="onPageChange($event)"></pagination-controls>
   </div>
-  
+</div>

src/app/dashboard/achievements/add-achievement/add-achievement.component.css

@@ -1,3 +1,5 @@
-input {
-    font-size: 13px !important;
+input,select {
+    font-size: 12px;
+    background-color: #f9f9f9;
+    border: 2px solid #bda380;
 }

src/app/dashboard/achievements/add-achievement/add-achievement.component.html

@@ -1,58 +1,59 @@
-  <div class="container">
-    
-    <div class="row" style="margin-bottom: 30px;">
-        <div class="col-12">
-          <ul class="list-unstyled titileLi-w">
-            <li class="headingText-w">خدمه إداره المحتوي / </li>
-            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الإنجازات العامه / </li>
-            <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
-          </ul>
-          <hr class="hr">
-        </div>
+<div class="container">
+
+  <div class="row" style="margin-bottom: 30px;">
+    <div class="col-12">
+      <ul class="list-unstyled titileLi-w">
+        <li class="headingText-w">خدمه إداره المحتوي > </li>
+        <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الإنجازات العامه > </li>
+        <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
+      </ul>
     </div>
+  </div>
+  <div class="containerContent-w">
 
-    <div class="row">
-      <div class="col-12">
+  <div class="row">
+    <div class="col-12">
 
-        <form (ngSubmit)="onSubmitted()" #f="ngForm">
-          <div class="row">
-            <div class="col-12 col-sm-12 col-md-6">
-              <div class="form-group">
-                <label for="title" style="float: right; margin-right: 5px">العنوان باللغه العربيه <span class="spanReqired-w">*</span></label>
-                  <input type="text" class="form-control" placeholder="العنوان باللغه العربيه" id="title" name="title" ngModel [ngModel]="achiv.title" #title="ngModel" required/>
-              </div>
+      <form (ngSubmit)="onSubmitted()" #f="ngForm">
+        <div class="row">
+          <div class="col-12 col-sm-12 col-md-6">
+            <div class="form-group">
+              <label for="title" style="float: right; margin-right: 5px">العنوان باللغه العربيه <span class="spanReqired-w">*</span></label>
+              <input type="text" class="form-control" placeholder="العنوان باللغه العربيه" id="title" name="title" ngModel [ngModel]="achiv.title" #title="ngModel" required/>
             </div>
-            <div class="col-12 col-sm-12 col-md-6">
-              <div class="form-group">
-                <label for="title_en" style="float: right; margin-right: 5px">العنوان باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
-                  <input type="text" class="form-control" id="title_en" placeholder="العنوان باللغه الانجليزيه" name="title_en" ngModel [ngModel]="achiv.title_en" #title="ngModel" required/>
-              </div>
+          </div>
+          <div class="col-12 col-sm-12 col-md-6">
+            <div class="form-group">
+              <label for="title_en" style="float: right; margin-right: 5px">العنوان باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
+              <input type="text" class="form-control" id="title_en" placeholder="العنوان باللغه الانجليزيه" name="title_en" ngModel [ngModel]="achiv.title_en" #title="ngModel" required/>
             </div>
-            
-            <div class="col-12 col-sm-12 col-md-12">
-              <div class="form-group">
-                <label for="description" style="float:right;margin-right: 5px">الوصف باللغه العربيه <span class="spanReqired-w">*</span></label>
-                <quill-editor name="description" ngModel [ngModel]="achiv.description" #description="ngModel" required>
-
-                </quill-editor>
-              </div>
+          </div>
+
+          <label for="description" style="float:right;margin-right: 5px">الوصف باللغه العربيه <span class="spanReqired-w">*</span></label>
+          <div class="col-12 col-sm-12 col-md-12">
+            <div class="form-group">
+              <quill-editor name="description" ngModel [ngModel]="achiv.description" #description="ngModel" required>
+
+              </quill-editor>
             </div>
+          </div>
 
-            <div class="col-12 col-sm-12 col-md-12">
-              <div class="form-group">
-                <label for="description_en" style="float:right;margin-right: 5px">الوصف باللغه الانجليزيه <span class="spanReqired-w">*</span></label>
+          <label for="description_en" style="float:right;margin-right: 5px">الوصف باللغه الانجليزيه <span class="spanReqired-w">*</span></label>
+          <div class="col-12 col-sm-12 col-md-12">
+            <div class="form-group">
               <quill-editor id="description_en" name="description_en" ngModel [ngModel]="achiv.description_en" #description="ngModel" required>
 
               </quill-editor>
-              </div>
             </div>
-
           </div>
-          
-          <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
 
-        </form>
+        </div>
+
+        <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid" style="float: right;">حفظ</button>
+
+      </form>
 
-      </div>
     </div>
   </div>
+</div>
+</div>

src/app/dashboard/add-join-us/add-join-us.component.css

@@ -22,7 +22,6 @@
     position: relative;
     border-radius: 20px;
     margin: 30px auto;
-    float: right;
 }
 .iconUpload-w {
     width: 30px;
@@ -35,7 +34,8 @@
     right: 37px;
     border: 1px solid #ccc;
     border-radius: 50%;
-    top: 10px;
+    bottom: 0;
+    right: 42%;
 }
 
 .inputfile {
@@ -47,10 +47,12 @@
 	z-index: -1;
 }
 
-input {
-    font-size: 13px !important;
+input,select {
+    font-size: 12px;
+    background-color: #f9f9f9;
+    border: 2px solid #bda380;
 }
-/* 
+/*
 .inputfile + label {
     width: 100%;
     font-size: 1.25em;
@@ -88,5 +90,3 @@ input {
     float: right !important;
     margin: 40px 0 !important;
 }
-
-

src/app/dashboard/add-join-us/add-join-us.component.html

@@ -3,55 +3,59 @@
       <div class="row">
         <div class="col-12">
           <ul class="list-unstyled titileLi-w">
-            <li class="headingText-w">خدمه الصلاحيات / </li>
-            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">خدمه إداره المحتوي / </li>
+            <li class="headingText-w">خدمه اداره المحتوي > </li>
+            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">إنضم الينا > </li>
             <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}}  </li>
           </ul>
-          <hr class="hr">
         </div>
       </div>
-      <form [formGroup]="joinUsForm" (ngSubmit)="onSubmittedForm()">
-        <div class="row">
-          <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-bottom:30px">
-            <div class="form-group text-center imgContainer">
-                <img [src]="urlImg" class="imgProfile" height="200"> 
-                <input type="file" name="file" id="file" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event)" (change)="getUrl($event)" [(fileModel)]="files" />
-                <label for="file" class="iconUpload-w"><i class="fas fa-upload"></i></label>
+
+      <div class="containerContent-w">
+
+        <form [formGroup]="joinUsForm" (ngSubmit)="onSubmittedForm()">
+          <div class="row">
+            <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-bottom:30px">
+              <div class="form-group text-center imgContainer">
+                  <img [src]="urlImg" class="imgProfile" height="200">
+                  <input type="file" name="file" id="file" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event)" (change)="getUrl($event)" [(fileModel)]="files" />
+                  <label for="file" class="iconUpload-w"><i class="fas fa-upload"></i></label>
+              </div>
             </div>
-          </div>
-          <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-            <div class="form-group">
-              <label for="name" style="float:right">الأسم باللغه العربيه <span class="spanReqired-w">*</span></label>
-              <input type="text" id="name" class="form-control" placeholder="الاسم باللغه العربيه" formControlName="name" />
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <div class="form-group">
+                <label for="name" style="float:right">الأسم باللغه العربيه <span class="spanReqired-w">*</span></label>
+                <input type="text" id="name" class="form-control" placeholder="الاسم باللغه العربيه" formControlName="name" />
+              </div>
             </div>
-          </div>
-          <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-            <div class="form-group">
-              <label for="name_en" style="float:right">الأسم باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
-              <input type="text" id="name_en" class="form-control" placeholder="الاسم باللغه الانجليزيه" formControlName="name_en" />
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <div class="form-group">
+                <label for="name_en" style="float:right">الأسم باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
+                <input type="text" id="name_en" class="form-control" placeholder="الاسم باللغه الانجليزيه" formControlName="name_en" />
+              </div>
             </div>
-          </div>
-  
-  
-          <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-            <div class="form-group">
-              <label for="date_employment_hij" style="float:right">تاريخ التوظيف الهجري <span class="spanReqired-w">*</span></label>
-              <input type="date" class="form-control" placeholder="تاريخ التوظيف الهجري" id="date_employment_hij" formControlName="date_of_employment_hij" />
+
+
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <div class="form-group">
+                <label for="date_employment_hij" style="float:right">تاريخ التوظيف الهجري <span class="spanReqired-w">*</span></label>
+                <input type="date" class="form-control" placeholder="تاريخ التوظيف الهجري" id="date_employment_hij" formControlName="date_of_employment_hij" />
+              </div>
             </div>
-          </div>
-         
-          
-          <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-            <div class="form-group">
-              <label style="float:right">الاداره <span class="spanReqired-w">*</span></label>
-              <select class="form-control" formControlName="adminstration_id" (change)="getDepartment()">
-                <option *ngFor="let admin of adminstrations; let i = index" [ngValue]="admin.id">{{admin.name}}</option>
-              </select>
+
+
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <div class="form-group">
+                <label style="float:right">الاداره <span class="spanReqired-w">*</span></label>
+                <select class="form-control" formControlName="adminstration_id" (change)="getDepartment()">
+                  <option *ngFor="let admin of adminstrations; let i = index" [ngValue]="admin.id">{{admin.name}}</option>
+                </select>
+              </div>
             </div>
+
           </div>
-         
-        </div>
-        <button type="submit" [disabled]="!joinUsForm.valid" class="btn btn-success regesterBtn-w">حفظ</button>
-      </form>
+          <button type="submit" [disabled]="!joinUsForm.valid" class="btn btn-success regesterBtn-w">حفظ</button>
+        </form>
+      </div>
+
   </div>
 </div>

src/app/dashboard/events/add-event/add-event.component.css

@@ -16,6 +16,8 @@
     border-radius: 20px;
 }
 
-input {
-    font-size: 13px !important;
-}
+input,select {
+    font-size: 12px;
+    background-color: #f9f9f9;
+    border: 2px solid #bda380;
+}

src/app/dashboard/events/add-event/add-event.component.html

@@ -1,96 +1,96 @@
 <div class="addHospital-w">
-    <div class="container">
-      
-      <div class="row" style="margin-bottom: 30px;">
-          <div class="col-12">
-            <ul class="list-unstyled titileLi-w">
-              <li class="headingText-w">خدمه إداره المحتوي / </li>
-              <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">مشاركه اللحظات / </li>
-              <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
-            </ul>
-            <hr class="hr">
-          </div>
-      </div>
+  <div class="container">
 
-      <div class="row">
-        <div class="col-12">
-          <form (ngSubmit)="onSubmitted()" #f="ngForm">
-            <div class="row">
-              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                <div class="form-group">
-                  <label for="name" style="float: right; margin-right: 5px"> الأسم باللغه العربيه <span class="spanReqired-w">*</span></label>
-                    <input type="text" class="form-control" id="name" name="name" ngModel [ngModel]="event.name" #name="ngModel" required/>
-                </div>
-              </div>
-              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                <div class="form-group">
-                  <label for="name_en" style="float: right; margin-right: 5px">الأسم باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
-                    <input type="text" class="form-control" id="name_en" name="name_en" ngModel [ngModel]="event.name_en" #name="ngModel" required/>
-                </div>
-              </div>
-              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                <div class="form-group">
-                  <label for="ranking" style="float: right; margin-right: 5px">الترتيب <span class="spanReqired-w">*</span></label>
-                  <select class="form-control" name="ranking" [ngModel]="event.ranking" id="ranking" required>  
-                    <option value="10000">المزيد</option>
-                    <option value="1">1</option>
-                    <option value="2">2</option>
-                    <option value="3">3</option>
-                    <option value="4">4</option>
-                    <option value="5">5</option>
-                    <option value="6">6</option>
-                  </select>
-                    <!-- <span *ngIf="!name.valid && name.touched"></span>  -->
-                </div>
-              </div>
-              
-              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                <div class="form-group">
-                  <label for="display_location" style="float: right; margin-right: 5px"> الصفحه <span class="spanReqired-w">*</span></label>
-                  <select class="form-control" name="display_location" [ngModel]="event.display_location" id="display_location" required>  
-                    <option value="internal">داخليه</option>
-                    <option value="external">خارجيه</option>
-                    <option value="both">كلاهما</option>
-                  </select>
-                </div>
+    <div class="row" style="margin-bottom: 30px;">
+      <div class="col-12">
+        <ul class="list-unstyled titileLi-w">
+          <li class="headingText-w">خدمه إداره المحتوي > </li>
+          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">مشاركه اللحظات > </li>
+          <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
+        </ul>
+      </div>
+    </div>
+    <div class="containerContent-w">
+    <div class="row">
+      <div class="col-12">
+        <form (ngSubmit)="onSubmitted()" #f="ngForm">
+          <div class="row">
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <div class="form-group">
+                <label for="name" style="float: right; margin-right: 5px"> الأسم باللغه العربيه <span class="spanReqired-w">*</span></label>
+                <input type="text" class="form-control" id="name" name="name" ngModel [ngModel]="event.name" #name="ngModel" required/>
               </div>
-    
-              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                  <div class="form-group">
-                      <label for="type" style="float: right;margin-right: 5px"> النوع <span class="spanReqired-w">*</span></label>
-                      <select class="form-control" name="type" [ngModel]="event.type" id="type" required>  
-                        <option value="1">تهاني</option>
-                        <option value="0">تعازي</option>
-                      </select>
-                    </div>
+            </div>
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <div class="form-group">
+                <label for="name_en" style="float: right; margin-right: 5px">الأسم باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
+                <input type="text" class="form-control" id="name_en" name="name_en" ngModel [ngModel]="event.name_en" #name="ngModel" required/>
               </div>
-    
-              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                <label for="status" style="float: right; margin-right: 5px">الحاله <span class="spanReqired-w">*</span></label>
-                <select class="form-control" name="status" [ngModel]="event.status" id="status" required>  
-                  <option value="1">فعال</option>
-                  <option value="0">غير فعال</option>
+            </div>
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <div class="form-group">
+                <label for="ranking" style="float: right; margin-right: 5px">الترتيب <span class="spanReqired-w">*</span></label>
+                <select class="form-control" name="ranking" [ngModel]="event.ranking" id="ranking" required>
+                  <option value="1">1</option>
+                  <option value="2">2</option>
+                  <option value="3">3</option>
+                  <option value="4">4</option>
+                  <option value="5">5</option>
+                  <option value="6">6</option>
+                  <option value="10000">المزيد</option>
                 </select>
+                <!-- <span *ngIf="!name.valid && name.touched"></span>  -->
               </div>
+            </div>
 
-              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                <label for="date" style="float: right; margin-right: 5px">التاريخ</label>
-                <input type="date" class="form-control" [ngModel]="event.date" id="date" name="date" />
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <div class="form-group">
+                <label for="display_location" style="float: right; margin-right: 5px"> الصفحه <span class="spanReqired-w">*</span></label>
+                <select class="form-control" name="display_location" [ngModel]="event.display_location" id="display_location" required>
+                  <option value="internal">داخليه</option>
+                  <option value="external">خارجيه</option>
+                  <option value="both">كلاهما</option>
+                </select>
               </div>
+            </div>
 
-              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                  <label for="time" style="float: right; margin-right: 5px">الوقت</label>
-                  <input type="time" class="form-control" [ngModel]="event.time" id="time" name="time" />
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <div class="form-group">
+                <label for="type" style="float: right;margin-right: 5px"> النوع <span class="spanReqired-w">*</span></label>
+                <select class="form-control" name="type" [ngModel]="event.type" id="type" required>
+                  <option value="1">تهاني</option>
+                  <option value="0">تعازي</option>
+                </select>
               </div>
+            </div>
+
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <label for="status" style="float: right; margin-right: 5px">الحاله <span class="spanReqired-w">*</span></label>
+              <select class="form-control" name="status" [ngModel]="event.status" id="status" required>
+                <option value="1">فعال</option>
+                <option value="0">غير فعال</option>
+              </select>
+            </div>
 
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <label for="date" style="float: right; margin-right: 5px">التاريخ</label>
+              <input type="date" class="form-control" [ngModel]="event.date" id="date" name="date" />
             </div>
-            
-            <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
-  
-          </form>
-  
-        </div>
+
+            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+              <label for="time" style="float: right; margin-right: 5px">الوقت</label>
+              <input type="time" class="form-control" [ngModel]="event.time" id="time" name="time" />
+            </div>
+
+          </div>
+
+          <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
+
+        </form>
+
       </div>
     </div>
   </div>
-  
+
+  </div>
+</div>

src/app/dashboard/events/events.component.html

@@ -1,90 +1,90 @@
 <div class="container">
-  
+
   <div class="row">
     <div class="col-12">
       <ul class="list-unstyled titileLi-w">
-        <li class="headingText-w">خدمه إداره المحتوي / </li>
-        <li class="headingText-w activeLi-w" style="margin-right:5px">مشاركه اللحظات</li>
+        <li class="headingText-w">خدمه إداره المحتوي > </li>
+        <li class="headingText-w activeLi-w" style="margin-right:5px">مشاركه اللحظات </li>
       </ul>
-      <hr class="hr">
     </div>
   </div>
 
 
-
   <div class="row">
     <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-        <button type="button" class="btn btn-outline-success dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn">إنشاء</button>
-        <button type="button" class="btn btn-outline-danger dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn">حذف</button>
+        <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+        <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
     </div>
     <div class="col-12 col-sm-12 col-md-6 col-lg-6">
       <div class="form-group">
-        <input type="text" placeholder="البحث" class="form-control" style="margin-top:13px;" (input)="filtterFunc($event)"/>
+        <input type="text" placeholder="البحث" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
         <hr>
       </div>
     </div>
   </div>
+  <div class="containerContent-w">
+    <div class="row">
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+          <div class="form-group">
+            <span class="spanSelect-w">
+              <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
+                <option value="5">5</option>
+                <option value="10">10</option>
+                <option value="15">15</option>
+                <option value="20">20</option>
+              </select>
+              من العناصر يتم عرضها
+            </span>
+          </div>
+        </div>
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
 
-  <div class="row">
-    <div class="col-12 col-sm-12 col-md-6">
-      <div class="form-group">
-        <span class="spanSelect-w">أظهر
-          <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
-            <option value="5">5</option>
-            <option value="10">10</option>
-            <option value="15">15</option>
-            <option value="20">20</option>
-          </select>
-          من العناصر
-        </span>
-      </div>
-    </div>
-    <div class="col-12 col-sm-12 col-md-6">
-    
+        </div>
     </div>
+
+    <table class="table table-bordered">
+      <thead class="headBackground-w">
+        <tr>
+          <th>
+            <div class="custom-control custom-checkbox">
+                <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
+                <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor: pointer;"></label>
+            </div>
+          </th>
+          <th>الاسم</th>
+          <th>الترتيب</th>
+          <th>موقع العرض</th>
+          <th>النوع</th>
+          <th *ngIf="authSer.showEditBtn">تعديل</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let event of eventsList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
+          <td>
+            <div class="custom-control custom-checkbox centerIneerItem">
+              <input type="checkbox" class="custom-control-input" id="{{event.id}}" [(ngModel)]="event.selected" [value]='event' (change)="checkIfAllSelected();">
+              <label class="custom-control-label disblayBlock-w" for="{{event.id}}" style="color:#2a2a2a;cursor: pointer;"></label>
+            </div>
+          </td>
+          <td>{{event.name}}</td>
+          <td>
+            {{event.ranking}}
+            <!-- <select class="form-control" [ngModel]="event.ranking" (change)="changeRanking($event, event.id)">
+              <option value="1">1</option>
+              <option value="2">2</option>
+              <option value="3">3</option>
+              <option value="4">4</option>
+              <option value="5">5</option>
+              <option value="6">6</option>
+            </select> -->
+          </td>
+          <td>{{event.display_location == 'both' ? 'كلاهما' : event.display_location == 'internal' ? 'الصفحه الداخليه' : event.display_location == 'external' ? 'الصفحه الخارجيه' : 'No'}}</td>
+          <td>{{event.type == '0' ? 'التعازي' : event.type == '1' ? 'التهاني' : 'No'}}</td>
+          <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(event.id)"><i class="fas fa-edit"></i></button></td>
+        </tr>
+      </tbody>
+    </table>
+    <pagination-controls (pageChange)="onPageChange($event)"></pagination-controls>
   </div>
-  
-  <table class="table table-bordered">
-    <thead class="headBackground-w">
-      <tr>
-        <th>
-          <div class="custom-control custom-checkbox">
-              <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
-              <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor: pointer;"></label>
-          </div>
-        </th>
-        <th>الاسم</th>
-        <th>الترتيب</th>
-        <th>موقع العرض</th>
-        <th>النوع</th>
-        <th *ngIf="authSer.showEditBtn">تعديل</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr *ngFor="let event of eventsList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
-        <td>
-          <div class="custom-control custom-checkbox centerIneerItem">
-            <input type="checkbox" class="custom-control-input" id="{{event.id}}" [(ngModel)]="event.selected" [value]='event' (change)="checkIfAllSelected();">
-            <label class="custom-control-label disblayBlock-w" for="{{event.id}}" style="color:#2a2a2a;cursor: pointer;"></label>
-          </div>
-        </td>
-        <td>{{event.name}}</td>
-        <td>
-          {{event.ranking}}
-          <!-- <select class="form-control" [ngModel]="event.ranking" (change)="changeRanking($event, event.id)">
-            <option value="1">1</option>
-            <option value="2">2</option>
-            <option value="3">3</option>
-            <option value="4">4</option>
-            <option value="5">5</option>
-            <option value="6">6</option>
-          </select> -->
-        </td>
-        <td>{{event.display_location == 'both' ? 'كلاهما' : event.display_location == 'internal' ? 'الصفحه الداخليه' : event.display_location == 'external' ? 'الصفحه الخارجيه' : 'No'}}</td>
-        <td>{{event.type == '0' ? 'التعازي' : event.type == '1' ? 'التهاني' : 'No'}}</td>
-        <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(event.id)"><i class="fas fa-edit"></i></button></td>
-      </tr>
-    </tbody>
-  </table>
-  <pagination-controls (pageChange)="onPageChange($event)"></pagination-controls>
+
 </div>

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

@@ -12,7 +12,6 @@
     position: relative;
     border-radius: 20px;
     margin: 30px auto;
-    float: right;
 }
 .iconUpload-w {
     width: 30px;
@@ -25,7 +24,8 @@
     right: 37px;
     border: 1px solid #ccc;
     border-radius: 50%;
-    top: 10px;
+    bottom: 0;
+    right: 42%;
 }
 
 .inputfile {
@@ -65,4 +65,9 @@
 .rightW {
     display: block;
     margin: 20px 0;
-}
+}
+input,select {
+    font-size: 12px;
+    background-color: #f9f9f9;
+    border: 2px solid #bda380;
+}

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

@@ -1,76 +1,76 @@
 <div class="addHospital-w">
-    <div class="container">
-      
-      <div class="row" style="margin-bottom: 30px;">
-          <div class="col-12">
-            <ul class="list-unstyled titileLi-w">
-              <li class="headingText-w">خدمه إداره المحتوي / </li>
-              <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الفوتر / </li>
-              <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
-            </ul>
-            <hr class="hr">
-          </div>
+  <div class="container">
+
+    <div class="row" style="margin-bottom: 30px;">
+      <div class="col-12">
+        <ul class="list-unstyled titileLi-w">
+          <li class="headingText-w">خدمه إداره المحتوي > </li>
+          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  إدارة الفوتر > </li>
+          <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
+        </ul>
       </div>
+    </div>
+    <div class="containerContent-w">
 
       <div class="row">
         <div class="col-12">
-  
+
           <form (ngSubmit)="onSubmitted()" #f="ngForm">
             <div class="row">
               <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-bottom:30px">
                 <div class="form-group text-center imgContainer">
-                    <img [src]="urlImg" class="imgProfile" height="200"> 
-                    <input type="file" name="file" id="file" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event)" (change)="getUrl($event)" [(fileModel)]="files" />
-                    <label for="file" class="iconUpload-w"><i class="fas fa-upload"></i></label>
+                  <img [src]="urlImg" class="imgProfile" height="200">
+                  <input type="file" name="file" id="file" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event)" (change)="getUrl($event)" [(fileModel)]="files" />
+                  <label for="file" class="iconUpload-w"><i class="fas fa-upload"></i></label>
                 </div>
                 <span *ngIf="checkValidImg" style="color: red; position: absolute; right:0;bottom:0">must be in 'png' format</span>
               </div>
               <div class="col-12 col-sm-12 col-md-4">
                 <div class="form-group">
                   <label for="name" style="float: right; margin-right: 5px">الأسم باللغه العربيه  <span class="spanReqired-w">*</span></label>
-                    <input type="text" class="form-control" id="name" name="name" placeholder="الأسم باللغه العربيه" ngModel [ngModel]="footer.name" #name="ngModel" required/>
+                  <input type="text" class="form-control" id="name" name="name" placeholder="الأسم باللغه العربيه" ngModel [ngModel]="footer.name" #name="ngModel" required/>
                 </div>
               </div>
               <div class="col-12 col-sm-12 col-md-4">
-                  <div class="form-group">
-                    <label for="name_en" style="float: right; margin-right: 5px">الأسم باللغه الإنجليزيه  <span class="spanReqired-w">*</span></label>
-                      <input type="text" class="form-control" id="name_en" placeholder="الأسم باللغه الأنجليزيه" name="name_en" ngModel [ngModel]="footer.name_en" #name="ngModel" required/>
-                  </div>
+                <div class="form-group">
+                  <label for="name_en" style="float: right; margin-right: 5px">الأسم باللغه الإنجليزيه  <span class="spanReqired-w">*</span></label>
+                  <input type="text" class="form-control" id="name_en" placeholder="الأسم باللغه الأنجليزيه" name="name_en" ngModel [ngModel]="footer.name_en" #name="ngModel" required/>
                 </div>
+              </div>
               <div class="col-12 col-sm-12 col-md-4">
                 <div class="form-group">
                   <label for="link" style="float: right; margin-right: 5px">الرابط  <span class="spanReqired-w">*</span></label>
-                    <input type="text" class="form-control" id="link" name="link" ngModel [ngModel]="footer.link" #link="ngModel" required/>
+                  <input type="text" class="form-control" id="link" name="link" ngModel [ngModel]="footer.link" #link="ngModel" required/>
                 </div>
               </div>
 
               <div class="col-12 col-sm-12 col-md-4">
-                  <div class="form-group">
-                    <label for="type" style="float: right; margin-right: 5px">النوع</label>
-                    <select id="type" name="type" class="form-control" [ngModel]="footer.type" required>
-                        <option value="0">قسم الروابط</option>
-                        <option value="1">قسم التواصل</option>
-                        <option value="2">قسم الجوائز</option>
-                    </select>
-                  </div>
-              </div>  
-             
-              
+                <div class="form-group">
+                  <label for="type" style="float: right; margin-right: 5px">النوع</label>
+                  <select id="type" name="type" class="form-control" [ngModel]="footer.type" required>
+                    <option value="0">قسم الروابط</option>
+                    <option value="1">قسم التواصل</option>
+                    <option value="2">قسم الجوائز</option>
+                  </select>
+                </div>
+              </div>
+
+
               <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                 <label for="status" style="float: right; margin-right: 5px">الحاله  <span class="spanReqired-w">*</span></label>
-                <select class="form-control" name="status" [ngModel]="footer.status" id="status" required>  
+                <select class="form-control" name="status" [ngModel]="footer.status" id="status" required>
                   <option value="1">فعال</option>
                   <option value="0">غير فعال</option>
                 </select>
               </div>
             </div>
-            
+
             <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
-  
+
           </form>
-  
+
         </div>
       </div>
     </div>
   </div>
-  
+</div>

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

@@ -1,76 +1,76 @@
 <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <ul class="list-unstyled titileLi-w">
-          <li class="headingText-w">خدمه إداره المحتوي / </li>
-          <li class="headingText-w activeLi-w" style="margin-right:5px"> الفوتر</li>
-        </ul>
-        <hr class="hr">
-      </div>
+  <div class="row">
+    <div class="col-12">
+      <ul class="list-unstyled titileLi-w">
+        <li class="headingText-w">خدمه إداره المحتوي > </li>
+        <li class="headingText-w activeLi-w" style="margin-right:5px"> إدارة الفوتر</li>
+      </ul>
     </div>
+  </div>
+  <div class="containerContent-w">
 
-    <div class="row">
-      <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-          <button type="button" class="btn btn-outline-success dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn">إنشاء</button>
-          <button type="button" class="btn btn-outline-danger dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn">حذف</button>
-      </div>
-      <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-        <div class="form-group">
-          <input type="text" placeholder="البحث بالاسم" class="form-control" style="margin-top:13px;" (input)="filtterFunc($event)"/>
-          <hr>
-        </div>
-      </div>
+  <div class="row">
+    <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+      <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+      <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
     </div>
-    
-    <div class="row">
-      <div class="col-12 col-sm-12 col-md-6">
-        <div class="form-group">
-          <span class="spanSelect-w">أظهر
-            <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
-              <option value="5">5</option>
-              <option value="10">10</option>
-              <option value="15">15</option>
-              <option value="20">20</option>
-            </select>
-            من العناصر
-          </span>
-        </div>
+    <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+      <div class="form-group">
+        <input type="text" placeholder="البحث بالاسم" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
+        <hr>
       </div>
-      <div class="col-12 col-sm-12 col-md-6">
-      
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+      <div class="form-group">
+        <span class="spanSelect-w">
+          <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
+            <option value="5">5</option>
+            <option value="10">10</option>
+            <option value="15">15</option>
+            <option value="20">20</option>
+          </select>
+          من العناصر يتم عرضها
+        </span>
       </div>
     </div>
-    
-    <table class="table table-bordered">
-      <thead class="headBackground-w">
-        <tr>
-          <th>
-            <div class="custom-control custom-checkbox">
-                <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
-                <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor: pointer;"></label>
-            </div>
-          </th>
-          <th>الاسم</th>
-          <th>النوع</th>
-          <th> الحاله</th>
-          <th *ngIf="authSer.showEditBtn">تعديل</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr *ngFor="let footer of footerList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
-          <td>
-            <div class="custom-control custom-checkbox centerIneerItem">
-              <input type="checkbox" class="custom-control-input" id="{{footer.id}}" [(ngModel)]="footer.selected" [value]='footer' (change)="checkIfAllSelected();">
-              <label class="custom-control-label disblayBlock-w" for="{{footer.id}}" style="color:#2a2a2a;cursor: pointer;"></label>
-            </div>
-          </td>
-          <td>{{footer.name}}</td>
-          <td>{{footer.type == 0 ? 'قسم الروابط' :  footer.type == 1 ? 'قسم التواصل' : footer.type == 2 ? 'قسم الجوائز' : 'N/A' }}</td>
-          <td>{{footer.status == 0 ? 'غير فعال' : footer.status == 1 ? 'فعال' : 'N/A'}}</td>
-          <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(footer.id)"><i class="fas fa-edit"></i></button></td>
-        </tr>
-      </tbody>
-    </table>
-    <pagination-controls (pageChange)="onPageChange($event)"></pagination-controls>
+    <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+
+    </div>
   </div>
-  
+
+  <table class="table table-bordered">
+    <thead class="headBackground-w">
+      <tr>
+        <th>
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
+            <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor: pointer;"></label>
+          </div>
+        </th>
+        <th>الاسم</th>
+        <th>النوع</th>
+        <th> الحاله</th>
+        <th *ngIf="authSer.showEditBtn">تعديل</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let footer of footerList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
+        <td>
+          <div class="custom-control custom-checkbox centerIneerItem">
+            <input type="checkbox" class="custom-control-input" id="{{footer.id}}" [(ngModel)]="footer.selected" [value]='footer' (change)="checkIfAllSelected();">
+            <label class="custom-control-label disblayBlock-w" for="{{footer.id}}" style="color:#2a2a2a;cursor: pointer;"></label>
+          </div>
+        </td>
+        <td>{{footer.name}}</td>
+        <td>{{footer.type == 0 ? 'قسم الروابط' :  footer.type == 1 ? 'قسم التواصل' : footer.type == 2 ? 'قسم الجوائز' : 'N/A' }}</td>
+        <td>{{footer.status == 0 ? 'غير فعال' : footer.status == 1 ? 'فعال' : 'N/A'}}</td>
+        <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(footer.id)"><i class="fas fa-edit"></i></button></td>
+      </tr>
+    </tbody>
+  </table>
+  <pagination-controls (pageChange)="onPageChange($event)"></pagination-controls>
+</div>
+</div>

src/app/dashboard/internal-services/add-internal-services/add-internal-services.component.css

@@ -41,8 +41,10 @@
 	z-index: -1;
 }
 
-input{
-    font-size: 13px !important;
+input,select {
+    font-size: 12px;
+    background-color: #f9f9f9;
+    border: 2px solid #bda380;
 }
 
 /* .inputfile + label {
@@ -87,6 +89,3 @@ input{
     padding: 20px;
     border-radius: 20px;
 }
-
-
-

src/app/dashboard/internal-services/add-internal-services/add-internal-services.component.html

@@ -1,93 +1,94 @@
 <div class="addHospital-w">
   <div class="container">
-    
+
     <div class="row">
       <div class="col-12">
         <ul class="list-unstyled titileLi-w">
-          <li class="headingText-w">خدمه إداره المحتوي / </li>
-          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> الخدمات الداخليه / </li>
+          <li class="headingText-w">خدمه إداره المحتوي > </li>
+          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> الخدمات الداخليه > </li>
           <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
         </ul>
-        <hr class="hr">
       </div>
     </div>
-    
+    <div class="containerContent-w">
+
     <div class="row" style="margin-top: 30px;">
       <div class="col-12">
         <form (ngSubmit)="onSubmitted()" [formGroup]="addInternalForm">
 
           <div class="row">
             <div class="col-12 col-sm-12 col-md-4">
-                <div class="form-group">
-                  <label style="float: right; margin: 5px 0">الاسم باللغه العربيه  <span class="spanReqired-w">*</span></label>
-                  <input type="text" class="form-control" placeholder="الأسم باللغه العربيه" formControlName="name"/>
-                </div>
+              <div class="form-group">
+                <label style="float: right; margin: 5px 0">الاسم باللغه العربيه  <span class="spanReqired-w">*</span></label>
+                <input type="text" class="form-control" placeholder="الأسم باللغه العربيه" formControlName="name"/>
               </div>
-              
-              <div class="col-12 col-sm-12 col-md-4">
-                  <div class="form-group">
-                      <label style="float: right; margin: 5px 0">الاسم باللغه الأنجليزيه  <span class="spanReqired-w">*</span></label>
-                      <input type="text" class="form-control" placeholder="الأسم باللغه الانجليزيه" formControlName="name_en"/>
-                  </div>
+            </div>
+
+            <div class="col-12 col-sm-12 col-md-4">
+              <div class="form-group">
+                <label style="float: right; margin: 5px 0">الاسم باللغه الأنجليزيه  <span class="spanReqired-w">*</span></label>
+                <input type="text" class="form-control" placeholder="الأسم باللغه الانجليزيه" formControlName="name_en"/>
               </div>
-            
-              <div class="col-12 col-sm-12 col-md-4">
-                <div class="form-group">
-                  <label for="satus_ex" style="float:right">الحاله  <span class="spanReqired-w">*</span></label>
-                  <select class="form-control" formControlName="status">
-                    <option value="0">غير فعال</option>
-                    <option value="1">فعال</option>
-                  </select>
-                </div>
+            </div>
+
+            <div class="col-12 col-sm-12 col-md-4">
+              <div class="form-group">
+                <label for="satus_ex" style="float:right">الحاله  <span class="spanReqired-w">*</span></label>
+                <select class="form-control" formControlName="status">
+                  <option value="0">غير فعال</option>
+                  <option value="1">فعال</option>
+                </select>
               </div>
-    
-              <div class="col-12 col-sm-12 col-md-4">
-                <div class="form-group">
-                    <button class="btn btn-secondary form-control" style="margin-top:30px" type="button" (click)="onAddTitle(i)">أضف المزيد من الوصف</button>
-                </div>
+            </div>
+
+            <div class="col-12 col-sm-12 col-md-4">
+              <div class="form-group">
+                <button class="btn btn-secondary form-control" style="margin-top:30px" type="button" (click)="onAddTitle(i)">أضف المزيد من الوصف</button>
               </div>
+            </div>
           </div>
 
           <hr>
-        <div class="descriptionContainer">
-          <div class="row">
-            <div class="col-12 col-md-6"  formArrayName="fields" *ngFor="let titleControl of addInternalForm.get('fields').controls; let i = index">
-              <div class="form-group  arrayGroupForm-w" [formGroupName]="i">
-                <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-bottom:30px">
-                  <div class="form-group text-center imgContainer">
+          <div class="descriptionContainer">
+            <div class="row">
+              <div class="col-12 col-md-6"  formArrayName="fields" *ngFor="let titleControl of addInternalForm.get('fields').controls; let i = index">
+                <div class="form-group  arrayGroupForm-w" [formGroupName]="i">
+                  <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-bottom:30px">
+                    <div class="form-group text-center imgContainer">
                       <img [src]="urlImg[i]" class="imgProfile" height="200">
                       <input type="file" name="file{{i}}" id="file{{i}}" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event,i)" (change)="getUrl($event,i)" formControlName="photo"/>
                       <label for="file{{i}}" class="iconUpload-w"  *ngIf="showOpenFile[i]"><i class="fas fa-upload"></i></label>
                       <label class="iconUpload-w" *ngIf="showCloseFile[i]" (click)="closePhoto(i)"><i class="fas fa-times"></i></label>
+                    </div>
                   </div>
-                </div>
-                <label for="name" style="float: right;">الأسم باللغه العربيه</label>
-                <input type="text" id="name" class="form-control" formControlName="name" style="margin: 10px 0;" />
-                <label for="name_en" style="float: right;">الأسم باللغه الإنجليزيه</label>
-                <input type="text" id="name_en" class="form-control" formControlName="name_en" style="margin: 10px 0;" />
-                <label for="link" style="float: right;">الرابط</label>
-                <input type="text" id="link" class="form-control" formControlName="link" style="margin:10px 0" />
-                
-                <label for="apperance" style="float: right;">الظهور</label>
-                <select id="apperance" class="form-control" formControlName="apperance" style="margin: 10px 0">
+                  <label for="name" style="float: right;">الأسم باللغه العربيه</label>
+                  <input type="text" id="name" class="form-control" formControlName="name" style="margin: 10px 0;" />
+                  <label for="name_en" style="float: right;">الأسم باللغه الإنجليزيه</label>
+                  <input type="text" id="name_en" class="form-control" formControlName="name_en" style="margin: 10px 0;" />
+                  <label for="link" style="float: right;">الرابط</label>
+                  <input type="text" id="link" class="form-control" formControlName="link" style="margin:10px 0" />
+
+                  <label for="apperance" style="float: right;">الظهور</label>
+                  <select id="apperance" class="form-control" formControlName="apperance" style="margin: 10px 0">
                     <option value="1">الظهور</option>
                     <option value="0">غير الظهور</option>
-                </select>
-                <label for="status" style="float: right;">الحاله</label>
-                <select id="status" class="form-control" formControlName="status" style="margin: 10px 0">
+                  </select>
+                  <label for="status" style="float: right;">الحاله</label>
+                  <select id="status" class="form-control" formControlName="status" style="margin: 10px 0">
                     <option value="1">فعال</option>
                     <option value="0">غير فعال</option>
-                </select>
-                <button type="button" class="btn btn-danger rightW" (click)="removeTitle(i)">حذف</button>
+                  </select>
+                  <button type="button" class="btn btn-danger rightW" (click)="removeTitle(i)">حذف</button>
+                </div>
               </div>
             </div>
-          </div>  
-        </div>
+          </div>
+
+          <button type="submit" class="btn btn-success rightW" [disabled]="!addInternalForm.valid">حفظ</button>
 
-        <button type="submit" class="btn btn-success rightW" [disabled]="!addInternalForm.valid">حفظ</button>
-        
-      </form>
+        </form>
       </div>
     </div>
   </div>
-</div>
+  </div>
+</div>

src/app/dashboard/internal-services/internal-services.component.html

@@ -1,54 +1,54 @@
 <div class="container">
-  
+
   <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 activeLi-w" style="margin-right:5px">{{typeLink}}</li>
       </ul>
-      <hr class="hr">
     </div>
   </div>
-    
+  <div class="containerContent-w">
+
   <div class="row">
     <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-        <button type="button" class="btn btn-outline-success dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn">إنشاء</button>
-        <button type="button" class="btn btn-outline-danger dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn">حذف</button>
+      <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+      <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
     </div>
     <div class="col-12 col-sm-12 col-md-6 col-lg-6">
       <div class="form-group">
-        <input type="text" placeholder="البحث" class="form-control" style="margin-top:13px;" (input)="filtterFunc($event)"/>
+        <input type="text" placeholder="البحث" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
         <hr>
       </div>
     </div>
   </div>
 
   <div class="row">
-    <div class="col-12 col-sm-12 col-md-6">
+    <div class="col-12 col-sm-12 col-md-12 col-lg-6">
       <div class="form-group">
-        <span class="spanSelect-w">أظهر
+        <span class="spanSelect-w">
           <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
             <option value="5">5</option>
             <option value="10">10</option>
             <option value="15">15</option>
             <option value="20">20</option>
           </select>
-          من العناصر
+          من العناصر يتم عرضها
         </span>
       </div>
     </div>
-    <div class="col-12 col-sm-12 col-md-6">
-    
+    <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+
     </div>
   </div>
-  
+
   <table class="table table-bordered">
     <thead class="headBackground-w">
       <tr>
         <th>
           <div class="custom-control custom-checkbox">
-              <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
-              <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor: pointer;"></label>
+            <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
+            <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor: pointer;"></label>
           </div>
         </th>
         <th>الاسم</th>
@@ -72,3 +72,4 @@
   </table>
   <pagination-controls (pageChange)="onPageChange($event)"></pagination-controls>
 </div>
+</div>

src/app/dashboard/lectures/add-lecture/add-lecture.component.css

@@ -20,3 +20,8 @@
     border-radius: 20px;
 }
 
+input,select {
+    font-size: 12px;
+    background-color: #f9f9f9;
+    border: 2px solid #bda380;
+}

src/app/dashboard/lectures/add-lecture/add-lecture.component.html

@@ -1,88 +1,88 @@
 <div class="addHospital-w">
-    <div class="container">
-      
-      <div class="row" style="margin-bottom: 30px;">
-          <div class="col-12">
-            <ul class="list-unstyled titileLi-w">
-              <li class="headingText-w">خدمه إداره المحتوي / </li>
-              <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">شريط الأحداث والتفاعلات الداخليه / </li>
-              <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
-            </ul>
-            <hr class="hr">
-          </div>
-      </div>
+  <div class="container">
 
-      <div class="row">
-        <div class="col-12">
-          <form (ngSubmit)="onSubmitted()" #f="ngForm">
-            <div class="row">
-              <div class="col-12 col-sm-12 col-md-4">
-                <div class="form-group">
-                  <label for="name" style="float: right; margin-right: 5px"> الأسم باللغه العربيه <span class="spanReqired-w">*</span></label>
-                    <input type="text" class="form-control" id="name" name="name" ngModel [ngModel]="lecture.name" #name="ngModel" required/>
-                </div>
-              </div>
-              <div class="col-12 col-sm-12 col-md-4">
-                <div class="form-group">
-                  <label for="name_en" style="float: right; margin-right: 5px">الأسم باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
-                    <input type="text" class="form-control" id="name_en" name="name_en" ngModel [ngModel]="lecture.name_en" #name="ngModel" required/>
-                </div>
+    <div class="row" style="margin-bottom: 30px;">
+      <div class="col-12">
+        <ul class="list-unstyled titileLi-w">
+          <li class="headingText-w">خدمه إداره المحتوي > </li>
+          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">شريط الأحداث والتفاعلات الداخليه > </li>
+          <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
+        </ul>
+      </div>
+    </div>
+    <div class="containerContent-w">
+    <div class="row">
+      <div class="col-12">
+        <form (ngSubmit)="onSubmitted()" #f="ngForm">
+          <div class="row">
+            <div class="col-12 col-sm-12 col-md-4">
+              <div class="form-group">
+                <label for="name" style="float: right; margin-right: 5px"> الأسم باللغه العربيه <span class="spanReqired-w">*</span></label>
+                <input type="text" class="form-control" id="name" name="name" ngModel [ngModel]="lecture.name" #name="ngModel" required/>
               </div>
-              <div class="col-12 col-sm-12 col-md-4">
-                <div class="form-group">
-                  <label for="ranking" style="float: right; margin-right: 5px">الترتيب <span class="spanReqired-w">*</span></label>
-                  <select class="form-control" name="ranking" [ngModel]="lecture.ranking" id="ranking" required>
-                    <option value="10000">المزيد</option>  
-                    <option value="1">1</option>
-                    <option value="2">2</option>
-                    <option value="3">3</option>
-                    <option value="4">4</option>
-                    <option value="5">5</option>
-                    <option value="6">6</option>
-                  </select>
-                    <!-- <span *ngIf="!name.valid && name.touched"></span>  -->
-                </div>
+            </div>
+            <div class="col-12 col-sm-12 col-md-4">
+              <div class="form-group">
+                <label for="name_en" style="float: right; margin-right: 5px">الأسم باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
+                <input type="text" class="form-control" id="name_en" name="name_en" ngModel [ngModel]="lecture.name_en" #name="ngModel" required/>
               </div>
-              
-              <div class="col-12 col-sm-12 col-md-4">
-                <div class="form-group">
-                  <label for="display_location" style="float: right; margin-right: 5px"> الصفحه <span class="spanReqired-w">*</span></label>
-                  <select class="form-control" name="display_location" [ngModel]="lecture.display_location" id="display_location" required>  
-                    <option value="internal">داخليه</option>
-                    <option value="external">خارجيه</option>
-                    <option value="both">كلاهما</option>
-                  </select>
-                </div>
+            </div>
+            <div class="col-12 col-sm-12 col-md-4">
+              <div class="form-group">
+                <label for="ranking" style="float: right; margin-right: 5px">الترتيب <span class="spanReqired-w">*</span></label>
+                <select class="form-control" name="ranking" [ngModel]="lecture.ranking" id="ranking" required>
+                  <option value="10000">المزيد</option>
+                  <option value="1">1</option>
+                  <option value="2">2</option>
+                  <option value="3">3</option>
+                  <option value="4">4</option>
+                  <option value="5">5</option>
+                  <option value="6">6</option>
+                </select>
+                <!-- <span *ngIf="!name.valid && name.touched"></span>  -->
               </div>
-    
-              <div class="col-12 col-sm-12 col-md-4">
-                  <div class="form-group">
-                      <label for="lecture_time" style="float: right;margin-right: 5px"> وقت البدء <span class="spanReqired-w">*</span></label>
-                      <input type="datetime-local" class="form-control" name="lecture_time" [ngModel]="lecture.lecture_time" id="lecture_time" required />
-                   </div>
+            </div>
+
+            <div class="col-12 col-sm-12 col-md-4">
+              <div class="form-group">
+                <label for="display_location" style="float: right; margin-right: 5px"> الصفحه <span class="spanReqired-w">*</span></label>
+                <select class="form-control" name="display_location" [ngModel]="lecture.display_location" id="display_location" required>
+                  <option value="internal">داخليه</option>
+                  <option value="external">خارجيه</option>
+                  <option value="both">كلاهما</option>
+                </select>
               </div>
-              <div class="col-12 col-sm-12 col-md-4">
-                  <div class="form-group">
-                      <label for="lecture_end" style="float: right;margin-right: 5px"> وقت الإنتهاء <span class="spanReqired-w">*</span></label>
-                      <input type="datetime-local" class="form-control" name="end_time" [ngModel]="lecture.end_time" id="lecture_end" required />
-                  </div>
+            </div>
+
+            <div class="col-12 col-sm-12 col-md-4">
+              <div class="form-group">
+                <label for="lecture_time" style="float: right;margin-right: 5px"> وقت البدء <span class="spanReqired-w">*</span></label>
+                <input type="datetime-local" class="form-control" name="lecture_time" [ngModel]="lecture.lecture_time" id="lecture_time" required />
               </div>
-    
-              <div class="col-12 col-sm-12 col-md-4">
-                <label for="status" style="float: right; margin-right: 5px">الحاله <span class="spanReqired-w">*</span></label>
-                <select class="form-control" name="status" [ngModel]="lecture.status" id="status" required>  
-                  <option value="1">فعال</option>
-                  <option value="0">غير فعال</option>
-                </select>
+            </div>
+            <div class="col-12 col-sm-12 col-md-4">
+              <div class="form-group">
+                <label for="lecture_end" style="float: right;margin-right: 5px"> وقت الإنتهاء <span class="spanReqired-w">*</span></label>
+                <input type="datetime-local" class="form-control" name="end_time" [ngModel]="lecture.end_time" id="lecture_end" required />
               </div>
             </div>
-            
-            <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
-  
-          </form>
-  
-        </div>
+
+            <div class="col-12 col-sm-12 col-md-4">
+              <label for="status" style="float: right; margin-right: 5px">الحاله <span class="spanReqired-w">*</span></label>
+              <select class="form-control" name="status" [ngModel]="lecture.status" id="status" required>
+                <option value="1">فعال</option>
+                <option value="0">غير فعال</option>
+              </select>
+            </div>
+          </div>
+
+          <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
+
+        </form>
+
       </div>
     </div>
   </div>
-  
+
+  </div>
+</div>

src/app/dashboard/lectures/lectures-list/lectures-list.component.html

@@ -1,48 +1,48 @@
 <div class="container">
-  
+
     <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 activeLi-w" style="margin-right:5px"> شريط الأحداث والتفاعلات الداخليه</li>
         </ul>
-        <hr class="hr">
       </div>
     </div>
-  
-  
+
+    <div class="containerContent-w">
+
     <div class="row">
       <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-          <button type="button" class="btn btn-outline-success dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn">إنشاء</button>
-          <button type="button" class="btn btn-outline-danger dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn">حذف</button>
+          <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+          <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
       </div>
       <div class="col-12 col-sm-12 col-md-6 col-lg-6">
         <div class="form-group">
-          <input type="text" placeholder="البحث" class="form-control" style="margin-top:13px;" (input)="filtterFunc($event)"/>
+          <input type="text" placeholder="البحث" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
           <hr>
         </div>
       </div>
     </div>
-  
+
     <div class="row">
-      <div class="col-12 col-sm-12 col-md-6">
-        <div class="form-group">
-          <span class="spanSelect-w">أظهر
-            <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
-              <option value="5">5</option>
-              <option value="10">10</option>
-              <option value="15">15</option>
-              <option value="20">20</option>
-            </select>
-            من العناصر
-          </span>
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+          <div class="form-group">
+            <span class="spanSelect-w">
+              <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
+                <option value="5">5</option>
+                <option value="10">10</option>
+                <option value="15">15</option>
+                <option value="20">20</option>
+              </select>
+              من العناصر يتم عرضها
+            </span>
+          </div>
+        </div>
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+
         </div>
-      </div>
-      <div class="col-12 col-sm-12 col-md-6">
-      
-      </div>
     </div>
-    
+
     <table class="table table-bordered">
       <thead class="headBackground-w">
         <tr>
@@ -89,4 +89,4 @@
     </table>
     <pagination-controls (pageChange)="onPageChange($event)"></pagination-controls>
   </div>
-  
+  </div>

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

@@ -36,7 +36,6 @@
     position: relative;
     border-radius: 20px;
     margin: 30px auto;
-    float: right;
 }
 .iconUpload-w {
     width: 30px;
@@ -49,7 +48,8 @@
     right: 37px;
     border: 1px solid #ccc;
     border-radius: 50%;
-    top: 10px;
+    bottom: 0;
+    right: 42%;
 }
 
 .inputfile {
@@ -61,10 +61,11 @@
 	z-index: -1;
 }
 
-input {
-    font-size: 13px !important;
+input,select {
+    font-size: 12px;
+    background-color: #f9f9f9;
+    border: 2px solid #bda380;
 }
-
 /* .inputfile + label {
     width: 100%;
     font-size: 1.25em;
@@ -89,4 +90,4 @@ input {
 .inputfile:focus + label {
 	outline: 1px dotted #000;
 	outline: -webkit-focus-ring-color auto 5px;
-}
+}

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

@@ -1,105 +1,107 @@
 <div class="addHospital-w">
   <div class="container">
-    
+
     <div class="row" style="margin-bottom: 30px;">
         <div class="col-12">
           <ul class="list-unstyled titileLi-w">
-            <li class="headingText-w">خدمه إداره المحتوي / </li>
-            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الاخبار / </li>
+            <li class="headingText-w">خدمه إداره المحتوي > </li>
+            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الاخبار > </li>
             <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
           </ul>
-          <hr class="hr">
         </div>
     </div>
+    <div class="containerContent-w">
+      <div class="row">
+        <div class="col-12">
 
-    <div class="row">
-      <div class="col-12">
-
-        <form (ngSubmit)="onSubmitted()" #f="ngForm">
-          <div class="row">
-            <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-bottom:30px">
-              <div class="form-group text-center imgContainer">
-                  <img [src]="urlImg" class="imgProfile" height="200"> 
-                  <input type="file" name="file" id="file" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event)" (change)="getUrl($event)" [(fileModel)]="files" />
-                  <label for="file" class="iconUpload-w"><i class="fas fa-upload"></i></label>
+          <form (ngSubmit)="onSubmitted()" #f="ngForm">
+            <div class="row">
+              <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-bottom:30px">
+                <div class="form-group text-center imgContainer">
+                    <img [src]="urlImg" class="imgProfile" height="200">
+                    <input type="file" name="file" id="file" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event)" (change)="getUrl($event)" [(fileModel)]="files" />
+                    <label for="file" class="iconUpload-w"><i class="fas fa-upload"></i></label>
+                </div>
               </div>
-              <span *ngIf="checkValidImg" style="color: red; position: absolute; right:0; bottom:0">must be in 'png' format</span>
-            </div>
 
-            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-              <div class="form-group">
-                <label for="title" style="float: right; margin-right: 5px">العنوان بالغه العربيه <span class="spanReqired-w">*</span></label>
-                  <input type="text" class="form-control" placeholder="العنوان باللغه العربيه" id="title" name="title" ngModel [ngModel]="new.title" #name="ngModel" required/>
-              </div>
-            </div>
-            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-              <div class="form-group">
-                <label for="title_en" style="float: right; margin-right: 5px">العنوان باللغه الانجليزيه <span class="spanReqired-w">*</span></label>
-                  <input type="text" class="form-control" id="title_en" placeholder="العنوان باللغه الانجليزيه" name="title_en" ngModel [ngModel]="new.title_en" #name="ngModel" required/>
-              </div>
-            </div>
-            <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-              <div class="form-group">
-                <label for="ranking" style="float: right; margin-right: 5px">الترتيب <span class="spanReqired-w">*</span></label>
-                <select class="form-control" name="ranking" [ngModel]="new.ranking" id="ranking" required>  
-                  <option value="10000">المزيد</option>
-                  <option value="1">1</option>
-                  <option value="2">2</option>
-                  <option value="3">3</option>
-                  <option value="4">4</option>
-                  <option value="5">5</option>
-                  <option value="6">6</option>
-                </select>
-                  <!-- <span *ngIf="!name.valid && name.touched"></span>  -->
+              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+                <div class="form-group">
+                  <label for="title" style="float: right; margin-right: 5px">العنوان بالغه العربيه <span class="spanReqired-w">*</span></label>
+                    <input type="text" class="form-control" placeholder="العنوان باللغه العربيه" id="title" name="title" ngModel [ngModel]="new.title" #name="ngModel" required/>
+                </div>
               </div>
-            </div>
-            
-            <div class="col-12 col-sm-12 col-md-4">
-              <div class="form-group">
-                <label for="display_location" style="float: right; margin-right: 5px"> الصفحه <span class="spanReqired-w">*</span></label>
-                <select class="form-control" name="display_location" [ngModel]="new.display_location" id="display_location" required>  
-                  <option value="internal">داخليه</option>
-                  <option value="external">خارجيه</option>
-                  <option value="both">كلاهما</option>
-                </select>
+              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+                <div class="form-group">
+                  <label for="title_en" style="float: right; margin-right: 5px">العنوان باللغه الانجليزيه <span class="spanReqired-w">*</span></label>
+                    <input type="text" class="form-control" id="title_en" placeholder="العنوان باللغه الانجليزيه" name="title_en" ngModel [ngModel]="new.title_en" #name="ngModel" required/>
+                </div>
               </div>
-            </div>
-
-            <div class="col-12 col-sm-12 col-md-4">
-              <label for="status" style="float: right; margin-right: 5px">الحاله <span class="spanReqired-w">*</span></label>
-              <select class="form-control" name="status" [ngModel]="new.status" id="status" required>  
-                <option value="1">فعال</option>
-                <option value="0">غير فعال</option>
-              </select>
-            </div>
-  
-            <div class="col-12 col-sm-12 col-md-12">
+              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                 <div class="form-group">
-                    <label for="description" style="float: right;margin-right: 5px"> الوصف باللغه العربيه <span class="spanReqired-w">*</span></label>
-                    <!-- <textarea cols="3" class="form-control" id="description" name="description" [ngModel]="new.description" required></textarea> -->
-                  <quill-editor id="description" name="description" [ngModel]="new.description" required>
-                  </quill-editor>
+                  <label for="ranking" style="float: right; margin-right: 5px">الترتيب <span class="spanReqired-w">*</span></label>
+                  <select class="form-control" name="ranking" [ngModel]="new.ranking" id="ranking" required>
+                    <option value="1">1</option>
+                    <option value="2">2</option>
+                    <option value="3">3</option>
+                    <option value="4">4</option>
+                    <option value="5">5</option>
+                    <option value="6">6</option>
+                    <option value="10000">المزيد</option>
+                  </select>
+                    <!-- <span *ngIf="!name.valid && name.touched"></span>  -->
                 </div>
-            </div>
+              </div>
 
-            <div class="col-12 col-sm-12 col-md-12">
+              <div class="col-12 col-sm-12 col-md-4">
                 <div class="form-group">
-                    <label for="description_en" style="float: right;margin-right: 5px"> الوصف باللغه الانجليزيه <span class="spanReqired-w">*</span></label>
-                    <quill-editor id="description_en" name="description_en" [ngModel]="new.description_en" required>
-                    <!-- <textarea cols="3" class="form-control" id="description_en" name="description_en" [ngModel]="new.description_en" required></textarea> -->
-                  </quill-editor>
+                  <label for="display_location" style="float: right; margin-right: 5px"> الصفحه <span class="spanReqired-w">*</span></label>
+                  <select class="form-control" name="display_location" [ngModel]="new.display_location" id="display_location" required>
+                    <option value="internal">داخليه</option>
+                    <option value="external">خارجيه</option>
+                    <option value="both">كلاهما</option>
+                  </select>
                 </div>
+              </div>
+
+              <div class="col-12 col-sm-12 col-md-4">
+                <label for="status" style="float: right; margin-right: 5px">الحاله <span class="spanReqired-w">*</span></label>
+                <select class="form-control" name="status" [ngModel]="new.status" id="status" required>
+                  <option value="1">فعال</option>
+                  <option value="0">غير فعال</option>
+                </select>
+              </div>
+
+              <div class="col-12 col-sm-12 col-md-12">
+                  <div class="form-group">
+                      <label for="description" style="float: right;margin-right: 5px"> الوصف باللغه العربيه <span class="spanReqired-w">*</span></label>
+                      <!-- <textarea cols="3" class="form-control" id="description" name="description" [ngModel]="new.description" required></textarea> -->
+                    <quill-editor id="description" name="description" [ngModel]="new.description" required>
+                    </quill-editor>
+                  </div>
+              </div>
+
+              <div class="col-12 col-sm-12 col-md-12">
+                  <div class="form-group">
+                      <label for="description_en" style="float: right;margin-right: 5px"> الوصف باللغه الانجليزيه <span class="spanReqired-w">*</span></label>
+                      <quill-editor id="description_en" name="description_en" [ngModel]="new.description_en" required>
+                      <!-- <textarea cols="3" class="form-control" id="description_en" name="description_en" [ngModel]="new.description_en" required></textarea> -->
+                    </quill-editor>
+                  </div>
+              </div>
+
+
+
             </div>
 
-              
-  
-          </div>
-          
-          <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
+            <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
 
-        </form>
+          </form>
 
+        </div>
       </div>
+
     </div>
+
+
   </div>
 </div>

src/app/dashboard/news/news-list/news-list.component.html

@@ -2,90 +2,93 @@
   <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 activeLi-w" style="margin-right:5px">الأخبار</li>
         </ul>
-      <hr class="hr">
     </div>
   </div>
 
-  <div class="row">
-    <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-        <button type="button" class="btn btn-outline-success dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn">إنشاء</button>
-        <button type="button" class="btn btn-outline-danger dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn">حذف</button>
-    </div>
-    <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-      <div class="form-group">
-        <input type="text" placeholder="البحث" class="form-control" style="margin-top:13px;" (input)="filtterFunc($event)"/>
-        <hr>
+  <div class="containerContent-w">
+    <div class="row">
+      <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+          <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+          <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
       </div>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="col-12 col-sm-12 col-md-6">
-      <div class="form-group">
-        <span class="spanSelect-w">أظهر
-          <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
-            <option value="5">5</option>
-            <option value="10">10</option>
-            <option value="15">15</option>
-            <option value="20">20</option>
-          </select>
-          من العناصر
-        </span>
+      <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+        <div class="form-group">
+          <input type="text" placeholder="البحث" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
+          <hr>
+        </div>
       </div>
     </div>
-    <div class="col-12 col-sm-12 col-md-6">
-    
-    </div>
-</div>
-  
-  <table class="table table-bordered">
-    <thead class="headBackground-w">
-      <tr>
-        <th>
-          <div class="custom-control custom-checkbox">
-              <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
-              <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor: pointer;"></label>
-          </div>
-        </th>
-        <th>العنوان</th>
-        <th>الترتيب</th>
-        <th> الحاله</th>
-        <th>تاريخ الأنشاء</th>
-        <th>موقع العرض</th>
-        <th>الناشر</th>
-        <th *ngIf="authSer.showEditBtn">تعديل</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr *ngFor="let news of newsList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
-        <td>
-          <div class="custom-control custom-checkbox centerIneerItem">
-            <input type="checkbox" class="custom-control-input" id="{{news.id}}" [(ngModel)]="news.selected" [value]='news' (change)="checkIfAllSelected();">
-            <label class="custom-control-label disblayBlock-w" for="{{news.id}}" style="color:#2a2a2a;cursor: pointer;"></label>
+
+    <div class="row">
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+          <div class="form-group">
+            <span class="spanSelect-w">
+              <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
+                <option value="5">5</option>
+                <option value="10">10</option>
+                <option value="15">15</option>
+                <option value="20">20</option>
+              </select>
+              من العناصر يتم عرضها
+            </span>
           </div>
-        </td>
-        <td>{{news.title}}</td>
-        <td>
-          {{news.ranking}}
-          <!-- <select class="form-control" [ngModel]="news.ranking" (change)="changeRanking($event, news.id)">
-            <option value="1">1</option>
-            <option value="2">2</option>
-            <option value="3">3</option>
-            <option value="4">4</option>
-            <option value="5">5</option>
-            <option value="6">6</option>
-          </select> -->
-        </td>
-        <td>{{news.status == '0' ? 'نشر' : news.status == '1' ? 'مسوده' : 'not found'}}</td>
-        <td>{{news.created_at}}</td>
-        <td>{{news.display_location == 'internal' ? 'داخلي' : news.status == 'external' ? 'خارجي' : 'كلاهما'}}</td>
-        <td>{{news.created_by}}</td>
-        <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(news.id)"><i class="fas fa-edit"></i></button></td>
-      </tr>
-    </tbody>
-  </table>
-  <pagination-controls (pageChange)="onPageChange($event)"></pagination-controls>
+        </div>
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+
+        </div>
+    </div>
+
+    <table class="table table-bordered">
+      <thead class="headBackground-w">
+        <tr>
+          <th>
+            <div class="custom-control custom-checkbox">
+                <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
+                <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor: pointer;"></label>
+            </div>
+          </th>
+          <th>العنوان</th>
+          <th>الترتيب</th>
+          <th> الحاله</th>
+          <th>تاريخ الأنشاء</th>
+          <th>موقع العرض</th>
+          <th>الناشر</th>
+          <th *ngIf="authSer.showEditBtn">تعديل</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let news of newsList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
+          <td>
+            <div class="custom-control custom-checkbox centerIneerItem">
+              <input type="checkbox" class="custom-control-input" id="{{news.id}}" [(ngModel)]="news.selected" [value]='news' (change)="checkIfAllSelected();">
+              <label class="custom-control-label disblayBlock-w" for="{{news.id}}" style="color:#2a2a2a;cursor: pointer;"></label>
+            </div>
+          </td>
+          <td>{{news.title}}</td>
+          <td>
+            {{news.ranking}}
+            <!-- <select class="form-control" [ngModel]="news.ranking" (change)="changeRanking($event, news.id)">
+              <option value="1">1</option>
+              <option value="2">2</option>
+              <option value="3">3</option>
+              <option value="4">4</option>
+              <option value="5">5</option>
+              <option value="6">6</option>
+            </select> -->
+          </td>
+          <td>{{news.status == '0' ? 'نشر' : news.status == '1' ? 'مسوده' : 'not found'}}</td>
+          <td>{{news.created_at}}</td>
+          <td>{{news.display_location == 'internal' ? 'داخلي' : news.status == 'external' ? 'خارجي' : 'كلاهما'}}</td>
+          <td>{{news.created_by_name}}</td>
+          <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(news.id)"><i class="fas fa-edit"></i></button></td>
+        </tr>
+      </tbody>
+    </table>
+    <pagination-controls (pageChange)="onPageChange($event)"></pagination-controls>
+  </div>
+
+
 </div>

src/app/dashboard/tabs/add-tab/add-tab.component.css

@@ -19,3 +19,9 @@
     padding: 20px;
     border-radius: 20px;
 }
+
+input,select {
+    font-size: 12px;
+    background-color: #f9f9f9;
+    border: 2px solid #bda380;
+}

src/app/dashboard/tabs/add-tab/add-tab.component.html

@@ -1,15 +1,15 @@
 <div class="addHospital-w">
   <div class="container">
-      <div class="row" style="margin-bottom: 30px;">
-        <div class="col-12">
-          <ul class="list-unstyled titileLi-w">
-            <li class="headingText-w">خدمه إداره المحتوي / </li>
-            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الملفات / </li>
-            <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
-          </ul>
-          <hr class="hr">
-        </div>
+    <div class="row" style="margin-bottom: 30px;">
+      <div class="col-12">
+        <ul class="list-unstyled titileLi-w">
+          <li class="headingText-w">خدمه إداره المحتوي > </li>
+          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الملفات > </li>
+          <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
+        </ul>
       </div>
+    </div>
+    <div class="containerContent-w">
 
     <div class="row">
       <div class="col-12">
@@ -19,51 +19,51 @@
             <div class="col-12 col-sm-12 col-md-4">
               <div class="form-group">
                 <label for="name" style="float: right; margin-right: 5px">الاسم باللغه العربيه <span class="spanReqired-w">*</span></label>
-                  <input type="text" class="form-control" id="name" name="name" placeholder="الأسم باللغه العربيه"ngModel [ngModel]="tab.name" #name="ngModel" required/>
+                <input type="text" class="form-control" id="name" name="name" placeholder="الأسم باللغه العربيه"ngModel [ngModel]="tab.name" #name="ngModel" required/>
               </div>
             </div>
             <div class="col-12 col-sm-12 col-md-4">
               <div class="form-group">
                 <label for="name_en" style="float: right; margin-right: 5px">الاسم باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
-                  <input type="text" class="form-control" id="name_en" name="name_en" placeholder="الإسم باللغه الإنجليزيه" ngModel [ngModel]="tab.name_en" #name="ngModel" required/>
+                <input type="text" class="form-control" id="name_en" name="name_en" placeholder="الإسم باللغه الإنجليزيه" ngModel [ngModel]="tab.name_en" #name="ngModel" required/>
               </div>
             </div>
             <div class="col-12 col-sm-12 col-md-4">
               <div class="form-group">
                 <label for="ranking" style="float: right; margin-right: 5px">الترتيب <span class="spanReqired-w">*</span></label>
-                <select class="form-control" name="ranking" [ngModel]="tab.ranking" id="ranking" required>  
-                  <option value="10000">المزيد</option>
+                <select class="form-control" name="ranking" [ngModel]="tab.ranking" id="ranking" required>
                   <option value="1">1</option>
                   <option value="2">2</option>
                   <option value="3">3</option>
                   <option value="4">4</option>
                   <option value="5">5</option>
                   <option value="6">6</option>
+                  <option value="10000">المزيد</option>
                 </select>
               </div>
             </div>
-            
+
             <div class="col-12 col-sm-12 col-md-4">
               <div class="form-group">
                 <label for="type" style="float: right; margin-right: 5px"> النوع <span class="spanReqired-w">*</span></label>
-                <select class="form-control" name="type" [ngModel]="tab.type" id="type" required>  
+                <select class="form-control" name="type" [ngModel]="tab.type" id="type" required>
                   <option value="0">تعميم داخلي</option>
                   <option value="1">تعميم خارجي</option>
                   <option value="2">سياسات</option>
                 </select>
               </div>
             </div>
-  
+
             <div class="col-12 col-sm-12 col-md-4">
               <label for="status" style="float: right; margin-right: 5px">الحاله <span class="spanReqired-w">*</span></label>
-              <select class="form-control" name="status" [ngModel]="tab.status" id="status" required>  
+              <select class="form-control" name="status" [ngModel]="tab.status" id="status" required>
                 <option value="1">فعال</option>
                 <option value="0">غير فعال</option>
               </select>
             </div>
 
           </div>
-          
+
           <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
 
         </form>
@@ -71,4 +71,5 @@
       </div>
     </div>
   </div>
+  </div>
 </div>

src/app/dashboard/tabs/tab-list/tab-list.component.html

@@ -1,54 +1,53 @@
 <div class="container">
-    
+
   <div class="row">
     <div class="col-12">
-        <ul class="list-unstyled titileLi-w">
-          <li class="headingText-w">خدمه إداره المحتوي / </li>
-          <li class="headingText-w activeLi-w" style="margin-right:5px"> الملفات</li>
-        </ul>
-      <hr class="hr">
+      <ul class="list-unstyled titileLi-w">
+        <li class="headingText-w">خدمه إداره المحتوي > </li>
+        <li class="headingText-w activeLi-w" style="margin-right:5px"> الملفات</li>
+      </ul>
     </div>
   </div>
 
   <div class="row">
     <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-        <button type="button" class="btn btn-outline-success dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn">إنشاء</button>
-        <button type="button" class="btn btn-outline-danger dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn">حذف</button>
+      <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+      <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
     </div>
     <div class="col-12 col-sm-12 col-md-6 col-lg-6">
       <div class="form-group">
-        <input type="text" placeholder="البحث" class="form-control" style="margin-top:13px;" (input)="filtterFunc($event)"/>
+        <input type="text" placeholder="البحث" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
         <hr>
       </div>
     </div>
   </div>
 
   <div class="row">
-    <div class="col-12 col-sm-12 col-md-6">
-      <div class="form-group">
-        <span class="spanSelect-w">أظهر
-          <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
-            <option value="5">5</option>
-            <option value="10">10</option>
-            <option value="15">15</option>
-            <option value="20">20</option>
-          </select>
-          من العناصر
-        </span>
+      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+        <div class="form-group">
+          <span class="spanSelect-w">
+            <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
+              <option value="5">5</option>
+              <option value="10">10</option>
+              <option value="15">15</option>
+              <option value="20">20</option>
+            </select>
+            من العناصر يتم عرضها
+          </span>
+        </div>
+      </div>
+      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+
       </div>
-    </div>
-    <div class="col-12 col-sm-12 col-md-6">
-    
-    </div>
   </div>
-  
+
   <table class="table table-bordered">
     <thead class="headBackground-w">
       <tr>
         <th>
           <div class="custom-control custom-checkbox">
-              <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
-              <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px;"></label>
+            <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
+            <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px;"></label>
           </div>
         </th>
         <th>إسم الوثيقه</th>
@@ -72,19 +71,19 @@
         <td>
           {{tab.ranking}}
           <!-- <select class="form-control" [ngModel]="tab.ranking" (change)="changeRanking($event, tab.id)">
-            <option value="1">1</option>
-            <option value="2">2</option>
-            <option value="3">3</option>
-            <option value="4">4</option>
-            <option value="5">5</option>
-            <option value="6">6</option>
-          </select> -->
-        </td>
-        <td>{{tab.type == '0' ? 'تعميم داخلي' : tab.type == '1' ? 'تعميم خارجي' : tab.type == '2' ? 'سياسات' : 'not found'}}</td>
-        <td>{{tab.created_at}}</td>
-        <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(tab.id)"><i class="fas fa-edit"></i></button></td>
-      </tr>
-    </tbody>
-  </table>
-  <pagination-controls (pageChange)="onPageChange($event)"></pagination-controls>
+          <option value="1">1</option>
+          <option value="2">2</option>
+          <option value="3">3</option>
+          <option value="4">4</option>
+          <option value="5">5</option>
+          <option value="6">6</option>
+        </select> -->
+      </td>
+      <td>{{tab.type == '0' ? 'تعميم داخلي' : tab.type == '1' ? 'تعميم خارجي' : tab.type == '2' ? 'سياسات' : 'not found'}}</td>
+      <td>{{tab.created_at}}</td>
+      <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(tab.id)"><i class="fas fa-edit"></i></button></td>
+    </tr>
+  </tbody>
+</table>
+<pagination-controls (pageChange)="onPageChange($event)"></pagination-controls>
 </div>