fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2025-12-25 19:17:35 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Fixed user check in avatar image edit

Browse Source
This commit is contained in:
Fergal Moran
2014-02-10 20:21:54 +00:00
parent 2db23761c6
commit e3ff1f33d7
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
static/js/app/views/user/userProfileView.coffee
View File

@@ -17,17 +17,19 @@ define ['app', 'utils', 'moment', 'marionette', 'vent', 'app.lib/editableView',
onDomRefresh: -> onDomRefresh: ->
console.log("UserProfileView: initialize") console.log("UserProfileView: initialize")
$.fn.editable.defaults.mode = "inline"
$.fn.editableform.loading = "<div class='editableform-loading'><i class='light-blue icon-2x icon-spinner icon-spin'></i></div>"
$.fn.editableform.buttons = "<button type=\"submit\" class=\"btn btn-info editable-submit\"><i class=\"fa fa-check fa-white\"></i></button>" + "<button type=\"button\" class=\"btn editable-cancel\"><i class=\"fa fa-times fa-white\"></i></button>"
#editables
if utils.isMe(@model.get("id"))
@setupImageEditable @setupImageEditable
el: $("#avatar", @el) el: $("#avatar", @el)
url: "/ajax/upload_avatar_image/" url: "/ajax/upload_avatar_image/"
chooseMessage: "Choose profile image" chooseMessage: "Choose profile image"
$.fn.editable.defaults.mode = "inline"
$.fn.editableform.loading = "<div class='editableform-loading'><i class='light-blue icon-2x icon-spinner icon-spin'></i></div>"
$.fn.editableform.buttons = "<button type=\"submit\" class=\"btn btn-info editable-submit\"><i class=\"icon-ok icon-white\"></i></button>" + "<button type=\"button\" class=\"btn editable-cancel\"><i class=\"icon-remove\"></i></button>"
#editables
if utils.isMe(@model.get("id"))
$("#about", @el).editable $("#about", @el).editable
mode: "inline" mode: "inline"
type: "wysiwyg" type: "wysiwyg"

8
static/js/app/views/user/userProfileView.js
View File

@@ -39,15 +39,15 @@
UserProfileView.prototype.onDomRefresh = function() { UserProfileView.prototype.onDomRefresh = function() {
var _this = this; var _this = this;
console.log("UserProfileView: initialize"); console.log("UserProfileView: initialize");
$.fn.editable.defaults.mode = "inline";
$.fn.editableform.loading = "<div class='editableform-loading'><i class='light-blue icon-2x icon-spinner icon-spin'></i></div>";
$.fn.editableform.buttons = "<button type=\"submit\" class=\"btn btn-info editable-submit\"><i class=\"fa fa-check fa-white\"></i></button>" + "<button type=\"button\" class=\"btn editable-cancel\"><i class=\"fa fa-times fa-white\"></i></button>";
if (utils.isMe(this.model.get("id"))) {
this.setupImageEditable({ this.setupImageEditable({
el: $("#avatar", this.el), el: $("#avatar", this.el),
url: "/ajax/upload_avatar_image/", url: "/ajax/upload_avatar_image/",
chooseMessage: "Choose profile image" chooseMessage: "Choose profile image"
}); });
$.fn.editable.defaults.mode = "inline";
$.fn.editableform.loading = "<div class='editableform-loading'><i class='light-blue icon-2x icon-spinner icon-spin'></i></div>";
$.fn.editableform.buttons = "<button type=\"submit\" class=\"btn btn-info editable-submit\"><i class=\"icon-ok icon-white\"></i></button>" + "<button type=\"button\" class=\"btn editable-cancel\"><i class=\"icon-remove\"></i></button>";
if (utils.isMe(this.model.get("id"))) {
$("#about", this.el).editable({ $("#about", this.el).editable({
mode: "inline", mode: "inline",
type: "wysiwyg", type: "wysiwyg",

2
templates/views/UserProfileView.html
View File

@@ -6,7 +6,7 @@
<div> <div>
<span class="profile-picture"> <span class="profile-picture">
<img id="avatar" <img id="avatar"
class="editable img-responsive image-user-profile" class="img-responsive image-user-profile"
alt="Avatar Image" alt="Avatar Image"
src="<%= avatar_image %>"> src="<%= avatar_image %>">
</span> </span>