summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordumpfmprod <dumpfmprod@ubuntu.(none)>2010-05-19 21:19:09 -0400
committerdumpfmprod <dumpfmprod@ubuntu.(none)>2010-05-19 21:19:09 -0400
commit462d127bb4073bc3941a03757065b1ea40d8f3a3 (patch)
treee893577a0946f2d3327cc60e8d694b9ea7a01f1c
parent90de261feb9aabc17c3839848cf203e2404b4196 (diff)
Change chat palette behavior to always display button
-rw-r--r--static/js/pichat.js31
-rw-r--r--template/profile.st17
2 files changed, 13 insertions, 35 deletions
diff --git a/static/js/pichat.js b/static/js/pichat.js
index da68baa..ac89dc4 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -436,8 +436,6 @@ function initChat() {
messageList = $("#messageList")[0]
- if (!isEmptyObject(RawFavs)) paletteButtonShow()
-
initChatThumb()
scrollToEnd()
@@ -578,29 +576,6 @@ function initChatThumb(){
})
}
-function paletteButtonHideAnim(){
- $("#msginputrapper").stop().animate({"marginRight": "374px"}, 'fast')
- $("#msgSubmit").stop().animate({"right": "260px"}, 'fast')
- $("#palette-button").stop().animate({"width": "0px"}, 'fast', 'swing', function(){ $("#palette-button").css("display", "none") })
-}
-function paletteButtonHide(){
- $("#msginputrapper").css("marginRight", "374px")
- $("#msgSubmit").css("right", "260px")
- $("#palette-button").css("width", "0px")
- $("#palette-button").css("display", "none")
-}
-function paletteButtonShowAnim(){
- $("#msginputrapper").stop().animate({"marginRight": "415px"}, 'fast')
- $("#msgSubmit").stop().animate({"right": "300px"}, 'fast')
- $("#palette-button").css("display", "inline-block")
- $("#palette-button").stop().animate({"width": "40px"}, 'fast')
-}
-function paletteButtonShow(){
- $("#msginputrapper").css("marginRight", "415px")
- $("#msgSubmit").css("right", "300px")
- $("#palette-button").css("display", "inline-block")
- $("#palette-button").css("width", "40px")
-}
function paletteToChat(img){
var chatText = $("#msgInput").val()
@@ -639,7 +614,11 @@ function paletteBuildImageThumbs(){
function paletteShow(){
$("#palette").css("display", "block")
- paletteBuildImageThumbs()
+ if (isEmptyObject(RawFavs)) {
+ $('#palette-thumbs').html('<h1 style="width:300px;color:#000;letter-spacing:-1px;">This is where all the stuff you FAV goes!<br><br>To FAV a post click the little heart <img src="/static/img/thumbs/smallheart.gif"> next to a users name.<br><br> Everything you fav gets saved to your profile.. Have fun!</h1>');
+ } else {
+ paletteBuildImageThumbs();
+ }
}
function paletteHide(){
$("#palette").css("display", "none")
diff --git a/template/profile.st b/template/profile.st
index 5744691..9b7cbac 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -30,8 +30,12 @@
$dumps:{ d | $profile_dump(dump=d)$ }$
<div id="profile">
- <h2>$nick$</h2>
-
+ <h2>$nick$ </h2><br>
+ $if(score_ent)$
+ <h8>
+ $score$
+ $score_ent$
+ $endif$</h8>
$if(isadmin)$
<div id="adminmute">
<a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
@@ -66,13 +70,8 @@
<div><img id="bio" src="/static/img/noinfo.png"></div>
$endif$
- $if(score_ent)$
- <div id="score" style="font-size: 500%">
- <h3>score</h3>
- $score$
- $score_ent$
- </div>
- $endif$
+
+
$if(is_home)$
<br>