summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--askbot/skins/default/media/images/favicon.icobin0 -> 1150 bytes
-rw-r--r--askbot/skins/default/media/js/post.js6
-rwxr-xr-xaskbot/skins/default/media/style/style.css12
-rw-r--r--askbot/skins/default/templates/base.html2
-rw-r--r--askbot/skins/default/templates/question.html1
5 files changed, 18 insertions, 3 deletions
diff --git a/askbot/skins/default/media/images/favicon.ico b/askbot/skins/default/media/images/favicon.ico
new file mode 100644
index 00000000..51a57bed
--- /dev/null
+++ b/askbot/skins/default/media/images/favicon.ico
Binary files differ
diff --git a/askbot/skins/default/media/js/post.js b/askbot/skins/default/media/js/post.js
index 181e1e06..30846034 100644
--- a/askbot/skins/default/media/js/post.js
+++ b/askbot/skins/default/media/js/post.js
@@ -1494,6 +1494,10 @@ var socialSharing = function(){
facebook: {
url: "http://www.facebook.com/sharer.php?u={URL}&ref=fbshare&t={TEXT}",
params: "width=630,height=436,toolbar=1,status=1,resizable=1,scrollbars=1"
+ },
+ linkedin: {
+ url: "http://www.linkedin.com/shareArticle?mini=true&url={{ URL }}&source={{ TEXT }}",
+ params: "width=630,height=436,toolbar=1,status=1,resizable=1,scrollbars=1"
}
};
var URL = "";
@@ -1517,10 +1521,12 @@ var socialSharing = function(){
TEXT = escape($('h1 > a').html());
var fb = $('a.fb-share')
var tw = $('a.twitter-share');
+ var tw = $('a.linkedin-share');
copyAltToTitle(fb);
copyAltToTitle(tw);
setupButtonEventHandlers(fb, function(){share_page("facebook")});
setupButtonEventHandlers(tw, function(){share_page("twitter")});
+ setupButtonEventHandlers(tw, function(){share_page("linkedin")});
}
}
}();
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index da03e913..5c1dc239 100755
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -2257,12 +2257,15 @@ img.flag {
vertical-align: text-bottom;
}
+
+.fb-share, .twitter-share, .linkedin-share {
+ width:25px;
+ display:block;
+}
.fb-share, .twitter-share {
background: url(../images/sprite.png) no-repeat;
text-indent:-100em;
- width:25px;
height:25px;
- display:block;
}
.fb-share {
background-position: -25px 0px;
@@ -2271,6 +2274,11 @@ img.flag {
margin-top:10px;
background-position: 0px 0px;
}
+.linkedin-share {
+ background: url("http://static01.linkedin.com/scds/common/u/img/sprite/sprite_connect_v12.png") no-repeat scroll 4px 0 transparent !important;
+ height:20px;
+ margin-bottom:5px;
+}
/* Pretty printing styles. Used with prettify.js. */
a.edit {
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html
index db6670b2..fd1befbc 100644
--- a/askbot/skins/default/templates/base.html
+++ b/askbot/skins/default/templates/base.html
@@ -15,7 +15,7 @@
{% if settings.SITE_FAVICON %}
<link rel="shortcut icon" href="{{ settings.SITE_FAVICON|media }}" />
{% else %}
- <link rel="shortcut icon" href="{{ '/m/default/media/images/favicon.gif'|media }}" />
+ <link rel="shortcut icon" href="{{ '/m/default/media/images/favicon.ico'|media }}" />
{% endif %}
<link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" />
{{ skin.get_extra_css_link() }}
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index a06732b9..6f08e381 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -70,6 +70,7 @@
{% if settings.ENABLE_SOCIAL_SHARING %}
<a class="twitter-share" alt="{% trans %}Share this question on twitter{% endtrans %}"></a>
<a class="fb-share" alt="{% trans %}Share this question on facebook{% endtrans %}"></a>
+ <a class="linkedin-share" alt="{% trans %}Share this question on LinkedIn{% endtrans %}"></a>
<g:plusone size="small" count="false"></g:plusone>
{% endif %}
</div>