Merge with mainline

This commit is contained in:
Antoine Nguyen
2012-02-01 09:41:28 +01:00
21 changed files with 1985 additions and 490 deletions
+4 -2
View File
@@ -8,7 +8,9 @@
<script type="text/javascript" src="{{ MEDIA_URL }}js/email_listing.js"></script>
{% block css %}{% endblock %}
<script type="text/javascript">
var current_anchor = new AnchorNavigation("{{ deflocation }}");
var current_anchor = new AnchorNavigation("{{ deflocation }}", {
spin_target: "page"
});
function viewmail(event) {
event.stop();
@@ -56,7 +58,7 @@ function update_sortable_column() {
window.addEvent("domready", function() {
navparams = new Hash({
{% join navparams %}
{% if navparams %}{% join navparams %}{% endif %}
});
{% block js %}{% endblock %}
current_anchor.set_default_callback({{ defcallback }});
+4 -4
View File
@@ -2,18 +2,18 @@
<label>{% trans "Messages" %} {{ page.id_start }} {% trans "to" %} {{ page.id_stop }} {% trans "of" %} {{ page.items }}</label>
{% if page.previous_page %}
<a href="{{ page.baseurl }}?page=1">
<a href="{{ page.baseurl }}page=1">
<img src="{{ MEDIA_URL }}pics/first.png" border="0" title="{% trans "First" %}" />
</a>
<a href="{{ page.baseurl }}?page={{ page.previous_page }}">
<a href="{{ page.baseurl }}page={{ page.previous_page }}">
<img src="{{ MEDIA_URL }}pics/back.png" border="0" title="{% trans "Previous" %}" />
</a>
{% endif %}
{% if page.next_page %}
<a href="{{ page.baseurl }}?page={{ page.next_page }}">
<a href="{{ page.baseurl }}page={{ page.next_page }}">
<img src="{{ MEDIA_URL }}pics/next.png" border="0" title="{% trans "Next" %}" />
</a>
<a href="{{ page.baseurl }}?page={{ page.last_page }}">
<a href="{{ page.baseurl }}page={{ page.last_page }}">
<img src="{{ MEDIA_URL }}pics/last.png" border="0" title="{% trans "Last" %}" />
</a>
{% endif %}
+1
View File
@@ -9,6 +9,7 @@
<link rel="icon" type="image/png" href="{{ MEDIA_URL }}css/logo-icon.png" />
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/default.css" />
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/SqueezeBox.css" />
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/spinner.css" />
<script src="{{ MEDIA_URL }}js/mootools.js" type="text/javascript"></script>
<script src="{{ MEDIA_URL }}js/mootools-more.js" type="text/javascript"></script>
<script src="{{ MEDIA_URL }}js/SqueezeBox.js" type="text/javascript"></script>