diff options
| author | sostler <sbostler@gmail.com> | 2010-05-25 02:24:32 -0400 |
|---|---|---|
| committer | sostler <sbostler@gmail.com> | 2010-05-25 02:24:32 -0400 |
| commit | e882ec466fb26973a0f35711b6123af0c6b621aa (patch) | |
| tree | 84c1333de71f2be13aff2a215a06b06c0091643d | |
| parent | 7f2f73a513e937171fb37f796235b39324d5a597 (diff) | |
| parent | 0c28d18cee3f623d86caf4eccb71403831ca6064 (diff) | |
Merge branch 'master' of ssh://dump.fm/home/dumpfmprod/prod
| -rwxr-xr-x | static/css/dump.css | 4 | ||||
| -rw-r--r-- | static/js/pichat.js | 6 | ||||
| -rw-r--r-- | template/profile.st | 14 |
3 files changed, 8 insertions, 16 deletions
diff --git a/static/css/dump.css b/static/css/dump.css index c6cd068..18e3e76 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -415,7 +415,7 @@ opacity:0.87; z-index:18; text-align: left; } -#userList a:hover{color:#000;} +#userList a:hover{color:#ffffff;} .username{height:30px; margin-top:6px; line-height:20px; @@ -437,7 +437,7 @@ width:100%; height:100%; background-image:url(/static/img/moverc.png); background-repeat:repeat-x; -color:#000; +color:#fff; text-decoration:none; background-color:#f3f3f3; border-top-right-radius:5px; diff --git a/static/js/pichat.js b/static/js/pichat.js index 516fd99..e2ab061 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -953,7 +953,7 @@ function parseDomain(host){ // Away notification var UnseenMsgCounter = 0; -var OrigTitle = $('title').text(); +var OrigTitle = ""; var HasFocus = true; function onFocus() { @@ -981,3 +981,7 @@ function startTitleUpdater() { $(window).focus(onFocus); setTimeout(titleUpdater, 2000); } + +$(function() { + OrigTitle = $('title').text(); +});
\ No newline at end of file diff --git a/template/profile.st b/template/profile.st index 0634b05..e530e4a 100644 --- a/template/profile.st +++ b/template/profile.st @@ -78,19 +78,7 @@ <div id="date"> <div type="text" id="datepicker"></div></div> </div> - <div id="adsenseprofile" style="display:none;"> - <script type="text/javascript"><!-- -google_ad_client = "pub-9863902168532765"; -/* 200x200, created 5/23/10 */ -google_ad_slot = "0464631788"; -google_ad_width = 200; -google_ad_height = 200; -//--> -</script> -<script type="text/javascript" -src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> -</script> -</div> + $else$ <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$"> |