Merge pull request #207 from MITx/mm-remove-preferred-language
Mm remove preferred language
This commit is contained in:
@@ -115,7 +115,7 @@
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
.activation-message, .message, .notice {
|
||||
.notice {
|
||||
background: $yellow;
|
||||
border: 1px solid darken($yellow, 60%);
|
||||
color: darken($yellow, 60%);
|
||||
@@ -124,7 +124,7 @@
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
.activation-message {
|
||||
.activation-message, .message {
|
||||
padding: 0 40px 10px;
|
||||
|
||||
p {
|
||||
|
||||
@@ -19,9 +19,6 @@
|
||||
<li>
|
||||
<span class="title"><div class="icon location-icon"></div>Location</span><span class="data">${ user.profile.location }</span>
|
||||
</li>
|
||||
<li>
|
||||
<span class="title"><div class="icon language-icon"></div>Language</span><span class="data">${ user.profile.language }</span>
|
||||
</li>
|
||||
</ul>
|
||||
</section>
|
||||
</header>
|
||||
|
||||
@@ -49,26 +49,6 @@ $(function() {
|
||||
}
|
||||
});
|
||||
|
||||
$("#change_language").click(function() {
|
||||
$(this).hide();
|
||||
log_event("profile", {"type":"language_show", "old":$("#language_sub").text()});
|
||||
|
||||
if(lang) {
|
||||
lang=false;
|
||||
$("#language_sub").html('<form>'+'<input id="id_lang_text" type="text" name="lang_text" />'+
|
||||
'<input type="submit" id="change_lang_button" value="Save" />'+'</form>');
|
||||
$("#change_lang_button").click(function() {
|
||||
$("#change_language").show();
|
||||
postJSON('/change_setting', {'language':$("#id_lang_text").attr("value")}, function(json) {
|
||||
$("#language_sub").text(json.language);
|
||||
lang=true;
|
||||
$("#description").html("");
|
||||
log_event("profile", {"type":"language_change", "new":json.language});
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
$('#change_password').click(function(){
|
||||
$('.modal').trigger('click');
|
||||
log_event("profile", {"type":"password_show"});
|
||||
@@ -206,9 +186,6 @@ $(function() {
|
||||
<li>
|
||||
Location: <div id="location_sub">${location}</div><div id="description"></div> <a href="#" id="change_location" aria-label="Edit Location">Edit</a>
|
||||
</li>
|
||||
<li>
|
||||
Language: <div id="language_sub">${language}</div> <a href="#" id="change_language" aria-label="Edit Language">Edit</a>
|
||||
</li>
|
||||
<li>
|
||||
Password reset
|
||||
<input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
|
||||
|
||||
Reference in New Issue
Block a user