diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-01-19 00:42:18 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-01-19 00:42:18 -0300 |
| commit | 27d7ccd7a928da74a881cf4fbd508e23613780fa (patch) | |
| tree | ebed6ca44c1a5512b272685234ddfbb76fba76d8 /templates/devel | |
| parent | 755a03d279631138cb982dc07b2d67b341a4f99c (diff) | |
| parent | 523a15f81e819379d1d9ae8412ebd8a7c017a512 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
templates/devel/clock.html
templates/packages/group_details.html
templates/packages/groups.html
Diffstat (limited to 'templates/devel')
| -rw-r--r-- | templates/devel/clock.html | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/templates/devel/clock.html b/templates/devel/clock.html index 60a365cd..ebc3b8bf 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -6,13 +6,13 @@ <div id="dev-clocks-box" class="box"> <h2>Hackers World Clocks</h2> - <p>This page helps prevent you from waking a sleeping hacker. It also - depends on hackers keeping the time zone information up to date, so if - you see 'UTC' listed, pester them to update their settings.</p> - <p> - Parbola Server Time: {{ now|date:"Y-m-d H:i T" }}<br/> - UTC Time: {{ utc_now|date:"Y-m-d H:i T" }} - </p> + <p>This page helps prevent you from waking a sleeping hacker. It also + depends on hackers keeping the time zone information up to date, so if + you see 'UTC' listed, pester them to update their settings.</p> + <p> + Parabola Server Time: {{ now|date:"Y-m-d H:i T" }}<br/> + UTC Time: {{ utc_now|date:"Y-m-d H:i T" }} + </p> <table id="clocks-table" class="results dash-stats"> <thead> @@ -27,7 +27,7 @@ <tbody> {% for dev in developers %} <tr class="{% cycle 'odd' 'even' %}"> - <td>{{ dev.get_full_name }}</td> + <td><a href="mailto:{{ dev.email }}">{{ dev.get_full_name }}</a></td> <td>{{ dev.username }}</td> <td>{{ dev.userprofile.location }}</td> <td>{{ dev.userprofile.time_zone }}</td> |