[open-ils-commits] r1288 - servres/branches/i18n/conifer/templates/phys (gfawcett)

svn at svn.open-ils.org svn at svn.open-ils.org
Mon Mar 28 20:56:07 EDT 2011


Author: gfawcett
Date: 2011-03-28 20:56:06 -0400 (Mon, 28 Mar 2011)
New Revision: 1288

Added:
   servres/branches/i18n/conifer/templates/phys/checkout.xhtml_
   servres/branches/i18n/conifer/templates/phys/circlist_for_term.xhtml_
   servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml_
   servres/branches/i18n/conifer/templates/phys/index.xhtml_
   servres/branches/i18n/conifer/templates/phys/mark_arrived.xhtml_
   servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml_
   servres/branches/i18n/conifer/templates/phys/mark_arrived_outcome.xhtml_
Removed:
   servres/branches/i18n/conifer/templates/phys/checkout.xhtml
   servres/branches/i18n/conifer/templates/phys/circlist_for_term.xhtml
   servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml
   servres/branches/i18n/conifer/templates/phys/index.xhtml
   servres/branches/i18n/conifer/templates/phys/mark_arrived.xhtml
   servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml
   servres/branches/i18n/conifer/templates/phys/mark_arrived_outcome.xhtml
Log:
mark old 'physical' templates so they wont' be i18n'ed

I know, I should probably just delete them. For now, just changed their
extensions to '.xhtml_' so the i18nizer won't discover them.

Deleted: servres/branches/i18n/conifer/templates/phys/checkout.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/phys/checkout.xhtml	2011-03-29 00:56:03 UTC (rev 1287)
+++ servres/branches/i18n/conifer/templates/phys/checkout.xhtml	2011-03-29 00:56:06 UTC (rev 1288)
@@ -1,75 +0,0 @@
-<?python
-import os  # fixme, just for testing.
-sample_item = '31862017122801'  # fixme, just for testing.
-title = _('Patron Checkout of Item')
-?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:py="http://genshi.edgewall.org/">
-<xi:include href="../master.xhtml"/>
-<head>
-  <title>${title}</title>
-  <script>
-    $(function() { $('form:last input:visible:first').focus(); });
-  </script>
-  <style>
-    .success { background-color: #dfd; }
-    .failure { background-color: #fdd; }
-  </style>
-</head>
-<body>
-  <h1>${title}</h1>
-  <form action="." method="POST">
-    <input type="hidden" name="step" value="${step}"/>
-    <div>
-    <table class="metadata_table">
-      <tr py:choose="defined('patron')">
-	<th>Patron Barcode</th>
-	<td py:when="False">
-	  <input type="text" id="patron" name="patron" style="width: 400;" value=""/>
-	</td>
-	<td py:when="True">
-	    ${patron}: ${Markup(patron_descrip)}
-	    <input type="hidden" name="patron" value="${patron}"/>
-	    <input type="hidden" name="patron_descrip" value="${patron_descrip}"/>
-	</td>
-      </tr>
-      <tr py:if="step>1" py:choose="defined('item')">
-	<th>Item Barcode</th>
-	<td py:when="False">
-	  <input type="text" id="item" name="item" style="width: 400;" value="${sample_item}"/>
-	</td>
-	<td py:when="True">
-	  ${item}: ${Markup(item_descrip)}
-	  <input type="hidden" name="item" value="${item}"/>
-	</td>
-      </tr>
-      <tr py:if="step==3" py:with="successful=checkout_result['success']">
-	<th/>
-	<?python keys = checkout_result.keys(); keys.sort() ?>
-	<td class="${successful and 'success' or 'failure'}">
-	  <p py:if="successful">The checkout was successful. Due Date: ${checkout_result['due']}</p>
-	  <p py:if="not successful">The checkout failed.</p>
-	  <p style="font-size: 85%;">
-	    <a id="sdtog" href="javascript:$('#sip_details').toggle();$('#stog').hide();void(0);">Show details</a>
-	  </p>
-	  <table id="sip_details" style="font-size: 85%; display: none;"><tr py:for="k in keys">
-	    <th>${k}</th><td>${checkout_result[k]}</td>
-	  </tr></table>
-	</td>
-      </tr>
-      <tr>
-	<th/>
-	<td><input type="submit" value="${step==3 and _('Check out another item') or _('Continue')}"/> ${go_back_link()}</td>
-      </tr>
-      <tr py:if="step==3">
-	<th/>
-	<td><a href="../">Done</a></td>
-      </tr>
-
-
-    </table>
-  </div>
-  </form>
-</body>
-</html>

Copied: servres/branches/i18n/conifer/templates/phys/checkout.xhtml_ (from rev 1287, servres/branches/i18n/conifer/templates/phys/checkout.xhtml)
===================================================================
--- servres/branches/i18n/conifer/templates/phys/checkout.xhtml_	                        (rev 0)
+++ servres/branches/i18n/conifer/templates/phys/checkout.xhtml_	2011-03-29 00:56:06 UTC (rev 1288)
@@ -0,0 +1,75 @@
+<?python
+import os  # fixme, just for testing.
+sample_item = '31862017122801'  # fixme, just for testing.
+title = _('Patron Checkout of Item')
+?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+<xi:include href="../master.xhtml"/>
+<head>
+  <title>${title}</title>
+  <script>
+    $(function() { $('form:last input:visible:first').focus(); });
+  </script>
+  <style>
+    .success { background-color: #dfd; }
+    .failure { background-color: #fdd; }
+  </style>
+</head>
+<body>
+  <h1>${title}</h1>
+  <form action="." method="POST">
+    <input type="hidden" name="step" value="${step}"/>
+    <div>
+    <table class="metadata_table">
+      <tr py:choose="defined('patron')">
+	<th>Patron Barcode</th>
+	<td py:when="False">
+	  <input type="text" id="patron" name="patron" style="width: 400;" value=""/>
+	</td>
+	<td py:when="True">
+	    ${patron}: ${Markup(patron_descrip)}
+	    <input type="hidden" name="patron" value="${patron}"/>
+	    <input type="hidden" name="patron_descrip" value="${patron_descrip}"/>
+	</td>
+      </tr>
+      <tr py:if="step>1" py:choose="defined('item')">
+	<th>Item Barcode</th>
+	<td py:when="False">
+	  <input type="text" id="item" name="item" style="width: 400;" value="${sample_item}"/>
+	</td>
+	<td py:when="True">
+	  ${item}: ${Markup(item_descrip)}
+	  <input type="hidden" name="item" value="${item}"/>
+	</td>
+      </tr>
+      <tr py:if="step==3" py:with="successful=checkout_result['success']">
+	<th/>
+	<?python keys = checkout_result.keys(); keys.sort() ?>
+	<td class="${successful and 'success' or 'failure'}">
+	  <p py:if="successful">The checkout was successful. Due Date: ${checkout_result['due']}</p>
+	  <p py:if="not successful">The checkout failed.</p>
+	  <p style="font-size: 85%;">
+	    <a id="sdtog" href="javascript:$('#sip_details').toggle();$('#stog').hide();void(0);">Show details</a>
+	  </p>
+	  <table id="sip_details" style="font-size: 85%; display: none;"><tr py:for="k in keys">
+	    <th>${k}</th><td>${checkout_result[k]}</td>
+	  </tr></table>
+	</td>
+      </tr>
+      <tr>
+	<th/>
+	<td><input type="submit" value="${step==3 and _('Check out another item') or _('Continue')}"/> ${go_back_link()}</td>
+      </tr>
+      <tr py:if="step==3">
+	<th/>
+	<td><a href="../">Done</a></td>
+      </tr>
+
+
+    </table>
+  </div>
+  </form>
+</body>
+</html>

Deleted: servres/branches/i18n/conifer/templates/phys/circlist_for_term.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/phys/circlist_for_term.xhtml	2011-03-29 00:56:03 UTC (rev 1287)
+++ servres/branches/i18n/conifer/templates/phys/circlist_for_term.xhtml	2011-03-29 00:56:06 UTC (rev 1288)
@@ -1,62 +0,0 @@
-<?python
-title = _('Wanted items: %s') % term
-from conifer.libsystems.marcxml import marcxml_dictionary_to_dc as to_dublin
-dc_keys = ['dc:title', 'dc:creator', 'dc:publisher', 'dc:date']
-from django.conf import settings
-lang = settings.LANGUAGE_CODE.replace('_','-')
-catalogue_pattern = 'http://%s/opac/%s/skin/default/xml/rdetail.xml?r=%%s'
-catalogue_pattern = catalogue_pattern % (settings.EVERGREEN_GATEWAY_SERVER, lang)
-?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:py="http://genshi.edgewall.org/">
-<xi:include href="../master.xhtml"/>
-<head>
-  <title>${title}</title>
-</head>
-<body>
-  <h1>${title}</h1>
-
-<table class="pagetable">
-      <thead>
-	<tr><th>#</th><th>Title</th><th>Author</th><th>Publisher</th><th>PubDate</th></tr>
-      </thead>
-      <tbody py:for="resultnum, w in enumerate(wanted)"
-	     py:with="res = w.marc() or {}; dc=to_dublin(res)">
-	<tr>
-	  <td>${resultnum+1}.</td>
-	  <td>
-	    ${dc.get('dc:title', '???')}
-	    <p style="margin: 8px 0; font-size: 90%; color: darkred;">
-	      <a href="javascript:$('#full_${resultnum}').toggle(); void(0);">MARC</a>
-	      &bull;
-	      <span py:if="res.get('901c')" style="margin: 8px 0; font-size: 90%; color: darkred;">
-		<a href="${catalogue_pattern % res.get('901c')}">Catalogue</a>
-		&bull;
-	      </span>
-	      <span py:if="res.get('901c')" style="margin: 8px 0; font-size: 90%; color: darkred;">
-		<a href="${w.item_url()}">Reserves</a>
-	      </span>
-	      <span py:if="res.get('8569')" style="margin: 8px 0; font-size: 90%; color: darkred;">
-		&bull;
-		<a href="${res.get('856u')}">View Electronic</a>
-	      </span>
-	    </p>
-	  </td>
-	  <td py:for="k in dc_keys[1:]">${dc.get(k) or '&mdash;'}</td>
-	</tr>
-	<tr id="full_${resultnum}" style="display: none;">
-	  <td colspan="5" style="padding-left: 36;">
-	    <table class="metadata_table">
-	      <?python allkeys = res.keys(); allkeys.sort(); ?>
-	      <tr py:for="k in allkeys">
-		<th>${k}</th><td>${res[k]}</td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-      </tbody>
-    </table>
-
-</body>
-</html>

Copied: servres/branches/i18n/conifer/templates/phys/circlist_for_term.xhtml_ (from rev 1287, servres/branches/i18n/conifer/templates/phys/circlist_for_term.xhtml)
===================================================================
--- servres/branches/i18n/conifer/templates/phys/circlist_for_term.xhtml_	                        (rev 0)
+++ servres/branches/i18n/conifer/templates/phys/circlist_for_term.xhtml_	2011-03-29 00:56:06 UTC (rev 1288)
@@ -0,0 +1,62 @@
+<?python
+title = _('Wanted items: %s') % term
+from conifer.libsystems.marcxml import marcxml_dictionary_to_dc as to_dublin
+dc_keys = ['dc:title', 'dc:creator', 'dc:publisher', 'dc:date']
+from django.conf import settings
+lang = settings.LANGUAGE_CODE.replace('_','-')
+catalogue_pattern = 'http://%s/opac/%s/skin/default/xml/rdetail.xml?r=%%s'
+catalogue_pattern = catalogue_pattern % (settings.EVERGREEN_GATEWAY_SERVER, lang)
+?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+<xi:include href="../master.xhtml"/>
+<head>
+  <title>${title}</title>
+</head>
+<body>
+  <h1>${title}</h1>
+
+<table class="pagetable">
+      <thead>
+	<tr><th>#</th><th>Title</th><th>Author</th><th>Publisher</th><th>PubDate</th></tr>
+      </thead>
+      <tbody py:for="resultnum, w in enumerate(wanted)"
+	     py:with="res = w.marc() or {}; dc=to_dublin(res)">
+	<tr>
+	  <td>${resultnum+1}.</td>
+	  <td>
+	    ${dc.get('dc:title', '???')}
+	    <p style="margin: 8px 0; font-size: 90%; color: darkred;">
+	      <a href="javascript:$('#full_${resultnum}').toggle(); void(0);">MARC</a>
+	      &bull;
+	      <span py:if="res.get('901c')" style="margin: 8px 0; font-size: 90%; color: darkred;">
+		<a href="${catalogue_pattern % res.get('901c')}">Catalogue</a>
+		&bull;
+	      </span>
+	      <span py:if="res.get('901c')" style="margin: 8px 0; font-size: 90%; color: darkred;">
+		<a href="${w.item_url()}">Reserves</a>
+	      </span>
+	      <span py:if="res.get('8569')" style="margin: 8px 0; font-size: 90%; color: darkred;">
+		&bull;
+		<a href="${res.get('856u')}">View Electronic</a>
+	      </span>
+	    </p>
+	  </td>
+	  <td py:for="k in dc_keys[1:]">${dc.get(k) or '&mdash;'}</td>
+	</tr>
+	<tr id="full_${resultnum}" style="display: none;">
+	  <td colspan="5" style="padding-left: 36;">
+	    <table class="metadata_table">
+	      <?python allkeys = res.keys(); allkeys.sort(); ?>
+	      <tr py:for="k in allkeys">
+		<th>${k}</th><td>${res[k]}</td>
+	      </tr>
+	    </table>
+	  </td>
+	</tr>
+      </tbody>
+    </table>
+
+</body>
+</html>

Deleted: servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml	2011-03-29 00:56:03 UTC (rev 1287)
+++ servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml	2011-03-29 00:56:06 UTC (rev 1288)
@@ -1,21 +0,0 @@
-<?python
-title = _('Notify Circulation of wanted items')
-?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:py="http://genshi.edgewall.org/">
-<xi:include href="../master.xhtml"/>
-<head>
-  <title>${title}</title>
-</head>
-<body>
-  <h1>${title}</h1>
-  <p>Please select a term:</p>
-  <form action="." method="GET">
-    <select name="term">
-      <option py:for="term in terms" value="${term.code}">${term}</option>
-    </select>
-    <input type="submit" value="${_('Continue')}"/>
-  </form>
-</body>
-</html>

Copied: servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml_ (from rev 1287, servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml)
===================================================================
--- servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml_	                        (rev 0)
+++ servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml_	2011-03-29 00:56:06 UTC (rev 1288)
@@ -0,0 +1,21 @@
+<?python
+title = _('Notify Circulation of wanted items')
+?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+<xi:include href="../master.xhtml"/>
+<head>
+  <title>${title}</title>
+</head>
+<body>
+  <h1>${title}</h1>
+  <p>Please select a term:</p>
+  <form action="." method="GET">
+    <select name="term">
+      <option py:for="term in terms" value="${term.code}">${term}</option>
+    </select>
+    <input type="submit" value="${_('Continue')}"/>
+  </form>
+</body>
+</html>

Deleted: servres/branches/i18n/conifer/templates/phys/index.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/phys/index.xhtml	2011-03-29 00:56:03 UTC (rev 1287)
+++ servres/branches/i18n/conifer/templates/phys/index.xhtml	2011-03-29 00:56:06 UTC (rev 1288)
@@ -1,25 +0,0 @@
-<?python
-title = _('Physical Item Processing')
-?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:py="http://genshi.edgewall.org/">
-<xi:include href="../master.xhtml"/>
-<head>
-  <title>${title}</title>
-</head>
-<body>
-  <h1>${title}</h1>
-  <h2>Patron assistance</h2>
-  <ul>
-    <li><a href="checkout/">Patron Checkout of Item</a></li>
-  </ul>
-
-  <h2>Circulations workflow</h2>
-  <ul>
-    <li><a href="circlist/">Notify Circulation of wanted items</a></li>
-    <li><a href="mark_arrived/">Mark items as Arrived</a></li>
- </ul>
-
-</body>
-</html>

Copied: servres/branches/i18n/conifer/templates/phys/index.xhtml_ (from rev 1287, servres/branches/i18n/conifer/templates/phys/index.xhtml)
===================================================================
--- servres/branches/i18n/conifer/templates/phys/index.xhtml_	                        (rev 0)
+++ servres/branches/i18n/conifer/templates/phys/index.xhtml_	2011-03-29 00:56:06 UTC (rev 1288)
@@ -0,0 +1,25 @@
+<?python
+title = _('Physical Item Processing')
+?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+<xi:include href="../master.xhtml"/>
+<head>
+  <title>${title}</title>
+</head>
+<body>
+  <h1>${title}</h1>
+  <h2>Patron assistance</h2>
+  <ul>
+    <li><a href="checkout/">Patron Checkout of Item</a></li>
+  </ul>
+
+  <h2>Circulations workflow</h2>
+  <ul>
+    <li><a href="circlist/">Notify Circulation of wanted items</a></li>
+    <li><a href="mark_arrived/">Mark items as Arrived</a></li>
+ </ul>
+
+</body>
+</html>

Deleted: servres/branches/i18n/conifer/templates/phys/mark_arrived.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/phys/mark_arrived.xhtml	2011-03-29 00:56:03 UTC (rev 1287)
+++ servres/branches/i18n/conifer/templates/phys/mark_arrived.xhtml	2011-03-29 00:56:06 UTC (rev 1288)
@@ -1,37 +0,0 @@
-<?python
-title = _('Mark Items as Arrived')
-?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:py="http://genshi.edgewall.org/">
-<xi:include href="../master.xhtml"/>
-<head>
-  <title>${title}</title>
-  <script>
-    $(function() { $('form:last input:visible:first').focus(); });
-  </script>
-  <style>
-    .success { background-color: #dfd; }
-    .failure { background-color: #fdd; }
-  </style>
-</head>
-<body>
-  <h1>${title}</h1>
-  <form action="." method="POST">
-    <div>
-    <table class="metadata_table">
-      <tr>
-	<th>Item Barcode</th>
-	<td>
-	  <input type="text" id="item" name="item" style="width: 400;" value=""/>
-	</td>
-      </tr>
-      <tr>
-	<th/>
-	<td><input type="submit" value="${False and _('Check out another item') or _('Continue')}"/> ${go_back_link()}</td>
-      </tr>
-    </table>
-  </div>
-  </form>
-</body>
-</html>

Copied: servres/branches/i18n/conifer/templates/phys/mark_arrived.xhtml_ (from rev 1287, servres/branches/i18n/conifer/templates/phys/mark_arrived.xhtml)
===================================================================
--- servres/branches/i18n/conifer/templates/phys/mark_arrived.xhtml_	                        (rev 0)
+++ servres/branches/i18n/conifer/templates/phys/mark_arrived.xhtml_	2011-03-29 00:56:06 UTC (rev 1288)
@@ -0,0 +1,37 @@
+<?python
+title = _('Mark Items as Arrived')
+?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+<xi:include href="../master.xhtml"/>
+<head>
+  <title>${title}</title>
+  <script>
+    $(function() { $('form:last input:visible:first').focus(); });
+  </script>
+  <style>
+    .success { background-color: #dfd; }
+    .failure { background-color: #fdd; }
+  </style>
+</head>
+<body>
+  <h1>${title}</h1>
+  <form action="." method="POST">
+    <div>
+    <table class="metadata_table">
+      <tr>
+	<th>Item Barcode</th>
+	<td>
+	  <input type="text" id="item" name="item" style="width: 400;" value=""/>
+	</td>
+      </tr>
+      <tr>
+	<th/>
+	<td><input type="submit" value="${False and _('Check out another item') or _('Continue')}"/> ${go_back_link()}</td>
+      </tr>
+    </table>
+  </div>
+  </form>
+</body>
+</html>

Deleted: servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml	2011-03-29 00:56:03 UTC (rev 1287)
+++ servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml	2011-03-29 00:56:06 UTC (rev 1288)
@@ -1,80 +0,0 @@
-<?python
-import re
-title = _('Mark Items as Arrived: Choose Match')
-?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:py="http://genshi.edgewall.org/">
-<xi:include href="../master.xhtml"/>
-<head>
-  <title>${title}</title>
-  <script>
-    $(function() { $('form:last input:visible:first').focus(); });
-  </script>
-  <style>
-    .success { background-color: #dfd; }
-    .failure { background-color: #fdd; }
-    .likely { background-color: #dfd; }
-    .doubtful { font-size: 75%; }
-  </style>
-</head>
-<body>
-  <h1>${title}</h1>
-    <div>
-      <table class="metadata_table">
-	<tr><th>Item Barcode</th><td>${barcode}</td></tr>
-	<tr py:for="k in ['dc:title', 'dc:creator', 'dc:publisher', 'dc:date']" py:if="k in metadata">
-	  <th>${k}</th><td>${metadata[k]}</td>
-	</tr>
-	<tr><th/><td><a href="javascript:$('#more_detail').toggle(); void(0);">Detail</a></td></tr>
-      </table>
-      <table id="more_detail" style="display: none;" class="metadata_table">
-      <tr py:for="k in metadata">
-	<th>${k}</th><td>${metadata[k]}</td>
-      </tr>
-    </table>
-    <h2>Matches</h2>
-    <form action="match/" method="POST">
-    <div style="float: right;">
-      Optional: Small-number ID for this item: 
-      <input type="text" name="smallint"/>
-    </div>
-    <p><input type="submit" value="${_('Associate item with matches selected below')}"/></p>
-    <input type="hidden" name="barcode" value="${barcode}"/>
-    <table class="metadata_table" width="100%;">
-      <thead style="font-size: 70%;">
-	<tr><th py:for="v in 'Select Title Author Site Instructor Score'.split(' ')">${v}</th></tr>
-      </thead>
-      <tbody py:for="n, (score, item) in enumerate(ranked)"
-	  class="${score &lt; 5 and 'likely' or score &lt; 50 and 'maybe' or 'doubtful'}"
-	  py:with="marc=item.marc()">
-	<tr>
-	<td><input type="checkbox" name="choose_${item.id}" id="choose_${item.id}"/></td>
-	<td><label for="choose_${item.id}">${item}</label>
-	<span py:if="marc"><a href="javascript:$('#marcdata${n}').toggle();void(0);">detail</a></span>
-	</td>
-	<td>${item.author() or '&mdash;'}</td>	
-	<td>${item.site.title}</td>
-	<td>${','.join(n.last_name for n in item.site.get_instructors())}</td>
-	<td>${repr(score)}</td>
-	</tr>
-	<tr py:if="marc" id="marcdata${n}"  style="display: none;">
-	  <td/>
-	  <td colspan="3">
-	    <div>
-	      <?python keys=marc.keys(); keys.sort() ?>
-	      <table>
-		<tr py:for="k in keys">
-		  <th>${k}</th>
-		  <td>${marc[k]}</td>
-		</tr>
-	      </table>
-	    </div>
-	  </td>
-	</tr>
-      </tbody>
-    </table>
-    </form>
-  </div>
-</body>
-</html>

Copied: servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml_ (from rev 1287, servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml)
===================================================================
--- servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml_	                        (rev 0)
+++ servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml_	2011-03-29 00:56:06 UTC (rev 1288)
@@ -0,0 +1,80 @@
+<?python
+import re
+title = _('Mark Items as Arrived: Choose Match')
+?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+<xi:include href="../master.xhtml"/>
+<head>
+  <title>${title}</title>
+  <script>
+    $(function() { $('form:last input:visible:first').focus(); });
+  </script>
+  <style>
+    .success { background-color: #dfd; }
+    .failure { background-color: #fdd; }
+    .likely { background-color: #dfd; }
+    .doubtful { font-size: 75%; }
+  </style>
+</head>
+<body>
+  <h1>${title}</h1>
+    <div>
+      <table class="metadata_table">
+	<tr><th>Item Barcode</th><td>${barcode}</td></tr>
+	<tr py:for="k in ['dc:title', 'dc:creator', 'dc:publisher', 'dc:date']" py:if="k in metadata">
+	  <th>${k}</th><td>${metadata[k]}</td>
+	</tr>
+	<tr><th/><td><a href="javascript:$('#more_detail').toggle(); void(0);">Detail</a></td></tr>
+      </table>
+      <table id="more_detail" style="display: none;" class="metadata_table">
+      <tr py:for="k in metadata">
+	<th>${k}</th><td>${metadata[k]}</td>
+      </tr>
+    </table>
+    <h2>Matches</h2>
+    <form action="match/" method="POST">
+    <div style="float: right;">
+      Optional: Small-number ID for this item: 
+      <input type="text" name="smallint"/>
+    </div>
+    <p><input type="submit" value="${_('Associate item with matches selected below')}"/></p>
+    <input type="hidden" name="barcode" value="${barcode}"/>
+    <table class="metadata_table" width="100%;">
+      <thead style="font-size: 70%;">
+	<tr><th py:for="v in 'Select Title Author Site Instructor Score'.split(' ')">${v}</th></tr>
+      </thead>
+      <tbody py:for="n, (score, item) in enumerate(ranked)"
+	  class="${score &lt; 5 and 'likely' or score &lt; 50 and 'maybe' or 'doubtful'}"
+	  py:with="marc=item.marc()">
+	<tr>
+	<td><input type="checkbox" name="choose_${item.id}" id="choose_${item.id}"/></td>
+	<td><label for="choose_${item.id}">${item}</label>
+	<span py:if="marc"><a href="javascript:$('#marcdata${n}').toggle();void(0);">detail</a></span>
+	</td>
+	<td>${item.author() or '&mdash;'}</td>	
+	<td>${item.site.title}</td>
+	<td>${','.join(n.last_name for n in item.site.get_instructors())}</td>
+	<td>${repr(score)}</td>
+	</tr>
+	<tr py:if="marc" id="marcdata${n}"  style="display: none;">
+	  <td/>
+	  <td colspan="3">
+	    <div>
+	      <?python keys=marc.keys(); keys.sort() ?>
+	      <table>
+		<tr py:for="k in keys">
+		  <th>${k}</th>
+		  <td>${marc[k]}</td>
+		</tr>
+	      </table>
+	    </div>
+	  </td>
+	</tr>
+      </tbody>
+    </table>
+    </form>
+  </div>
+</body>
+</html>

Deleted: servres/branches/i18n/conifer/templates/phys/mark_arrived_outcome.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/phys/mark_arrived_outcome.xhtml	2011-03-29 00:56:03 UTC (rev 1287)
+++ servres/branches/i18n/conifer/templates/phys/mark_arrived_outcome.xhtml	2011-03-29 00:56:06 UTC (rev 1288)
@@ -1,22 +0,0 @@
-<?python
-title = _('Matches saved; item marked as received')
-?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:py="http://genshi.edgewall.org/">
-<xi:include href="../master.xhtml"/>
-<head>
-  <title>${title}</title>
-  <script>
-    $(function() { $('form:last input:visible:first').focus(); });
-  </script>
-  <style>
-    .success { background-color: #dfd; }
-    .failure { background-color: #fdd; }
-  </style>
-</head>
-<body>
-  <h1>${title}</h1>
-  <p><a href="../">Continue</a></p>
-</body>
-</html>

Copied: servres/branches/i18n/conifer/templates/phys/mark_arrived_outcome.xhtml_ (from rev 1287, servres/branches/i18n/conifer/templates/phys/mark_arrived_outcome.xhtml)
===================================================================
--- servres/branches/i18n/conifer/templates/phys/mark_arrived_outcome.xhtml_	                        (rev 0)
+++ servres/branches/i18n/conifer/templates/phys/mark_arrived_outcome.xhtml_	2011-03-29 00:56:06 UTC (rev 1288)
@@ -0,0 +1,22 @@
+<?python
+title = _('Matches saved; item marked as received')
+?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+<xi:include href="../master.xhtml"/>
+<head>
+  <title>${title}</title>
+  <script>
+    $(function() { $('form:last input:visible:first').focus(); });
+  </script>
+  <style>
+    .success { background-color: #dfd; }
+    .failure { background-color: #fdd; }
+  </style>
+</head>
+<body>
+  <h1>${title}</h1>
+  <p><a href="../">Continue</a></p>
+</body>
+</html>



More information about the open-ils-commits mailing list