diff options
| author | Aamir Khan <syst3m.w0rm@gmail.com> | 2012-06-22 18:20:36 -0400 |
|---|---|---|
| committer | Aamir Khan <syst3m.w0rm@gmail.com> | 2012-06-22 18:20:36 -0400 |
| commit | bc36d6fe5d92f83af7dc6e0b917ae4ebfe19d573 (patch) | |
| tree | 61f9f5b4cabfa26328a717042497389de842797f | |
| parent | 45412823f4bb9aeeeb26c72ebe60ea328eec4ec9 (diff) | |
| download | hyperkitty-bc36d6fe5d92f83af7dc6e0b917ae4ebfe19d573.tar.gz hyperkitty-bc36d6fe5d92f83af7dc6e0b917ae4ebfe19d573.tar.xz hyperkitty-bc36d6fe5d92f83af7dc6e0b917ae4ebfe19d573.zip | |
Templates refactoring : added lists/list_nav.html
| -rw-r--r-- | templates/base.html | 73 | ||||
| -rw-r--r-- | templates/lists/list_nav.html | 20 |
2 files changed, 49 insertions, 44 deletions
diff --git a/templates/base.html b/templates/base.html index c23b369..48d4809 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,51 +14,36 @@ <body> <!-- Header --> - <div class="header">{% block header %} - <div id="headline"> - <ul class="inline-block">{% if list_address %} - <li id="list_name"> - <a href="/list/{{list_address}}">{{list_name}}</a> - </li>{% else %} - <li id="list_name"> - <a href="/list/">{{list_name}}</a> - </li>{% endif %} - <li id="page_date">{{month}}</li> - </ul>{% block usertools %} {% if user.is_authenticated %} - <div id="user-tools">{% if user.active %} Logged in as: - <a href="{% url user_profile %}">{% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %}</a>{% else %}{% trans 'Welcome,' %} - <strong>{% filter force_escape %}{% firstof user.first_name user.username %}{% - endfilter %}</strong>. {% endif %} - <ul class="userlinks">{% block userlinks %}{% endblock %}</ul> - </div> - <li> - <a class="mm_logout" href="{% url user_logout %}">Logout</a>{% else %} - <li> - <a class="mm_user" href="{% url user_login %}">Login</a> - </li>{% endif %} {% endblock %} {% if month_participants and month_discussions - %} - <ul class="inline-block" id="top_right"> - <li class="participant">{{month_participants}} participants</li> - <li class="discussion">{{month_discussions}} discussions</li> - <li class="saved">1 saved</li> - </ul>{% endif %}</div>{% if list_address %} - <p id="list_email"> - <a href="mailto:{{list_address}}">{{list_address}}</a> - </p> - <p id="list_email" class='inline'> - <a href="/"> All lists </a> - </p> - <div id="searchbox"> - <form action="/search/{{list_address}}" method="get">{{ search_form }}</form> - </div>{% endif %} - <div id="newthread"> - <a href="#Create_new_thread"> <img src="{{ STATIC_URL }}img/newthread.png" alt="New thread" /></a> - </div> - <hr id="white" /> - <hr />{% endblock %} - </div> - <!-- End of Header --> + <div class="header"> + {% block header %} + + <div id="headline"> + <ul class="inline-block">{% if list_address %} + <li id="list_name"> + <a href="/list/{{list_address}}">{{list_name}}</a> + </li>{% else %} + <li id="list_name"> + <a href="/list/">{{list_name}}</a> + </li>{% endif %} + <li id="page_date">{{month}}</li> + <li>{% if user.is_authenticated %}<a class="mm_logout" href="{% url user_logout %}">Logout</a>{% else %}<a class="mm_user" href="{% url user_login %}">Login</a>{% endif %}</li> + </ul> + + {% if user.is_authenticated %} + <div class="mm_loginName">Logged in as: <a href="{% url user_profile %}">{{ user.username }}</a></div> + {% endif %} + + {% if list_address %} + {% include 'lists/list_nav.html' %} + {% endif %} + </div> + + {% endblock %} + </div> + <!-- End of Header --> + {% block content %} {% endblock %} + {% block footer %} {% endblock %} </body> <script src="{{ STATIC_URL }}/js/libs/jquery-1.7.1.min.js"></script> {% block additionaljs %} {% endblock %} diff --git a/templates/lists/list_nav.html b/templates/lists/list_nav.html new file mode 100644 index 0000000..44ece68 --- /dev/null +++ b/templates/lists/list_nav.html @@ -0,0 +1,20 @@ +{% if month_participants and month_discussions %} + <ul class="inline-block" id="top_right"> + <li class="participant">{{month_participants}} participants</li> + <li class="discussion">{{month_discussions}} discussions</li> + <li class="saved">1 saved</li> + </ul> +{% endif %}</div> + +{% if list_address %} + <p id="list_email"> + <a href="mailto:{{list_address}}">{{list_address}}</a> + </p> + <p id="list_email" class='inline'> + <a href="/"> All lists </a> + </p> + <div id="searchbox"> + <form action="/search/{{list_address}}" method="get">{{ search_form }}</form> + </div> +{% endif %} + |