From: Aleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Tue, 8 Oct 2013 09:48:42 +0000 (+0200)
Subject: Merge branch 'forum'
X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/42c42960c2dce4500f12dd14a68a10ed4f06abf5?hp=-c

Merge branch 'forum'
---

42c42960c2dce4500f12dd14a68a10ed4f06abf5
diff --combined edumed/settings.d/50-static.py
index b6d9591,780ce01..4d75c9a
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@@ -25,6 -25,8 +25,8 @@@ PIPELINE_CSS = 
            'catalogue/css/section_list.scss',
            'curriculum/curriculum.scss',
            'jquery/colorbox/colorbox.css',
+ 
+           'css/forum.scss',
          ),
          'output_filename': 'compressed/base.css',
      },
@@@ -40,7 -42,8 +42,8 @@@ PIPELINE_JS = 
              'catalogue/js/lesson.js',
              'sponsors/js/sponsors.js',
              'curriculum/curriculum.js',
 -
 +            'js/formset.js',
+             'pybb/js/pybbjs.js',
          ),
          'output_filename': 'compressed/base.js',
      },
diff --combined edumed/templates/base.html
index 52b34ce,5486d6d..1c8f434
--- a/edumed/templates/base.html
+++ b/edumed/templates/base.html
@@@ -30,6 -30,9 +30,9 @@@
                  src="{% static "tlo.png" %}"
                  style="position:absolute; opacity: 0.5; top:0; left: -83px; z-index:1000"
                  -->
+             {% if request.user.is_authenticated %}
+                 <a href="{% url 'logout' %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">Wyloguj</a>
+             {% endif %}
              <div id="header-top">
              <a id="logo" href="/"><img src="{% static "img/logo.png" %}" alt="Edukacja medialna"/></a>
              <div id="organizer">
@@@ -42,7 -45,7 +45,7 @@@
                  <li><a class="menu-lekcje" href="{% url "catalogue_lessons" %}">Lekcje</a></li>
                  <li><a class="menu-kompetencje" href="{% url "curriculum" %}">Kompetencje</a></li>
                  <li><a class="menu-wspolpraca" href="{% url "info" "wspolpraca/" %}">Współpraca</a></li>
 -                <li><a class="menu-szkolenia" href="{% url "info" "konkurs/" %}">Konkurs</a></li>
 +                <li><a class="menu-szkolenia" href="{% url "info" "turniej/" %}">Turniej</a></li>
                  <li><a class="menu-wesprzyj" href="{% url "info" "wesprzyj/" %}">Wesprzyj nas</a></li>
                  <li><a class="menu-o-nas" href="{% url "info" "o-nas/" %}">O nas</a></li>
                  <li><a class="menu-kontakt" href="{% url "info" "kontakt/" %}">Kontakt</a></li>
@@@ -96,6 -99,7 +99,7 @@@
  
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
      {% compressed_js 'base' %}
+     {% block extra_script %}{% endblock %}
      {{ piwik_tag|safe }}
      </body>
  </html>
diff --combined requirements.txt
index cf1dfa8,c96b02c..49b1e28
--- a/requirements.txt
+++ b/requirements.txt
@@@ -29,5 -29,8 +29,9 @@@ django-sponsors>=1.1,<1.
  django-haystack>=2.0,<2.1
  pysolr>=3,<4
  
+ pybbm>=0.14,<0.15
+ django-libravatar
+ 
  sorl-thumbnail>=11,<12
 +pyyaml
+