[open-ils-commits] [GIT] Evergreen ILS branch master updated. 41b7e1327541ce36f730c177c9a9ba7fd0d26138
Evergreen Git
git at git.evergreen-ils.org
Thu Mar 7 02:43:42 EST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 41b7e1327541ce36f730c177c9a9ba7fd0d26138 (commit)
via 703aa090502ef9c77f78dba931c976eb585716eb (commit)
from f395b228f4e3f920fc26fde1b9483d3f9688fb05 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 41b7e1327541ce36f730c177c9a9ba7fd0d26138
Author: Bill Erickson <berick at esilibrary.com>
Date: Wed Mar 6 13:30:59 2013 -0500
.gitignore additions for (new) generated files
Add these to Evergreen .gitignore:
Open-ILS/examples/apache/eg.conf
Open-ILS/examples/apache/eg_startup
Open-ILS/examples/apache/eg_vhost.conf
Open-ILS/src/support-scripts/eg_db_config
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/.gitignore b/.gitignore
index 9c48a33..9c7a34d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -329,3 +329,7 @@ Open-ILS/xul/staff_client/xulrunner-3.6.25.en-US.linux-i686.tar.bz2
Open-ILS/xul/staff_client/xulrunner/
README.html
HACKING.html
+Open-ILS/examples/apache/eg.conf
+Open-ILS/examples/apache/eg_startup
+Open-ILS/examples/apache/eg_vhost.conf
+Open-ILS/src/support-scripts/eg_db_config
commit 703aa090502ef9c77f78dba931c976eb585716eb
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Tue Mar 5 18:38:57 2013 +0200
LP1147286 - Allow translating more of the staff client portal page.
Add translatable strings for image alt-tags and the Search button on
the staff client portal page.
Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 877c926..f327a52 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -3609,27 +3609,43 @@
<!ENTITY staff.client.portal.welcome "Welcome to Evergreen">
<!ENTITY staff.client.portal.circpatron "Circulation and Patrons">
<!ENTITY staff.client.portal.checkout "Check Out Items">
+<!ENTITY staff.client.portal.checkout.description "Check Out Items">
<!ENTITY staff.client.portal.retrievebc "(Retrieve Patron By Barcode)">
<!ENTITY staff.client.portal.checkin "Check In Items">
+<!ENTITY staff.client.portal.checkin.description "Check In Items">
<!ENTITY staff.client.portal.patronreg "Register Patron(s)">
+<!ENTITY staff.client.portal.patronreg.description "Register Patron(s)">
<!ENTITY staff.client.portal.patronsearch "Search For Patron By Name">
+<!ENTITY staff.client.portal.patronsearch.description "Search For Patron By Name">
<!ENTITY staff.client.portal.holdlist "Pull List for Hold Requests">
+<!ENTITY staff.client.portal.holdlist.description "Pull List for Hold Requests">
<!ENTITY staff.client.portal.itemcataloging "Item Search and Cataloging">
<!ENTITY staff.client.portal.advsearch "Advanced Search">
+<!ENTITY staff.client.portal.advsearch.description "Advanced Search">
<!ENTITY staff.client.portal.itemstatus "Item Status / Display">
+<!ENTITY staff.client.portal.itemstatus.description "Item Status / Display">
<!ENTITY staff.client.portal.marcutil "MARC Batch Import / Export">
+<!ENTITY staff.client.portal.marcutil.description "MARC Batch Import / Export">
<!ENTITY staff.client.portal.z3950 "z39.50 Import">
+<!ENTITY staff.client.portal.z3950.description "z39.50 Import">
<!ENTITY staff.client.portal.copybuckets "Copy Buckets">
+<!ENTITY staff.client.portal.copybuckets.description "Copy Buckets">
<!ENTITY staff.client.portal.recordbuckets "Record Buckets">
+<!ENTITY staff.client.portal.recordbuckets.description "Record Buckets">
<!ENTITY staff.client.portal.admin "Administration">
<!ENTITY staff.client.portal.helpdesk "Get Help with Evergreen">
+<!ENTITY staff.client.portal.helpdesk.description "Submit A Helpdesk Ticket">
<!ENTITY staff.client.portal.reports "Reports">
+<!ENTITY staff.client.portal.reports.description "Reports">
<!ENTITY staff.client.portal.receipts "Edit Receipt Templates">
+<!ENTITY staff.client.portal.receipts.description "Edit Receipt Templates">
<!ENTITY staff.client.portal.copyright "Copyright © 2006-2012 Georgia Public Library Service, and others">
<!ENTITY staff.client.portal.poweredby "Powered by">
<!ENTITY staff.client.portal.toggle_tpac "Toggle Template Toolkit OPAC Use">
<!ENTITY staff.client.portal.toggle_tpac.message_on "The use of the Template Toolkit OPAC has been enabled. You may need to restart the staff client for this to take effect.">
<!ENTITY staff.client.portal.toggle_tpac.message_off "The use of the Template Toolkit OPAC has been disabled. You may need to restart the staff client for this to take effect.">
+<!ENTITY staff.client.portal.open_new_tab.description "Open in a new tab">
+<!ENTITY staff.client.portal.search.button "Search">
<!ENTITY staff.item.batch.hold.groupbox_caption "Request Details">
<!ENTITY staff.item.batch.hold.hold_type_menu.label "Hold Type">
<!ENTITY staff.item.batch.hold.hold_type_menu.accesskey "T">
diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml
index 1b36f3a..03bc29c 100644
--- a/Open-ILS/xul/staff_client/server/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/index.xhtml
@@ -365,9 +365,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/forward.png" height="48" width="48"
onclick="try { checkout(false); } catch(E) { alert(E); }" alt=
- "Check Out Items" /></td>
+ "&staff.client.portal.checkout.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { checkout(true); } catch(E) { alert(E); }" /><a href="#"
onclick=
"try { checkout(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.checkout;</a><br />
@@ -379,9 +379,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/back.png" height="48" width="48" onclick=
"try { checkin(false); } catch(E) { alert(E); }" alt=
- "Check In Items" /></td>
+ "&staff.client.portal.checkin.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { checkin(true); } catch(E) { alert(E); }" /> <a href="#"
onclick=
"try { checkin(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.checkin;</a><br /></td>
@@ -390,9 +390,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/registerpatron.png" height="48" width="48"
onclick="try { register_patron(false); } catch(E) { alert(E); }" alt=
- "Register Patron" /></td>
+ "&staff.client.portal.patronreg.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { register_patron(true); } catch(E) { alert(E); }" /> <a href=
"#" onclick=
"try { register_patron(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.patronreg;</a></td>
@@ -401,9 +401,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/retreivepatron.png" height="48" width="48"
onclick="try { find_patron(false); } catch(E) { alert(E); }" alt=
- "Search For Patron By Name" /></td>
+ "&staff.client.portal.patronsearch.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { find_patron(true); } catch(E) { alert(E); }" /> <a href="#"
onclick=
"try { find_patron(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.patronsearch;</a></td>
@@ -412,9 +412,9 @@
<tr>
<td height="50"><img class="funcimg" src="skin/media/images/portal/holds.png" height="48"
width="48" onclick="try { hold_pull_list(false); } catch(E) { alert(E); }"
- alt="Pull List for Hold Requests" /></td>
+ alt="&staff.client.portal.holdlist.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { hold_pull_list(true); } catch(E) { alert(E); }" /> <a href=
"#" onclick=
"try { hold_pull_list(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.holdlist;</a></td>
@@ -424,7 +424,7 @@
<td height="50"><img src="skin/media/images/portal/map.PNG" alt="Locate Address In Map"
onclick="try { address_map(false); } catch(E) { alert(E); }" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { address_map(true); } catch(E) { alert(E); }" /> <a href="#"
onclick=
"try { address_map(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.addrmap;</a></td>
@@ -444,7 +444,7 @@
<td colspan="2" rowspan="1">
<form action="#" onsubmit="return SearchOnSubmit();">
<input id="quicksearch" onfocus="SearchOnFocus();" onblur=
- "SearchOnBlur();" onkeydown="SearchOnFocus();" /> <input value="Search" type="submit" />
+ "SearchOnBlur();" onkeydown="SearchOnFocus();" /> <input value="&staff.client.portal.search.button;" type="submit" />
</form>
</td>
</tr>
@@ -452,9 +452,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/book.png" height="48" width="48" onclick=
"try { catalog(false); } catch(E) { alert(E); }" alt=
- "Advanced Search" /></td>
+ "&staff.client.portal.advsearch.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { catalog(true); } catch(E) { alert(E); }" /> <a href="#"
onclick=
"try { catalog(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.advsearch;</a></td>
@@ -463,9 +463,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/book.png" height="48" width="48" onclick=
"try { copy_status(false); } catch(E) { alert(E); }" alt=
- "Item Status / Display" /></td>
+ "&staff.client.portal.itemstatus.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { copy_status(true); } catch(E) { alert(E); }" /> <a href="#"
onclick=
"try { copy_status(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.itemstatus;</a></td>
@@ -474,9 +474,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/batchimport.png" height="48" width="48"
onclick="try { MARC_batch_import(false); } catch(E) { alert(E); }" alt=
- "MARC Batch Import / Export" /></td>
+ "&staff.client.portal.marcutil.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { MARC_batch_import(true); } catch(E) { alert(E); }" />
<a href="#" onclick=
"try { MARC_batch_import(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.marcutil;</a></td>
@@ -484,9 +484,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/z3950.png" height="48" width="48" onclick=
- "try { z39_50(false); } catch(E) { alert(E); }" alt="Z39.50 Import" /></td>
+ "try { z39_50(false); } catch(E) { alert(E); }" alt="&staff.client.portal.z3950.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { z39_50(true); } catch(E) { alert(E); }" /> <a href="#"
onclick=
"try { z39_50(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.z3950;</a></td>
@@ -495,9 +495,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/bucket.png" height="48" width="48" onclick=
"try { copy_buckets(false); } catch(E) { alert(E); }" alt=
- "Copy Buckets" /></td>
+ "&staff.client.portal.copybuckets.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { copy_buckets(true); } catch(E) { alert(E); }" /> <a href="#"
onclick=
"try { copy_buckets(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.copybuckets;</a></td>
@@ -506,9 +506,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/bucket.png" height="48" width="48" onclick=
"try { record_buckets(false); } catch(E) { alert(E); }" alt=
- "Record Buckets" /></td>
+ "&staff.client.portal.recordbuckets.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { record_buckets(true); } catch(E) { alert(E); }" /> <a href=
"index.html#" onclick=
"try { record_buckets(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.recordbuckets;</a></td>
@@ -526,7 +526,7 @@
<tr>
<td height="50"><img src="skin/media/images/portal/helpdesk.png" height="48" width="48"
onclick="try { helpdesk(false); } catch(E) { alert(E); }" alt=
- "Submit A Helpdesk Ticket" /></td>
+ "&staff.client.portal.helpdesk.description;" /></td>
<td><a href="#"
onclick="try { helpdesk(false); } catch(E) { alert(E); }">&staff.client.portal.helpdesk;</a></td>
@@ -535,9 +535,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/reports.png" height="48" width="48"
onclick="try { local_admin_reports(false); } catch(E) { alert(E); }" alt=
- "Reports" /></td>
+ "&staff.client.portal.reports.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { local_admin_reports(true); } catch(E) { alert(E); }" />
<a href="#" onclick=
"try { local_admin_reports(false); } catch(E) { alert(E); }; return false;">
@@ -547,9 +547,9 @@
<tr>
<td height="50"><img src="skin/media/images/portal/receipt_editor.png" height="48" width="48"
onclick="try { receipt_editor(false); } catch(E) { alert(E); }" alt=
- "Edit Receipt Templates" /></td>
+ "&staff.client.portal.receipts.description;" /></td>
- <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+ <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="&staff.client.portal.open_new_tab.description;"
onclick="try { receipt_editor(true); } catch(E) { alert(E); }" /> <a href=
"#" onclick=
"try { receipt_editor(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.receipts;</a></td>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 ++
Open-ILS/web/opac/locale/en-US/lang.dtd | 16 +++++++
Open-ILS/xul/staff_client/server/index.xhtml | 58 +++++++++++++-------------
3 files changed, 49 insertions(+), 29 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list