From fb487bee6d77e16bdaf0c4ecad985e4744b43fe8 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 14 Nov 2005 03:28:11 +0000
Subject: [PATCH] dtd-izing the tips stuff (and the "of" on the results pages)

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2015 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/opac/locale/en-US/lang.dtd             | 6 ++++++
 Open-ILS/web/opac/skin/default/js/tips.js           | 9 +++++++--
 Open-ILS/web/opac/skin/default/xml/mresult.xml      | 2 +-
 Open-ILS/web/opac/skin/default/xml/result_table.xml | 6 +++---
 Open-ILS/web/opac/skin/default/xml/rresult.xml      | 2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 6be654f828..64cf1f9290 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -23,6 +23,12 @@
 
 <!ENTITY common.nowSearching "Now searching ">
 <!ENTITY common.at " at ">
+<!ENTITY common.ofAtLeast " of at least ">
+<!ENTITY common.relevancy "Relevancy ">
+
+<!ENTITY common.tips "Tips:">
+<!ENTITY common.tips.tip1 "Click on a folder icon in the sidebar to access related quick searches">
+<!ENTITY common.tips.tip2 "If you don't find what you want try expanding your search using the range selector at the right of the search bar">
 
 
 <!-- Sidebar Header Labels -->
diff --git a/Open-ILS/web/opac/skin/default/js/tips.js b/Open-ILS/web/opac/skin/default/js/tips.js
index 755bda0724..6cdd2e84ac 100644
--- a/Open-ILS/web/opac/skin/default/js/tips.js
+++ b/Open-ILS/web/opac/skin/default/js/tips.js
@@ -1,13 +1,18 @@
 attachEvt('common', 'run', insertTip);
 
+/*
 var user_tips = [
 	'Click on a folder icon in the sidebar to access related quick searches',
 	"If you don't find what you want try expanding your search using the range selector at the right of the search bar"
 ];
+*/
 
 function insertTip () {
 	var tip_div = document.getElementById('tips');
-	if (tip_div)
-		tip_div.appendChild( text( user_tips[ Math.floor(Math.random() * user_tips.length) ] ) );
+	if (tip_div) {
+		var tips = tip_div.getElementsByTagName('div')[0].getElementsByTagName('span');
+		var index = Math.floor(Math.random() * tips.length);
+		tip_div.appendChild( tips[index] );
+	}
 }
 
diff --git a/Open-ILS/web/opac/skin/default/xml/mresult.xml b/Open-ILS/web/opac/skin/default/xml/mresult.xml
index 249de16f64..b22a99ae44 100644
--- a/Open-ILS/web/opac/skin/default/xml/mresult.xml
+++ b/Open-ILS/web/opac/skin/default/xml/mresult.xml
@@ -27,7 +27,7 @@
 						<xi:include href="result_common.xml"/>
 					</div>
 					<br/>
-					<div id='tips' class='tips'><span style="font-weight: bold;">Tip:  </span></div>
+					<xi:include href="tips.xml"/>
 					</td>
 				</tr>
 			</tbody>
diff --git a/Open-ILS/web/opac/skin/default/xml/result_table.xml b/Open-ILS/web/opac/skin/default/xml/result_table.xml
index c8e15256ec..6fcc43f384 100644
--- a/Open-ILS/web/opac/skin/default/xml/result_table.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result_table.xml
@@ -30,11 +30,11 @@
 										<span id='offset_start'> </span>
 										<span> - </span>
 										<span id='offset_end'> </span>
-										<span> of </span>
+										<span> &common.ofAtLeast; </span>
 										<span id='result_count'> </span>
 										<span style='padding-left: 6px;'> (page </span>
 										<span id='current_page'> </span>
-										<span> of </span>
+										<span> &common.ofAtLeast; </span>
 										<span id='num_pages'> </span>
 									</span>
 
@@ -160,7 +160,7 @@
 									</a>
 
 									<span class='hide_me' style='color: #9999FF; padding-left: 10px; font-size: 7pt; font-weight: 300;'> 
-										<span>Relevancy </span><span name='relevancy_span'> </span>
+										<span>&common.relevancy; </span><span name='relevancy_span'> </span>
 									</span>
 
 								</td>
diff --git a/Open-ILS/web/opac/skin/default/xml/rresult.xml b/Open-ILS/web/opac/skin/default/xml/rresult.xml
index 3fa3b66e57..5ef37ec991 100644
--- a/Open-ILS/web/opac/skin/default/xml/rresult.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rresult.xml
@@ -28,7 +28,7 @@
 						<xi:include href="result_common.xml"/>
 					</div>
 					<br/>
-					<div id='tips' class='tips'><span style="font-weight: bold;">Tip:  </span></div>
+					<xi:include href="tips.xml"/>
 					</td>
 				</tr>
 			</tbody>
-- 
2.43.2