From: Radek Czajka Date: Wed, 29 Aug 2012 15:12:45 +0000 (+0200) Subject: social X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/09f046d960613fb4022cd7f4ad5a66a9787bc32a social --- diff --git a/migdal/templates/migdal/entry/entry_detail.html b/migdal/templates/migdal/entry/entry_detail.html index 1f322be..ef842b8 100755 --- a/migdal/templates/migdal/entry/entry_detail.html +++ b/migdal/templates/migdal/entry/entry_detail.html @@ -1,6 +1,19 @@ {% extends "base.html" %} {% load comments i18n %} -{% load migdal_tags %} +{% load common_tags migdal_tags share %} + + +{% block "titleextra" %}{{ entry.title }} ::{% endblock %} +{% block "ogtitle" %}{{ entry.title }}{% endblock %} +{% block "ogtype" %}article{% endblock %} +{% block "ogdescription"%}{{ entry.lead|striptags|truncatewords:10 }}{% endblock %} +{% block "ogimage" %}{% spaceless %} +{% if entry.image %} + {{ entry.image.url|build_absolute_uri:request }} +{% else %} + {{ block.super }} +{% endif %} +{% endspaceless %}{% endblock %} {% block "main_menu" %} @@ -21,6 +34,15 @@
{{ entry.body }}
+ +
+ +
+ +
+
{% if entry.get_type.commentable %} diff --git a/migdal/templates/migdal/entry/entry_short.html b/migdal/templates/migdal/entry/entry_short.html index 5dbef6f..31dbf9e 100755 --- a/migdal/templates/migdal/entry/entry_short.html +++ b/migdal/templates/migdal/entry/entry_short.html @@ -1,6 +1,6 @@ {% load i18n %} {% load comments %} -{% load migdal_tags %} +{% load migdal_tags share %}
@@ -8,6 +8,9 @@ {% entry_begin object %} +
+ +
{% if object.get_type.commentable %} @@ -23,9 +26,11 @@
- +
+
diff --git a/migdal/templates/migdal/last_comments.html b/migdal/templates/migdal/last_comments.html index 2b5945a..f26cfea 100755 --- a/migdal/templates/migdal/last_comments.html +++ b/migdal/templates/migdal/last_comments.html @@ -6,7 +6,7 @@
{{ comment.content_object.title }}
{{ comment.name }}
-
{{ comment.comment|textile_restricted_pl|striptags|truncatechars:32 }}
+
{{ comment.comment|textile_restricted_pl|striptags|truncatewords:8 }}
 {% endfor %} diff --git a/prawokultury/static/css/base.css b/prawokultury/static/css/base.css index 615e005..aa0c016 100644 --- a/prawokultury/static/css/base.css +++ b/prawokultury/static/css/base.css @@ -28,3 +28,6 @@ h1 { padding: 1em; background: #ffd; font-size: 1.3em; } + +.notice { + font-size: 1.3em; } diff --git a/prawokultury/static/css/base.scss b/prawokultury/static/css/base.scss index 01723b1..67115d2 100644 --- a/prawokultury/static/css/base.scss +++ b/prawokultury/static/css/base.scss @@ -36,3 +36,7 @@ h1 { background: #ffd; font-size: 1.3em; } + +.notice { + font-size: 1.3em; +} diff --git a/prawokultury/static/css/entry.css b/prawokultury/static/css/entry.css index d3a9a5e..655ae63 100644 --- a/prawokultury/static/css/entry.css +++ b/prawokultury/static/css/entry.css @@ -34,13 +34,20 @@ font-size: 1.3em; } .entry-wrapped .body { font-size: 1.3em; } - .entry-wrapped .more { - clear: both; - float: right; - font-size: 1.3em; + .entry-wrapped blockquote { + position: relative; + left: 1em; font-style: italic; - margin-top: .6em; + margin-left: 1em; } + .entry-wrapped .toolbar { + font-size: 1.3em; + margin-top: 1.4em; margin-bottom: 1.8em; } + .entry-wrapped .toolbar .social a { + margin-right: .6em; } + .entry-wrapped .more { + float: right; + font-style: italic; } .entry-wrapped .more a { color: #acacac; } .entry-wrapped .more .read-more { diff --git a/prawokultury/static/css/entry.scss b/prawokultury/static/css/entry.scss index 5ce77cb..62de95a 100644 --- a/prawokultury/static/css/entry.scss +++ b/prawokultury/static/css/entry.scss @@ -62,13 +62,22 @@ margin-left: 1em; } + .toolbar { + font-size: 1.3em; + margin-top: 1.4em; + margin-bottom: 1.8em; + + .social a { + margin-right: .6em; + img { + vertical-align: middle; + } + } + } + .more { - clear: both; float: right; - font-size: 1.3em; font-style: italic; - margin-top: .6em; - margin-bottom: 1.8em; a { color: #acacac; diff --git a/prawokultury/static/css/sidebar.css b/prawokultury/static/css/sidebar.css index 6ee67da..8358e45 100644 --- a/prawokultury/static/css/sidebar.css +++ b/prawokultury/static/css/sidebar.css @@ -84,3 +84,11 @@ #latest-comments .body { margin-top: 1.3em; font-size: 1.1em; } + +#sidebar .social { + padding-top: 2em; + padding-bottom: 2em; } + #sidebar .social a { + margin-right: 2em; } + #sidebar .social a img { + vertical-align: top; } diff --git a/prawokultury/static/css/sidebar.scss b/prawokultury/static/css/sidebar.scss index 2607deb..df4ab3e 100644 --- a/prawokultury/static/css/sidebar.scss +++ b/prawokultury/static/css/sidebar.scss @@ -123,4 +123,16 @@ margin-top: 1.3em; font-size: 1.1em; } -} \ No newline at end of file +} + +#sidebar .social { + padding-top: 2em; + padding-bottom: 2em; + + a { + margin-right: 2em; + img { + vertical-align: middle; + } + } +} diff --git a/prawokultury/static/img/social/bigfacebook.png b/prawokultury/static/img/social/bigfacebook.png new file mode 100644 index 0000000..630416c Binary files /dev/null and b/prawokultury/static/img/social/bigfacebook.png differ diff --git a/prawokultury/static/img/social/biggoogle.png b/prawokultury/static/img/social/biggoogle.png new file mode 100644 index 0000000..19ad19d Binary files /dev/null and b/prawokultury/static/img/social/biggoogle.png differ diff --git a/prawokultury/static/img/social/bignk.png b/prawokultury/static/img/social/bignk.png new file mode 100644 index 0000000..c119cd1 Binary files /dev/null and b/prawokultury/static/img/social/bignk.png differ diff --git a/prawokultury/static/img/social/bigtwitter.png b/prawokultury/static/img/social/bigtwitter.png new file mode 100644 index 0000000..fafbe64 Binary files /dev/null and b/prawokultury/static/img/social/bigtwitter.png differ diff --git a/prawokultury/static/img/social/facebook.png b/prawokultury/static/img/social/facebook.png new file mode 100644 index 0000000..dca6fe8 Binary files /dev/null and b/prawokultury/static/img/social/facebook.png differ diff --git a/prawokultury/static/img/social/google.png b/prawokultury/static/img/social/google.png new file mode 100644 index 0000000..c8c2882 Binary files /dev/null and b/prawokultury/static/img/social/google.png differ diff --git a/prawokultury/static/img/social/nk.png b/prawokultury/static/img/social/nk.png new file mode 100644 index 0000000..de6650f Binary files /dev/null and b/prawokultury/static/img/social/nk.png differ diff --git a/prawokultury/static/img/social/twitter.png b/prawokultury/static/img/social/twitter.png new file mode 100644 index 0000000..6745ef4 Binary files /dev/null and b/prawokultury/static/img/social/twitter.png differ diff --git a/prawokultury/static/img/square-logo.png b/prawokultury/static/img/square-logo.png new file mode 100644 index 0000000..cd42d39 Binary files /dev/null and b/prawokultury/static/img/square-logo.png differ diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html index db10839..e1095eb 100755 --- a/prawokultury/templates/base.html +++ b/prawokultury/templates/base.html @@ -1,13 +1,21 @@ {% load url from future %} {% load i18n static %} -{% load migdal_tags events_tags %} +{% load migdal_tags events_tags share %} {% load compressed %} - + - {% trans "Culture's right" %} + {% trans "Culture's right" %}{% block "titleextra" %}{% endblock %} {% compressed_css 'base' %} + + + + + + + +
@@ -58,9 +66,12 @@ {% categories 'topics' %} {% categories 'types' %}
- +

{% trans "Latest comments" %}

{% last_comments %} diff --git a/prawokultury/templates/share.html b/prawokultury/templates/share.html new file mode 100755 index 0000000..3f6b487 --- /dev/null +++ b/prawokultury/templates/share.html @@ -0,0 +1,29 @@ +{% load i18n common_tags static %} +{% with encoded_url=url|build_absolute_uri:request|urlencode encoded_desc=description|urlencode %} + + + {% trans 'Share on Google+' %} + + + {% trans 'Share on NK.pl' %} +{% comment %} + + {% trans 'Share on Diaspora' %} + + {% trans 'Share on Blip.pl' %} +{% endcomment %} +{% endwith %} \ No newline at end of file diff --git a/prawokultury/templatetags/common_tags.py b/prawokultury/templatetags/common_tags.py new file mode 100755 index 0000000..ccaf03b --- /dev/null +++ b/prawokultury/templatetags/common_tags.py @@ -0,0 +1,7 @@ +from django import template +register = template.Library() + + +@register.filter +def build_absolute_uri(uri, request): + return request.build_absolute_uri(uri) diff --git a/prawokultury/templatetags/share.py b/prawokultury/templatetags/share.py new file mode 100755 index 0000000..ba9a69b --- /dev/null +++ b/prawokultury/templatetags/share.py @@ -0,0 +1,13 @@ +from django.template import Library + +register = Library() + + +@register.inclusion_tag('share.html', takes_context=True) +def share(context, url, description, iconset=""): + return { + 'url': url, + 'description': description, + 'iconset': iconset, + 'request': context['request'], + }