From 71244c822d1060c4ce82fcaf467f98b5a029387f Mon Sep 17 00:00:00 2001
From: resicovenba <venbatechnologies@gmail.com>
Date: Wed, 27 Dec 2017 12:02:44 +0530
Subject: [PATCH] profile image place change: kdk

---
 Apollo/assets/views/partials/nav.html         |  33 ++++
 .../views/student/editStudentDetails.html     | 141 ++++++++++--------
 2 files changed, 109 insertions(+), 65 deletions(-)

diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html
index 1413ba0c..40f81a98 100755
--- a/Apollo/assets/views/partials/nav.html
+++ b/Apollo/assets/views/partials/nav.html
@@ -343,6 +343,39 @@
 					<span class="title" translate="sidebar.nav.student.STUDENTDETAILS"> STUDENT DETAILS </span>
 				</a>
 			</li>
+			<li>
+				<a href="javascript:;">
+					<span translate="sidebar.nav.student.status.MAIN">Status Update</span> <i class="icon-arrow"></i>
+				</a>
+				<ul class="sub-menu">
+					<li  ui-sref-active="active">
+						<a ui-sref="app.student.status.studymaterial" translate="sidebar.nav.student.status.STUDYMATERIAL">
+							Study Material
+						</a>
+					</li>
+					<li  ui-sref-active="active">
+						<a ui-sref="app.student.status.fees" translate="sidebar.nav.status.FEES">
+							Fess
+						</a>
+					</li>
+					<li  ui-sref-active="active">
+						<a ui-sref="app.student.status.answerbooklet" translate="sidebar.nav.student.status.ANSWERBOOKLET">
+							Answer Booklet
+						</a>
+					</li>
+					<li  ui-sref-active="active">
+						<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION">
+							Certification
+						</a>
+					</li>
+					<li  ui-sref-active="active">
+						<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION">
+							Application
+						</a>
+					</li>
+				</ul>
+
+			</li>
 		</ul>
 	</li>
 	<li ng-class="{'active open':$state.includes('app.tracking')}">
diff --git a/Apollo/assets/views/student/editStudentDetails.html b/Apollo/assets/views/student/editStudentDetails.html
index 6033190c..b9068299 100755
--- a/Apollo/assets/views/student/editStudentDetails.html
+++ b/Apollo/assets/views/student/editStudentDetails.html
@@ -6,7 +6,76 @@
                     <legend>
                         Personal Details
                     </legend>
+                    <div class="row">
+                        <div class="right">
+                            <img class="thumb prof" ng-src="images/{{p.ProfilePicPath}}" />
+                            <style>
+                                .thumb {
+                                    width: 130px;
+                                    height: 140px;
+                                    margin: 18px;
+                                    float: left;
+                                }
 
+                                .prof {
+                                    border: 2px solid #2C3543;
+                                }
+
+                                .uploader {
+                                    clear: both;
+                                }
+                            </style>
+                        </div>
+                        <div  class="right" >
+                            <form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
+                                <div class="file-upload">
+                                    <div class="row">
+                                        <div class="col-md-4">
+                                            <h5>Update Profile Picture</h5>
+                                            <div class=" margin-bottom-5">
+
+                                            </div>
+                                            <input type="file" accept="image/*" ng-init="resetImageEdit()" file-upload-edit onchange="angular.element(this).scope().imageUploadEdit(event)"
+                                            />
+                                        </div>
+                                        <div class="col-md-2">
+                                            <div class="form-group">
+                                                <div class="user-image">
+                                                </div>
+                                                <!--<input type="file" file-model="idProof"
+                                                                       accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>-->
+
+                                                <div>
+                                                    <div ng-repeat="step in stepsModelEdit">
+                                                        <!--<a class="close-thin"></a>-->
+                                                        <img class="thumb" ng-src="{{step}}" />
+                                                        <div class="col-md-12">
+                                                            <div class="pull-right">
+                                                                <button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImageEdit()">Reset
+                                                                    </button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <style>
+                                                    .thumb {
+                                                        width: 130px;
+                                                        height: 140px;
+                                                        margin: 18px;
+                                                        float: left;
+                                                    }
+
+                                                    .uploader {
+                                                        clear: both;
+                                                    }
+                                                </style>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
                     <div class="row">
                         <div class="col-md-4 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
                             <label>
@@ -273,72 +342,14 @@
                                 <switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
                             </div>
                         </div>
-                        <div class="col-md-2">
-                            <img class="thumb prof" ng-src="images/{{p.ProfilePicPath}}" />
-                            <style>
-                                .thumb {
-                                    width: 130px;
-                                    height: 140px;
-                                    margin: 18px;
-                                    float: left;
-                                }
-                                .prof {
-                                    border: 2px solid #2C3543;
-                                }
-                                .uploader {
-                                    clear: both;
-                                }
-                            </style>
-                        </div>
-                        <div class="col-md-6">
-                            <form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
-                                <div class="file-upload">
-                                    <div class="row">
-                                        <div class="col-md-4">
-                                            <h5>Update Profile Picture</h5>
-                                            <div class=" margin-bottom-5">
+                        <!--<div class="col-md-4" ng-if="p.IsActive == false" >
+                            <label>
+                                                De-Active Comments <span class="symbol required"></span>
+                                            </label>
+                             <textarea placeholder="Enter Permanent Address" tabindex="10" class="form-control textdsc" name="address1" ng-model="p.PermanentAddress"></textarea>
+                            <span class="error text-small block" ng-if="Form.address1.$dirty && Form.address1.$invalid">Permanent Address is required</span>
+                        </div>-->
 
-                                            </div>
-                                            <input type="file" accept="image/*" ng-init="resetImageEdit()" file-upload-edit onchange="angular.element(this).scope().imageUploadEdit(event)"
-                                            />
-                                        </div>
-                                        <div class="col-md-2">
-                                            <div class="form-group">
-                                                <div class="user-image">
-                                                </div>
-                                                <!--<input type="file" file-model="idProof"
-                                                                       accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>-->
-
-                                                <div>
-                                                    <div ng-repeat="step in stepsModelEdit">
-                                                        <!--<a class="close-thin"></a>-->
-                                                        <img class="thumb" ng-src="{{step}}" />
-                                                        <div class="col-md-12">
-                                                            <div class="pull-right">
-                                                                <button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImageEdit()">Reset
-                                                                    </button>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <style>
-                                                    .thumb {
-                                                        width: 130px;
-                                                        height: 140px;
-                                                        margin: 18px;
-                                                        float: left;
-                                                    }
-
-                                                    .uploader {
-                                                        clear: both;
-                                                    }
-                                                </style>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
                     </div>
             </div>
             <!--<pre>{{ p | json}}</pre>-->