Merge remote-tracking branch 'upstream/pelican' into pelican

Author: arturfsousa

content/primeiro-projeto-django.rst

@@ -8,7 +8,12 @@ Seu primeiro projeto Django com Sublime Text no Linux
 :author: Fabiano Góes
 :email:  [email protected]
 :summary: Primeiro projeto Django no Linux/Ubuntu com Sublime Text 3
-
+:github: fabianogoes
+:bitbucket: fabianogoes
+:site: http://estudepy.wordpress.com/
+:twitter: @fabiano_goes
+:facebook: fabianogoes.face
+:linkedin: fabianogoes
 
 ========================
 O objetivo deste artigo:
@@ -310,4 +315,4 @@ Neste momento podemos selecionar Pessoa e cadastrar pessoas ao nosso sistema.
 
 Bom pessoal, é isso, um tutorial simples apenas de meio longo.
 
-espero que gostem, um abraço a todos!
+espero que gostem, um abraço a todos!

pelicanconf.py

@@ -11,6 +11,7 @@
 GITHUB_URL = 'https://github.com/pythonclub/pythonclub.github.io'
 DISQUS_SITENAME = 'pythonclub'
 
+GOOGLE_ANALYTICS = 'UA-50935105-1'
 FACEBOOK_APPID = '1487080281503641'
 
 TIMEZONE = 'America/Sao_Paulo'

theme/templates/analytics.html

@@ -1,12 +1,12 @@
 {% if GOOGLE_ANALYTICS %}
-    <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl./" : "http://www./");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
-        try {
-            var pageTracker = _gat._getTracker("{{ GOOGLE_ANALYTICS }}");
-            pageTracker._trackPageview();
-            } catch(err) {}
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+      ga('create', '{{ GOOGLE_ANALYTICS }}', 'pythonclub.com.br');
+      ga('send', 'pageview');
+
     </script>
 {% endif %}

theme/templates/archives.html

@@ -12,7 +12,9 @@ <h1 class="content-subhead">Todos as postagens</h1>
             {% for article in dates %}
                 <div class="archive-item">
                     <a href="{{ SITEURL }}/{{ article.author.url }}" title="See posts by {{ article.author }}">
+                    {% if article.author_gravatar %}
                         <img class="avatar" alt="{{ article.author }}" src="{{ article.author_gravatar }}">
+                    {% endif %}
                     </a>
                     <h5 class="archive-date">{{ article.date|strftime('%Y') }}</h5>
                     <h4 class="archive-date">{{ article.date|strftime('%d %B') }}</h4>

theme/templates/article.html

@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block title %}{{ article.title|striptags }} // {{ super() }}{% endblock title %}
+{% block title %}{{ article.title|striptags }} - {{ article.author }} // {{ super() }}{% endblock title %}
 
 {% block head_css %}
     <link rel="stylesheet" href="{{ SITEURL }}/theme/css/pygments.css">
@@ -31,7 +31,9 @@
         <header class="header-article">
             <hgroup>
                 <a href="{{ SITEURL }}/{{ article.author.url }}" title="See posts by {{ article.author }}">
-                    <img class="article-avatar" alt="{{ article.author }}" src="{{ article.author_gravatar }}">
+                    {% if article.author_gravatar %}
+                        <img class="article-avatar" alt="{{ article.author }}" src="{{ article.author_gravatar }}">
+                    {% endif %}
                 </a>
                 <h2 class="article-info">{{ article.author }}</h2>
     			<ul class="author-social">

theme/templates/post.html

@@ -1,7 +1,9 @@
 <section class="post">
     <header class="post-header">
         <a href="{{ SITEURL }}/{{ article.author.url }}" title="See posts by {{ article.author }}">
-            <img class="avatar" alt="{{ article.author }}" src="{{ article.author_gravatar }}">
+            {% if article.author_gravatar %}
+                <img class="avatar" alt="{{ article.author }}" src="{{ article.author_gravatar }}">
+            {% endif %}
         </a>
         <h3><a class="post-title" href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h3>
             <p class="post-meta">{{ article.summary }}</p>