Merge branch 'master' into rwd
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Tue, 12 Nov 2013 11:57:43 +0000 (12:57 +0100)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Tue, 12 Nov 2013 11:57:43 +0000 (12:57 +0100)
Conflicts:
apps/wolnelektury_core/templates/superbase.html

1  2 
apps/wolnelektury_core/templates/superbase.html

      <body id="{% block bodyid %}base{% endblock %}">
  
          {% block bodycontent %}
 -              <div id="header-bg"></div>
 -
 -        <div id="header">
 -
 -        <div id="header-content">
 -            <div id="logo">
 -                <a class="logo" href="/">
 -                <img id="logo-image" src="{% static "img/logo-neon.png" %}"
 -                    alt="Wolne Lektury" /></a>
 -            </div>
 -
 -            <div id="tagline">
 -                <span>
 -                {% cache 60 tagline LANGUAGE_CODE %}
 -                    {% url 'book_list' as b %}
 -                    {% url 'infopage' 'prawa' as r %}
 -                        {% count_books book_count %}
 -                    {% blocktrans count book_count as c %}
 -                    <a href='{{b}}'>{{c}}</a> free reading you have <a href='{{r}}'>right to</a>
 -                    {% plural %}
 -                    <a href='{{b}}'>{{c}}</a> free readings you have <a href='{{r}}'>right to</a>
 -                    {% endblocktrans %}
 -                {% endcache %}
 -                </span>
 -            </div>
 -
 -            <p id="user-info" class="mono">
+         {% funding link=1 closeable=1 add_class="funding-top-header" %}
 +        <div id="header-wrapper">
 +        <header id="main">
 +            <a href="/" id="logo">
 +                <img src="{% static 'img/logo-neon.png' %}"
 +                    alt="Wolne Lektury" />
 +            </a>
 +
 +            <p id="user-info">
                  {% if user.is_authenticated %}
                      {% trans "Welcome" %}, 
 -                      <span class="hidden-box-wrapper">
 -                              <a href="{% url 'user_settings' %}" class="hidden-box-trigger">
 -                                      <strong>{{ user.username }}</strong>
 -                              </a>
 -                              <span id="user-menu" class="hidden-box">
 -                                      <a href="{% url 'account_set_password' %}">{% trans "Password" %}</a><br/>
 -                                      <a href="{% url 'account_email' %}">{% trans "E-mail" %}</a><br/>
 -                                      <a href="{% url 'socialaccount_connections' %}">{% trans "Social accounts" %}</a><br/>
 -                              </span>
 -                      </span>
 +                    <span class="hidden-box-wrapper">
 +                        <a href="{% url 'user_settings' %}" class="hidden-box-trigger">
 +                            <strong>{{ user.username }}</strong>
 +                        </a>
 +                        <span id="user-menu" class="hidden-box">
 +                            <a href="{% url 'account_set_password' %}">{% trans "Password" %}</a><br/>
 +                            <a href="{% url 'account_email' %}">{% trans "E-mail" %}</a><br/>
 +                            <a href="{% url 'socialaccount_connections' %}">{% trans "Social accounts" %}</a><br/>
 +                        </span>
 +                    </span>
                      | <a href="{% url 'social_my_shelf' %}" id="user-shelves-link">{% trans "My shelf" %}</a>
                      {% if user.is_staff %}
                      | <a href="/admin/">{% trans "Administration" %}</a>