From 13ef28118d28a8dce140288b4eb80a7e8315f8e5 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Tue, 26 Nov 2013 15:15:23 -0500 Subject: [PATCH 1/3] closes #557 --- public/src/forum/accountedit.js | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/public/src/forum/accountedit.js b/public/src/forum/accountedit.js index 38d4cd5833..912bb29b37 100644 --- a/public/src/forum/accountedit.js +++ b/public/src/forum/accountedit.js @@ -1,11 +1,13 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) { - var AccountEdit = {}; + var AccountEdit = {}, + gravatarPicture = '', + uploadedPicture = ''; AccountEdit.init = function() { header.init(); - var gravatarPicture = templates.get('gravatarpicture'); - var uploadedPicture = templates.get('uploadedpicture'); + gravatarPicture = templates.get('gravatarpicture'); + uploadedPicture = templates.get('uploadedpicture'); var selectedImageType = ''; @@ -194,31 +196,33 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) { AccountEdit.updateImages = function() { var currentPicture = $('#user-current-picture').attr('src'); - var gravatarPicture = templates.get('gravatarpicture'); - var uploadedPicture = templates.get('uploadedpicture'); if (gravatarPicture) { $('#user-gravatar-picture').attr('src', gravatarPicture); $('#gravatar-box').show(); - } else + } else { $('#gravatar-box').hide(); + } if (uploadedPicture) { $('#user-uploaded-picture').attr('src', uploadedPicture); $('#uploaded-box').show(); - } else + } else { $('#uploaded-box').hide(); + } - if (currentPicture == gravatarPicture) + if (currentPicture == gravatarPicture) { $('#gravatar-box .fa-check').show(); - else + } else { $('#gravatar-box .fa-check').hide(); + } - if (currentPicture == uploadedPicture) + if (currentPicture == uploadedPicture) { $('#uploaded-box .fa-check').show(); - else + } else { $('#uploaded-box .fa-check').hide(); + } } return AccountEdit; From 8f807335634cf22ab4e7ab47594708d6967dbff4 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 26 Nov 2013 15:19:30 -0500 Subject: [PATCH 2/3] fixing #552 overflows properly --- public/templates/topic.tpl | 306 +++++++++++++++++++------------------ 1 file changed, 154 insertions(+), 152 deletions(-) diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index 0f9562a6fb..07eff8e112 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -9,174 +9,176 @@ -
-
    -
  1. - -
    2. -
  2. - -
    3. -
  3. - {topic_name} -
    4. +
    +
    +
      +
    1. + +
      2. +
    2. + +
      3. +
    3. + {topic_name} +
      4. -
    +
-
- -
-
- - -
- - -
-
-
- - - - + \ No newline at end of file From 48a7f9058ffa2dc8fc6b4a86088c129e8ba594b9 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Tue, 26 Nov 2013 15:28:45 -0500 Subject: [PATCH 3/3] closes #558 --- public/src/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/app.js b/public/src/app.js index 740b082c44..8f6d8ed433 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -136,7 +136,7 @@ var socket, $.post(RELATIVE_PATH + '/logout', { _csrf: $('#csrf_token').val() }, function() { - window.location.reload(false); + window.location.href = RELATIVE_PATH + '/'; }); }