Author: floguy
Date: Mon Sep 22 01:28:02 2008
New Revision: 925
Modified:
trunk/local_apps/projects/thing.py
trunk/local_apps/tribes/thing.py
trunk/pinax/templates/things/ordering.html
Log:
Changed the style of the ordering to be more compact and usable.
Modified: trunk/local_apps/projects/thing.py
==============================================================================
--- trunk/local_apps/projects/thing.py (original)
+++ trunk/local_apps/projects/thing.py Mon Sep 22 01:28:02 2008
@@ -2,20 +2,28 @@
from django.db import connection
class ProjectThing(things.ModelThing):
- created = things.OrderField(verbose_name_asc='Oldest',
- verbose_name_desc='Newest', url_asc='oldest', url_desc='newest',
- field_url='date')
- name = things.OrderField()
+ created = things.OrderField(
+ verbose_name_asc='Age',
+ verbose_name_desc='Age',
+ url_asc='oldest',
+ url_desc='newest',
+ field_url='date',
+ reverse=True
+ )
+ name = things.OrderField(
+ verbose_name_asc='Name',
+ verbose_name_desc='Name'
+ )
member_users = things.OrderCountField(
- verbose_name_asc='Least Members',
- verbose_name_desc='Most Members',
- url_asc='last-members',
+ verbose_name_asc='Member Count',
+ verbose_name_desc='Member Count',
+ url_asc='least-members',
url_desc='most-members',
field_url='members'
)
topics = things.OrderCountField(
- verbose_name_asc='Least Topics',
- verbose_name_desc='Most Topics',
+ verbose_name_asc='Topic Count',
+ verbose_name_desc='Topic Count',
url_asc='least-topics',
url_desc='most-topics',
field_url='topics'
Modified: trunk/local_apps/tribes/thing.py
==============================================================================
--- trunk/local_apps/tribes/thing.py (original)
+++ trunk/local_apps/tribes/thing.py Mon Sep 22 01:28:02 2008
@@ -2,20 +2,28 @@
from django.db import connection
class TribeThing(things.ModelThing):
- created = things.OrderField(verbose_name_asc='Oldest',
- verbose_name_desc='Newest', url_asc='oldest', url_desc='newest',
- field_url='date')
- name = things.OrderField()
+ created = things.OrderField(
+ verbose_name_asc='Age',
+ verbose_name_desc='Age',
+ url_asc='oldest',
+ url_desc='newest',
+ field_url='date',
+ reverse=True
+ )
+ name = things.OrderField(
+ verbose_name_asc='Name',
+ verbose_name_desc='Name'
+ )
members = things.OrderCountField(
- verbose_name_asc='Least Members',
- verbose_name_desc='Most Members',
- url_asc='last-members',
+ verbose_name_asc='Member Count',
+ verbose_name_desc='Member Count',
+ url_asc='least-members',
url_desc='most-members',
field_url='members'
)
topics = things.OrderCountField(
- verbose_name_asc='Least Topics',
- verbose_name_desc='Most Topics',
+ verbose_name_asc='Topic Count',
+ verbose_name_desc='Topic Count',
url_asc='least-topics',
url_desc='most-topics',
field_url='topics'
Modified: trunk/pinax/templates/things/ordering.html
==============================================================================
--- trunk/pinax/templates/things/ordering.html (original)
+++ trunk/pinax/templates/things/ordering.html Mon Sep 22 01:28:02 2008
@@ -2,16 +2,16 @@
{% for f in fields %}
{% ifequal f field %}
{% if descending %}
- <a href="{{ f.full_url_asc }}">{{ f.verbose_name_asc
}}</a> or
- <b>{{ f.verbose_name_desc }}</b>
+ <a href="{{ f.full_url_asc }}">{{ f.verbose_name_asc }}
↑</a>
{% else %}
- <b>{{ f.verbose_name_asc }}</b> or
- <a href="{{ f.full_url_desc }}">{{ f.verbose_name_desc
}}</a>
+ <a href="{{ f.full_url_desc }}">{{ f.verbose_name_desc }}
↓</a>
{% endif %}
{% else %}
- <a href="{{ f.full_url_asc }}">{{ f.verbose_name_asc }}</a> or
- <a href="{{ f.full_url_desc }}">{{ f.verbose_name_desc }}</a>
+ {% if f.default_sort_descending %}
+ <a href="{{ f.full_url_desc }}">{{ f.verbose_name_desc
}}</a>
+ {% else %}
+ <a href="{{ f.full_url_asc }}">{{ f.verbose_name_asc }}</a>
+ {% endif %}
{% endifequal %}
- {% if not forloop.last %}, {% endif %}
{% endfor %}
</p>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
