update!

Author: a.shtyrnyaev

templates/base.html

@@ -22,9 +22,9 @@
       {% block header_block %}
         {% include 'blocks/header.html' %}
       {% endblock %}
-      <div id="top-banner" class="conf">
+      <!-- <div id="top-banner" class="conf">
         <a href="http://conf.python.ru/?utm_source=python-ru&amp;utm_medium=banner&amp;utm_campaign=python-ru-top" target="_blank"></a>
-      </div>
+      </div> -->
 
       <main>
         {% block main_content %}{% endblock %}
@@ -40,4 +40,4 @@
   {% include 'blocks/analytics.html' %}
   {% block extra_js %}{% endblock %}
 </body>
-</html>
+</html>

templates/blocks/about_us.html

@@ -40,4 +40,4 @@ <h1>Немного о нас</h1>
       </div>
     </div>
   </div>
-</section>
+</section>

templates/blocks/analytics.html

@@ -11,14 +11,12 @@
                 });
             } catch(e) { }
         });
-
         var n = d.getElementsByTagName("script")[0],
             s = d.createElement("script"),
             f = function () { n.parentNode.insertBefore(s, n); };
         s.type = "text/javascript";
         s.async = true;
         s.src = "https://mc.yandex.ru/metrika/watch.js";
-
         if (w.opera == "[object Opera]") {
             d.addEventListener("DOMContentLoaded", f, false);
         } else { f(); }
@@ -32,10 +30,8 @@
   (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','https://www.google-analytics.com/analytics.js','ga');
-
   ga('create', 'UA-76163383-1', 'auto');
   ga('send', 'pageview');
-
 </script>
 
 <script type="text/javascript">(window.Image ? (new Image()) : document.createElement('img')).src = location.protocol + '//vk.com/rtrg?r=rMFPKf5XsBOkyFnhVuuCB*sk2MtYdGxkHpF*/ydkYXmbvvXJXZCE0hZmetQgWrWd1umw7ylDNVS5Whv/pVUzLK0FT4Nrk*399Cy9nWwHw*RHMPDKusRyK0qifR5YFXy/iUv*LGjIB7HmGQ6crvbCv0j3eCS9NVHz5oDy4*FWvf0-';</script>

templates/blocks/contact_us.html

@@ -25,4 +25,4 @@
       </form>
     </div>
   </div>
-</section>
+</section>

templates/blocks/events.html

@@ -24,4 +24,4 @@ <h1>Ближайшие события</h1>
       </ul>
     </div>
   </div>
-</section>
+</section>

templates/blocks/events_stub.html

@@ -9,4 +9,4 @@ <h1>Ближайшие события</h1>
         Если вы организуете такую - <a href="mailto:team@python.ru" style="text-decoration: underline">дайте нам знать</a> и мы напишем о вас.
       </p>
     </div>
-</section>
+</section>

templates/blocks/footer.html

@@ -12,4 +12,4 @@
     <!-- copyright -->
     <p class="copyright">&copy; 2016 <a href="https://python.ru">Python.ru</a></p>
   </div>
-</footer>
+</footer>

templates/blocks/header_no_menu.html

@@ -21,4 +21,4 @@
       {% endfor %}
     </ul>
   </div>
-</header>
+</header>

templates/blocks/links.html

@@ -17,4 +17,4 @@ <h2>{{ section.grouper|get_section_name }}</h2>
       {% endfor %}
     </div>
   </div>
-</section>
+</section>

templates/blocks/news.html

@@ -11,14 +11,48 @@
           {% endif %}
           <div class="description">
             <time datetime="">{{ article_featured.published_at|date:"j E Y" }}</time>
-            <h1><a {% if not article_featured.is_our %}href="{{ article_featured.url }}" target="_blank"{% else %}href="{% url 'post_page' article_featured.id %}"{% endif %}>
+            <h1><a href="{{ article_featured.url }}" target="_blank">
               {{ article_featured.name }}
             </a></h1>
           </div>
         </div>
       </article>
 
-    {% include 'blocks/news_right_sidebar.html' %}
+      {# Ближайшие события #}
+      <section class="grid-item articles-list">
+        <div class="item-holder">
+          <strong class="title">Ближайшие события</strong>
+          <div class="articles-holder">
+            {% for article in articles_top %}
+            <article class="article">
+              <time datetime="{{ event.date|date:" Y-m-d H:m " }}">{{ article.published_at|date:"j E Y" }}</time>
+              <h1>
+                <a href="{{ article.url }}" target="_blank">
+                  {{ article.name }}
+                </a>
+              </h1>
+            </article>
+            {% endfor %}
+          </div>
+        </div>
+      </section>
+
+      {# News right sidebar #}
+      <section class="grid-item articles-list">
+        <div class="item-holder">
+          <strong class="title">Новости</strong>
+          <div class="articles-holder">
+            {% for article in articles_top %}
+            <article class="article">
+              <time datetime="{{ event.date|date:"Y-m-d H:m" }}">{{ article.published_at|date:"j E Y" }}</time>
+              <h1><a href="{{ article.url }}" target="_blank">
+                {{ article.name }}
+              </a></h1>
+            </article>
+            {% endfor %}
+          </div>
+        </div>
+      </section>
 
       {% for article in articles_all %}
       <article class="grid-item">
@@ -30,15 +64,16 @@ <h1><a {% if not article_featured.is_our %}href="{{ article_featured.url }}" tar
           {% endif %}
           <div class="text-holder">
             <time datetime="{{ event.date|date:"Y-m-d H:m" }}">{{ article.published_at|date:"j E Y" }}</time>
-            <h1><a {% if not article.is_our %}href="{{ article.url }}" target="_blank"{% else %}href="{% url 'post_page' article.id %}" {% endif %}>{{ article.name }}</a></h1>
+            <h1><a href="{{ article.url }}" target="_blank">{{ article.name }}</a></h1>
             {{ article.description|safe }}
           </div>
         </div>
       </article>
       {% endfor %}
     </div>
+
 {#    <div class="btn-holder">#}
 {#      <a href="#" class="btn-default btn-more">Показать ещё</a>#}
 {#    </div>#}
   </div>
-</section>
+</section>