diff options
Diffstat (limited to 'hyperkitty/templates')
| -rw-r--r-- | hyperkitty/templates/api.html | 4 | ||||
| -rw-r--r-- | hyperkitty/templates/base.html | 75 | ||||
| -rw-r--r-- | hyperkitty/templates/message.html | 8 | ||||
| -rw-r--r-- | hyperkitty/templates/messages/message.html | 13 | ||||
| -rw-r--r-- | hyperkitty/templates/month_view.html | 6 | ||||
| -rw-r--r-- | hyperkitty/templates/thread.html | 8 | ||||
| -rw-r--r-- | hyperkitty/templates/threads/month_list.html | 18 |
7 files changed, 55 insertions, 77 deletions
diff --git a/hyperkitty/templates/api.html b/hyperkitty/templates/api.html index 0fa38c9..c6e2b85 100644 --- a/hyperkitty/templates/api.html +++ b/hyperkitty/templates/api.html @@ -1,9 +1,5 @@ {% extends "base.html" %} -{% block additional_stylesheets %} - <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/thread.css" /> -{% endblock %} - {% block content %} <h2>REST API</h2> <p> diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index c679687..53d0ada 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -14,47 +14,40 @@ {% load i18n %} <body> - <div class="navbar navbar-fixed-top"> - <div class="navbar-inner"> - <div class="container"> - <div class="nav-collapse collapse"> - - {% if user.is_authenticated %} - <li class="user_nav"> - <a class="mm_logout" style="float:right;" href="{% url user_logout %}">Logout</a> - </li> - <li class="user_nav" style="float:right;"> - <a style="float:right;" href="{% url user_profile %}">{{ user.username }}</a> - </li> - {% else %} - <li class="user_nav" style="float:right;"> - <a class="mm_user" style="float:right;" href="{% url user_login %}">Login</a> - </li> - <li class="user_nav" style="float:right;"> - <a style="float:right;" href="{% url user_registration %}"> Sign Up </a> - </li> - {% endif %} - - - <ul class="nav"> - - <li class="root{% if not list_address %} active{% endif %}"> - <a href="{% url root %}">{{ app_name|title }}</a> - </li> - - {% if list_address %} - <li id="list_name" class="active"> - <a href="{% url list_overview mlist_fqdn=list_address %}">{{list_address}}</a> - </li> - {% endif %} - - - </ul> - </div> - </div> - </div> - </div> - + <header> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + + <ul class="nav auth"> + {% if user.is_authenticated %} + <li><a class="mm_logout" href="{% url user_logout %}">Logout</a></li> + <li><a href="{% url user_profile %}">{{ user.username }}</a></li> + {% else %} + <li><a class="mm_user" href="{% url user_login %}">Login</a></li> + <li><a href="{% url user_registration %}"> Sign Up </a></li> + {% endif %} + </ul> + + + <ul class="nav"> + + <li class="root{% if not list_address %} active{% endif %}"> + <a href="{% url root %}">{{ app_name|title }}</a> + </li> + + {% if list_address %} + <li id="list_name" class="active"> + <a href="{% url list_overview mlist_fqdn=list_address %}">{{list_address}}</a> + </li> + {% endif %} + + + </ul> + </div> + </div> + </div> + </header> <div class="container"> {% block content %} {% endblock %} diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html index 6c26c4f..5ae2fb1 100644 --- a/hyperkitty/templates/message.html +++ b/hyperkitty/templates/message.html @@ -3,18 +3,14 @@ {% load hk_generic %} {% load storm %} -{% block additional_stylesheets %} -<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/thread.css" /> -{% endblock %} - {% block content %} -<header> +<div class="message-header"> <a class="thread-back" href="{% url thread threadid=message.thread_id, mlist_fqdn=list_address %}"> </a> <h1>{{ message.subject }}</h1> -</header> +</div> <section id="thread_content"> {% include 'messages/first_email.html' with first_mail=message %} diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html index 6ff6c15..415bc58 100644 --- a/hyperkitty/templates/messages/message.html +++ b/hyperkitty/templates/messages/message.html @@ -12,19 +12,18 @@ </span> {% endifchanged %} <span class="time">{{email.date|date:"H:i:s e"}}</span> - <br /> </div> - {% gravatar_img_for_email email.email 40 %} + <div class="gravatar{% if use_mockups %} pull-left{% endif %}"> + {% gravatar_img_for_email email.email 40 %} + </div> <div class="email_author inline-block"> - <span class="name"> <a href="{% url message_index mlist_fqdn=list_address, hashid=email.message_id_hash %}">{{email.sender_name}}</a> </span> + <span class="name"><a href="{% url message_index mlist_fqdn=list_address, hashid=email.message_id_hash %}">{{email.sender_name}}</a></span> + {% if use_mockups %} <br /> <span class="rank"> - {% if use_mockups %} Rank 8 - {% else %} - - {% endif %} </span> + {% endif %} </div> </div> diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html index 00b7a96..a6239fe 100644 --- a/hyperkitty/templates/month_view.html +++ b/hyperkitty/templates/month_view.html @@ -7,7 +7,7 @@ <div id="month-view"> - <header> + <div class="month-header"> <div class="list-name">{{ mlist.display_name|default:mlist.name|escapeatsign }}</div> <div class="month-name">{{ month|date:"F Y"|capfirst }}</div> <ul class="month-info"> @@ -23,7 +23,7 @@ <a href="mailto:{{ list_address|escapeatsign }}">{{ list_address|escapeatsign }}</a> </p> {% endif %} - </header> + </div> {% for email in threads %} <!-- New thread --> @@ -95,7 +95,7 @@ </div> <!-- End of thread --> {% empty %} - Sorry no emails could be found for your search. + Sorry no emails could be found for this month. {% endfor %} {% include "paginator.html" %} diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html index be2d875..c55d445 100644 --- a/hyperkitty/templates/thread.html +++ b/hyperkitty/templates/thread.html @@ -4,13 +4,9 @@ {% load hk_generic %} {% load storm %} -{% block additional_stylesheets %} -<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/thread.css" /> -{% endblock %} - {% block content %} - <header> + <div class="thread-header"> {% for thread in neighbors %} {% if thread %} <a class="thread-{% ifequal forloop.counter 1 %}older{% else %}newer{% endifequal %}" @@ -19,7 +15,7 @@ {% endif %} {% endfor %} <h1>{{ subject }}</h1> - </header> + </div> {% include 'threads/right_col.html' %} diff --git a/hyperkitty/templates/threads/month_list.html b/hyperkitty/templates/threads/month_list.html index d642567..85af7b6 100644 --- a/hyperkitty/templates/threads/month_list.html +++ b/hyperkitty/templates/threads/month_list.html @@ -3,15 +3,13 @@ <div id="archives"> {% for year, months in archives_length|sort %} <h3>{{ year }}</h3> - <div> - <ul> - {% for ar_month in months %} - <li class="{% if year == month.year and ar_month == month.month %}current{% endif %}"> - <a href="{% url archives_with_month year=year, mlist_fqdn=list_address, month=ar_month %}" - >{{ ar_month|monthtodate:year|date:"F" }}</a> - </li> - {% endfor %} - </ul> - </div> + <ul> + {% for ar_month in months %} + <li class="{% if year == month.year and ar_month == month.month %}current{% endif %}"> + <a href="{% url archives_with_month year=year, mlist_fqdn=list_address, month=ar_month %}" + >{{ ar_month|monthtodate:year|date:"F" }}</a> + </li> + {% endfor %} + </ul> {% endfor %} </div> |