summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortimb <timb@mb.local>2010-04-10 14:21:24 -0700
committertimb <timb@mb.local>2010-04-10 14:21:24 -0700
commit999b92dbf918cb31c0713106ad0337ff3ea16887 (patch)
tree3a2de3cacb76801725367a518d3c76ff47bce3d5
parent1e3b2d85671460112838b946c10d7a82dfa30d7b (diff)
move thumb
-rwxr-xr-xstatic/css/header.css14
-rw-r--r--static/js/pichat.js2
-rw-r--r--template/log_dump.st5
-rw-r--r--template/profile_dump.st15
-rw-r--r--template/share_buttons.st7
5 files changed, 25 insertions, 18 deletions
diff --git a/static/css/header.css b/static/css/header.css
index e43ec4c..8c70ff5 100755
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -291,29 +291,35 @@ img.chat-thumb {
padding-right: 15px;
}
+.logged-dump {
+ position: relative;
+}
+
/* sharing */
.buttons{
cursor:pointer;
padding-top: 8px;
}
.buttons .share {
- opacity: 0.2;
+ opacity: 0.5;
}
.buttons .share:hover {
opacity: 1;
}
.buttons .other-sites {
- padding-left: 20px;
+ /*padding-left: 20px;*/
}
-.buttons img.thumb {
+img.thumb {
position: absolute;
margin-left: 0px;
margin-top: 0px;
height: 16px;
width: 16px;
+ right: 10px;
+ top: 10px;
display: block;
}
-.buttons .thumb.favorite {
+.thumb.favorite {
position: absolute;
margin-left: 0px;
margin-top: 0px;
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 50dd8b0..5fa079a 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -448,7 +448,7 @@ function initLog() {
// jesus this logic is ugly
function initLogThumb(){
- $(".buttons .thumb").bind('mouseover mouseout',
+ $(".logged-dump .thumb").bind('mouseover mouseout',
function(e) {
var favorited = $(this).parents(".dump").hasClass("favorite") ? true : false;
if (e.type == "mouseover") {
diff --git a/template/log_dump.st b/template/log_dump.st
index 155981d..0a6b596 100644
--- a/template/log_dump.st
+++ b/template/log_dump.st
@@ -12,6 +12,11 @@ $else$
<img height="50" width="50" src="/static/noinfo.png">
$endif$
</div></a>
+$if(dump.favorited)$
+ <img src="/static/img/thumbs/color.left.gif" class="thumb favorite" onclick="Tag.favorite(this)">
+$else$
+ <img src="/static/img/thumbs/bw.left.gif" class="thumb" onclick="Tag.favorite(this)">
+$endif$
<div class="content">$dump.content$</div>
<!-- <hr /> -->
$share_buttons()$
diff --git a/template/profile_dump.st b/template/profile_dump.st
index ff5ff8c..31a0ca3 100644
--- a/template/profile_dump.st
+++ b/template/profile_dump.st
@@ -4,14 +4,17 @@
</div>
<a href="/u/$dump.nick$">
<div id="logavatar">
-
- $if(dump.avatar)$
+$if(dump.avatar)$
<img height="50" width="50" src="$dump.avatar$" />
- $else$
+$else$
<img height="50" width="50" src="/static/img/noinfo.png">
- $endif$
-
+$endif$
</div></a>
+$if(dump.favorited)$
+ <img src="/static/img/thumbs/color.left.gif" class="thumb favorite" onclick="Tag.favorite(this)">
+$else$
+ <img src="/static/img/thumbs/bw.left.gif" class="thumb" onclick="Tag.favorite(this)">
+$endif$
<div class="content">$dump.content$</div>
- $share_buttons()$
+$share_buttons()$
</div>
diff --git a/template/share_buttons.st b/template/share_buttons.st
index 3f1f472..02736dc 100644
--- a/template/share_buttons.st
+++ b/template/share_buttons.st
@@ -1,11 +1,4 @@
<div class="buttons">
-$if(dump)$
- $if(dump.favorited)$
- <img src="/static/img/thumbs/color.left.gif" class="thumb favorite" onclick="Tag.favorite(this)">
- $else$
- <img src="/static/img/thumbs/bw.left.gif" class="thumb" onclick="Tag.favorite(this)">
- $endif$
-$endif$
<span class="other-sites">
<img src="/static/img/share/tumblricon.png" class="share" onclick="Share.tumblr(this)">
<img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)">