Skip to content
This repository has been archived by the owner on Aug 21, 2018. It is now read-only.

Commit

Permalink
[#959] Memberimage overlapping and heading fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
Rupesh87 authored and Pr0chin committed Jul 27, 2017
1 parent 87b0d94 commit b9c0565
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions app/MyApp/app/Router.js
Original file line number Diff line number Diff line change
Expand Up @@ -1505,7 +1505,7 @@ $(function() {
})
nameOfLabel=label;
App.$el.children('.body').html('<div id="AddCourseMainDiv"></div>');
$('#AddCourseMainDiv').append('<h3>'+languageDictValue.get(nameOfLabel) + ' | ' + model.get('firstName') + ' ' + model.get('lastName') + '</h3>')
$('#AddCourseMainDiv').append('<h3 style="margin-left:22px;">'+languageDictValue.get(nameOfLabel) + ' | ' + model.get('firstName') + ' ' + model.get('lastName') + '</h3>')
}
else if (modelId) {
model.id = modelId
Expand All @@ -1514,12 +1514,12 @@ $(function() {
})
nameOfLabel="Edit_"+label;
App.$el.children('.body').html('<div id="AddCourseMainDiv"></div>');
$('#AddCourseMainDiv').append('<h3>'+languageDictValue.get(nameOfLabel) + ' | ' + model.get('firstName') + ' ' + model.get('lastName') + '</h3>')
$('#AddCourseMainDiv').append('<h3 style="margin-left:22px;">'+languageDictValue.get(nameOfLabel) + ' | ' + model.get('firstName') + ' ' + model.get('lastName') + '</h3>')


} else {
nameOfLabel="Add_"+label;
$('#AddCourseMainDiv').append('<h3>'+languageDictValue.get(nameOfLabel)+'</h3>')
$('#AddCourseMainDiv').append('<h3 style="margin-left:22px;">'+languageDictValue.get(nameOfLabel)+'</h3>')
}
$('#AddCourseMainDiv').append(modelForm.el)
// Bind form events for when Course is ready
Expand Down
2 changes: 1 addition & 1 deletion app/MyApp/app/tabl.css
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ bbf-form ul{border: 5px solid;}
color:red;
}
.signup-submit {
margin-top: -4px;
margin-left: 0px;
margin-top:77px;
text-align: auto;
}
.signup-btn.btn {
Expand Down
5 changes: 4 additions & 1 deletion app/MyApp/app/views/MemberForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ $(function() {
} else {
promoteBtn = '';
}
var $upload = $('<form method="post" id="fileAttachment" ><input type="file" name="_attachments" id="_attachments" multiple="multiple" /> <input class="rev" type="hidden" name="_rev"></form>')
var $upload = $('<form method="post" id="fileAttachment" style="margin-left:20px;"><input type="file" name="_attachments" id="_attachments" multiple="multiple" /> <input class="rev" type="hidden" name="_rev"></form>')
var $img = $('<div id="browseImage" >' + $imgt + '<img style="width:100px;height:100px;border-radius:50px" id="memberImage"></div>')
this.$el.append($img)
this.$el.append($upload)
Expand All @@ -238,6 +238,9 @@ $(function() {
}
// give the form a submit button
this.$el.append($button)
if (this.model.id == undefined) {
$(".signup-submit").css("margin-top","50px")
}
if(url_page[1] != "view"){
if (this.model.id != undefined) {
if (this.model.get("status") == "active") {
Expand Down

0 comments on commit b9c0565

Please sign in to comment.