Skip to content

Commit

Permalink
Convert .ico files to .png for IE
Browse files Browse the repository at this point in the history
  • Loading branch information
@ginatrapani
ginatrapani committed Nov 14, 2011
1 parent 84c957f commit cc851ef
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion webapp/_lib/view/_link.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="individual-tweet post clearfix article"> <div class="individual-tweet post clearfix article">
<div class="grid_1 alpha"> <div class="grid_1 alpha">
<a href="https://twitter.com/intent/user?user_id={$l->container_post->author_user_id}"> <a href="https://twitter.com/intent/user?user_id={$l->container_post->author_user_id}">
<img src="{$l->container_post->author_avatar}" class="avatar"/><img src="{$site_root_path}plugins/{$l->container_post->network|get_plugin_path}/assets/img/favicon.ico" class="service-icon"/></a> <img src="{$l->container_post->author_avatar}" class="avatar"/><img src="{$site_root_path}plugins/{$l->container_post->network|get_plugin_path}/assets/img/favicon.png" class="service-icon"/></a>
</div> </div>
<div class="grid_3 right small"> <div class="grid_3 right small">
<a href="https://twitter.com/intent/user?user_id={$l->container_post->author_user_id}">{$l->container_post->author_username}</a> <a href="https://twitter.com/intent/user?user_id={$l->container_post->author_user_id}">{$l->container_post->author_username}</a>
Expand Down
2 changes: 1 addition & 1 deletion webapp/_lib/view/_post.author_no_counts.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $unit (optional) If $show_distance='true', unit should be 'mi' or 'km' for miles
<div class="grid_2 alpha"> <div class="grid_2 alpha">
<div class="avatar-container"> <div class="avatar-container">
{if $post->network == 'twitter'} <a href="https://twitter.com/intent/user?user_id={$post->author_user_id}" title="{$post->author_username} on Twitter">{/if} {if $post->network == 'twitter'} <a href="https://twitter.com/intent/user?user_id={$post->author_user_id}" title="{$post->author_username} on Twitter">{/if}
<img src="{$post->author_avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$post->network|get_plugin_path}/assets/img/favicon.ico" class="service-icon"/> <img src="{$post->author_avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$post->network|get_plugin_path}/assets/img/favicon.png" class="service-icon"/>
{if $post->network == 'twitter'}</a>{/if} {if $post->network == 'twitter'}</a>{/if}
</div> </div>
</div> </div>
Expand Down
4 changes: 2 additions & 2 deletions webapp/_lib/view/_post.qa.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="individual-tweet post clearfix"{if $smarty.foreach.foo.index % 2 == 1} style="background-color:#EEE"{/if}> <div class="individual-tweet post clearfix"{if $smarty.foreach.foo.index % 2 == 1} style="background-color:#EEE"{/if}>
<div class="grid_2 alpha"> <div class="grid_2 alpha">
<div class="avatar-container"> <div class="avatar-container">
<img src="{$r.questioner_avatar}" class="avatar"/><img src="{$site_root_path}plugins/{$r.network|get_plugin_path}/assets/img/favicon.ico" class="service-icon"/> <img src="{$r.questioner_avatar}" class="avatar"/><img src="{$site_root_path}plugins/{$r.network|get_plugin_path}/assets/img/favicon.png" class="service-icon"/>
</div> </div>
</div> </div>
<div class="grid_4 small"> <div class="grid_4 small">
Expand Down Expand Up @@ -53,7 +53,7 @@


<div class="grid_2 alpha"> <div class="grid_2 alpha">
<div class="avatar-container"> <div class="avatar-container">
<img src="{$r.answerer_avatar}" class="avatar"/><img src="{$site_root_path}plugins/{$r.network|get_plugin_path}/assets/img/favicon.ico" class="service-icon"/> <img src="{$r.answerer_avatar}" class="avatar"/><img src="{$site_root_path}plugins/{$r.network|get_plugin_path}/assets/img/favicon.png" class="service-icon"/>
</div> </div>
</div> </div>
<div class="grid_4 small"> <div class="grid_4 small">
Expand Down
2 changes: 1 addition & 1 deletion webapp/_lib/view/_post.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div class="individual-tweet post clearfix{if $t->is_protected} private{/if}"> <div class="individual-tweet post clearfix{if $t->is_protected} private{/if}">
<div class="grid_2 alpha"> <div class="grid_2 alpha">
<div class="avatar-container"> <div class="avatar-container">
<img src="{$t->author_avatar}" class="avatar"/><img src="{$site_root_path}plugins/{$t->network|get_plugin_path}/assets/img/favicon.ico" class="service-icon"/> <img src="{$t->author_avatar}" class="avatar"/><img src="{$site_root_path}plugins/{$t->network|get_plugin_path}/assets/img/favicon.png" class="service-icon"/>
{if $t->is_reply_by_friend or $t->is_retweet_by_friend} {if $t->is_reply_by_friend or $t->is_retweet_by_friend}
<div class="small gray">Friend</div> <div class="small gray">Friend</div>
{/if} {/if}
Expand Down
2 changes: 1 addition & 1 deletion webapp/_lib/view/_user.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="grid_2 alpha"> <div class="grid_2 alpha">
<div class="avatar-container"> <div class="avatar-container">
{if $f.network == 'twitter'}<a href="https://twitter.com/intent/user?user_id={$f.user_id}" title="{$f.user_name} on Twitter">{/if} {if $f.network == 'twitter'}<a href="https://twitter.com/intent/user?user_id={$f.user_id}" title="{$f.user_name} on Twitter">{/if}
<img src="{$f.avatar}" class="avatar"/><img src="{$site_root_path}plugins/{$f.network|get_plugin_path}/assets/img/favicon.ico" class="service-icon"/> <img src="{$f.avatar}" class="avatar"/><img src="{$site_root_path}plugins/{$f.network|get_plugin_path}/assets/img/favicon.png" class="service-icon"/>
{if $f.network == 'twitter'}</a>{/if} {if $f.network == 'twitter'}</a>{/if}
</div> </div>
</div> </div>
Expand Down
4 changes: 2 additions & 2 deletions webapp/_lib/view/dashboard.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<div class="grid_2 alpha"> <div class="grid_2 alpha">
<div class="avatar-container"> <div class="avatar-container">
<img src="{$user_details->avatar}" class="avatar2"/> <img src="{$user_details->avatar}" class="avatar2"/>
<img src="{$site_root_path}plugins/{$user_details->network|get_plugin_path}/assets/img/favicon.ico" class="service-icon2"/> <img src="{$site_root_path}plugins/{$user_details->network|get_plugin_path}/assets/img/favicon.png" class="service-icon2"/>
</div> </div>
</div> </div>
<div class="grid_15 omega"> <div class="grid_15 omega">
Expand Down Expand Up @@ -194,7 +194,7 @@
<div class="clearfix article" style="padding-top : 0px;"> <div class="clearfix article" style="padding-top : 0px;">
{foreach from=$least_likely_followers key=uid item=u name=foo} {foreach from=$least_likely_followers key=uid item=u name=foo}
<div class="avatar-container" style="float:left;margin:7px;"> <div class="avatar-container" style="float:left;margin:7px;">
<a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name} has {$u.follower_count|number_format} followers and {$u.friend_count|number_format} friends"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.ico" class="service-icon2"/></a> <a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name} has {$u.follower_count|number_format} followers and {$u.friend_count|number_format} friends"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.png" class="service-icon2"/></a>
</div> </div>
{/foreach} {/foreach}
<br /><br /><br /> <br /><br /><br />
Expand Down
2 changes: 1 addition & 1 deletion webapp/_lib/view/install.upgradeneeded.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>ThinkUp: Upgrading</title> <title>ThinkUp: Upgrading</title>
<link rel="shortcut icon" type="image/x-icon" <link rel="shortcut icon" type="image/x-icon"
href="/assets/img/favicon.ico"> href="/assets/img/favicon.png">
<!-- jquery --> <!-- jquery -->
<link type="text/css" rel="stylesheet" <link type="text/css" rel="stylesheet"
href="//ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css"> href="//ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css">
Expand Down
2 changes: 1 addition & 1 deletion webapp/_lib/view/post.index._top-post.tpl
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="grid_2 alpha"> <div class="grid_2 alpha">
<div class="avatar-container"> <div class="avatar-container">
<img src="{$post->author_avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$post->network|get_plugin_path}/assets/img/favicon.ico" class="service-icon2"/> <img src="{$post->author_avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$post->network|get_plugin_path}/assets/img/favicon.png" class="service-icon2"/>
</div> </div>
</div> </div>


Expand Down
4 changes: 2 additions & 2 deletions webapp/_lib/view/user.index.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<div class="clearfix"> <div class="clearfix">
<div class="grid_2 alpha"> <div class="grid_2 alpha">
<div class="avatar-container"> <div class="avatar-container">
<img src="{$profile->avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$profile->network|get_plugin_path}/assets/img/favicon.ico" class="service-icon2"/> <img src="{$profile->avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$profile->network|get_plugin_path}/assets/img/favicon.png" class="service-icon2"/>
</div> </div>
</div> </div>
<div class="grid_12"> <div class="grid_12">
Expand Down Expand Up @@ -66,7 +66,7 @@
<div class="grid_18 alpha omega"> <div class="grid_18 alpha omega">
{foreach from=$mutual_friends key=uid item=u name=foo} {foreach from=$mutual_friends key=uid item=u name=foo}
<div class="avatar-container float-l mr_10 mb_10"> <div class="avatar-container float-l mr_10 mb_10">
<a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name}"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.ico" class="service-icon2"/></a> <a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name}"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.png" class="service-icon2"/></a>
</div> </div>
{/foreach} {/foreach}
</div> </div>
Expand Down
Binary file added webapp/plugins/facebook/assets/img/favicon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion webapp/plugins/geoencoder/view/geoencoder.map.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="clearfix alert stats"> <div class="clearfix alert stats">
<div class="grid_2 alpha"> <div class="grid_2 alpha">
<div class="avatar-container"> <div class="avatar-container">
<img src="{$post->author_avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$post->network|get_plugin_path}/assets/img/favicon.ico" class="service-icon2"/> <img src="{$post->author_avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$post->network|get_plugin_path}/assets/img/favicon.png" class="service-icon2"/>
</div> </div>
</div> </div>
<div class="{if $retweets}grid_12{else}grid_16{/if}"> <div class="{if $retweets}grid_12{else}grid_16{/if}">
Expand Down
2 changes: 1 addition & 1 deletion webapp/plugins/geoencoder/view/geoencoder.nearest.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="clearfix alert stats"> <div class="clearfix alert stats">
<div class="grid_2 alpha"> <div class="grid_2 alpha">
<div class="avatar-container"> <div class="avatar-container">
<img src="{$post->author_avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$post->network|get_plugin_path}/assets/img/favicon.ico" class="service-icon2"/> <img src="{$post->author_avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$post->network|get_plugin_path}/assets/img/favicon.png" class="service-icon2"/>
</div> </div>
</div> </div>
<div class="{if $retweets}grid_12{else}grid_16{/if}"> <div class="{if $retweets}grid_12{else}grid_16{/if}">
Expand Down
Binary file added webapp/plugins/googleplus/assets/img/favicon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added webapp/plugins/twitter/assets/img/favicon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions webapp/plugins/twitter/view/followers.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="article" style="padding-left : 0px; padding-top : 0px;"> <div class="article" style="padding-left : 0px; padding-top : 0px;">
{foreach from=$leastlikelythisweek key=tid item=u name=foo} {foreach from=$leastlikelythisweek key=tid item=u name=foo}
<div class="avatar-container" style="float:left;margin:7px;"> <div class="avatar-container" style="float:left;margin:7px;">
<a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name} has {$u.follower_count|number_format} followers and {$u.friend_count|number_format} friends"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.ico" class="service-icon2"/></a> <a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name} has {$u.follower_count|number_format} followers and {$u.friend_count|number_format} friends"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.png" class="service-icon2"/></a>
</div> </div>
{/foreach} {/foreach}
<br /><br /><br /> <br /><br /><br />
Expand All @@ -19,7 +19,7 @@
<div class="article" style="padding-left : 0px; padding-top : 0px;"> <div class="article" style="padding-left : 0px; padding-top : 0px;">
{foreach from=$leastlikely key=tid item=u name=foo} {foreach from=$leastlikely key=tid item=u name=foo}
<div class="avatar-container" style="float:left;margin:7px;"> <div class="avatar-container" style="float:left;margin:7px;">
<a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name} has {$u.follower_count|number_format} followers and {$u.friend_count|number_format} friends"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.ico" class="service-icon2"/></a> <a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name} has {$u.follower_count|number_format} followers and {$u.friend_count|number_format} friends"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.png" class="service-icon2"/></a>
</div> </div>
{/foreach} {/foreach}
<br /><br /><br /> <br /><br /><br />
Expand All @@ -34,7 +34,7 @@
<div class="article" style="padding-left : 0px; padding-top : 0px;"> <div class="article" style="padding-left : 0px; padding-top : 0px;">
{foreach from=$popular key=tid item=u name=foo} {foreach from=$popular key=tid item=u name=foo}
<div class="avatar-container" style="float:left;margin:7px;"> <div class="avatar-container" style="float:left;margin:7px;">
<a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name} has {$u.follower_count|number_format} followers and {$u.friend_count|number_format} friends"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.ico" class="service-icon2"/></a> <a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name} has {$u.follower_count|number_format} followers and {$u.friend_count|number_format} friends"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.png" class="service-icon2"/></a>
</div> </div>
{/foreach} {/foreach}
<br /><br /><br /> <br /><br /><br />
Expand Down
6 changes: 3 additions & 3 deletions webapp/plugins/twitter/view/who_you_follow.tpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="article" style="padding-left : 0px; padding-top : 0px;"> <div class="article" style="padding-left : 0px; padding-top : 0px;">
{foreach from=$chatterboxes key=tid item=u name=foo} {foreach from=$chatterboxes key=tid item=u name=foo}
<div class="avatar-container" style="float:left;margin:7px;"> <div class="avatar-container" style="float:left;margin:7px;">
<a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name}"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.ico" class="service-icon2"/></a> <a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name}"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.png" class="service-icon2"/></a>
</div> </div>
{/foreach} {/foreach}
<br /><br /><br /> <br /><br /><br />
Expand All @@ -21,7 +21,7 @@
<div class="article" style="padding-left : 0px; padding-top : 0px;"> <div class="article" style="padding-left : 0px; padding-top : 0px;">
{foreach from=$deadbeats key=tid item=u name=foo} {foreach from=$deadbeats key=tid item=u name=foo}
<div class="avatar-container" style="float:left;margin:7px;"> <div class="avatar-container" style="float:left;margin:7px;">
<a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name}"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.ico" class="service-icon2"/></a> <a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name}"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.png" class="service-icon2"/></a>
</div> </div>
{/foreach} {/foreach}
<br /><br /><br /> <br /><br /><br />
Expand All @@ -36,7 +36,7 @@
<div class="article" style="padding-left : 0px; padding-top : 0px;"> <div class="article" style="padding-left : 0px; padding-top : 0px;">
{foreach from=$popular key=tid item=u name=foo} {foreach from=$popular key=tid item=u name=foo}
<div class="avatar-container" style="float:left;margin:7px;"> <div class="avatar-container" style="float:left;margin:7px;">
<a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name}"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.ico" class="service-icon2"/></a> <a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name}"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.png" class="service-icon2"/></a>
</div> </div>
{/foreach} {/foreach}
<br /><br /><br /> <br /><br /><br />
Expand Down

0 comments on commit cc851ef

Please sign in to comment.