theme merged
authormicroft <microft@joker>
Sat, 20 Jun 2009 11:24:27 +0000 (12:24 +0100)
committermicroft <microft@joker>
Sat, 20 Jun 2009 11:24:27 +0000 (12:24 +0100)
ui/themes/defaultsmall/blue_stripe.png [new file with mode: 0644]
ui/themes/defaultsmall/forward.png [deleted file]
ui/themes/defaultsmall/minus.png
ui/themes/defaultsmall/rt.png [deleted file]
ui/themes/defaultsmall/theme.html
ui/themes/defaultsmall/x.png [deleted file]

diff --git a/ui/themes/defaultsmall/blue_stripe.png b/ui/themes/defaultsmall/blue_stripe.png
new file mode 100644 (file)
index 0000000..fa9482c
Binary files /dev/null and b/ui/themes/defaultsmall/blue_stripe.png differ
diff --git a/ui/themes/defaultsmall/forward.png b/ui/themes/defaultsmall/forward.png
deleted file mode 100644 (file)
index 9fe94a7..0000000
Binary files a/ui/themes/defaultsmall/forward.png and /dev/null differ
index 0d5382d..878b7ec 100644 (file)
Binary files a/ui/themes/defaultsmall/minus.png and b/ui/themes/defaultsmall/minus.png differ
diff --git a/ui/themes/defaultsmall/rt.png b/ui/themes/defaultsmall/rt.png
deleted file mode 100644 (file)
index 130051a..0000000
Binary files a/ui/themes/defaultsmall/rt.png and /dev/null differ
index ba1ab8d..4098932 100644 (file)
       .toggledupe {
         float: left;
         display: none;
-        margin-top: -16px;
+        margin-top: -18px;
         margin-left: 3px;
       }
     </style>
         html = '<div id="'+ data.gId +'" class="message '+ data.username + data.protocol + ' ' + data.aId + data.bgcolor +'" title="'+ data.sender_nick +'">' +
             '<center> \
             <p class="content"> \
-            <span class="title">'+ data.sender +'</span>  \
-            <span> \
-              <a href="gwibber:unfollow/'+ data.aId +'/'+ data.sender_nick +'"><img alt="Unfollow" title="Unfollow" src="x.png" /></a> \
-            </span><br /> \
+            <span class="title">'+ data.sender +'</span><br /> \
             <span class="text">'+ data.sender_followers_count +' followers</span><br /> \
-            <span class="text">'+ (data.sender_location ? data.sender_location : '' ) +'</span><br /> \
+            <span class="text">'+ data.sender_location +'</span><br /> \
             <span class="text"><a href="'+ data.external_profile_url  +'">'+ data.external_profile_url +'</a></span> \
             </p> \
             </center> \
               <p class="content"> \
                 <span class="title">'+ (data.title == undefined ? data.sender : data.title) +'</span> \
                 <span class="time"> (<a href="'+ 'gwibber:read/' + data.message_index  +'">'+ data.time_string +'</a>' +
-                    (data.source ? ', from '+ data.source : '') +
-                    (data.reply_nick ? ', <a href="'+ data.reply_url +'">'+ msg.reply +' '+ data.reply_nick +'</a>' : '') +
+                    (data.reply_nick ? ' <a href="'+ data.reply_url +'">'+ msg.reply +' '+ data.reply_nick +'</a>' : '') +
                     ')</span><br /> \
                 <span class="text">'+ data.html_string +'</span> \
               </p> \
             '<div class="toggledupe"><img src="add.png" /></div> ' +
             '<div class="replybutton">' +
              (data.can_thread ? '<a href="gwibber:thread/' + data.message_index + '"><img src="thread.png" /></a>' : '') +
-             '<a href="gwibber:reply/'+ data.message_index +'"><img src="reply.png" title="Reply" /></a> ' + 
-             (data.can_retweet ? '<a href="gwibber:retweet/' + data.message_index + '"><img alt="ReTweet" title="ReTweet" src="rt.png" /></a>' : '') +
-            '<a href="gwibber:forward/' + data.message_index + '"><img alt="Forward" title="Forward" src="forward.png" /></a>' +
-            ' </div> ' +
+             (data.can_reply ? '<a href="gwibber:reply/'+ data.message_index +'"><img src="reply.png" /></a>' : '') +
+             '</div> ' +
             '<div class="dupes"></div> \
         </div>'
 
         if (data.is_duplicate) {
           $("#" + data.gId + " .dupes:first").append(html);
           $("#" + data.gId + " .toggledupe:first").show(0).unbind().toggle(
-          function() {
-              $(this).parent().find(".toggledupe:first").find("img").attr("src", "minus.png");
-              $(this).parent().find(".dupes").show(100); 
-          },
-          function() {
-              $(this).parent().find(".toggledupe:first").find("img").attr("src", "add.png"); 
-              $(this).parent().find(".dupes").hide(100);
-          });
+            function() {$(this).parent().find(".dupes").show(100)},
+            function() {$(this).parent().find(".dupes").hide(100)});
         } else $(".messages").append(html);
 
         if (data.protocol == "digg")
diff --git a/ui/themes/defaultsmall/x.png b/ui/themes/defaultsmall/x.png
deleted file mode 100644 (file)
index a50bb64..0000000
Binary files a/ui/themes/defaultsmall/x.png and /dev/null differ