[open-ils-commits] r245 - in servres/trunk/conifer: . static syrup templates templates/phys (gfawcett)
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu Apr 2 21:30:58 EDT 2009
Author: gfawcett
Date: 2009-04-02 21:30:56 -0400 (Thu, 02 Apr 2009)
New Revision: 245
Added:
servres/trunk/conifer/templates/phys/
servres/trunk/conifer/templates/phys/checkout.xhtml
servres/trunk/conifer/templates/phys/index.xhtml
Modified:
servres/trunk/conifer/TODO
servres/trunk/conifer/static/main.css
servres/trunk/conifer/syrup/urls.py
servres/trunk/conifer/syrup/views.py
servres/trunk/conifer/templates/tabbar.xhtml
Log:
added mockup for Physical Item Processing admin-screen
Including a simple form for patron-item checkout.
Modified: servres/trunk/conifer/TODO
===================================================================
--- servres/trunk/conifer/TODO 2009-04-03 01:30:52 UTC (rev 244)
+++ servres/trunk/conifer/TODO 2009-04-03 01:30:56 UTC (rev 245)
@@ -3,5 +3,7 @@
* Update views.search() when this is in place.
-* ...
+* Import of reserves data from Leddy voyager. Laurentian, others?
+
+* Generating barcodes in emails, printable screens? (3 of 9 enough?)
Modified: servres/trunk/conifer/static/main.css
===================================================================
--- servres/trunk/conifer/static/main.css 2009-04-03 01:30:52 UTC (rev 244)
+++ servres/trunk/conifer/static/main.css 2009-04-03 01:30:56 UTC (rev 245)
@@ -73,7 +73,7 @@
/* actions (e.g. "edit user" link) */
.action a { font-weight: bold; }
-#tabbar { margin: 18 0; padding: 0; width: 700; }
+#tabbar { margin: 18 0; padding: 0; }
#tabbar li { display: inline; }
#tabbar li a { padding: 18 18 4 18; background-color: #ddf; color: black; text-decoration: none; }
#tabbar li a:hover { background-color: #fc8; }
Modified: servres/trunk/conifer/syrup/urls.py
===================================================================
--- servres/trunk/conifer/syrup/urls.py 2009-04-03 01:30:52 UTC (rev 244)
+++ servres/trunk/conifer/syrup/urls.py 2009-04-03 01:30:56 UTC (rev 245)
@@ -39,11 +39,16 @@
(ITEM_PREFIX + r'edit/$', 'item_edit'),
(ITEM_PREFIX + r'add/$', 'item_add'), # for adding sub-things
(ITEM_PREFIX + r'add/cat_search/$', 'item_add_cat_search'),
+
(r'^admin/$', 'admin_index'),
(r'^admin/terms/' + GENERIC_REGEX, 'admin_terms'),
(r'^admin/depts/' + GENERIC_REGEX, 'admin_depts'),
(r'^admin/news/' + GENERIC_REGEX, 'admin_news'),
(r'^admin/targets/' + GENERIC_REGEX, 'admin_targets'),
+
+ (r'^phys/$', 'phys_index'),
+ (r'^phys/checkout/$', 'phys_checkout'),
+
(r'^course/(?P<course_id>\d+)/reseq$', 'course_reseq'),
(ITEM_PREFIX + r'reseq', 'item_heading_reseq'),
(ITEM_PREFIX + r'relocate/', 'item_relocate'), # move to new subheading
Modified: servres/trunk/conifer/syrup/views.py
===================================================================
--- servres/trunk/conifer/syrup/views.py 2009-04-03 01:30:52 UTC (rev 244)
+++ servres/trunk/conifer/syrup/views.py 2009-04-03 01:30:56 UTC (rev 245)
@@ -1209,3 +1209,14 @@
return HttpResponseRedirect(course.course_url())
+
+#-----------------------------------------------------------------------------
+# Physical item processing
+
+ at admin_only # fixme, is this the right permission?
+def phys_index(request):
+ return g.render('phys/index.xhtml')
+
+ at admin_only # fixme, is this the right permission?
+def phys_checkout(request):
+ return g.render('phys/checkout.xhtml')
Added: servres/trunk/conifer/templates/phys/checkout.xhtml
===================================================================
--- servres/trunk/conifer/templates/phys/checkout.xhtml (rev 0)
+++ servres/trunk/conifer/templates/phys/checkout.xhtml 2009-04-03 01:30:56 UTC (rev 245)
@@ -0,0 +1,35 @@
+<?python
+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() { $('#patron').focus(); });
+ </script>
+</head>
+<body>
+ <h1>${title}</h1>
+ <form action="." method="POST">
+ <table>
+ <tr>
+ <th>Patron Barcode</th>
+ <td><input type="text" id="patron" name="patron" style="width: 400;"/></td>
+ </tr>
+ <tr>
+ <th>Item Barcode</th>
+ <td><input type="text" name="item" style="width: 400;"/></td>
+ </tr>
+ <tr>
+ <th/>
+ <td><input type="submit" value="Request Checkout"/></td>
+ </tr>
+ </table>
+
+ </form>
+
+</body>
+</html>
Added: servres/trunk/conifer/templates/phys/index.xhtml
===================================================================
--- servres/trunk/conifer/templates/phys/index.xhtml (rev 0)
+++ servres/trunk/conifer/templates/phys/index.xhtml 2009-04-03 01:30:56 UTC (rev 245)
@@ -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>
Modified: servres/trunk/conifer/templates/tabbar.xhtml
===================================================================
--- servres/trunk/conifer/templates/tabbar.xhtml 2009-04-03 01:30:52 UTC (rev 244)
+++ servres/trunk/conifer/templates/tabbar.xhtml 2009-04-03 01:30:56 UTC (rev 245)
@@ -11,15 +11,6 @@
<li><a href="/syrup/browse/">Browse</a></li>
<li class="active"><a href="/syrup/course/">My Courses</a></li>
<li><a href="/syrup/admin/">Admin Options</a></li>
- <!--
- !RD had a concept of "joining" which i am
- suppressing for now, our staff is definitely
- not keen on the idea and my small focus group
- think it's way too much too expect for this
- library function.
- -->
- <!-- <li><a href="/syrup/join/">Join a Course</a></li> -->
- <!-- <li><a href="/syrup">Add a Reserve</a></li> -->
- <!-- <li><a href="/syrup">Manage Users</a></li> -->
+ <li><a href="/syrup/phys/">Physical Item Processing</a></li>
</ul>
</html>
More information about the open-ils-commits
mailing list