Commit b2765395 by Kyle Fiedler

Added some more markup and added styles for the email and profile changes

--HG--
branch : pmitros-name-change
parent 7c6a41b5
...@@ -141,19 +141,23 @@ $(function() { ...@@ -141,19 +141,23 @@ $(function() {
<section class="user-info"> <section class="user-info">
<h1>${name}</h1> <header>
%if True: <h1>${name}</h1>
<a href="#apply_name_change" rel="leanModal">Apply to change</a> %if True:
%else: <a href="#apply_name_change" rel="leanModal">Apply to change</a>
(Name change pending) %else:
%endif (Name change pending)
%endif
</header>
<ul> <ul>
<li> <li>
Forum name: <strong>${username}</strong> Forum name: <strong>${username}</strong>
</li> </li>
<li> <li>
E-mail: <strong>${email}</strong> <a href="#change_email" rel="leanModal">Update</a> E-mail: <strong>${email}</strong> <a href="#change_email" rel="leanModal" class="edit-email">Edit</a>
</li> </li>
<li> <li>
Location: <div id="location_sub">${location}</div><div id="description"></div> <a href="#" id="change_location">Edit</a> Location: <div id="location_sub">${location}</div><div id="description"></div> <a href="#" id="change_location">Edit</a>
</li> </li>
...@@ -169,9 +173,9 @@ $(function() { ...@@ -169,9 +173,9 @@ $(function() {
<input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" /> <input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
<input type="submit" id="pwd_reset_button" value="Reset Password" /> <input type="submit" id="pwd_reset_button" value="Reset Password" />
</div> </div>
<div id="unenroll"> <div id="unenroll">
<a href="#unenroll_course" rel="leanModal">Unenroll</a> <a href="#unenroll_course" rel="leanModal">Unenroll from 6.002x</a>
</div> </div>
</section> </section>
</div> </div>
...@@ -189,6 +193,8 @@ $(function() { ...@@ -189,6 +193,8 @@ $(function() {
<h1>Apply to change your name</h1> <h1>Apply to change your name</h1>
<form> <form>
<fieldset> <fieldset>
<p>A member of the course staff will review your request, and if approved, update your information. Please allow up to a week for your requested to be processed.</p>
<ul> <ul>
<li> <li>
<label>Enter your desired full name, as it will appear on the MITx Certificate: </label> <label>Enter your desired full name, as it will appear on the MITx Certificate: </label>
...@@ -199,7 +205,6 @@ $(function() { ...@@ -199,7 +205,6 @@ $(function() {
<textarea id="name_rationale" value=""></textarea> <textarea id="name_rationale" value=""></textarea>
</li> </li>
<li> <li>
<label>A member of the course staff will review your request, and if approved, update your information. Please allow up to a week for your requested to be processed.</label>
<input type="submit" id="submit"> <input type="submit" id="submit">
</li> </li>
</ul> </ul>
...@@ -233,9 +238,7 @@ $(function() { ...@@ -233,9 +238,7 @@ $(function() {
<div id="unenroll_course" class="leanModal_box"> <div id="unenroll_course" class="leanModal_box">
<h1> Unenroll </h1> <h1> Unenroll </h1>
<p> At the end of the semester, all students who do not complete the <p> At the end of the semester, all students who do not complete the course will be automatically dropped. If you would still prefer to deactivate your account, you can: </p>
course will be automatically dropped. If you would still prefer to
deactivate your account, you can: </p>
<form> <form>
<fieldset> <fieldset>
<ul> <ul>
......
...@@ -8,11 +8,14 @@ div.profile-wrapper { ...@@ -8,11 +8,14 @@ div.profile-wrapper {
border-left: 1px solid #d3d3d3; border-left: 1px solid #d3d3d3;
border-right: 0; border-right: 0;
h1 { header {
padding: lh(.5) lh(); padding: lh(.5) lh();
font-size: 18px;
margin: 0 ; margin: 0 ;
@extend .bottom-border; @extend .bottom-border;
h1 {
font-size: 18px;
}
} }
ul { ul {
...@@ -57,7 +60,7 @@ div.profile-wrapper { ...@@ -57,7 +60,7 @@ div.profile-wrapper {
font-size: 12px; font-size: 12px;
} }
a#change_language, a#change_location { a#change_language, a#change_location, a.edit-email {
position: absolute; position: absolute;
top: 9px; top: 9px;
right: lh(.5); right: lh(.5);
...@@ -69,12 +72,39 @@ div.profile-wrapper { ...@@ -69,12 +72,39 @@ div.profile-wrapper {
color: #555; color: #555;
} }
} }
} }
} }
div#change_password_pop { div#change_password_pop {
padding: 7px lh(); border-bottom: 1px solid #d3d3d3;
@include box-shadow(0 1px 0 #eee);
color: #4D4D4D; color: #4D4D4D;
padding: 7px lh();
h2 {
margin-top: 0;
font-weight: bold;
text-transform: uppercase;
font-size: $body-font-size;
}
}
div#unenroll {
border-bottom: 1px solid #d3d3d3;
@include box-shadow(0 1px 0 #eee);
a {
color: lighten($text-color, 10%);
display: block;
display: block;
padding: 7px lh();
@include transition();
&:hover {
background: #efefef;
}
}
} }
} }
......
...@@ -17,6 +17,7 @@ div.leanModal_box { ...@@ -17,6 +17,7 @@ div.leanModal_box {
@include box-sizing(border-box); @include box-sizing(border-box);
display: none; display: none;
padding: lh(2); padding: lh(2);
text-align: left;
a.modal_close { a.modal_close {
color: #aaa; color: #aaa;
...@@ -204,6 +205,30 @@ div#pwd_reset { ...@@ -204,6 +205,30 @@ div#pwd_reset {
} }
} }
div#apply_name_change,
div#change_email,
div#unenroll_course {
max-width: 700px;
ul {
list-style: none;
li {
margin-bottom: lh(.5);
textarea, #{$all-text-inputs} {
display: block;
width: 100%;
@include box-sizing(border-box);
}
textarea {
height: 60px;
}
}
}
}
div#feedback_div{ div#feedback_div{
form{ form{
ol { ol {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment