summaryrefslogtreecommitdiffstats
path: root/hyperkitty/templates
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-01-25 15:49:53 +0100
committerAurélien Bompard <aurelien@bompard.org>2013-01-25 15:49:53 +0100
commitd4ecad9325292f865e58b9fe7f58927f6e5af953 (patch)
tree8537b3ea831beb89fbb2238c64f0c280b07bcfe6 /hyperkitty/templates
parent9e179cd7889ab9f47c41cee8ae9025ddf81aea04 (diff)
downloadhyperkitty-d4ecad9325292f865e58b9fe7f58927f6e5af953.tar.gz
hyperkitty-d4ecad9325292f865e58b9fe7f58927f6e5af953.tar.xz
hyperkitty-d4ecad9325292f865e58b9fe7f58927f6e5af953.zip
Style changes
- move imported JS/CSS libs to a separate directory - real accordion for the months list - the top navbar is not black anymore
Diffstat (limited to 'hyperkitty/templates')
-rw-r--r--hyperkitty/templates/base.html11
-rw-r--r--hyperkitty/templates/month_view.html2
-rw-r--r--hyperkitty/templates/paginator.html29
-rw-r--r--hyperkitty/templates/recent_activities.html2
-rw-r--r--hyperkitty/templates/search.html2
-rw-r--r--hyperkitty/templates/thread.html2
-rw-r--r--hyperkitty/templates/threads/month_list.html2
7 files changed, 24 insertions, 26 deletions
diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html
index 7f3d146..62d4c4f 100644
--- a/hyperkitty/templates/base.html
+++ b/hyperkitty/templates/base.html
@@ -7,7 +7,8 @@
<meta name="author" content="" />
<meta name="dc.language" content="en" />
<link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />
- <link rel="stylesheet" media="screen" href="{{ STATIC_URL }}css/bootstrap.min.css" />
+ <link rel="stylesheet" media="screen" href="{{ STATIC_URL }}libs/bootstrap/bootstrap.min.css" />
+ <link rel="stylesheet" media="screen" href="{{ STATIC_URL }}libs/jquery/ui-lightness/jquery-ui-1.9.1.custom.min.css" />
<link rel="stylesheet" media="all" href="{{ STATIC_URL }}css/hyperkitty.css" />
{% block additional_stylesheets %} {% endblock %}
</head>
@@ -16,7 +17,7 @@
<body>
<div class="container-fluid">
<header class="row-fluid">
- <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
@@ -56,9 +57,9 @@
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
- <script>window.jQuery || document.write('<script src="{{ STATIC_URL }}js/libs/jquery-1.8.3.min.js"><\/script>')</script>
- <script src="{{ STATIC_URL }}js/libs/jquery-ui-1.9.1.custom.min.js"></script>
- <script src="{{ STATIC_URL }}js/libs/bootstrap.min.js"></script>
+ <script>window.jQuery || document.write('<script src="{{ STATIC_URL }}libs/jquery/jquery-1.8.3.min.js"><\/script>')</script>
+ <script src="{{ STATIC_URL }}libs/jquery/jquery-ui-1.9.1.custom.min.js"></script>
+ <script src="{{ STATIC_URL }}libs/bootstrap/bootstrap.min.js"></script>
<script src="{{ STATIC_URL }}js/hyperkitty.js"></script>
{% block additionaljs %} {% endblock %}
diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html
index f9d381f..16bef68 100644
--- a/hyperkitty/templates/month_view.html
+++ b/hyperkitty/templates/month_view.html
@@ -111,7 +111,7 @@
{% endblock %}
{% block additionaljs %}
-<script src="{{ STATIC_URL }}js/libs/jquery.expander.js"></script>
+<script src="{{ STATIC_URL }}libs/jquery.expander.js"></script>
<script>
$(document).ready(function() {
$('span.expander').expander({
diff --git a/hyperkitty/templates/paginator.html b/hyperkitty/templates/paginator.html
index 1b8bfd6..7978f06 100644
--- a/hyperkitty/templates/paginator.html
+++ b/hyperkitty/templates/paginator.html
@@ -1,29 +1,26 @@
{% load i18n %}
-<div class="pager">
- {% if has_previous %}
- <span class="page">
- <a href="?page={{ previous }}">&lt; Prev</a>
- </span>
- {% endif %}
+<ul class="pager">
+ <li{% if not has_previous %} class="disabled"{% endif %}>
+ <a href="?page={{ previous }}">&larr; Newer</a>
+ </li>
{% if show_first %}
- <span class="page"><a href="?page=1">1</a></span>
- <span class="ellipsis">...</span>
+ <li class="page"><a href="?page=1">1</a></li>
+ <li class="ellipsis">...</li>
{% endif %}
{% for linkpage in page_numbers %}
{% ifequal linkpage page %}
- <span class="current">{{ page }}</span>
+ <li class="current">{{ page }}</li>
{% else %}
- <span class="page"><a href="?page={{ linkpage }}">{{ linkpage }}</a></span>
+ <li class="page"><a href="?page={{ linkpage }}">{{ linkpage }}</a></li>
{% endifequal %}
{% endfor %}
{% if show_last %}
- <span class="ellipsis">...</span>
- <span class="page"><a href="?page=last">{{ pages }}</a></span>
- {% endif %}
- {% if has_next %}
- <span class="page"><a href="?page={{ next }}">Next &gt;</a></span>
+ <li class="ellipsis">...</li>
+ <li class="page"><a href="?page=last">{{ pages }}</a></li>
{% endif %}
-</div>
+
+ <li{% if not has_next %} class="disabled"{% endif %}><a href="?page={{ next }}">Older &rarr;</a></li>
+</ul>
{# vim: set noet: #}
diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html
index 326f933..70d944a 100644
--- a/hyperkitty/templates/recent_activities.html
+++ b/hyperkitty/templates/recent_activities.html
@@ -113,7 +113,7 @@
{% endblock %}
{% block additionaljs %}
-<script src="{{ STATIC_URL }}js/libs/protovis-d3.1.js"></script>
+<script src="{{ STATIC_URL }}libs/protovis-d3.1.js"></script>
{% endblock %}
{# vim: set noet: #}
diff --git a/hyperkitty/templates/search.html b/hyperkitty/templates/search.html
index a80d9ff..da464b2 100644
--- a/hyperkitty/templates/search.html
+++ b/hyperkitty/templates/search.html
@@ -88,7 +88,7 @@ Sorry no emails could be found for your search.
{% endblock %}
{% block additionaljs %}
-<script src="{{ STATIC_URL }}js/libs/jquery.expander.js"></script>
+<script src="{{ STATIC_URL }}libs/jquery.expander.js"></script>
<script>
$(document).ready(function() {
$('span.expander').expander({
diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html
index 3fa401b..3cc3819 100644
--- a/hyperkitty/templates/thread.html
+++ b/hyperkitty/templates/thread.html
@@ -75,7 +75,7 @@
{% block additionaljs %}
-<script src="{{ STATIC_URL }}js/libs/jquery.expander.js"></script>
+<script src="{{ STATIC_URL }}libs/jquery.expander.js"></script>
<script type="text/javascript">
$(document).ready(function() {
// hide quotes by default in the thread view
diff --git a/hyperkitty/templates/threads/month_list.html b/hyperkitty/templates/threads/month_list.html
index 66aa3f9..75b72d4 100644
--- a/hyperkitty/templates/threads/month_list.html
+++ b/hyperkitty/templates/threads/month_list.html
@@ -1,6 +1,6 @@
{% load hk_generic %}
-<div id="archives" class="span2">
+<div id="months-list" class="span2">
{% for year, months in archives_length|sort %}
<h3>{{ year }}</h3>
<ul>
generated by cgit (git 2.34.1) at 2026-01-06 09:44:09 +0000