From 7d58b04ef927cf30cf9ab197d9894e459d67237b Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 8 Nov 2007 23:58:14 +0000
Subject: [PATCH] Made sort labels more explicit when an option has already
 been chosen added relevance as a sort option -- probably needs some kind of
 style change since it doesn't match the style of the other top-level labels

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8046 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/opac/locale/en-US/opac.dtd            | 16 ++++++++++-----
 .../opac/skin/default/xml/result/filtersort.xml    | 24 +++++++++++-----------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd
index 5802878d57..63159260cd 100644
--- a/Open-ILS/web/opac/locale/en-US/opac.dtd
+++ b/Open-ILS/web/opac/locale/en-US/opac.dtd
@@ -59,10 +59,12 @@
 	"The password must be at least 7 characters in length, 
 	contain at least one letter (a-z/A-Z), 
 	and contain at least one number.">
-<!ENTITY common.a2z "A to Z">
-<!ENTITY common.z2a "Z to A">
-<!ENTITY common.new2old "Newest to Oldest">
-<!ENTITY common.old2new "Oldest to Newest">
+<!ENTITY common.a2z.title "Title: A to Z">
+<!ENTITY common.z2a.title "Title: Z to A">
+<!ENTITY common.a2z.author "Author: A to Z">
+<!ENTITY common.z2a.author "Author: Z to A">
+<!ENTITY common.new2old.pubdate "Date: Newest to Oldest">
+<!ENTITY common.old2new.pubdate "Date: Oldest to Newest">
 
 <!ENTITY opac.style.reddish "Reddish">
 
@@ -527,7 +529,11 @@ We recommend that you remove this title from any bookbags it may have been added
 <!ENTITY rdetail.noneAvailable " * There are no copies in this location">
 <!ENTITY rdetail.summary.online "Online Resources">
 
-<!ENTITY result.sort_by "Sort Results by ...">
+<!ENTITY result.sort_by "Sort Results by Relevance">
+<!ENTITY result.sort_by.title "Sort Results by Title">
+<!ENTITY result.sort_by.author "Sort Results by Author">
+<!ENTITY result.sort_by.pubdate "Sort Results by Publicate Date">
+
 <!ENTITY result.limit2avail "Limit to Available">
 <!ENTITY result.info.copies "Available copies / Total copies">
 <!ENTITY result.info.no.items "No items with the selected format were found in this location.">
diff --git a/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml b/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml
index 35f2e18780..6177b52be7 100644
--- a/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml
@@ -1,20 +1,20 @@
 <span>
     &result.limit2avail;<input type='checkbox' id='opac.result.limit2avail' onclick='searchBarSubmit();'/>
     <select id='opac.result.sort' onchange='searchBarSubmit();'>
-        <option selelted='selected' value=''>&result.sort_by;</option>
-        <optgroup label='&common.title;'>
-            <option id='opac.result.title.a2z' label='&common.a2z;' value='title.asc'>&common.a2z;</option>
-            <option id='opac.result.title.z2a' label='&common.z2a;' value='title.desc'>&common.z2a;</option>
+        <option selected='selected' value=''>&result.sort_by;</option>
+        <optgroup label='&result.sort_by.title;'>
+            <option id='opac.result.title.a2z' label='&common.a2z.titla;' value='title.asc'>&common.a2z.title;</option>
+            <option id='opac.result.title.z2a' label='&common.z2a.titla;' value='title.desc'>&common.z2a.title;</option>
         </optgroup>
-        <optgroup label='&common.author;'>
-            <option id='opac.result.author.a2z' label='&common.a2z;' value='author.asc'>&common.a2z;</option>
-            <option id='opac.result.author.z2a' label='&common.z2a;' value='author.desc'>&common.z2a;</option>
+        <optgroup label='&result.sort_by.author;'>
+            <option id='opac.result.author.a2z' label='&common.a2z.author;' value='author.asc'>&common.a2z.author;</option>
+            <option id='opac.result.author.z2a' label='&common.z2a.author;' value='author.desc'>&common.z2a.author;</option>
         </optgroup>
-        <optgroup label='&common.pubdate;'>
-            <option id='opac.result.pubdate.new2old' label='&common.new2old;' 
-                value='pubdate.desc'>&common.new2old;</option>
-            <option id='opac.result.pubdate.old2new' label='&common.old2new;' 
-                value='pubdate.asc'>&common.old2new;</option>
+        <optgroup label='&result.sort_by.pubdate;'>
+            <option id='opac.result.pubdate.new2old' label='&common.new2old.pubdate;' 
+                value='pubdate.desc'>&common.new2old.pubdate;</option>
+            <option id='opac.result.pubdate.old2new' label='&common.old2new.pubdate;' 
+                value='pubdate.asc'>&common.old2new.pubdate;</option>
         </optgroup>
     </select>
 </span>
-- 
2.11.0